From 42499ea6ffa524af6cf6dc86f4024798ec48eea9 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Tue, 3 Mar 2015 18:10:01 +0000
Subject: [PATCH] Minor tweaks and fixes for #1529

1. Display friendlier caption field in select dropdown
2. Remove extraneous line break from end of default config tiddler
3. Minor wording tweak
---
 core/language/en-GB/ControlPanel.multids            | 2 +-
 core/ui/ControlPanel/Settings/DefaultSidebarTab.tid | 6 +++---
 core/wiki/config/DefaultSidebarTab.tid              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index 829ec8af8..e8bea8c7b 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -85,7 +85,7 @@ 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
+Settings/DefaultSidebarTab/Hint: Specify which sidebar tab is displayed by default
 StoryView/Caption: Story View
 StoryView/Prompt: Current view:
 Theme/Caption: Theme
diff --git a/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid b/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid
index 7c94e44c1..538e15ca8 100644
--- a/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid
+++ b/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid
@@ -6,8 +6,8 @@ title: $:/core/ui/ControlPanel/Settings/DefaultSidebarTab
 
 <$link to="$:/config/DefaultSidebarTab"><<lingo Hint>></$link>
 
-<$select tiddler="$:/config/DefaultSidebarTab" default={{$:/config/DefaultSidebarTab}}>
+<$select tiddler="$:/config/DefaultSidebarTab">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]">
-<option value=<<currentTiddler>>><<currentTiddler>></option>
+<option value=<<currentTiddler>>><$transclude field="caption"><$text text=<<currentTiddler>>/></$transclude></option>
 </$list>
-</$select>
\ No newline at end of file
+</$select>
diff --git a/core/wiki/config/DefaultSidebarTab.tid b/core/wiki/config/DefaultSidebarTab.tid
index a018fb952..e24b2a107 100644
--- a/core/wiki/config/DefaultSidebarTab.tid
+++ b/core/wiki/config/DefaultSidebarTab.tid
@@ -1,3 +1,3 @@
 title: $:/config/DefaultSidebarTab
 
-$:/core/ui/SideBar/Open
+$:/core/ui/SideBar/Open
\ No newline at end of file