Merge remote-tracking branch 'upstream/master'

core/images/clone-button.tid

@@ -0,0 +1,9 @@
+title: $:/core/images/clone-button
+tags: $:/tags/Image
+
+<svg class="tw-clone-button tw-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M32.2650915,96 L32.2650915,120.002359 C32.2650915,124.419334 35.8432884,128 40.2627323,128 L120.002359,128 C124.419334,128 128,124.421803 128,120.002359 L128,40.2627323 C128,35.8457573 124.421803,32.2650915 120.002359,32.2650915 L96,32.2650915 L96,48 L108.858899,48 C110.519357,48 111.853018,49.3405131 111.853018,50.9941198 L111.853018,108.858899 C111.853018,110.519357 110.512505,111.853018 108.858899,111.853018 L50.9941198,111.853018 C49.333661,111.853018 48,110.512505 48,108.858899 L48,96 L32.2650915,96 Z"></path>
+        <path d="M40,56 L32.0070969,56 C27.5881712,56 24,52.418278 24,48 C24,43.5907123 27.5848994,40 32.0070969,40 L40,40 L40,32.0070969 C40,27.5881712 43.581722,24 48,24 C52.4092877,24 56,27.5848994 56,32.0070969 L56,40 L63.9929031,40 C68.4118288,40 72,43.581722 72,48 C72,52.4092877 68.4151006,56 63.9929031,56 L56,56 L56,63.9929031 C56,68.4118288 52.418278,72 48,72 C43.5907123,72 40,68.4151006 40,63.9929031 L40,56 Z M7.9992458,0 C3.58138434,0 0,3.5881049 0,7.9992458 L0,88.0007542 C0,92.4186157 3.5881049,96 7.9992458,96 L88.0007542,96 C92.4186157,96 96,92.4118951 96,88.0007542 L96,7.9992458 C96,3.58138434 92.4118951,0 88.0007542,0 L7.9992458,0 Z M19.0010118,16 C17.3435988,16 16,17.336731 16,19.0010118 L16,76.9989882 C16,78.6564012 17.336731,80 19.0010118,80 L76.9989882,80 C78.6564012,80 80,78.663269 80,76.9989882 L80,19.0010118 C80,17.3435988 78.663269,16 76.9989882,16 L19.0010118,16 Z"></path>
+    </g>
+</svg>

core/images/close-others-button.tid

@@ -0,0 +1,8 @@
+title: $:/core/images/close-others-button
+tags: $:/tags/Image
+
+<svg class="tw-image-close-others-button tw-image-button" width="22pt" height="22pt" viewBox="0 0 128 127">
+    <g fill-rule="evenodd">
+        <path d="M64,128 C99.346224,128 128,99.346224 128,64 C128,28.653776 99.346224,0 64,0 C28.653776,0 0,28.653776 0,64 C0,99.346224 28.653776,128 64,128 Z M64,112 C90.509668,112 112,90.509668 112,64 C112,37.490332 90.509668,16 64,16 C37.490332,16 16,37.490332 16,64 C16,90.509668 37.490332,112 64,112 Z M64,96 C81.673112,96 96,81.673112 96,64 C96,46.326888 81.673112,32 64,32 C46.326888,32 32,46.326888 32,64 C32,81.673112 46.326888,96 64,96 Z M64,80 C72.836556,80 80,72.836556 80,64 C80,55.163444 72.836556,48 64,48 C55.163444,48 48,55.163444 48,64 C48,72.836556 55.163444,80 64,80 Z"></path>
+    </g>
+</svg>

core/images/permalink-button.tid

