Rejig the control panel to use nested tabs for Appearance and Advanced

core/language/en-GB/ControlPanel.tids

@@ -16,10 +16,11 @@ Basics/ShadowTiddlers/Prompt: Number of shadow tiddlers:
 Basics/OverriddenShadowTiddlers/Prompt: Number of overridden shadow tiddlers:
 Basics/Language/Prompt: Hello! Current language:
 Appearance/Caption: Appearance
-Appearance/Theme/Caption: Current theme:
-Appearance/Theme/Heading: Theme
-Appearance/StoryView/Caption: Current view:
-Appearance/StoryView/Heading: Story View
+Appearance/Hint: Ways to customise the appearance of your TiddlyWiki.
+Appearance/Theme/Prompt: Current theme:
+Appearance/Theme/Caption: Theme
+Appearance/StoryView/Prompt: Current view:
+Appearance/StoryView/Caption: Story View
 Saving/Caption: Saving
 Saving/Heading: Saving
 Saving/AutoSave: Autosave
@@ -54,8 +55,9 @@ Tools/Encryption/Disabled/Prompt: This wiki is not encrypted
 Tools/Encryption/ClearPassword/Button: clear password
 Tools/Encryption/ChangePassword/Button: change password
 Tools/Encryption/SetPassword/Button: set password
-Internals/Caption: Internals
-Internals/TiddlerFields/Heading: TiddlerFields
-Internals/TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
-Internals/LoadedModules/Heading: Loaded Modules
-Internals/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.
+Advanced/Caption: Advanced
+Advanced/Hint: Internal information about this TiddlyWiki
+Advanced/TiddlerFields/Caption: Tiddler Fields
+Advanced/TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
+Advanced/LoadedModules/Caption: Loaded Modules
+Advanced/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.

core/ui/ControlPanel/Advanced.tid

@@ -0,0 +1,7 @@
+title: $:/core/ui/ControlPanel/Advanced
+tags: $:/tags/ControlPanel
+caption: {{$:/language/ControlPanel/Advanced/Caption}}
+
+{{$:/language/ControlPanel/Advanced/Hint}}
+
+<div class="tw-control-panel"><<tabs "[is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Advanced]] [!is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Advanced]] +[tag[$:/tags/ControlPanel/Advanced]]" "$:/core/ui/ControlPanel/Advanced/TiddlerFields">></div>

core/ui/ControlPanel/Advanced/LoadedModules.tid

@@ -0,0 +1,8 @@
+title: $:/core/ui/ControlPanel/Advanced/LoadedModules
+tags: $:/tags/ControlPanel/Advanced
+caption: {{$:/language/ControlPanel/Advanced/LoadedModules/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Advanced/
+<<lingo LoadedModules/Hint>>
+
+{{$:/snippets/modules}}

core/ui/ControlPanel/Advanced/TiddlerFields.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/Advanced/TiddlerFields
+tags: $:/tags/ControlPanel/Advanced
+caption: {{$:/language/ControlPanel/Advanced/TiddlerFields/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Advanced/
+
+<<lingo TiddlerFields/Hint>>
+
+{{$:/snippets/allfields}}

core/ui/ControlPanel/Appearance.tid

@@ -2,11 +2,6 @@ title: $:/core/ui/ControlPanel/Appearance
 tags: $:/tags/ControlPanel
 caption: {{$:/language/ControlPanel/Appearance/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/Appearance/
-! <<lingo Theme/Heading>>
+{{$:/language/ControlPanel/Appearance/Hint}}
 
-{{$:/snippets/themeswitcher}}
-
-! <<lingo StoryView/Heading>>
-
-{{$:/snippets/viewswitcher}}
+<div class="tw-control-panel"><<tabs "[is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Appearance]] [!is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Appearance]] +[tag[$:/tags/ControlPanel/Appearance]]" "$:/core/ui/ControlPanel/Appearance/Theme">></div>

core/ui/ControlPanel/Appearance/StoryView.tid

@@ -0,0 +1,5 @@
+title: $:/core/ui/ControlPanel/Appearance/StoryView
+tags: $:/tags/ControlPanel/Appearance
+caption: {{$:/language/ControlPanel/Appearance/StoryView/Caption}}
+
+{{$:/snippets/viewswitcher}}

core/ui/ControlPanel/Appearance/Theme.tid

@@ -0,0 +1,5 @@
+title: $:/core/ui/ControlPanel/Appearance/Theme
+tags: $:/tags/ControlPanel/Appearance
+caption: {{$:/language/ControlPanel/Appearance/Theme/Caption}}
+
+{{$:/snippets/themeswitcher}}

core/ui/ControlPanel/Internals.tid

@@ -1,16 +0,0 @@
-title: $:/core/ui/ControlPanel/Internals
-tags: $:/tags/ControlPanel
-caption: {{$:/language/ControlPanel/Internals/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/Internals/
-! <<lingo TiddlerFields/Heading>>
-
-<<lingo TiddlerFields/Hint>>
-
-{{$:/snippets/allfields}}
-
-! <<lingo LoadedModules/Heading>>
-
-<<lingo LoadedModules/Hint>>
-
-{{$:/snippets/modules}}

core/wiki/minithemeswitcher.tid

@@ -1,7 +1,7 @@
 title: $:/snippets/minithemeswitcher
 
 \define lingo-base() $:/language/ControlPanel/Appearance/Theme/
-<<lingo Caption>> <$view tiddler={{$:/theme}} field="name"/>
+<<lingo Prompt>> <$view tiddler={{$:/theme}} field="name"/>
 
 <$linkcatcher to="$:/theme">
 <$list filter="[plugin-type[theme]sort[title]]"><div><$reveal state="$:/theme" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/theme" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="name" format="text"/></$link></div>

core/wiki/themeswitcher.tid

@@ -1,7 +1,7 @@
 title: $:/snippets/themeswitcher
 
 \define lingo-base() $:/language/ControlPanel/Appearance/Theme/
-<<lingo Caption>> <$view tiddler={{$:/theme}} field="name"/>
+<<lingo Prompt>> <$view tiddler={{$:/theme}} field="name"/>
 
 <$linkcatcher to="$:/theme">
 <$list filter="[plugin-type[theme]sort[title]]"><div><$reveal state="$:/theme" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/theme" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}>''<$view field="name" format="text"/>'' <$view field="description" format="text"/></$link></div>

core/wiki/viewswitcher.tid

@@ -1,7 +1,7 @@
 title: $:/snippets/viewswitcher
 
 \define lingo-base() $:/language/ControlPanel/Appearance/StoryView/
-<<lingo Caption>> {{$:/view}}
+<<lingo Prompt>> {{$:/view}}
 
 <$linkcatcher to="$:/view"><$list filter="classic zoomin pop"><div><$reveal state="$:/view" type="match" text={{!!title}}>&bull;</$reveal><$reveal state="$:/view" type="nomatch" text={{!!title}}>&nbsp;</$reveal> <$link to={{!!title}}><$view field="title"/></$link>
 </div>

themes/tiddlywiki/vanilla/ThemeTweaks.tid

@@ -1,5 +1,5 @@
 title: $:/themes/tiddlywiki/vanilla/themetweaks
-tags: $:/tags/ControlPanel
+tags: $:/tags/ControlPanel/Appearance
 caption: Theme Tweaks
 
 You can tweak certain aspects of the ''Vanilla'' theme.