From a668f0952285ee0f0dd55dc6d3b0f62819d8b851 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sun, 10 Nov 2013 21:53:39 +0000 Subject: [PATCH] More refinements to the control panel Including adding a TiddlyWeb-specific control panel tab --- core/ui/ControlPanel/Basics.tid | 14 ++++++++++ core/ui/ControlPanel/Info.tid | 13 --------- core/ui/ControlPanel/Tools.tid | 9 ++++++ core/wiki/ControlPanel.tid | 28 ------------------- core/wiki/tags/ControlPanel.tid | 2 +- .../tw5.com/tiddlers/Release 5.0.0alpha14.tid | 1 + .../tiddlyweb/ServerControlPanel.tid | 6 ++-- 7 files changed, 28 insertions(+), 45 deletions(-) delete mode 100644 core/ui/ControlPanel/Info.tid create mode 100644 core/ui/ControlPanel/Tools.tid delete mode 100644 core/wiki/ControlPanel.tid diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid index 0f36913ef..8a5d024c4 100644 --- a/core/ui/ControlPanel/Basics.tid +++ b/core/ui/ControlPanel/Basics.tid @@ -2,8 +2,22 @@ title: $:/core/ui/ControlPanel/Basics tags: $:/tags/ControlPanel caption: Basics +! Settings + |[[Title of this TiddlyWiki|SiteTitle]] |<$edit-text tiddler="SiteTitle" default="" tag="input"/> | |[[Subtitle|SiteSubtitle]] |<$edit-text tiddler="SiteSubtitle" default="" tag="input"/> | |[[Username for signing edits|$:/status/UserName]] |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> | |[[Animation duration|$:/config/AnimationDuration]] |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> | |[[DefaultTiddlers|$:/DefaultTiddlers]] |Choose which tiddlers are displayed at startup:
<$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/> | + +! Info + +!! Your Stuff + +* Number of tiddlers: <$count filter="[!is[system]]"/> + +!! TiddlyWiki's Stuff + +* Number of system tiddlers: <$count filter="[is[system]]"/> +* Number of shadow tiddlers: <$count filter="[is[shadow]]"/> +** Number of over-ridden shadow tiddlers: <$count filter="[!is[system]is[shadow]]"/> diff --git a/core/ui/ControlPanel/Info.tid b/core/ui/ControlPanel/Info.tid deleted file mode 100644 index c2cf8f190..000000000 --- a/core/ui/ControlPanel/Info.tid +++ /dev/null @@ -1,13 +0,0 @@ -title: $:/core/ui/ControlPanel/Info -tags: $:/tags/ControlPanel -caption: Info - -! Your Stuff - -* Number of tiddlers: <$count filter="[!is[system]]"/> - -! TiddlyWiki's Stuff - -* Number of system tiddlers: <$count filter="[is[system]]"/> -* Number of shadow tiddlers: <$count filter="[is[shadow]]"/> -** Number of over-ridden shadow tiddlers: <$count filter="[!is[system]is[shadow]]"/> diff --git a/core/ui/ControlPanel/Tools.tid b/core/ui/ControlPanel/Tools.tid new file mode 100644 index 000000000..cdbe84f04 --- /dev/null +++ b/core/ui/ControlPanel/Tools.tid @@ -0,0 +1,9 @@ +title: $:/core/ui/ControlPanel/Tools +tags: $:/tags/ControlPanel +caption: Tools + +! Import + +<$browse/> + +Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). You can also drag and drop files directly to the browser window. diff --git a/core/wiki/ControlPanel.tid b/core/wiki/ControlPanel.tid deleted file mode 100644 index 6a3cde943..000000000 --- a/core/wiki/ControlPanel.tid +++ /dev/null @@ -1,28 +0,0 @@ -title: $:/ControlPanel_old - -''Initial setup'' - -| ![[Title of this TiddlyWiki|SiteTitle]]|<$edit-text tiddler="SiteTitle" default="" tag="input"/> | -| ![[Subtitle|SiteSubtitle]]|<$edit-text tiddler="SiteSubtitle" default="" tag="input"/> | -| ![[Username for signing edits|$:/status/UserName]]|<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> | -| ![[Animation duration|$:/config/AnimationDuration]]|<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> | - -Edit [[DefaultTiddlers|$:/DefaultTiddlers]] to choose which tiddlers are displayed at startup - -{{$:/snippets/encryptionstatus}} - -''Add plugins and tiddlers to your ~TiddlyWiki'' - -:Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). <$browse/> - -''Visual appearance'' - -*{{$:/snippets/viewswitcher}} -*{{$:/snippets/themeswitcher}} -*Edit [[ThemeTweaks|$:/ControlPanel/ThemeTweaks]] to change the appearance of your ~TiddlyWiki - -''Additional information about this ~TiddlyWiki'' - -*~TiddlyWiki5 version <> -*[[Wiki Info|$:/WikiInfo]] -*[[Internal configuration information|$:/ConfigInfo]] diff --git a/core/wiki/tags/ControlPanel.tid b/core/wiki/tags/ControlPanel.tid index fdef2541f..e9cae24ce 100644 --- a/core/wiki/tags/ControlPanel.tid +++ b/core/wiki/tags/ControlPanel.tid @@ -1,2 +1,2 @@ title: $:/tags/ControlPanel -list: $:/core/ui/ControlPanel/Basics $:/core/ui/ControlPanel/Appearance $:/core/ui/ControlPanel/Encryption $:/core/ui/ControlPanel/Plugins $:/core/ui/ControlPanel/Internals +list: $:/core/ui/ControlPanel/Basics $:/core/ui/ControlPanel/Appearance $:/core/ui/ControlPanel/Encryption $:/core/ui/ControlPanel/Plugins $:/core/ui/ControlPanel/Tools $:/core/ui/ControlPanel/Internals diff --git a/editions/tw5.com/tiddlers/Release 5.0.0alpha14.tid b/editions/tw5.com/tiddlers/Release 5.0.0alpha14.tid index 63d26662c..e144a8160 100644 --- a/editions/tw5.com/tiddlers/Release 5.0.0alpha14.tid +++ b/editions/tw5.com/tiddlers/Release 5.0.0alpha14.tid @@ -9,5 +9,6 @@ tags: releasenote This release has several bug fixes: +* Improved the layout of the [[control panel|$:/ControlPanel]] * Fixed problem with using the CheckboxWidget to apply tags to tiddlers that don't have any existing tags * Fixed problem with default password for the PasswordWidget being the string "null" diff --git a/plugins/tiddlywiki/tiddlyweb/ServerControlPanel.tid b/plugins/tiddlywiki/tiddlyweb/ServerControlPanel.tid index d07a295f3..21dc08977 100644 --- a/plugins/tiddlywiki/tiddlyweb/ServerControlPanel.tid +++ b/plugins/tiddlywiki/tiddlyweb/ServerControlPanel.tid @@ -1,6 +1,6 @@ -title: $:/core/ui/ServerControlPanel - ----- +title: $:/plugins/tiddlywiki/tiddlyweb/ServerControlPanel +caption: Server +tags: $:/tags/ControlPanel <$reveal state="$:/status/IsLoggedIn" type="nomatch" text="yes"> Log in to ~TiddlyWeb: <$button message="tw-login" class="btn btn-info">Login