@@ -0,0 +1,8 @@
+title: $:/core/images/permalink-button
+tags: $:/tags/Image
+
+<svg class="tw-image-permalink-button tw-image-button" width="22pt" height="22pt" viewBox="0 0 129 125">
+    <g fill-rule="evenodd">
+        <path d="M114,92.0520153 L85.0841463,92.0520153 L77.4459963,128.151367 L64.6248159,128.151367 L72.2629659,92.0520153 L47.8936301,92.0520153 L40.2554801,128.151367 L27.4342997,128.151367 L35.0724497,92.0520153 L17.7047515,92.0520153 L17.7047515,80.1401384 L37.6184997,80.1401384 L44.5292069,47.4961401 L17.7047515,47.4961401 L17.7047515,35.5842633 L46.9843266,35.5842633 L54.6224766,-0.151367188 L67.443657,-0.151367188 L59.805507,35.5842633 L84.1748428,35.5842633 L91.8129928,-0.151367188 L104.634173,-0.151367188 L97.0869535,35.5842633 L114,35.5842633 L114,47.4961401 L94.6318339,47.4961401 L87.7211267,80.1401384 L114,80.1401384 L114,92.0520153 Z M81.8106535,47.4961401 L57.3503873,47.4961401 L50.5306105,80.1401384 L74.8999463,80.1401384 L81.8106535,47.4961401 Z"></path>
+    </g>
+</svg>

core/images/permaview-button.tid

@@ -0,0 +1,10 @@
+title: $:/core/images/permaview-button
+tags: $:/tags/Image
+
+<svg class="tw-image-permaview-button tw-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M111.6744,92.2645264 L82.9006479,92.2645264 L75.300034,128.289805 L62.5418608,128.289805 L70.1424746,92.2645264 L45.8928971,92.2645264 L38.2922833,128.289805 L25.53411,128.289805 L33.1347239,92.2645264 L15.8523757,92.2645264 L15.8523757,80.3770918 L35.6682618,80.3770918 L42.5450077,47.8000762 L15.8523757,47.8000762 L15.8523757,35.9126416 L44.9880621,35.9126416 L52.588676,0.250337625 L65.3468492,0.250337625 L57.7462354,35.9126416 L81.9958129,35.9126416 L89.5964268,0.250337625 L102.3546,0.250337625 L94.8444696,35.9126416 L111.6744,35.9126416 L111.6744,47.8000762 L92.4014152,47.8000762 L85.5246693,80.3770918 L111.6744,80.3770918 L111.6744,92.2645264 Z M79.643242,47.8000762 L55.3031809,47.8000762 L48.5169186,80.3770918 L72.7664961,80.3770918 L79.643242,47.8000762 Z"></path>
+        <rect x="15.9992745" y="57.8809888" width="95.528227" height="11.975377"></rect>
+        <path d="M70.8113396,0.098602426 L83.5061663,0.219342965 L56.0934841,128.105958 L43.968839,128.22602 L70.8113396,0.098602426 Z"></path>
+    </g>
+</svg>

core/ui/TiddlerInfo.tid

@@ -1,5 +1,21 @@
 title: $:/core/ui/TiddlerInfo
 
-<$button message="tw-permalink" title={{$:/language/Buttons/Permalink/Hint}} aria-label={{$:/language/Buttons/Permalink/Caption}}>{{$:/language/Buttons/Permalink/Caption}}</$button> <$button message="tw-permaview" title={{$:/language/Buttons/Permaview/Hint}} aria-label={{$:/language/Buttons/Permaview/Caption}}>{{$:/language/Buttons/Permaview/Caption}}</$button> <$button message="tw-new-tiddler" param=<<currentTiddler>> title={{$:/language/Buttons/Clone/Hint}} aria-label={{$:/language/Buttons/Clone/Caption}}>{{$:/language/Buttons/Clone/Caption}}</$button> <$button message="tw-close-other-tiddlers" param=<<currentTiddler>> title={{$:/language/Buttons/CloseOthers/Hint}} aria-label={{$:/language/Buttons/CloseOthers/Caption}}>{{$:/language/Buttons/CloseOthers/Caption}}</$button>
+\define config-title()
+$:/config/Buttons/Hide/$(listItem)$
+\end
+
+<$set name="tw-config-toolbar-icons" value="yes">
+
+<$set name="tw-config-toolbar-text" value="yes">
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem">
+
+<$transclude tiddler=<<listItem>>/> (<$checkbox tiddler=<<config-title>> field="text" checked="no" unchecked="yes" default="no"> Show in toolbar</$checkbox>)
+
+</$list>
+
+</$set>
+
+</$set>
 
 <<tabs "[all[shadows+tiddlers]tag[$:/tags/TiddlerInfo]!has[draft.of]]" "$:/core/ui/TiddlerInfo/References">>

