From b7832cd1d4d77de6927aeb9fb4d32fa243b34c84 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Wed, 1 May 2013 22:10:55 +0100 Subject: [PATCH] Add new tiddler and options buttons to sidebar --- core/images/new-button.svg | 3 +++ core/images/new-button.svg.meta | 2 ++ core/images/options-button.svg | 3 +++ core/images/options-button.svg.meta | 2 ++ core/templates/ControlPanel.tid | 23 ----------------------- core/templates/SideBar.tid | 8 ++++++-- core/templates/ToolsPanel.tid | 15 +++++++++++++++ core/wiki/ControlPanel.tid | 23 +++++++++++++++++++++++ themes/tiddlywiki/snowwhite/base.tid | 8 ++++++-- 9 files changed, 60 insertions(+), 27 deletions(-) create mode 100644 core/images/new-button.svg create mode 100644 core/images/new-button.svg.meta create mode 100644 core/images/options-button.svg create mode 100644 core/images/options-button.svg.meta delete mode 100644 core/templates/ControlPanel.tid create mode 100644 core/templates/ToolsPanel.tid create mode 100644 core/wiki/ControlPanel.tid diff --git a/core/images/new-button.svg b/core/images/new-button.svg new file mode 100644 index 000000000..aa7bbf53c --- /dev/null +++ b/core/images/new-button.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/images/new-button.svg.meta b/core/images/new-button.svg.meta new file mode 100644 index 000000000..bff0f102b --- /dev/null +++ b/core/images/new-button.svg.meta @@ -0,0 +1,2 @@ +title: $:/core/images/new-button.svg +type: image/svg+xml diff --git a/core/images/options-button.svg b/core/images/options-button.svg new file mode 100644 index 000000000..b5029d3d4 --- /dev/null +++ b/core/images/options-button.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/images/options-button.svg.meta b/core/images/options-button.svg.meta new file mode 100644 index 000000000..2f9ec7f97 --- /dev/null +++ b/core/images/options-button.svg.meta @@ -0,0 +1,2 @@ +title: $:/core/images/options-button.svg +type: image/svg+xml diff --git a/core/templates/ControlPanel.tid b/core/templates/ControlPanel.tid deleted file mode 100644 index 1aae81cac..000000000 --- a/core/templates/ControlPanel.tid +++ /dev/null @@ -1,23 +0,0 @@ -title: $:/templates/ControlPanel - -<$button message="tw-new-tiddler" class="btn btn-success">New Tiddler - ---- - -Import: <$import class="tw-drop-zone"> - -Drop files here - - - ---- - -<$button message="tw-save-wiki" class="btn btn-primary">Save Changes - ---- - -{{$:/snippets/encryptionstatus}} - ---- - -{{$:/snippets/themeswitcher}} diff --git a/core/templates/SideBar.tid b/core/templates/SideBar.tid index 0f6d7dffa..ed4dacfaa 100644 --- a/core/templates/SideBar.tid +++ b/core/templates/SideBar.tid @@ -22,6 +22,11 @@ title: $:/templates/SideBar <$reveal state="$:/temp/search" type="match" text=""> +
+<$button message="tw-new-tiddler" class="btn-invisible">{{$:/core/images/new-button.svg}} +<$link to="$:/ControlPanel">{{$:/core/images/options-button.svg}} +
+
<$button type="set" set="$:/state/sideBarTabSet" setTo="openTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Open<$button type="set" set="$:/state/sideBarTabSet" setTo="allTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">All<$button type="set" set="$:/state/sideBarTabSet" setTo="toolsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Tools<$button type="set" set="$:/state/sideBarTabSet" setTo="moreTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">More
@@ -37,8 +42,7 @@ title: $:/templates/SideBar <$list filter="[!is[system]sort[title]]" itemClass="tw-menu-list-item"/> <$reveal type="match" state="$:/state/sideBarTabSet" text="toolsTab" qualifyTiddlerTitles="yes"> -{{$:/templates/ControlPanel}} -{{$:/templates/ServerControlPanel}} +{{$:/templates/ToolsPanel}} <$reveal type="match" state="$:/state/sideBarTabSet" text="moreTab" qualifyTiddlerTitles="yes"> {{$:/templates/MoreSideBar}} diff --git a/core/templates/ToolsPanel.tid b/core/templates/ToolsPanel.tid new file mode 100644 index 000000000..f0aa336a4 --- /dev/null +++ b/core/templates/ToolsPanel.tid @@ -0,0 +1,15 @@ +title: $:/templates/ToolsPanel + +Import: <$import class="tw-drop-zone"/> + +--- + +<$button message="tw-save-wiki" class="btn btn-primary">Save Changes + +--- + +{{$:/snippets/encryptionstatus}} + +--- + +{{$:/snippets/themeswitcher}} diff --git a/core/wiki/ControlPanel.tid b/core/wiki/ControlPanel.tid new file mode 100644 index 000000000..22d858e77 --- /dev/null +++ b/core/wiki/ControlPanel.tid @@ -0,0 +1,23 @@ +title: $:/ControlPanel + +! Import tiddlers + +Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). + +<$import class="tw-drop-zone"/> + +! Save changes + +<$button message="tw-save-wiki" class="btn btn-primary">Save Changes + +! Encryption + +The tiddlers in TiddlyWiki documents can be securely encrypted by specifying a password before saving changes. + +{{$:/snippets/encryptionstatus}} + +! Theme + +{{$:/snippets/themeswitcher}} + +{{$:/templates/ServerControlPanel}} diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid index 4936752a6..57800f124 100644 --- a/themes/tiddlywiki/snowwhite/base.tid +++ b/themes/tiddlywiki/snowwhite/base.tid @@ -252,8 +252,12 @@ a.tw-tiddlylink-missing { padding-top: 1em; } -.tw-page-controls .tw-button img { - height: 1em; +.tw-page-controls { + margin-top: 1em; +} + +.tw-page-controls img { + height: 1.5em; } .tw-menu-list-item {