From 4b05608ad5e77043b01495825ea0f0e76c378760 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 14 Aug 2014 08:49:03 +0100 Subject: [PATCH] Add tag manager button --- core/images/tag-button.tid | 9 +++++++++ core/language/en-GB/Buttons.multids | 2 ++ core/language/en-GB/SideBar.multids | 2 -- core/ui/MoreSideBar/Tags.tid | 15 +++++++++++++-- core/ui/PageControls/tag-button.tid | 13 +++++++++++++ core/wiki/config/PageControlButtons.multids | 1 + core/wiki/tags/PageControls.tid | 2 +- languages/de-DE/Buttons.multids | 6 ++++-- languages/de-DE/SideBar.multids | 1 - languages/fr-FR/Buttons.multids | 3 ++- languages/fr-FR/SideBar.multids | 1 - languages/it-IT/SideBar.multids | 2 -- languages/ja-JP/SideBar.multids | 2 -- languages/zh-Hans/Buttons.multids | 2 ++ languages/zh-Hans/SideBar.multids | 2 -- languages/zh-Hant/Buttons.multids | 2 ++ languages/zh-Hant/SideBar.multids | 2 -- 17 files changed, 49 insertions(+), 18 deletions(-) create mode 100644 core/images/tag-button.tid create mode 100644 core/ui/PageControls/tag-button.tid diff --git a/core/images/tag-button.tid b/core/images/tag-button.tid new file mode 100644 index 000000000..b93180dd7 --- /dev/null +++ b/core/images/tag-button.tid @@ -0,0 +1,9 @@ +title: $:/core/images/tag-button +tags: $:/tags/Image + + + + + + + diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids index 80ceeb032..8074b51fb 100644 --- a/core/language/en-GB/Buttons.multids +++ b/core/language/en-GB/Buttons.multids @@ -52,5 +52,7 @@ HideSideBar/Caption: hide sidebar HideSideBar/Hint: Hide sidebar ShowSideBar/Caption: show sidebar ShowSideBar/Hint: Show sidebar +TagManager/Caption: tag manager +TagManager/Hint: Open tag manager Theme/Caption: theme Theme/Hint: Choose the display theme diff --git a/core/language/en-GB/SideBar.multids b/core/language/en-GB/SideBar.multids index e18dd924e..1ae4439dd 100644 --- a/core/language/en-GB/SideBar.multids +++ b/core/language/en-GB/SideBar.multids @@ -11,8 +11,6 @@ Recent/Caption: Recent Shadows/Caption: Shadows System/Caption: System Tags/Caption: Tags -Tags/TagManager/Caption: Tag Manager Tags/Untagged/Caption: untagged Tools/Caption: Tools Types/Caption: Types - diff --git a/core/ui/MoreSideBar/Tags.tid b/core/ui/MoreSideBar/Tags.tid index eda362e5f..63eab2673 100644 --- a/core/ui/MoreSideBar/Tags.tid +++ b/core/ui/MoreSideBar/Tags.tid @@ -2,8 +2,19 @@ title: $:/core/ui/MoreSideBar/Tags tags: $:/tags/MoreSideBar caption: {{$:/language/SideBar/Tags/Caption}} -\define lingo-base() $:/language/SideBar/Tags/ -<$button to="$:/TagManager" class="btn"><> +<$set name="tw-config-toolbar-icons" value="yes"> + +<$set name="tw-config-toolbar-text" value="yes"> + +<$set name="tw-config-toolbar-class" value=""> + +{{$:/core/ui/Buttons/tag-manager}} + + + + + + <$list filter="[tags[]!is[system]sort[title]]"> diff --git a/core/ui/PageControls/tag-button.tid b/core/ui/PageControls/tag-button.tid new file mode 100644 index 000000000..2becac341 --- /dev/null +++ b/core/ui/PageControls/tag-button.tid @@ -0,0 +1,13 @@ +title: $:/core/ui/Buttons/tag-manager +tags: $:/tags/PageControls +caption: {{$:/core/images/tag-button}} {{$:/language/Buttons/TagManager/Caption}} +description: {{$:/language/Buttons/TagManager/Hint}} + +<$button to="$:/TagManager" title={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=<>> +<$list filter="[prefix[yes]]"> +{{$:/core/images/tag-button}} + +<$list filter="[prefix[yes]]"> +<$text text={{$:/language/Buttons/TagManager/Caption}}/> + + diff --git a/core/wiki/config/PageControlButtons.multids b/core/wiki/config/PageControlButtons.multids index d15149785..df29cd1f0 100644 --- a/core/wiki/config/PageControlButtons.multids +++ b/core/wiki/config/PageControlButtons.multids @@ -6,6 +6,7 @@ core/ui/Buttons/full-screen: hide core/ui/Buttons/home: hide core/ui/Buttons/import: hide core/ui/Buttons/language: hide +core/ui/Buttons/tag-manager: hide core/ui/Buttons/more-page-actions: hide core/ui/Buttons/permaview: hide core/ui/Buttons/storyview: hide diff --git a/core/wiki/tags/PageControls.tid b/core/wiki/tags/PageControls.tid index 49b346080..080bb82d8 100644 --- a/core/wiki/tags/PageControls.tid +++ b/core/wiki/tags/PageControls.tid @@ -1,2 +1,2 @@ title: $:/tags/PageControls -list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/more-page-actions]] +list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/more-page-actions]] diff --git a/languages/de-DE/Buttons.multids b/languages/de-DE/Buttons.multids index f42ba314a..2fbde2f6f 100644 --- a/languages/de-DE/Buttons.multids +++ b/languages/de-DE/Buttons.multids @@ -1,7 +1,7 @@ title: $:/language/Buttons/ AdvancedSearch/Caption: erweiterte suche -AdvancedSearch/Hint: Erweiterte Suche +AdvancedSearch/Hint: Erweiterte Suche Cancel/Caption: abbrechen Cancel/Hint: Tiddler bearbeiten abbrechen Clone/Caption: klone @@ -31,7 +31,7 @@ Import/Hint: Importiere Dateien Info/Caption: info Info/Hint: Informationen zu diesem Tiddler anzeigen Home/Caption: home -Home/Hint: Seite neu laden und öffne die standard (default) Tiddler +Home/Hint: Seite neu laden und öffne die standard (default) Tiddler Language/Caption: sprache Language/Hint: Auswahl Dialog für die System Sprache NewTiddler/Caption: neuer Tiddler @@ -52,5 +52,7 @@ HideSideBar/Caption: Sidebar ausblenden HideSideBar/Hint: Sidebar ausblenden ShowSideBar/Caption: Sidebar einblenden ShowSideBar/Hint: Sidebar eiblenden +TagManager/Caption: tag manager +TagManager/Hint: Öffne das "Tag Manager" Theme/Caption: Thema Theme/Hint: Thema auswählen diff --git a/languages/de-DE/SideBar.multids b/languages/de-DE/SideBar.multids index 5f598eab8..fe9fc2fa0 100644 --- a/languages/de-DE/SideBar.multids +++ b/languages/de-DE/SideBar.multids @@ -11,7 +11,6 @@ Recent/Caption: Zuletzt Shadows/Caption: Schatten System/Caption: System Tags/Caption: Tags -Tags/TagManager/Caption: Tag Manager Tags/Untagged/Caption: untagged Tools/Caption: Tools Types/Caption: Typen diff --git a/languages/fr-FR/Buttons.multids b/languages/fr-FR/Buttons.multids index d2dcde78e..9af347c03 100644 --- a/languages/fr-FR/Buttons.multids +++ b/languages/fr-FR/Buttons.multids @@ -52,6 +52,7 @@ HideSideBar/Caption: cacher la barre latérale HideSideBar/Hint: Cacher la barre latérale ShowSideBar/Caption: afficher la barre latérale ShowSideBar/Hint: Afficher la barre latérale +TagManager/Caption: gestionnaire de tags +TagManager/Hint: Gestionnaire de tags Theme/Caption: thème Theme/Hint: Choix du thème pour l'affichage - diff --git a/languages/fr-FR/SideBar.multids b/languages/fr-FR/SideBar.multids index fc5a7ceb4..8c1febb55 100644 --- a/languages/fr-FR/SideBar.multids +++ b/languages/fr-FR/SideBar.multids @@ -11,7 +11,6 @@ Recent/Caption: Récents Shadows/Caption: Shadows System/Caption: Système Tags/Caption: Tags -Tags/TagManager/Caption: Gestionnaire de tags Tags/Untagged/Caption: sans étiquette Tools/Caption: Outils Types/Caption: Types diff --git a/languages/it-IT/SideBar.multids b/languages/it-IT/SideBar.multids index 80535f364..afb8c3b19 100644 --- a/languages/it-IT/SideBar.multids +++ b/languages/it-IT/SideBar.multids @@ -10,8 +10,6 @@ Recent/Caption: Recenti Shadows/Caption: Nascosti System/Caption: Sistema Tags/Caption: Categorie -Tags/TagManager/Caption: Manager categorie Tags/Untagged/Caption: Non categorizzati Tools/Caption: Strumenti Types/Caption: Tipi - diff --git a/languages/ja-JP/SideBar.multids b/languages/ja-JP/SideBar.multids index f31016c64..5595c3808 100644 --- a/languages/ja-JP/SideBar.multids +++ b/languages/ja-JP/SideBar.multids @@ -10,8 +10,6 @@ Recent/Caption: 最近 Shadows/Caption: 隠し System/Caption: システム Tags/Caption: タグ別 -Tags/TagManager/Caption: タグマネージャ Tags/Untagged/Caption: 未タグ Tools/Caption: ツール Types/Caption: 種類別 - diff --git a/languages/zh-Hans/Buttons.multids b/languages/zh-Hans/Buttons.multids index 66dba0aff..47126e38c 100644 --- a/languages/zh-Hans/Buttons.multids +++ b/languages/zh-Hans/Buttons.multids @@ -52,5 +52,7 @@ HideSideBar/Caption: 隐藏侧边栏 HideSideBar/Hint: 隐藏侧边栏 ShowSideBar/Caption: 显示侧边栏 ShowSideBar/Hint: 显示侧边栏 +TagManager/Caption: 标签管理 +TagManager/Hint: 标签管理 Theme/Caption: 布景主题 Theme/Hint: 选择布景主题 diff --git a/languages/zh-Hans/SideBar.multids b/languages/zh-Hans/SideBar.multids index 802931301..c4a206302 100644 --- a/languages/zh-Hans/SideBar.multids +++ b/languages/zh-Hans/SideBar.multids @@ -11,8 +11,6 @@ Recent/Caption: 最近 Shadows/Caption: 默认 System/Caption: 系统 Tags/Caption: 标签 -Tags/TagManager/Caption: 标签管理 Tags/Untagged/Caption: 未设标签 Tools/Caption: 工具 Types/Caption: 类型 - diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids index c3ebb63d6..cd6984c9e 100644 --- a/languages/zh-Hant/Buttons.multids +++ b/languages/zh-Hant/Buttons.multids @@ -52,5 +52,7 @@ HideSideBar/Caption: 隱藏側邊欄 HideSideBar/Hint: 隱藏側邊欄 ShowSideBar/Caption: 顯示側邊欄 ShowSideBar/Hint: 顯示側邊欄 +TagManager/Caption: 標籤管理 +TagManager/Hint: 標籤管理 Theme/Caption: 佈景主題 Theme/Hint: 選擇佈景主題 diff --git a/languages/zh-Hant/SideBar.multids b/languages/zh-Hant/SideBar.multids index f91949153..53af4eb09 100644 --- a/languages/zh-Hant/SideBar.multids +++ b/languages/zh-Hant/SideBar.multids @@ -11,8 +11,6 @@ Recent/Caption: 最近 Shadows/Caption: 預設 System/Caption: 系統 Tags/Caption: 標籤 -Tags/TagManager/Caption: 標籤管理 Tags/Untagged/Caption: 未設標籤 Tools/Caption: 工具 Types/Caption: 類型 -