From 21b738936f1eedf7cfd6ed93cd6d175e2cc38576 Mon Sep 17 00:00:00 2001 From: Felix Hayashi Date: Wed, 25 Feb 2015 17:53:32 +0100 Subject: [PATCH 1/2] setting default sidebar tab --- core/language/en-GB/TiddlerInfo.multids | 117 +++++++++++++++--- .../Settings/DefaultSidebarTab.tid | 13 ++ core/ui/SideBarLists.tid | 2 +- core/wiki/config/DefaultSidebarTab.tid | 3 + 4 files changed, 115 insertions(+), 20 deletions(-) create mode 100644 core/ui/ControlPanel/Settings/DefaultSidebarTab.tid create mode 100644 core/wiki/config/DefaultSidebarTab.tid diff --git a/core/language/en-GB/TiddlerInfo.multids b/core/language/en-GB/TiddlerInfo.multids index a395ce19b..a6609eab7 100644 --- a/core/language/en-GB/TiddlerInfo.multids +++ b/core/language/en-GB/TiddlerInfo.multids @@ -1,21 +1,100 @@ -title: $:/language/TiddlerInfo/ +title: $:/language/ControlPanel/ Advanced/Caption: Advanced -Advanced/PluginInfo/Empty/Hint: none -Advanced/PluginInfo/Heading: Plugin Details -Advanced/PluginInfo/Hint: This plugin contains the following shadow tiddlers: -Advanced/ShadowInfo/Heading: Shadow Status -Advanced/ShadowInfo/NotShadow/Hint: The tiddler <$link to=<>><$text text=<>/> is not a shadow tiddler -Advanced/ShadowInfo/Shadow/Hint: The tiddler <$link to=<>><$text text=<>/> is a shadow tiddler -Advanced/ShadowInfo/Shadow/Source: It is defined in the plugin <$link to=<>><$text text=<>/> -Advanced/ShadowInfo/OverriddenShadow/Hint: It is overridden by an ordinary tiddler -Fields/Caption: Fields -List/Caption: List -List/Empty: This tiddler does not have a list -Listed/Caption: Listed -Listed/Empty: This tiddler is not listed by any others -References/Caption: References -References/Empty: No tiddlers link to this one -Tagging/Caption: Tagging -Tagging/Empty: No tiddlers are tagged with this one -Tools/Caption: Tools +Advanced/Hint: Internal information about this TiddlyWiki +Appearance/Caption: Appearance +Appearance/Hint: Ways to customise the appearance of your TiddlyWiki. +Basics/AnimDuration/Prompt: Animation duration: +Basics/Caption: Basics +Basics/DefaultTiddlers/BottomHint: Use [[double square brackets]] for titles with spaces. Or you can choose to <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">retain story ordering +Basics/DefaultTiddlers/Prompt: Default tiddlers: +Basics/DefaultTiddlers/TopHint: Choose which tiddlers are displayed at startup: +Basics/Language/Prompt: Hello! Current language: +Basics/NewJournal/Title/Prompt: Title of new journal tiddlers +Basics/NewJournal/Tags/Prompt: Tags for new journal tiddlers +Basics/OverriddenShadowTiddlers/Prompt: Number of overridden shadow tiddlers: +Basics/ShadowTiddlers/Prompt: Number of shadow tiddlers: +Basics/Subtitle/Prompt: Subtitle: +Basics/SystemTiddlers/Prompt: Number of system tiddlers: +Basics/Tags/Prompt: Number of tags: +Basics/Tiddlers/Prompt: Number of tiddlers: +Basics/Title/Prompt: Title of this ~TiddlyWiki: +Basics/Username/Prompt: Username for signing edits: +Basics/Version/Prompt: ~TiddlyWiki version: +EditorTypes/Caption: Editor Types +EditorTypes/Editor/Caption: Editor +EditorTypes/Hint: These tiddlers determine which editor is used to edit specific tiddler types. +EditorTypes/Type/Caption: Type +Info/Caption: Info +Info/Hint: Information about this TiddlyWiki +LoadedModules/Caption: Loaded Modules +LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process. +Palette/Caption: Palette +Palette/Editor/Clone/Caption: clone +Palette/Editor/Clone/Prompt: It is recommended that you clone this shadow palette before editing it +Palette/Editor/Prompt/Modified: This shadow palette has been modified +Palette/Editor/Prompt: Editing +Palette/Editor/Reset/Caption: reset +Palette/HideEditor/Caption: hide editor +Palette/Prompt: Current palette: +Palette/ShowEditor/Caption: show editor +Plugins/Caption: Plugins +Plugins/Disable/Caption: disable +Plugins/Disable/Hint: Disable this plugin when reloading page +Plugins/Disabled/Status: (disabled) +Plugins/Empty/Hint: None +Plugins/Enable/Caption: enable +Plugins/Enable/Hint: Enable this plugin when reloading page +Plugins/Language/Prompt: Languages +Plugins/Plugin/Prompt: Plugins +Plugins/Theme/Prompt: Themes +Saving/Caption: Saving +Saving/Heading: Saving +Saving/TiddlySpot/Advanced/Heading: Advanced Settings +Saving/TiddlySpot/BackupDir: Backup Directory +Saving/TiddlySpot/Backups: Backups +Saving/TiddlySpot/Description: These settings are only used when saving to http://tiddlyspot.com or a compatible remote server +Saving/TiddlySpot/Filename: Upload Filename +Saving/TiddlySpot/Heading: ~TiddlySpot +Saving/TiddlySpot/Hint: //The server URL defaults to `http://.tiddlyspot.com/store.cgi` and can be changed to use a custom server address// +Saving/TiddlySpot/Password: Password +Saving/TiddlySpot/ServerURL: Server URL +Saving/TiddlySpot/UploadDir: Upload Directory +Saving/TiddlySpot/UserName: Wiki Name +Settings/AutoSave/Caption: Autosave +Settings/AutoSave/Disabled/Description: Do not save changes automatically +Settings/AutoSave/Enabled/Description: Save changes automatically +Settings/AutoSave/Hint: Automatically save changes during editing +Settings/DefaultSidebarTab/Caption: Default Sidebar Tab +Settings/DefaultSidebarTab/Hint: Define the sidebar tab that is displayed per default +Settings/Caption: Settings +Settings/Hint: These settings let you customise the behaviour of TiddlyWiki. +Settings/NavigationAddressBar/Caption: Navigation Address Bar +Settings/NavigationAddressBar/Hint: Behaviour of the browser address bar when navigating to a tiddler: +Settings/NavigationAddressBar/No/Description: Do not update the address bar +Settings/NavigationAddressBar/Permalink/Description: Include the target tiddler +Settings/NavigationAddressBar/Permaview/Description: Include the target tiddler and the current story sequence +Settings/NavigationHistory/Caption: Navigation History +Settings/NavigationHistory/Hint: Update browser history when navigating to a tiddler: +Settings/NavigationHistory/No/Description: Do not update history +Settings/NavigationHistory/Yes/Description: Update history +Settings/ToolbarButtons/Caption: Toolbar Buttons +Settings/ToolbarButtons/Hint: Default toolbar button appearance: +Settings/ToolbarButtons/Icons/Description: Include icon +Settings/ToolbarButtons/Text/Description: Include text +StoryView/Caption: Story View +StoryView/Prompt: Current view: +Theme/Caption: Theme +Theme/Prompt: Current theme: +TiddlerFields/Caption: Tiddler Fields +TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers). +Toolbars/Caption: Toolbars +Toolbars/EditToolbar/Caption: Edit Toolbar +Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode +Toolbars/Hint: Select which toolbar buttons are displayed +Toolbars/PageControls/Caption: Page Toolbar +Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar +Toolbars/ViewToolbar/Caption: View Toolbar +Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode +Tools/Download/Full/Caption: Download full wiki + diff --git a/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid b/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid new file mode 100644 index 000000000..7c94e44c1 --- /dev/null +++ b/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid @@ -0,0 +1,13 @@ +caption: {{$:/language/ControlPanel/Settings/DefaultSidebarTab/Caption}} +tags: $:/tags/ControlPanel/Settings +title: $:/core/ui/ControlPanel/Settings/DefaultSidebarTab + +\define lingo-base() $:/language/ControlPanel/Settings/DefaultSidebarTab/ + +<$link to="$:/config/DefaultSidebarTab"><> + +<$select tiddler="$:/config/DefaultSidebarTab" default={{$:/config/DefaultSidebarTab}}> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]"> + + + \ No newline at end of file diff --git a/core/ui/SideBarLists.tid b/core/ui/SideBarLists.tid index 100d6fec8..8c3b53329 100644 --- a/core/ui/SideBarLists.tid +++ b/core/ui/SideBarLists.tid @@ -33,7 +33,7 @@ title: $:/core/ui/SideBarLists <$reveal state="$:/temp/search" type="match" text=""> -<> +<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]" default={{$:/config/DefaultSidebarTab}} state="$:/state/tab/sidebar" /> diff --git a/core/wiki/config/DefaultSidebarTab.tid b/core/wiki/config/DefaultSidebarTab.tid new file mode 100644 index 000000000..a018fb952 --- /dev/null +++ b/core/wiki/config/DefaultSidebarTab.tid @@ -0,0 +1,3 @@ +title: $:/config/DefaultSidebarTab + +$:/core/ui/SideBar/Open From 13f02992f55fd736f29b931ed2ff3e624be397db Mon Sep 17 00:00:00 2001 From: Felix Hayashi Date: Wed, 25 Feb 2015 18:00:02 +0100 Subject: [PATCH 2/2] changed wrong file --- core/language/en-GB/ControlPanel.multids | 2 + core/language/en-GB/TiddlerInfo.multids | 117 ++++------------------- 2 files changed, 21 insertions(+), 98 deletions(-) diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids index 1d583770a..829ec8af8 100644 --- a/core/language/en-GB/ControlPanel.multids +++ b/core/language/en-GB/ControlPanel.multids @@ -84,6 +84,8 @@ Settings/ToolbarButtons/Caption: Toolbar Buttons Settings/ToolbarButtons/Hint: Default toolbar button appearance: Settings/ToolbarButtons/Icons/Description: Include icon Settings/ToolbarButtons/Text/Description: Include text +Settings/DefaultSidebarTab/Caption: Default Sidebar Tab +Settings/DefaultSidebarTab/Hint: Define the sidebar tab that is displayed per default StoryView/Caption: Story View StoryView/Prompt: Current view: Theme/Caption: Theme diff --git a/core/language/en-GB/TiddlerInfo.multids b/core/language/en-GB/TiddlerInfo.multids index a6609eab7..a395ce19b 100644 --- a/core/language/en-GB/TiddlerInfo.multids +++ b/core/language/en-GB/TiddlerInfo.multids @@ -1,100 +1,21 @@ -title: $:/language/ControlPanel/ +title: $:/language/TiddlerInfo/ Advanced/Caption: Advanced -Advanced/Hint: Internal information about this TiddlyWiki -Appearance/Caption: Appearance -Appearance/Hint: Ways to customise the appearance of your TiddlyWiki. -Basics/AnimDuration/Prompt: Animation duration: -Basics/Caption: Basics -Basics/DefaultTiddlers/BottomHint: Use [[double square brackets]] for titles with spaces. Or you can choose to <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">retain story ordering -Basics/DefaultTiddlers/Prompt: Default tiddlers: -Basics/DefaultTiddlers/TopHint: Choose which tiddlers are displayed at startup: -Basics/Language/Prompt: Hello! Current language: -Basics/NewJournal/Title/Prompt: Title of new journal tiddlers -Basics/NewJournal/Tags/Prompt: Tags for new journal tiddlers -Basics/OverriddenShadowTiddlers/Prompt: Number of overridden shadow tiddlers: -Basics/ShadowTiddlers/Prompt: Number of shadow tiddlers: -Basics/Subtitle/Prompt: Subtitle: -Basics/SystemTiddlers/Prompt: Number of system tiddlers: -Basics/Tags/Prompt: Number of tags: -Basics/Tiddlers/Prompt: Number of tiddlers: -Basics/Title/Prompt: Title of this ~TiddlyWiki: -Basics/Username/Prompt: Username for signing edits: -Basics/Version/Prompt: ~TiddlyWiki version: -EditorTypes/Caption: Editor Types -EditorTypes/Editor/Caption: Editor -EditorTypes/Hint: These tiddlers determine which editor is used to edit specific tiddler types. -EditorTypes/Type/Caption: Type -Info/Caption: Info -Info/Hint: Information about this TiddlyWiki -LoadedModules/Caption: Loaded Modules -LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process. -Palette/Caption: Palette -Palette/Editor/Clone/Caption: clone -Palette/Editor/Clone/Prompt: It is recommended that you clone this shadow palette before editing it -Palette/Editor/Prompt/Modified: This shadow palette has been modified -Palette/Editor/Prompt: Editing -Palette/Editor/Reset/Caption: reset -Palette/HideEditor/Caption: hide editor -Palette/Prompt: Current palette: -Palette/ShowEditor/Caption: show editor -Plugins/Caption: Plugins -Plugins/Disable/Caption: disable -Plugins/Disable/Hint: Disable this plugin when reloading page -Plugins/Disabled/Status: (disabled) -Plugins/Empty/Hint: None -Plugins/Enable/Caption: enable -Plugins/Enable/Hint: Enable this plugin when reloading page -Plugins/Language/Prompt: Languages -Plugins/Plugin/Prompt: Plugins -Plugins/Theme/Prompt: Themes -Saving/Caption: Saving -Saving/Heading: Saving -Saving/TiddlySpot/Advanced/Heading: Advanced Settings -Saving/TiddlySpot/BackupDir: Backup Directory -Saving/TiddlySpot/Backups: Backups -Saving/TiddlySpot/Description: These settings are only used when saving to http://tiddlyspot.com or a compatible remote server -Saving/TiddlySpot/Filename: Upload Filename -Saving/TiddlySpot/Heading: ~TiddlySpot -Saving/TiddlySpot/Hint: //The server URL defaults to `http://.tiddlyspot.com/store.cgi` and can be changed to use a custom server address// -Saving/TiddlySpot/Password: Password -Saving/TiddlySpot/ServerURL: Server URL -Saving/TiddlySpot/UploadDir: Upload Directory -Saving/TiddlySpot/UserName: Wiki Name -Settings/AutoSave/Caption: Autosave -Settings/AutoSave/Disabled/Description: Do not save changes automatically -Settings/AutoSave/Enabled/Description: Save changes automatically -Settings/AutoSave/Hint: Automatically save changes during editing -Settings/DefaultSidebarTab/Caption: Default Sidebar Tab -Settings/DefaultSidebarTab/Hint: Define the sidebar tab that is displayed per default -Settings/Caption: Settings -Settings/Hint: These settings let you customise the behaviour of TiddlyWiki. -Settings/NavigationAddressBar/Caption: Navigation Address Bar -Settings/NavigationAddressBar/Hint: Behaviour of the browser address bar when navigating to a tiddler: -Settings/NavigationAddressBar/No/Description: Do not update the address bar -Settings/NavigationAddressBar/Permalink/Description: Include the target tiddler -Settings/NavigationAddressBar/Permaview/Description: Include the target tiddler and the current story sequence -Settings/NavigationHistory/Caption: Navigation History -Settings/NavigationHistory/Hint: Update browser history when navigating to a tiddler: -Settings/NavigationHistory/No/Description: Do not update history -Settings/NavigationHistory/Yes/Description: Update history -Settings/ToolbarButtons/Caption: Toolbar Buttons -Settings/ToolbarButtons/Hint: Default toolbar button appearance: -Settings/ToolbarButtons/Icons/Description: Include icon -Settings/ToolbarButtons/Text/Description: Include text -StoryView/Caption: Story View -StoryView/Prompt: Current view: -Theme/Caption: Theme -Theme/Prompt: Current theme: -TiddlerFields/Caption: Tiddler Fields -TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers). -Toolbars/Caption: Toolbars -Toolbars/EditToolbar/Caption: Edit Toolbar -Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode -Toolbars/Hint: Select which toolbar buttons are displayed -Toolbars/PageControls/Caption: Page Toolbar -Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar -Toolbars/ViewToolbar/Caption: View Toolbar -Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode -Tools/Download/Full/Caption: Download full wiki - +Advanced/PluginInfo/Empty/Hint: none +Advanced/PluginInfo/Heading: Plugin Details +Advanced/PluginInfo/Hint: This plugin contains the following shadow tiddlers: +Advanced/ShadowInfo/Heading: Shadow Status +Advanced/ShadowInfo/NotShadow/Hint: The tiddler <$link to=<>><$text text=<>/> is not a shadow tiddler +Advanced/ShadowInfo/Shadow/Hint: The tiddler <$link to=<>><$text text=<>/> is a shadow tiddler +Advanced/ShadowInfo/Shadow/Source: It is defined in the plugin <$link to=<>><$text text=<>/> +Advanced/ShadowInfo/OverriddenShadow/Hint: It is overridden by an ordinary tiddler +Fields/Caption: Fields +List/Caption: List +List/Empty: This tiddler does not have a list +Listed/Caption: Listed +Listed/Empty: This tiddler is not listed by any others +References/Caption: References +References/Empty: No tiddlers link to this one +Tagging/Caption: Tagging +Tagging/Empty: No tiddlers are tagged with this one +Tools/Caption: Tools