From 29e4965d2b94c43e789993926741422369a598de Mon Sep 17 00:00:00 2001
From: TheDiveO <TheDiveO@users.noreply.github.com>
Date: Mon, 5 Mar 2018 12:14:30 +0100
Subject: [PATCH] implements default setting for the More sidebar in the same
 way as the existing default setting which sidebar tab to open as default;
 adds control panel setting; adds en-GB and de-DE lingo (#3135)

---
 core/language/en-GB/ControlPanel.multids            |  2 ++
 .../ControlPanel/Settings/DefaultMoreSidebarTab.tid | 13 +++++++++++++
 core/ui/SideBar/More.tid                            |  4 ++--
 core/wiki/config/DefaultMoreSidebarTab.tid          |  3 +++
 languages/de-DE/ControlPanel.multids                |  4 +++-
 5 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
 create mode 100644 core/wiki/config/DefaultMoreSidebarTab.tid

diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index 71ac8fa86..49bd177b5 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -139,6 +139,8 @@ Settings/ToolbarButtons/Icons/Description: Include icon
 Settings/ToolbarButtons/Text/Description: Include text
 Settings/DefaultSidebarTab/Caption: Default Sidebar Tab
 Settings/DefaultSidebarTab/Hint: Specify which sidebar tab is displayed by default
+Settings/DefaultMoreSidebarTab/Caption: Default More Sidebar Tab
+Settings/DefaultMoreSidebarTab/Hint: Specify which More sidebar tab is displayed by default
 Settings/LinkToBehaviour/Caption: Tiddler Opening Behaviour
 Settings/LinkToBehaviour/InsideRiver/Hint: Navigation from //within// the story river
 Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation from //outside// the story river
diff --git a/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid b/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
new file mode 100644
index 000000000..e6077f2a2
--- /dev/null
+++ b/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
@@ -0,0 +1,13 @@
+caption: {{$:/language/ControlPanel/Settings/DefaultMoreSidebarTab/Caption}}
+tags: $:/tags/ControlPanel/Settings
+title: $:/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab
+
+\define lingo-base() $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/
+
+<$link to="$:/config/DefaultMoreSidebarTab"><<lingo Hint>></$link>
+
+<$select tiddler="$:/config/DefaultMoreSidebarTab">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]">
+<option value=<<currentTiddler>>><$transclude field="caption"><$text text=<<currentTiddler>>/></$transclude></option>
+</$list>
+</$select>
diff --git a/core/ui/SideBar/More.tid b/core/ui/SideBar/More.tid
index d0a0e4bb2..624a3ae4a 100644
--- a/core/ui/SideBar/More.tid
+++ b/core/ui/SideBar/More.tid
@@ -3,5 +3,5 @@ tags: $:/tags/SideBar
 caption: {{$:/language/SideBar/More/Caption}}
 
 <div class="tc-more-sidebar">
-<<tabs "[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" "$:/core/ui/MoreSideBar/Tags" "$:/state/tab/moresidebar" "tc-vertical">>
-</div>
+<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" default={{$:/config/DefaultMoreSidebarTab}} state="$:/state/tab/moresidebar" class="tc-vertical" />
+</div>
\ No newline at end of file
diff --git a/core/wiki/config/DefaultMoreSidebarTab.tid b/core/wiki/config/DefaultMoreSidebarTab.tid
new file mode 100644
index 000000000..a90f9a7e8
--- /dev/null
+++ b/core/wiki/config/DefaultMoreSidebarTab.tid
@@ -0,0 +1,3 @@
+title: $:/config/DefaultMoreSidebarTab
+
+$:/core/ui/MoreSideBar/Tags
\ No newline at end of file
diff --git a/languages/de-DE/ControlPanel.multids b/languages/de-DE/ControlPanel.multids
index 774d867b6..1f91251db 100644
--- a/languages/de-DE/ControlPanel.multids
+++ b/languages/de-DE/ControlPanel.multids
@@ -139,6 +139,8 @@ Settings/ToolbarButtons/Icons/Description: Icon anzeigen
 Settings/ToolbarButtons/Text/Description: Text anzeigen
 Settings/DefaultSidebarTab/Caption: Standard Sidebar Tab
 Settings/DefaultSidebarTab/Hint: Definition, welcher Sidebar Tab standardmäßig aktiv ist.
+Settings/DefaultMoreSidebarTab/Caption: Standard More Sidebar Tab
+Settings/DefaultMoreSidebarTab/Hint: Definition, welcher More Sidebar Tab standardmäßig aktiv ist.
 Settings/LinkToBehaviour/Caption: Tiddler Öffnen
 Settings/LinkToBehaviour/InsideRiver/Hint: Navigation bei Klicks //innerhalb// der Story
 Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation bei Klicks //außerhalb// der Story
@@ -158,7 +160,7 @@ StoryView/Prompt: Ausgewählte Anzeige:
 Theme/Caption: Theme
 Theme/Prompt: Ausgewähltes Theme:
 TiddlerFields/Caption: Tiddler Felder
-TiddlerFields/Hint: Hier finden Sie alle [[Felder|TiddlerFields]], die in diesem Wiki verwendet werden. Inklusive der Felder aus System-, exklusive Schatten-Tiddler. 
+TiddlerFields/Hint: Hier finden Sie alle [[Felder|TiddlerFields]], die in diesem Wiki verwendet werden. Inklusive der Felder aus System-, exklusive Schatten-Tiddler.
 Toolbars/Caption: Toolbar
 Toolbars/EditToolbar/Caption: Edit Toolbar
 Toolbars/EditToolbar/Hint: Auswählen, welche Buttons im "Edit Modus" angezeigt werden. Verwenden Sie "Drag and Drop", um die Reihenfolge zu ändern