From e74a598aebbba88ceadd64a2b3e320133170ca38 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Sat, 9 Aug 2014 20:50:28 +0100
Subject: [PATCH 1/2] Better organisation for the tag image dropdown

---
 core/ui/TagManager.tid             | 20 +++++++++++++++-----
 themes/tiddlywiki/vanilla/base.tid |  1 +
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid
index 28457d0ab..9bc7a1ea1 100644
--- a/core/ui/TagManager.tid
+++ b/core/ui/TagManager.tid
@@ -1,17 +1,27 @@
 title: $:/TagManager
 
 \define lingo-base() $:/language/TagManager/
+\define iconEditorTab(type)
+<$list filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[sort[title]] +[$type$is[system]]">
+<$link to={{!!title}}>
+<$transclude/> <$view field="title"/>
+</$link>
+</$list>
+\end
 \define iconEditor(title)
 <div class="tw-drop-down-wrapper">
 <$edit-text field="icon" tag="input" size="20"/> <$button popup=<<qualify "$:/state/popup/icon/$title$">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button>
 <$reveal state=<<qualify "$:/state/popup/icon/$title$">> type="popup" position="belowleft" text="" default="">
 <div class="tw-drop-down">
 <$linkcatcher to="$title$!!icon">
-<$list filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[sort[title]]">
-<$link to={{!!title}}>
-<$transclude/> <$view field="title"/>
-</$link>
-</$list>
+<div class="tw-dropdown-item">
+Images
+</div>
+<<iconEditorTab type:"!">>
+<div class="tw-dropdown-item">
+System Images
+</div>
+<<iconEditorTab type:"">>
 </$linkcatcher>
 </div>
 </$reveal>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 6732b9162..a6720403e 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -952,6 +952,7 @@ canvas.tw-edit-bitmapeditor  {
 	padding: 4px 14px 4px 14px;
 }
 
+.tw-drop-down .tw-dropdown-item,
 .tw-block-dropdown .tw-dropdown-item {
 	padding: 4px 14px 4px 7px;
 	color: <<colour muted-foreground>>;

From 69de66ef804cf34218e7b6e0e396d8b4cc6802b0 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Sat, 9 Aug 2014 20:52:31 +0100
Subject: [PATCH 2/2] Avoid localisable strings in the tag manager icon
 dropdown

---
 core/ui/TagManager.tid | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid
index 9bc7a1ea1..9e56fd011 100644
--- a/core/ui/TagManager.tid
+++ b/core/ui/TagManager.tid
@@ -14,13 +14,8 @@ title: $:/TagManager
 <$reveal state=<<qualify "$:/state/popup/icon/$title$">> type="popup" position="belowleft" text="" default="">
 <div class="tw-drop-down">
 <$linkcatcher to="$title$!!icon">
-<div class="tw-dropdown-item">
-Images
-</div>
 <<iconEditorTab type:"!">>
-<div class="tw-dropdown-item">
-System Images
-</div>
+<hr/>
 <<iconEditorTab type:"">>
 </$linkcatcher>
 </div>