From 7d348b37333016af9ee9c13fe7a93488a18583ab Mon Sep 17 00:00:00 2001
From: Devin Weaver <suki@tritarget.org>
Date: Tue, 30 Jun 2015 23:56:02 -0400
Subject: [PATCH 1/3] Move counts to TagManager

---
 core/language/en-GB/Misc.multids | 1 +
 core/ui/MoreSideBar/Tags.tid     | 4 ++--
 core/ui/TagManager.tid           | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids
index f56540882..a76099e9d 100644
--- a/core/language/en-GB/Misc.multids
+++ b/core/language/en-GB/Misc.multids
@@ -25,6 +25,7 @@ PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$
 RecentChanges/DateFormat: DDth MMM YYYY
 SystemTiddler/Tooltip: This is a system tiddler
 TagManager/Colour/Heading: Colour
+TagManager/Count/Heading: Count
 TagManager/Icon/Heading: Icon
 TagManager/Info/Heading: Info
 TagManager/Tag/Heading: Tag
diff --git a/core/ui/MoreSideBar/Tags.tid b/core/ui/MoreSideBar/Tags.tid
index 268bca137..6eeb010be 100644
--- a/core/ui/MoreSideBar/Tags.tid
+++ b/core/ui/MoreSideBar/Tags.tid
@@ -18,10 +18,10 @@ caption: {{$:/language/SideBar/Tags/Caption}}
 
 <$list filter={{$:/core/Filters/AllTags!!filter}}>
 
-<$transclude tiddler="$:/core/ui/TagTemplate"/> <small class="tc-menu-list-count"><$count filter="[all[current]tagging[]]"/></small>
+<$transclude tiddler="$:/core/ui/TagTemplate"/>
 
 </$list>
 
 <hr class="tc-untagged-separator">
 
-{{$:/core/ui/UntaggedTemplate}} <small class="tc-menu-list-count"><$count filter="[untagged[]!is[system]] -[tags[]]"/></small>
+{{$:/core/ui/UntaggedTemplate}}
diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid
index 3e38f1f18..4ffb72d7f 100644
--- a/core/ui/TagManager.tid
+++ b/core/ui/TagManager.tid
@@ -44,6 +44,7 @@ $title$$(currentTiddler)$
 <tr>
 <th><<lingo Colour/Heading>></th>
 <th class="tc-tag-manager-tag"><<lingo Tag/Heading>></th>
+<th><<lingo Count/Heading>></th>
 <th><<lingo Icon/Heading>></th>
 <th><<lingo Info/Heading>></th>
 </tr>
@@ -51,6 +52,7 @@ $title$$(currentTiddler)$
 <tr>
 <td><$edit-text field="color" tag="input" type="color"/></td>
 <td><$transclude tiddler="$:/core/ui/TagTemplate"/></td>
+<td><$count filter="[all[current]tagging[]]"/></td>
 <td>
 <$macrocall $name="iconEditor" title={{!!title}}/>
 </td>

From 98a1ee1a8d3c5f885fd0dc49042326e3877c4aa7 Mon Sep 17 00:00:00 2001
From: Devin Weaver <suki@tritarget.org>
Date: Tue, 30 Jun 2015 23:56:16 -0400
Subject: [PATCH 2/3] Add untagged to TagManager

Used for stats and easy access to the untagged pill
---
 core/ui/TagManager.tid | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid
index 4ffb72d7f..c31a38cf7 100644
--- a/core/ui/TagManager.tid
+++ b/core/ui/TagManager.tid
@@ -76,5 +76,16 @@ $title$$(currentTiddler)$
 <td></td>
 </tr>
 </$list>
+<tr>
+<td></td>
+<td>
+{{$:/core/ui/UntaggedTemplate}}
+</td>
+<td>
+<small class="tc-menu-list-count"><$count filter="[untagged[]!is[system]] -[tags[]]"/></small>
+</td>
+<td></td>
+<td></td>
+</tr>
 </tbody>
 </table>

From 7057c6252e77d5cc69fffea563525a0d123818ef Mon Sep 17 00:00:00 2001
From: Devin Weaver <suki@tritarget.org>
Date: Tue, 30 Jun 2015 23:59:23 -0400
Subject: [PATCH 3/3] Fix bad table rendering with info button

When the info button in the TagManager was press it revealed the info
table but it was squished in one cell and that pushed the right side of
the table past the width of the tiddler. So using a colspan optimises
the spacing (plus it looks better).
---
 core/ui/TagManager.tid | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid
index c31a38cf7..fe3489dc9 100644
--- a/core/ui/TagManager.tid
+++ b/core/ui/TagManager.tid
@@ -62,7 +62,7 @@ $title$$(currentTiddler)$
 </tr>
 <tr>
 <td></td>
-<td>
+<td colspan="4">
 <$reveal state=<<qualifyTitle "$:/state/tag-manager/">> type="match" text="open" default="">
 <table>
 <tbody>
@@ -72,8 +72,6 @@ $title$$(currentTiddler)$
 </table>
 </$reveal>
 </td>
-<td></td>
-<td></td>
 </tr>
 </$list>
 <tr>