Add new tiddler and options buttons to sidebar

core/templates/ControlPanel.tid

@@ -1,23 +0,0 @@
-title: $:/templates/ControlPanel
-
-<$button message="tw-new-tiddler" class="btn btn-success">New Tiddler</$button>
-
----
-
-Import: <$import class="tw-drop-zone">
-
-Drop files here
-
-</$import>
-
----
-
-<$button message="tw-save-wiki" class="btn btn-primary">Save Changes</$button>
-
----
-
-{{$:/snippets/encryptionstatus}}
-
----
-
-{{$:/snippets/themeswitcher}}

core/templates/SideBar.tid

@@ -22,6 +22,11 @@ title: $:/templates/SideBar
 
 <$reveal state="$:/temp/search" type="match" text="">
 
+<div class="tw-page-controls">
+<$button message="tw-new-tiddler" class="btn-invisible">{{$:/core/images/new-button.svg}}</$button>
+<$link to="$:/ControlPanel">{{$:/core/images/options-button.svg}}</$link>
+</div>
+
 <div class="tw-tab-set">
 <div class="tw-tab-buttons"><$button type="set" set="$:/state/sideBarTabSet" setTo="openTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Open</$button><$button type="set" set="$:/state/sideBarTabSet" setTo="allTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">All</$button><$button type="set" set="$:/state/sideBarTabSet" setTo="toolsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Tools</$button><$button type="set" set="$:/state/sideBarTabSet" setTo="moreTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">More</$button></div>
 <div class="tw-tab-divider tw-sidebar-tab-divider">
@@ -37,8 +42,7 @@ title: $:/templates/SideBar
 <$list filter="[!is[system]sort[title]]" itemClass="tw-menu-list-item"/>
 </$reveal>
 <$reveal type="match" state="$:/state/sideBarTabSet" text="toolsTab" qualifyTiddlerTitles="yes">
-{{$:/templates/ControlPanel}}
-{{$:/templates/ServerControlPanel}}
+{{$:/templates/ToolsPanel}}
 </$reveal>
 <$reveal type="match" state="$:/state/sideBarTabSet" text="moreTab" qualifyTiddlerTitles="yes">
 {{$:/templates/MoreSideBar}}

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</$button>
+
+---
+
+{{$:/snippets/encryptionstatus}}
+
+---
+
+{{$:/snippets/themeswitcher}}