mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-01-12 10:20:26 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1857 from sukima/feature/move-tag-count-to-tag-manager

Browse Source 
Move tag counts to TagManager
This commit is contained in:
Jeremy Ruston 2015-07-01 09:24:32 +01:00
commit 908bb87505
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/language/en-GB/Misc.multids
View File

@ -25,6 +25,7 @@ PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$
RecentChanges/DateFormat: DDth MMM YYYY RecentChanges/DateFormat: DDth MMM YYYY
SystemTiddler/Tooltip: This is a system tiddler SystemTiddler/Tooltip: This is a system tiddler
TagManager/Colour/Heading: Colour TagManager/Colour/Heading: Colour
TagManager/Count/Heading: Count
TagManager/Icon/Heading: Icon TagManager/Icon/Heading: Icon
TagManager/Info/Heading: Info TagManager/Info/Heading: Info
TagManager/Tag/Heading: Tag TagManager/Tag/Heading: Tag

4
core/ui/MoreSideBar/Tags.tid
View File

@ -18,10 +18,10 @@ caption: {{$:/language/SideBar/Tags/Caption}}
<$list filter={{$:/core/Filters/AllTags!!filter}}> <$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> </$list>
<hr class="tc-untagged-separator"> <hr class="tc-untagged-separator">
{{$:/core/ui/UntaggedTemplate}} <small class="tc-menu-list-count"><$count filter="[untagged[]!is[system]] -[tags[]]"/></small> {{$:/core/ui/UntaggedTemplate}}

15
core/ui/TagManager.tid
View File

@ -44,6 +44,7 @@ $title$$(currentTiddler)$
<tr> <tr>
<th><<lingo Colour/Heading>></th> <th><<lingo Colour/Heading>></th>
<th class="tc-tag-manager-tag"><<lingo Tag/Heading>></th> <th class="tc-tag-manager-tag"><<lingo Tag/Heading>></th>
<th><<lingo Count/Heading>></th>
<th><<lingo Icon/Heading>></th> <th><<lingo Icon/Heading>></th>
<th><<lingo Info/Heading>></th> <th><<lingo Info/Heading>></th>
</tr> </tr>
@ -51,6 +52,7 @@ $title$$(currentTiddler)$
<tr> <tr>
<td><$edit-text field="color" tag="input" type="color"/></td> <td><$edit-text field="color" tag="input" type="color"/></td>
<td><$transclude tiddler="$:/core/ui/TagTemplate"/></td> <td><$transclude tiddler="$:/core/ui/TagTemplate"/></td>
<td><$count filter="[all[current]tagging[]]"/></td>
<td> <td>
<$macrocall $name="iconEditor" title={{!!title}}/> <$macrocall $name="iconEditor" title={{!!title}}/>
</td> </td>
@ -60,7 +62,7 @@ $title$$(currentTiddler)$
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
<td> <td colspan="4">
<$reveal state=<<qualifyTitle "$:/state/tag-manager/">> type="match" text="open" default=""> <$reveal state=<<qualifyTitle "$:/state/tag-manager/">> type="match" text="open" default="">
<table> <table>
<tbody> <tbody>
@ -70,9 +72,18 @@ $title$$(currentTiddler)$
</table> </table>
</$reveal> </$reveal>
</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>
<td></td> <td></td>
</tr> </tr>
</$list>
</tbody> </tbody>
</table> </table>