core/ui/ViewTemplate/title.tid

@@ -4,10 +4,13 @@ tags: $:/tags/ViewTemplate
 \define title-styles()
 fill:$(foregroundColor)$;
 \end
+\define config-title()
+$:/config/Buttons/Hide/$(listItem)$
+\end
 <div class="tw-tiddler-title">
 <h2 class="titlebar">
 <span class="tw-tiddler-controls">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="yes"><$transclude tiddler=<<listItem>>/></$reveal></$list>
 </span>
 <$set name="foregroundColor" value={{!!color}}>
 <span style=<<title-styles>>>

core/ui/ViewToolbar/clone.tid

@@ -0,0 +1,11 @@
+title: $:/core/ui/ViewToolbar/clone
+tags: $:/tags/ViewToolbar
+
+<$button message="tw-new-tiddler" param=<<currentTiddler>> title={{$:/language/Buttons/Clone/Hint}} aria-label={{$:/language/Buttons/Clone/Caption}} class="btn-invisible">
+<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
+{{$:/core/images/clone-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/Clone/Caption}}/>
+</$list>
+</$button>

core/ui/ViewToolbar/close-others.tid

@@ -0,0 +1,11 @@
+title: $:/core/ui/ViewToolbar/close-others
+tags: $:/tags/ViewToolbar
+
+<$button message="tw-close-other-tiddlers" param=<<currentTiddler>> title={{$:/language/Buttons/CloseOthers/Hint}} aria-label={{$:/language/Buttons/CloseOthers/Caption}} class="btn-invisible">
+<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
+{{$:/core/images/close-others-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/CloseOthers/Caption}}/>
+</$list>
+</$button>

core/ui/ViewToolbar/edit.tid

@@ -1,4 +1,11 @@
 title: $:/core/ui/ViewToolbar/edit
 tags: $:/tags/ViewToolbar
 
-<$button message="tw-edit-tiddler" title={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class="btn-invisible">{{$:/core/images/edit-button}}</$button>
+<$button message="tw-edit-tiddler" title={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class="btn-invisible">
+<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
+{{$:/core/images/edit-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/Edit/Caption}}/>
+</$list>
+</$button>

core/ui/ViewToolbar/info.tid

@@ -1,4 +1,11 @@
 title: $:/core/ui/ViewToolbar/info
 tags: $:/tags/ViewToolbar
 
-<$button popup=<<tiddlerInfoState>> title={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class="btn-invisible" selectedClass="tw-selected">{{$:/core/images/info-button}}</$button>
+<$button popup=<<tiddlerInfoState>> title={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class="btn-invisible" selectedClass="tw-selected">
+<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
+{{$:/core/images/info-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/Info/Caption}}/>
+</$list>
+</$button>

core/ui/ViewToolbar/permalink.tid

@@ -0,0 +1,11 @@
+title: $:/core/ui/ViewToolbar/permalink
+tags: $:/tags/ViewToolbar
+
+<$button message="tw-permalink" title={{$:/language/Buttons/Permalink/Hint}} aria-label={{$:/language/Buttons/Permalink/Caption}} class="btn-invisible">
+<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
+{{$:/core/images/permalink-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/Permalink/Caption}}/>
+</$list>
+</$button>

core/ui/ViewToolbar/permaview.tid

@@ -0,0 +1,11 @@
+title: $:/core/ui/ViewToolbar/permaview
+tags: $:/tags/ViewToolbar
+
+<$button message="tw-permaview" title={{$:/language/Buttons/Permaview/Hint}} aria-label={{$:/language/Buttons/Permaview/Caption}} class="btn-invisible">
+<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
+{{$:/core/images/permaview-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/Permaview/Caption}}/>
+</$list>
+</$button>

core/wiki/config/ButtonsHide.multids

@@ -0,0 +1,6 @@
+title: $:/config/Buttons/Hide/$:/
+
+core/ui/ViewToolbar/permalink: yes
+core/ui/ViewToolbar/permaview: yes
+core/ui/ViewToolbar/close-others: yes
+core/ui/ViewToolbar/clone: yes