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] 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>