clean up: remove vestige of custom login url

...and put Share settings at end of Other section

src/public/app/widgets/type_widgets/content_widget.js

@@ -91,12 +91,12 @@ const CONTENT_WIDGETS = {
     _optionsOther: [
         SearchEngineOptions,
         TrayOptions,
-        ShareSettingsOptions,
         NoteErasureTimeoutOptions,
         AttachmentErasureTimeoutOptions,
         RevisionsSnapshotIntervalOptions,
         RevisionSnapshotsLimitOptions,
-        NetworkConnectionsOptions
+        NetworkConnectionsOptions,
+        ShareSettingsOptions
     ],
     _optionsAdvanced: [
         DatabaseIntegrityCheckOptions,

src/services/options_init.ts

@@ -102,7 +102,6 @@ const defaultOptions: DefaultOption[] = [
     { name: 'headingStyle', value: 'underline', isSynced: true },
     { name: 'autoCollapseNoteTree', value: 'true', isSynced: true },
     { name: 'autoReadonlySizeText', value: '10000', isSynced: false },
-    { name: 'redirectBareDomain', value: 'false', isSynced: true },
     { name: 'autoReadonlySizeCode', value: '30000', isSynced: false },
     { name: 'dailyBackupEnabled', value: 'true', isSynced: false },
     { name: 'weeklyBackupEnabled', value: 'true', isSynced: false },
@@ -138,8 +137,9 @@ const defaultOptions: DefaultOption[] = [
     { name: "textNoteEditorType", value: "ckeditor-balloon", isSynced: true },
 
     { name: "layoutOrientation", value: "vertical", isSynced: false },
-    { name: 'shareRedirectUrl', value: 'share', isSynced: true },
+
-    { name: 'loginRedirectUrl', value: 'login', isSynced: true },
+    // Share settings
+    { name: 'redirectBareDomain', value: 'false', isSynced: true },
     { name: 'showLoginInShareTheme', value: 'false', isSynced: true }
 ];
 

src/share/routes.ts

@@ -158,8 +158,7 @@ function register(router: Router) {
         const { header, content, isEmpty } = contentRenderer.getContent(note);
         const subRoot = getSharedSubTreeRoot(note);
         const showLoginInShareTheme = optionService.getOption('showLoginInShareTheme');
-        const loginRedirectUrl = optionService.getOption('loginRedirectUrl');
+        const opts = { note, header, content, isEmpty, subRoot, assetPath, appPath, showLoginInShareTheme };
-        const opts = { note, header, content, isEmpty, subRoot, assetPath, appPath, showLoginInShareTheme, loginRedirectUrl };
         let useDefaultView = true;
 
         // Check if the user has their own template

src/views/share/page.ejs

@@ -91,7 +91,7 @@
 
 <footer>
     <% if (showLoginInShareTheme === 'true') { %>
-        <p><a href="<%= loginRedirectUrl %>" class="login-link"><%= loginRedirectUrl %></a></p>
+        <p><a href="/login" class="login-link">Login</a></p>
     <% } %>
 </footer>
 </body>