mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-03 21:19:01 +01:00 
			
		
		
		
	responding to code review (thanks pano!)
This commit is contained in:
		
							parent
							
								
									2ec2d784ec
								
							
						
					
					
						commit
						657638ee54
					
				@ -78,7 +78,7 @@ const CONTENT_WIDGETS: Record<string, (typeof NoteContextAwareWidget)[]> = {
 | 
				
			|||||||
        RevisionSnapshotsLimitOptions,
 | 
					        RevisionSnapshotsLimitOptions,
 | 
				
			||||||
        NetworkConnectionsOptions,
 | 
					        NetworkConnectionsOptions,
 | 
				
			||||||
        HtmlImportTagsOptions,
 | 
					        HtmlImportTagsOptions,
 | 
				
			||||||
        ShareSettingsOptions // moved to the end of the array
 | 
					        ShareSettingsOptions
 | 
				
			||||||
    ],
 | 
					    ],
 | 
				
			||||||
    _optionsAdvanced: [DatabaseIntegrityCheckOptions, DatabaseAnonymizationOptions, AdvancedSyncOptions, VacuumDatabaseOptions],
 | 
					    _optionsAdvanced: [DatabaseIntegrityCheckOptions, DatabaseAnonymizationOptions, AdvancedSyncOptions, VacuumDatabaseOptions],
 | 
				
			||||||
    _backendLog: [BackendLogWidget]
 | 
					    _backendLog: [BackendLogWidget]
 | 
				
			||||||
 | 
				
			|||||||
@ -5,22 +5,23 @@ import type { OptionMap, OptionNames } from "../../../../../../services/options_
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
const TPL = `
 | 
					const TPL = `
 | 
				
			||||||
<div class="card-body">
 | 
					<div class="card-body">
 | 
				
			||||||
    <h4>${t("Share Settings")}</h4>
 | 
					    <h4>${t("share.title")}</h4>
 | 
				
			||||||
    
 | 
					
 | 
				
			||||||
    <div class="form-check">
 | 
					    <div class="form-check">
 | 
				
			||||||
        <label class="form-check-label">
 | 
					        <label class="form-check-label">
 | 
				
			||||||
            <input class="form-check-input" type="checkbox" name="redirectBareDomain" value="true">
 | 
					            <input class="form-check-input" type="checkbox" name="redirectBareDomain" value="true">
 | 
				
			||||||
            ${t("Redirect bare domain to Share page")}
 | 
					            ${t("share.redirect_bare_domain")}
 | 
				
			||||||
        </label>
 | 
					        </label>
 | 
				
			||||||
        <p class="form-text">${t("When enabled, accessing the root URL will redirect to the Share page instead of Login")}</p>
 | 
					        <p class="form-text">${t("share.redirect_bare_domain_description")}</p>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <div class="form-check">
 | 
					    <div class="form-check">
 | 
				
			||||||
        <label class="form-check-label">
 | 
					        <label class="form-check-label">
 | 
				
			||||||
            <input class="form-check-input" type="checkbox" name="showLoginInShareTheme" value="true">
 | 
					            <input class="form-check-input" type="checkbox" name="showLoginInShareTheme" value="true">
 | 
				
			||||||
            ${t("Show Login link in Share theme")}
 | 
					            ${t("share.show_login_link")}
 | 
				
			||||||
        </label>
 | 
					        </label>
 | 
				
			||||||
        <p class="form-text">${t("Add a login link to the Share page footer")}</p>
 | 
					        <p class="form-text">${t("share.show_login_link_description")}</p>
 | 
				
			||||||
 | 
					        <p> </p>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
</div>`;
 | 
					</div>`;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -1656,5 +1656,27 @@
 | 
				
			|||||||
    "minutes": "Minutes",
 | 
					    "minutes": "Minutes",
 | 
				
			||||||
    "hours": "Hours",
 | 
					    "hours": "Hours",
 | 
				
			||||||
    "days": "Days"
 | 
					    "days": "Days"
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					  "share": {
 | 
				
			||||||
 | 
					    "title": "Share Settings",
 | 
				
			||||||
 | 
					    "redirect_bare_domain": "Redirect bare domain to Share page",
 | 
				
			||||||
 | 
					    "redirect_bare_domain_description": "When enabled, accessing the root URL will redirect to the Share page instead of Login",
 | 
				
			||||||
 | 
					    "show_login_link": "Show Login link in Share theme",
 | 
				
			||||||
 | 
					    "show_login_link_description": "Add a login link to the Share page footer"
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					  "sync_2": {
 | 
				
			||||||
 | 
					    "config_title": "Sync Configuration",
 | 
				
			||||||
 | 
					    "server_address": "Server instance address",
 | 
				
			||||||
 | 
					    "timeout": "Sync timeout (milliseconds)",
 | 
				
			||||||
 | 
					    "proxy_label": "Sync proxy server (optional)",
 | 
				
			||||||
 | 
					    "note": "Note",
 | 
				
			||||||
 | 
					    "note_description": "If you leave the proxy setting blank, the system proxy will be used (applies to desktop/electron build only).",
 | 
				
			||||||
 | 
					    "special_value_description": "Another special value is <code>noproxy</code> which forces ignoring even the system proxy and respects <code>NODE_TLS_REJECT_UNAUTHORIZED</code>.",
 | 
				
			||||||
 | 
					    "save": "Save",
 | 
				
			||||||
 | 
					    "help": "Help",
 | 
				
			||||||
 | 
					    "test_title": "Sync Test",
 | 
				
			||||||
 | 
					    "test_description": "This will test the connection and handshake to the sync server. If the sync server isn't initialized, this will set it up to sync with the local document.",
 | 
				
			||||||
 | 
					    "test_button": "Test sync",
 | 
				
			||||||
 | 
					    "handshake_failed": "Sync server handshake failed, error: {{message}}"
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -29,9 +29,6 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
 | 
				
			|||||||
    detailFontFamily: FontFamily;
 | 
					    detailFontFamily: FontFamily;
 | 
				
			||||||
    monospaceFontFamily: FontFamily;
 | 
					    monospaceFontFamily: FontFamily;
 | 
				
			||||||
    spellCheckLanguageCode: string;
 | 
					    spellCheckLanguageCode: string;
 | 
				
			||||||
    // Share settings
 | 
					 | 
				
			||||||
    redirectBareDomain: string;
 | 
					 | 
				
			||||||
    showLoginInShareTheme: string;
 | 
					 | 
				
			||||||
    codeNotesMimeTypes: string;
 | 
					    codeNotesMimeTypes: string;
 | 
				
			||||||
    headingStyle: string;
 | 
					    headingStyle: string;
 | 
				
			||||||
    highlightsList: string;
 | 
					    highlightsList: string;
 | 
				
			||||||
@ -97,6 +94,10 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
 | 
				
			|||||||
    codeBlockWordWrap: boolean;
 | 
					    codeBlockWordWrap: boolean;
 | 
				
			||||||
    textNoteEditorMultilineToolbar: boolean;
 | 
					    textNoteEditorMultilineToolbar: boolean;
 | 
				
			||||||
    backgroundEffects: boolean;
 | 
					    backgroundEffects: boolean;
 | 
				
			||||||
 | 
					    // Share settings
 | 
				
			||||||
 | 
					    redirectBareDomain: boolean;
 | 
				
			||||||
 | 
					    showLoginInShareTheme: boolean;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export type OptionNames = keyof OptionDefinitions;
 | 
					export type OptionNames = keyof OptionDefinitions;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user