From e9261a1b50136023ac60e52590061c0cb76a57cc Mon Sep 17 00:00:00 2001
From: Tobias Beer <beertobias@gmail.com>
Date: Wed, 28 Jan 2015 23:55:29 +0100
Subject: [PATCH 1/2] implements emptyStoryMessage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

as well added ControlPanel settings — reordered ControlPanel basics to
have DefaultTiddlers next to EmptyMessage but not shifting important
stuff too far down
---
 core/language/en-GB/ControlPanel.multids | 5 ++++-
 core/ui/ControlPanel/Basics.tid          | 7 ++++---
 core/ui/PageTemplate/story.tid           | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index 8fbaf59cc..6ef92111b 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -9,7 +9,10 @@ Basics/Caption: Basics
 Basics/DefaultTiddlers/BottomHint: Use &#91;&#91;double square brackets&#93;&#93; for titles with spaces. Or you can choose to <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">retain story ordering</$button>
 Basics/DefaultTiddlers/Prompt: Default tiddlers:
 Basics/DefaultTiddlers/TopHint: Choose which tiddlers are displayed at startup:
-Basics/Language/Prompt: Hello! Current language:
+Basics/EmptyStoryMessage/Prompt: Empty message:
+Basics/EmptyStoryMessage/TopHint: Wikitext displayed when the story is empty:
+Basics/Language/Prompt: Current language:
+Basics/Language/Hello: Hello!
 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:
diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid
index 714954a35..d62db171e 100644
--- a/core/ui/ControlPanel/Basics.tid
+++ b/core/ui/ControlPanel/Basics.tid
@@ -18,11 +18,12 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 |<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
 |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
 |<$link to="$:/status/UserName"><<lingo Username/Prompt>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
-|<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 |<$link to="$:/config/NewJournal/Title"><<lingo NewJournal/Title/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Tags"><<lingo NewJournal/Tags/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Tags" default="" tag="input"/> |
-|<<lingo Language/Prompt>> |{{$:/snippets/minilanguageswitcher}} |
+|<$link to="$:/language"><<lingo Language/Prompt>></$link> |{{$:/snippets/minilanguageswitcher}} <<lingo Language/Hello>>|
+|<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<$link to="$:/config/EmptyStoryMessage"><<lingo EmptyStoryMessage/Prompt>></$link> |<<lingo EmptyStoryMessage/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/config/EmptyStoryMessage" default=""/>|
 |<<lingo Tiddlers/Prompt>> |<<show-filter-count "[!is[system]sort[title]]">> |
 |<<lingo Tags/Prompt>> |<<show-filter-count "[tags[]sort[title]]">> |
 |<<lingo SystemTiddlers/Prompt>> |<<show-filter-count "[is[system]sort[title]]">> |
diff --git a/core/ui/PageTemplate/story.tid b/core/ui/PageTemplate/story.tid
index 0654ba46f..796c60032 100644
--- a/core/ui/PageTemplate/story.tid
+++ b/core/ui/PageTemplate/story.tid
@@ -13,7 +13,7 @@ tags: $:/tags/PageTemplate
 
 </section>
 
-<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" template="$:/core/ui/ViewTemplate" editTemplate="$:/core/ui/EditTemplate" storyview={{$:/view}} />
+<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" template="$:/core/ui/ViewTemplate" editTemplate="$:/core/ui/EditTemplate" storyview={{$:/view}} emptyMessage={{$:/config/EmptyStoryMessage}}/>
 
 <section class="story-frontdrop">
 

From a72581ba2691ffa74b7e9a5623e46dc54a3a146e Mon Sep 17 00:00:00 2001
From: Tobias Beer <beertobias@gmail.com>
Date: Sat, 7 Feb 2015 12:22:16 +0100
Subject: [PATCH 2/2] removed language switcher text

---
 core/language/en-GB/ControlPanel.multids | 3 +--
 core/ui/ControlPanel/Basics.tid          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index 6ef92111b..83440625e 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -11,8 +11,7 @@ Basics/DefaultTiddlers/Prompt: Default tiddlers:
 Basics/DefaultTiddlers/TopHint: Choose which tiddlers are displayed at startup:
 Basics/EmptyStoryMessage/Prompt: Empty message:
 Basics/EmptyStoryMessage/TopHint: Wikitext displayed when the story is empty:
-Basics/Language/Prompt: Current language:
-Basics/Language/Hello: Hello!
+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:
diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid
index d62db171e..8a874c7aa 100644
--- a/core/ui/ControlPanel/Basics.tid
+++ b/core/ui/ControlPanel/Basics.tid
@@ -20,7 +20,7 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 |<$link to="$:/status/UserName"><<lingo Username/Prompt>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Title"><<lingo NewJournal/Title/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Tags"><<lingo NewJournal/Tags/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Tags" default="" tag="input"/> |
-|<$link to="$:/language"><<lingo Language/Prompt>></$link> |{{$:/snippets/minilanguageswitcher}} <<lingo Language/Hello>>|
+|<<lingo Language/Prompt>> |{{$:/snippets/minilanguageswitcher}} |
 |<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
 |<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 |<$link to="$:/config/EmptyStoryMessage"><<lingo EmptyStoryMessage/Prompt>></$link> |<<lingo EmptyStoryMessage/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/config/EmptyStoryMessage" default=""/>|