From 037314a1b995fb9793da9077c2e2853f216c161d Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Sun, 1 Sep 2024 21:24:38 +0800 Subject: [PATCH 1/7] Let PageControls buttons use v5.3.2 syntax --- core/ui/PageControls/closeall.tid | 8 ++++---- core/ui/PageControls/controlpanel.tid | 13 ++++++------- core/ui/PageControls/encryption.tid | 16 ++++++++-------- core/ui/PageControls/export-page.tid | 2 +- core/ui/PageControls/fold-all.tid | 8 ++++---- core/ui/PageControls/full-screen.tid | 8 ++++---- core/ui/PageControls/home.tid | 8 ++++---- core/ui/PageControls/import.tid | 8 ++++---- core/ui/PageControls/language.tid | 21 +++++++++------------ core/ui/PageControls/layout.tid | 8 ++++---- core/ui/PageControls/new-journal.tid | 11 +++++------ 11 files changed, 53 insertions(+), 58 deletions(-) diff --git a/core/ui/PageControls/closeall.tid b/core/ui/PageControls/closeall.tid index 2665fff0da0..93a7f6e9b43 100644 --- a/core/ui/PageControls/closeall.tid +++ b/core/ui/PageControls/closeall.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/CloseAll/Hint}} \whitespace trim <$button message="tm-close-all-tiddlers" tooltip={{$:/language/Buttons/CloseAll/Hint}} aria-label={{$:/language/Buttons/CloseAll/Caption}} class=<>> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/close-all-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/CloseAll/Caption}}/> - +<% endif %> \ No newline at end of file diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid index 872d640acaf..5ca4f0bb34e 100644 --- a/core/ui/PageControls/controlpanel.tid +++ b/core/ui/PageControls/controlpanel.tid @@ -4,15 +4,14 @@ caption: {{$:/core/images/options-button}} {{$:/language/Buttons/ControlPanel/Ca description: {{$:/language/Buttons/ControlPanel/Hint}} \whitespace trim -\define control-panel-button(class) -\whitespace trim -<$button to="$:/ControlPanel" tooltip={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class="""$(tv-config-toolbar-class)$ $class$"""> -<$list filter="[match[yes]]"> +\procedure control-panel-button(class) +<$button to="$:/ControlPanel" tooltip={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`> +<% if [match[yes]] %> {{$:/core/images/options-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/ControlPanel/Caption}}/> - +<% endif %> \end diff --git a/core/ui/PageControls/encryption.tid b/core/ui/PageControls/encryption.tid index 9f8ae0bd600..2d507df9ecc 100644 --- a/core/ui/PageControls/encryption.tid +++ b/core/ui/PageControls/encryption.tid @@ -6,25 +6,25 @@ description: {{$:/language/Buttons/Encryption/Hint}} \whitespace trim <$reveal type="match" state="$:/isEncrypted" text="yes"> <$button message="tm-clear-password" tooltip={{$:/language/Buttons/Encryption/ClearPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/ClearPassword/Caption}} class=<>> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/locked-padlock}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/Encryption/ClearPassword/Caption}}/> - +<% endif %> <$reveal type="nomatch" state="$:/isEncrypted" text="yes"> <$button message="tm-set-password" tooltip={{$:/language/Buttons/Encryption/SetPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/SetPassword/Caption}} class=<>> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/unlocked-padlock}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/Encryption/SetPassword/Caption}}/> - +<% endif %> diff --git a/core/ui/PageControls/export-page.tid b/core/ui/PageControls/export-page.tid index fe036abf770..902f643e987 100644 --- a/core/ui/PageControls/export-page.tid +++ b/core/ui/PageControls/export-page.tid @@ -3,4 +3,4 @@ tags: $:/tags/PageControls caption: {{$:/core/images/export-button}} {{$:/language/Buttons/ExportPage/Caption}} description: {{$:/language/Buttons/ExportPage/Hint}} -<$macrocall $name="exportButton" exportFilter="[!is[system]sort[title]]" lingoBase="$:/language/Buttons/ExportPage/"/> \ No newline at end of file +<$transclude $variable="exportButton" exportFilter="[!is[system]sort[title]]" lingoBase="$:/language/Buttons/ExportPage/"/> \ No newline at end of file diff --git a/core/ui/PageControls/fold-all.tid b/core/ui/PageControls/fold-all.tid index 46c3165b8d6..5863aeb9459 100644 --- a/core/ui/PageControls/fold-all.tid +++ b/core/ui/PageControls/fold-all.tid @@ -6,12 +6,12 @@ description: {{$:/language/Buttons/FoldAll/Hint}} \whitespace trim <$button tooltip={{$:/language/Buttons/FoldAll/Hint}} aria-label={{$:/language/Buttons/FoldAll/Caption}} class=<>> <$action-sendmessage $message="tm-fold-all-tiddlers" $param=<> foldedStatePrefix="$:/state/folded/"/> -<$list filter="[match[yes]]" variable="listItem"> +<% if [match[yes]] %> {{$:/core/images/fold-all-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/FoldAll/Caption}}/> - +<% endif %> \ No newline at end of file diff --git a/core/ui/PageControls/full-screen.tid b/core/ui/PageControls/full-screen.tid index ada7d5a653b..20732be8110 100644 --- a/core/ui/PageControls/full-screen.tid +++ b/core/ui/PageControls/full-screen.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/FullScreen/Hint}} \whitespace trim <$button message="tm-full-screen" tooltip={{$:/language/Buttons/FullScreen/Hint}} aria-label={{$:/language/Buttons/FullScreen/Caption}} class=<>> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/full-screen-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/FullScreen/Caption}}/> - +<% endif %> \ No newline at end of file diff --git a/core/ui/PageControls/home.tid b/core/ui/PageControls/home.tid index f3a0b178779..b3d6fc67759 100644 --- a/core/ui/PageControls/home.tid +++ b/core/ui/PageControls/home.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/Home/Hint}} \whitespace trim <$button message="tm-home" tooltip={{$:/language/Buttons/Home/Hint}} aria-label={{$:/language/Buttons/Home/Caption}} class=<>> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/home-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/Home/Caption}}/> - +<% endif %> \ No newline at end of file diff --git a/core/ui/PageControls/import.tid b/core/ui/PageControls/import.tid index 39ca51eb683..446ba78b8ba 100644 --- a/core/ui/PageControls/import.tid +++ b/core/ui/PageControls/import.tid @@ -6,14 +6,14 @@ description: {{$:/language/Buttons/Import/Hint}} \whitespace trim
<$button tooltip={{$:/language/Buttons/Import/Hint}} aria-label={{$:/language/Buttons/Import/Caption}} class=<>> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/import-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/Import/Caption}}/> - +<% endif %> <$browse tooltip={{$:/language/Buttons/Import/Hint}}/>
\ No newline at end of file diff --git a/core/ui/PageControls/language.tid b/core/ui/PageControls/language.tid index 623c71004cc..e851131212c 100644 --- a/core/ui/PageControls/language.tid +++ b/core/ui/PageControls/language.tid @@ -4,21 +4,18 @@ caption: {{$:/core/images/globe}} {{$:/language/Buttons/Language/Caption}} description: {{$:/language/Buttons/Language/Hint}} \whitespace trim -\define flag-title() -$(languagePluginTitle)$/icon -\end <$button popup=<> tooltip={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<> selectedClass="tc-selected"> -<$list filter="[match[yes]]"> - -<$set name="languagePluginTitle" value={{$:/language}}> -<$image source=<>/> - - - -<$list filter="[match[yes]]"> +<% if [match[yes]] %> + + <$set name="languagePluginTitle" value={{$:/language}}> + <$image source=`$(languagePluginTitle)$/icon`/> + + +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/Language/Caption}}/> - +<% endif %> <$reveal state=<> type="popup" position="below" animate="yes"> diff --git a/core/ui/PageControls/layout.tid b/core/ui/PageControls/layout.tid index 703bbcb1ba1..6af61a97cc1 100644 --- a/core/ui/PageControls/layout.tid +++ b/core/ui/PageControls/layout.tid @@ -6,10 +6,10 @@ description: {{$:/language/LayoutSwitcher/Description}} \whitespace trim <$button tooltip={{$:/language/Buttons/LayoutSwitcher/Hint}} aria-label={{$:/language/Buttons/LayoutSwitcher/Caption}} class=<>> <$action-sendmessage $message="tm-show-switcher" switch="layout"/> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/layout-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/LayoutSwitcher/Caption}}/> - +<% endif %> diff --git a/core/ui/PageControls/new-journal.tid b/core/ui/PageControls/new-journal.tid index 8ae8ee78ada..4923b0db41a 100644 --- a/core/ui/PageControls/new-journal.tid +++ b/core/ui/PageControls/new-journal.tid @@ -4,17 +4,16 @@ caption: {{$:/core/images/new-journal-button}} {{$:/language/Buttons/NewJournal/ description: {{$:/language/Buttons/NewJournal/Hint}} \whitespace trim -\define journalButton() -\whitespace trim +\procedure journalButton() <$button tooltip={{$:/language/Buttons/NewJournal/Hint}} aria-label={{$:/language/Buttons/NewJournal/Caption}} class=<> actions={{$:/core/ui/Actions/new-journal}}> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/new-journal-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/NewJournal/Caption}}/> - +<% endif %> \end <> From ebd14b399d6b53c5ea4f6898e985c8dbf2d0e039 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Mon, 2 Sep 2024 18:02:18 +0800 Subject: [PATCH 2/7] Rewrite buttons and actions --- core/ui/Actions/new-journal.tid | 11 +++---- core/ui/Actions/new-tiddler.tid | 7 ++--- core/ui/PageControls/manager.tid | 13 ++++---- core/ui/PageControls/more-page-actions.tid | 36 ++++++++++------------ core/ui/PageControls/network-activity.tid | 8 ++--- core/ui/PageControls/new-image.tid | 8 ++--- core/ui/PageControls/newtiddler.tid | 8 ++--- core/ui/PageControls/palette.tid | 8 ++--- core/ui/PageControls/print.tid | 8 ++--- core/ui/PageControls/refresh.tid | 8 ++--- core/ui/PageControls/savewiki.tid | 8 ++--- core/ui/PageControls/storyview.tid | 13 +++----- core/ui/PageControls/tag-button.tid | 13 ++++---- core/ui/PageControls/theme.tid | 8 ++--- core/ui/PageControls/timestamp.tid | 16 +++++----- core/ui/PageControls/unfold-all.tid | 8 ++--- 16 files changed, 85 insertions(+), 96 deletions(-) diff --git a/core/ui/Actions/new-journal.tid b/core/ui/Actions/new-journal.tid index 9df31cb974e..3a86b96f88a 100644 --- a/core/ui/Actions/new-journal.tid +++ b/core/ui/Actions/new-journal.tid @@ -2,15 +2,14 @@ title: $:/core/ui/Actions/new-journal tags: $:/tags/Actions description: create a new journal tiddler -\define get-tags() $(textFieldTags)$ $(tagsFieldTags)$ \whitespace trim -<$vars journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}> -<$wikify name="journalTitle" text="<$macrocall $name='now' format=<>/>"> +<$let journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}> +<$wikify name="journalTitle" text="<$transclude $variable='now' format=<>/>"> <$reveal type="nomatch" state=<> text=""> -<$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text={{{ [get[]] }}}/> +<$action-sendmessage $message="tm-new-tiddler" title=<> tags=`$(textFieldTags)$ $(tagsFieldTags)$` text={{{ [get[]] }}}/> <$reveal type="match" state=<> text=""> -<$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text=<>/> +<$action-sendmessage $message="tm-new-tiddler" title=<> tags=`$(textFieldTags)$ $(tagsFieldTags)$` text=<>/> - + diff --git a/core/ui/Actions/new-tiddler.tid b/core/ui/Actions/new-tiddler.tid index f7133132765..03a10098758 100644 --- a/core/ui/Actions/new-tiddler.tid +++ b/core/ui/Actions/new-tiddler.tid @@ -2,8 +2,7 @@ title: $:/core/ui/Actions/new-tiddler tags: $:/tags/Actions description: create a new empty tiddler -\define get-tags() $(textFieldTags)$ $(tagsFieldTags)$ \whitespace trim -<$vars textFieldTags={{$:/config/NewTiddler/Tags}} tagsFieldTags={{$:/config/NewTiddler/Tags!!tags}}> -<$action-sendmessage $message="tm-new-tiddler" tags=<>/> - +<$let textFieldTags={{$:/config/NewTiddler/Tags}} tagsFieldTags={{$:/config/NewTiddler/Tags!!tags}}> +<$action-sendmessage $message="tm-new-tiddler" tags=`$(textFieldTags)$ $(tagsFieldTags)$`/> + diff --git a/core/ui/PageControls/manager.tid b/core/ui/PageControls/manager.tid index d2144c5745e..456f06ef506 100644 --- a/core/ui/PageControls/manager.tid +++ b/core/ui/PageControls/manager.tid @@ -4,17 +4,16 @@ caption: {{$:/core/images/list}} {{$:/language/Buttons/Manager/Caption}} description: {{$:/language/Buttons/Manager/Hint}} \whitespace trim -\define manager-button(class) -\whitespace trim -<$button to="$:/Manager" tooltip={{$:/language/Buttons/Manager/Hint}} aria-label={{$:/language/Buttons/Manager/Caption}} class="""$(tv-config-toolbar-class)$ $class$"""> -<$list filter="[match[yes]]"> +\procedure manager-button(class) +<$button to="$:/Manager" tooltip={{$:/language/Buttons/Manager/Hint}} aria-label={{$:/language/Buttons/Manager/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`> +<% if [match[yes]] %> {{$:/core/images/list}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/Manager/Caption}}/> - +<% endif %> \end diff --git a/core/ui/PageControls/more-page-actions.tid b/core/ui/PageControls/more-page-actions.tid index 3acaef2b6be..418fc8b9932 100644 --- a/core/ui/PageControls/more-page-actions.tid +++ b/core/ui/PageControls/more-page-actions.tid @@ -12,33 +12,29 @@ description: {{$:/language/Buttons/More/Hint}} class=<> selectedClass="tc-selected" > - <$list filter="[match[yes]]"> + <% if [match[yes]] %> {{$:/core/images/down-arrow}} - - <$list filter="[match[yes]]"> + <% endif %> + <% if [match[yes]] %> <$text text={{$:/language/Buttons/More/Caption}}/> - + <% endif %> <$reveal state=<> type="popup" position="below" animate="yes">
- <$set name="tv-config-toolbar-icons" value="yes"> - <$set name="tv-config-toolbar-text" value="yes"> - <$set name="tv-config-toolbar-class" value="tc-btn-invisible"> - <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]] -[[$:/core/ui/Buttons/more-page-actions]]" - variable="listItem" + <$let tv-config-toolbar-icons="yes" tv-config-toolbar-text="yes" tv-config-toolbar-class="tc-btn-invisible"> + <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]] -[[$:/core/ui/Buttons/more-page-actions]]" + variable="listItem" + > + <$reveal type="match" state=<> text="hide"> + <$set name="tv-config-toolbar-class" + filter="[] [encodeuricomponent[]addprefix[tc-btn-]]" > - <$reveal type="match" state=<> text="hide"> - <$set name="tv-config-toolbar-class" - filter="[] [encodeuricomponent[]addprefix[tc-btn-]]" - > - <$transclude tiddler=<> mode="inline"/> - - - - - - + <$transclude tiddler=<> mode="inline"/> + + + +
\ No newline at end of file diff --git a/core/ui/PageControls/network-activity.tid b/core/ui/PageControls/network-activity.tid index 763365f37a6..b178e07c833 100644 --- a/core/ui/PageControls/network-activity.tid +++ b/core/ui/PageControls/network-activity.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/NetworkActivity/Hint}} \whitespace trim <$button message="tm-http-cancel-all-requests" tooltip={{$:/language/Buttons/NetworkActivity/Hint}} aria-label={{$:/language/Buttons/NetworkActivity/Caption}} class=<>> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/network-activity}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/NetworkActivity/Caption}}/> - +<% endif %> \ No newline at end of file diff --git a/core/ui/PageControls/new-image.tid b/core/ui/PageControls/new-image.tid index b37fba7c506..73ebfe931c9 100644 --- a/core/ui/PageControls/new-image.tid +++ b/core/ui/PageControls/new-image.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/NewImage/Hint}} \whitespace trim <$button tooltip={{$:/language/Buttons/NewImage/Hint}} aria-label={{$:/language/Buttons/NewImage/Caption}} class=<> actions={{$:/core/ui/Actions/new-image}}> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/new-image-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/NewImage/Caption}}/> - +<% endif %> diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid index cd2f56913d2..8037673a5a7 100644 --- a/core/ui/PageControls/newtiddler.tid +++ b/core/ui/PageControls/newtiddler.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/NewTiddler/Hint}} \whitespace trim <$button actions={{$:/core/ui/Actions/new-tiddler}} tooltip={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<>> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/new-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/NewTiddler/Caption}}/> - +<% endif %> diff --git a/core/ui/PageControls/palette.tid b/core/ui/PageControls/palette.tid index 6fdbdb439b2..72802ee2fd9 100644 --- a/core/ui/PageControls/palette.tid +++ b/core/ui/PageControls/palette.tid @@ -6,12 +6,12 @@ description: {{$:/language/Buttons/Palette/Hint}} \whitespace trim <$button popup=<> tooltip={{$:/language/Buttons/Palette/Hint}} aria-label={{$:/language/Buttons/Palette/Caption}} class=<> selectedClass="tc-selected"> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/palette}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/Palette/Caption}}/> - +<% endif %> <$reveal state=<> type="popup" position="below" animate="yes"> diff --git a/core/ui/PageControls/print.tid b/core/ui/PageControls/print.tid index ef664b6e385..d9782b4e939 100644 --- a/core/ui/PageControls/print.tid +++ b/core/ui/PageControls/print.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/Print/Hint}} \whitespace trim <$button message="tm-print" tooltip={{$:/language/Buttons/Print/Hint}} aria-label={{$:/language/Buttons/Print/Caption}} class=<>> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/print-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/Print/Caption}}/> - +<% endif %> \ No newline at end of file diff --git a/core/ui/PageControls/refresh.tid b/core/ui/PageControls/refresh.tid index 38692f817d9..48553e5d663 100644 --- a/core/ui/PageControls/refresh.tid +++ b/core/ui/PageControls/refresh.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/Refresh/Hint}} \whitespace trim <$button message="tm-browser-refresh" tooltip={{$:/language/Buttons/Refresh/Hint}} aria-label={{$:/language/Buttons/Refresh/Caption}} class=<>> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/refresh-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/Refresh/Caption}}/> - +<% endif %> \ No newline at end of file diff --git a/core/ui/PageControls/savewiki.tid b/core/ui/PageControls/savewiki.tid index 60f8dc99fde..efae995cbb2 100644 --- a/core/ui/PageControls/savewiki.tid +++ b/core/ui/PageControls/savewiki.tid @@ -9,13 +9,13 @@ description: {{$:/language/Buttons/SaveWiki/Hint}} <$action-sendmessage $message="tm-save-wiki" $param={{$:/config/SaveWikiButton/Template}} filename=<>/> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/save-button-dynamic}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/SaveWiki/Caption}}/> - +<% endif %> \ No newline at end of file diff --git a/core/ui/PageControls/storyview.tid b/core/ui/PageControls/storyview.tid index c4d0b736599..a5803e91d32 100644 --- a/core/ui/PageControls/storyview.tid +++ b/core/ui/PageControls/storyview.tid @@ -4,19 +4,16 @@ caption: {{$:/core/images/storyview-classic}} {{$:/language/Buttons/StoryView/Ca description: {{$:/language/Buttons/StoryView/Hint}} \whitespace trim -\define icon() -$:/core/images/storyview-$(storyview)$ -\end <$button popup=<> tooltip={{$:/language/Buttons/StoryView/Hint}} aria-label={{$:/language/Buttons/StoryView/Caption}} class=<> selectedClass="tc-selected"> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> <$set name="storyview" value={{$:/view}}> -<$transclude tiddler=<>/> +<$transclude tiddler=`$:/core/images/storyview-$(storyview)$`/> - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/StoryView/Caption}}/> - +<% endif %> <$reveal state=<> type="popup" position="below" animate="yes"> diff --git a/core/ui/PageControls/tag-button.tid b/core/ui/PageControls/tag-button.tid index e2b5c927711..397416df6b6 100644 --- a/core/ui/PageControls/tag-button.tid +++ b/core/ui/PageControls/tag-button.tid @@ -4,17 +4,16 @@ caption: {{$:/core/images/tag-button}} {{$:/language/Buttons/TagManager/Caption} description: {{$:/language/Buttons/TagManager/Hint}} \whitespace trim -\define control-panel-button(class) -\whitespace trim -<$button to="$:/TagManager" tooltip={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class="""$(tv-config-toolbar-class)$ $class$"""> -<$list filter="[match[yes]]"> +\procedure control-panel-button(class) +<$button to="$:/TagManager" tooltip={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`> +<% if [match[yes]] %> {{$:/core/images/tag-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/TagManager/Caption}}/> - +<% endif %> \end diff --git a/core/ui/PageControls/theme.tid b/core/ui/PageControls/theme.tid index 2d8eadc7bd4..1c42ff15a05 100644 --- a/core/ui/PageControls/theme.tid +++ b/core/ui/PageControls/theme.tid @@ -6,12 +6,12 @@ description: {{$:/language/Buttons/Theme/Hint}} \whitespace trim <$button popup=<> tooltip={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<> selectedClass="tc-selected"> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/theme-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/Theme/Caption}}/> - +<% endif %> <$reveal state=<> type="popup" position="below" animate="yes"> diff --git a/core/ui/PageControls/timestamp.tid b/core/ui/PageControls/timestamp.tid index a54b3f2cac4..9e8553a659e 100644 --- a/core/ui/PageControls/timestamp.tid +++ b/core/ui/PageControls/timestamp.tid @@ -7,26 +7,26 @@ description: {{$:/language/Buttons/Timestamp/Hint}} <$reveal type="nomatch" state="$:/config/TimestampDisable" text="yes"> <$button tooltip={{$:/language/Buttons/Timestamp/On/Hint}} aria-label={{$:/language/Buttons/Timestamp/On/Caption}} class=<>> <$action-setfield $tiddler="$:/config/TimestampDisable" $value="yes"/> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/timestamp-on}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/Timestamp/On/Caption}}/> - +<% endif %> <$reveal type="match" state="$:/config/TimestampDisable" text="yes"> <$button tooltip={{$:/language/Buttons/Timestamp/Off/Hint}} aria-label={{$:/language/Buttons/Timestamp/Off/Caption}} class=<>> <$action-setfield $tiddler="$:/config/TimestampDisable" $value="no"/> -<$list filter="[match[yes]]"> +<% if [match[yes]] %> {{$:/core/images/timestamp-off}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/Timestamp/Off/Caption}}/> - +<% endif %> diff --git a/core/ui/PageControls/unfold-all.tid b/core/ui/PageControls/unfold-all.tid index 6e8357a3b9b..84f91ae19e8 100644 --- a/core/ui/PageControls/unfold-all.tid +++ b/core/ui/PageControls/unfold-all.tid @@ -6,12 +6,12 @@ description: {{$:/language/Buttons/UnfoldAll/Hint}} \whitespace trim <$button tooltip={{$:/language/Buttons/UnfoldAll/Hint}} aria-label={{$:/language/Buttons/UnfoldAll/Caption}} class=<>> <$action-sendmessage $message="tm-unfold-all-tiddlers" $param=<> foldedStatePrefix="$:/state/folded/"/> -<$list filter="[match[yes]]" variable="listItem"> +<% if [match[yes]] %> {{$:/core/images/unfold-all-button}} - -<$list filter="[match[yes]]"> +<% endif %> +<% if [match[yes]] %> <$text text={{$:/language/Buttons/UnfoldAll/Caption}}/> - +<% endif %> \ No newline at end of file From b541b99f910131cfabb31ec9862aeb072b4f26a9 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Tue, 3 Sep 2024 17:33:30 +0800 Subject: [PATCH 3/7] Omit whitespace & use function to avoid duplicating * Omit whitespace in conditional syntax * Define tf.get-tags function to avoid duplicated text substitution * Rewrite advanced search button --- core/ui/Actions/new-journal.tid | 5 +++-- core/ui/Actions/new-tiddler.tid | 3 ++- core/ui/PageControls/advanced-search.tid | 13 ++++++------- core/ui/PageControls/closeall.tid | 10 +++++----- core/ui/PageControls/controlpanel.tid | 8 ++++---- core/ui/PageControls/encryption.tid | 16 ++++++++-------- core/ui/PageControls/fold-all.tid | 10 +++++----- core/ui/PageControls/full-screen.tid | 10 +++++----- core/ui/PageControls/home.tid | 10 +++++----- core/ui/PageControls/import.tid | 10 +++++----- core/ui/PageControls/language.tid | 8 ++++---- core/ui/PageControls/layout.tid | 8 ++++---- core/ui/PageControls/manager.tid | 8 ++++---- core/ui/PageControls/more-page-actions.tid | 10 +++++----- core/ui/PageControls/network-activity.tid | 10 +++++----- core/ui/PageControls/new-image.tid | 8 ++++---- core/ui/PageControls/new-journal.tid | 8 ++++---- core/ui/PageControls/newtiddler.tid | 8 ++++---- core/ui/PageControls/palette.tid | 8 ++++---- core/ui/PageControls/print.tid | 10 +++++----- core/ui/PageControls/refresh.tid | 10 +++++----- core/ui/PageControls/savewiki.tid | 10 +++++----- core/ui/PageControls/storyview.tid | 8 ++++---- core/ui/PageControls/tag-button.tid | 8 ++++---- core/ui/PageControls/theme.tid | 8 ++++---- core/ui/PageControls/timestamp.tid | 16 ++++++++-------- core/ui/PageControls/unfold-all.tid | 10 +++++----- 27 files changed, 126 insertions(+), 125 deletions(-) diff --git a/core/ui/Actions/new-journal.tid b/core/ui/Actions/new-journal.tid index 3a86b96f88a..bf4342e6230 100644 --- a/core/ui/Actions/new-journal.tid +++ b/core/ui/Actions/new-journal.tid @@ -3,13 +3,14 @@ tags: $:/tags/Actions description: create a new journal tiddler \whitespace trim +\function tf.get-tags() [] [] +[join[]] <$let journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}> <$wikify name="journalTitle" text="<$transclude $variable='now' format=<>/>"> <$reveal type="nomatch" state=<> text=""> -<$action-sendmessage $message="tm-new-tiddler" title=<> tags=`$(textFieldTags)$ $(tagsFieldTags)$` text={{{ [get[]] }}}/> +<$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text={{{ [get[]] }}}/> <$reveal type="match" state=<> text=""> -<$action-sendmessage $message="tm-new-tiddler" title=<> tags=`$(textFieldTags)$ $(tagsFieldTags)$` text=<>/> +<$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text=<>/> diff --git a/core/ui/Actions/new-tiddler.tid b/core/ui/Actions/new-tiddler.tid index 03a10098758..2166aeb540c 100644 --- a/core/ui/Actions/new-tiddler.tid +++ b/core/ui/Actions/new-tiddler.tid @@ -3,6 +3,7 @@ tags: $:/tags/Actions description: create a new empty tiddler \whitespace trim +\function tf.get-tags() [] [] +[join[]] <$let textFieldTags={{$:/config/NewTiddler/Tags}} tagsFieldTags={{$:/config/NewTiddler/Tags!!tags}}> -<$action-sendmessage $message="tm-new-tiddler" tags=`$(textFieldTags)$ $(tagsFieldTags)$`/> +<$action-sendmessage $message="tm-new-tiddler" tags=<>/> diff --git a/core/ui/PageControls/advanced-search.tid b/core/ui/PageControls/advanced-search.tid index 1549b07f496..4aa49e6e527 100644 --- a/core/ui/PageControls/advanced-search.tid +++ b/core/ui/PageControls/advanced-search.tid @@ -4,15 +4,14 @@ caption: {{$:/core/images/advanced-search-button}} {{$:/language/Buttons/Advance description: {{$:/language/Buttons/AdvancedSearch/Hint}} \whitespace trim -\define advanced-search-button(class) -\whitespace trim -<$button to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="""$(tv-config-toolbar-class)$ $class$"""> -<$list filter="[match[yes]]"> +\procedure advanced-search-button(class) +<$button to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`> +<%if [match[yes]] %> {{$:/core/images/advanced-search-button}} - -<$list filter="[match[yes]]"> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/AdvancedSearch/Caption}}/> - +<%endif%> \end diff --git a/core/ui/PageControls/closeall.tid b/core/ui/PageControls/closeall.tid index 93a7f6e9b43..23aefa8be17 100644 --- a/core/ui/PageControls/closeall.tid +++ b/core/ui/PageControls/closeall.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/CloseAll/Hint}} \whitespace trim <$button message="tm-close-all-tiddlers" tooltip={{$:/language/Buttons/CloseAll/Hint}} aria-label={{$:/language/Buttons/CloseAll/Caption}} class=<>> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/close-all-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/CloseAll/Caption}}/> -<% endif %> - \ No newline at end of file +<%endif%> + diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid index 5ca4f0bb34e..8b9db8d9a30 100644 --- a/core/ui/PageControls/controlpanel.tid +++ b/core/ui/PageControls/controlpanel.tid @@ -6,12 +6,12 @@ description: {{$:/language/Buttons/ControlPanel/Hint}} \whitespace trim \procedure control-panel-button(class) <$button to="$:/ControlPanel" tooltip={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/options-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/ControlPanel/Caption}}/> -<% endif %> +<%endif%> \end diff --git a/core/ui/PageControls/encryption.tid b/core/ui/PageControls/encryption.tid index 2d507df9ecc..572d162de36 100644 --- a/core/ui/PageControls/encryption.tid +++ b/core/ui/PageControls/encryption.tid @@ -6,25 +6,25 @@ description: {{$:/language/Buttons/Encryption/Hint}} \whitespace trim <$reveal type="match" state="$:/isEncrypted" text="yes"> <$button message="tm-clear-password" tooltip={{$:/language/Buttons/Encryption/ClearPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/ClearPassword/Caption}} class=<>> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/locked-padlock}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Encryption/ClearPassword/Caption}}/> -<% endif %> +<%endif%> <$reveal type="nomatch" state="$:/isEncrypted" text="yes"> <$button message="tm-set-password" tooltip={{$:/language/Buttons/Encryption/SetPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/SetPassword/Caption}} class=<>> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/unlocked-padlock}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Encryption/SetPassword/Caption}}/> -<% endif %> +<%endif%> diff --git a/core/ui/PageControls/fold-all.tid b/core/ui/PageControls/fold-all.tid index 5863aeb9459..dba6bb1b626 100644 --- a/core/ui/PageControls/fold-all.tid +++ b/core/ui/PageControls/fold-all.tid @@ -6,12 +6,12 @@ description: {{$:/language/Buttons/FoldAll/Hint}} \whitespace trim <$button tooltip={{$:/language/Buttons/FoldAll/Hint}} aria-label={{$:/language/Buttons/FoldAll/Caption}} class=<>> <$action-sendmessage $message="tm-fold-all-tiddlers" $param=<> foldedStatePrefix="$:/state/folded/"/> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/fold-all-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/FoldAll/Caption}}/> -<% endif %> - \ No newline at end of file +<%endif%> + diff --git a/core/ui/PageControls/full-screen.tid b/core/ui/PageControls/full-screen.tid index 20732be8110..864ee5c2600 100644 --- a/core/ui/PageControls/full-screen.tid +++ b/core/ui/PageControls/full-screen.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/FullScreen/Hint}} \whitespace trim <$button message="tm-full-screen" tooltip={{$:/language/Buttons/FullScreen/Hint}} aria-label={{$:/language/Buttons/FullScreen/Caption}} class=<>> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/full-screen-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/FullScreen/Caption}}/> -<% endif %> - \ No newline at end of file +<%endif%> + diff --git a/core/ui/PageControls/home.tid b/core/ui/PageControls/home.tid index b3d6fc67759..6c1d5a7894f 100644 --- a/core/ui/PageControls/home.tid +++ b/core/ui/PageControls/home.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/Home/Hint}} \whitespace trim <$button message="tm-home" tooltip={{$:/language/Buttons/Home/Hint}} aria-label={{$:/language/Buttons/Home/Caption}} class=<>> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/home-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Home/Caption}}/> -<% endif %> - \ No newline at end of file +<%endif%> + diff --git a/core/ui/PageControls/import.tid b/core/ui/PageControls/import.tid index 446ba78b8ba..11474db2239 100644 --- a/core/ui/PageControls/import.tid +++ b/core/ui/PageControls/import.tid @@ -6,14 +6,14 @@ description: {{$:/language/Buttons/Import/Hint}} \whitespace trim
<$button tooltip={{$:/language/Buttons/Import/Hint}} aria-label={{$:/language/Buttons/Import/Caption}} class=<>> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/import-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Import/Caption}}/> -<% endif %> +<%endif%> <$browse tooltip={{$:/language/Buttons/Import/Hint}}/> -
\ No newline at end of file + diff --git a/core/ui/PageControls/language.tid b/core/ui/PageControls/language.tid index e851131212c..3315b5a2357 100644 --- a/core/ui/PageControls/language.tid +++ b/core/ui/PageControls/language.tid @@ -6,16 +6,16 @@ description: {{$:/language/Buttons/Language/Hint}} \whitespace trim <$button popup=<> tooltip={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<> selectedClass="tc-selected"> -<% if [match[yes]] %> +<%if [match[yes]] %> <$set name="languagePluginTitle" value={{$:/language}}> <$image source=`$(languagePluginTitle)$/icon`/> -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Language/Caption}}/> -<% endif %> +<%endif%> <$reveal state=<> type="popup" position="below" animate="yes"> diff --git a/core/ui/PageControls/layout.tid b/core/ui/PageControls/layout.tid index 6af61a97cc1..c9a0f596b61 100644 --- a/core/ui/PageControls/layout.tid +++ b/core/ui/PageControls/layout.tid @@ -6,10 +6,10 @@ description: {{$:/language/LayoutSwitcher/Description}} \whitespace trim <$button tooltip={{$:/language/Buttons/LayoutSwitcher/Hint}} aria-label={{$:/language/Buttons/LayoutSwitcher/Caption}} class=<>> <$action-sendmessage $message="tm-show-switcher" switch="layout"/> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/layout-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/LayoutSwitcher/Caption}}/> -<% endif %> +<%endif%> diff --git a/core/ui/PageControls/manager.tid b/core/ui/PageControls/manager.tid index 456f06ef506..3cc364f8023 100644 --- a/core/ui/PageControls/manager.tid +++ b/core/ui/PageControls/manager.tid @@ -6,14 +6,14 @@ description: {{$:/language/Buttons/Manager/Hint}} \whitespace trim \procedure manager-button(class) <$button to="$:/Manager" tooltip={{$:/language/Buttons/Manager/Hint}} aria-label={{$:/language/Buttons/Manager/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/list}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Manager/Caption}}/> -<% endif %> +<%endif%> \end diff --git a/core/ui/PageControls/more-page-actions.tid b/core/ui/PageControls/more-page-actions.tid index 418fc8b9932..7453b9df76f 100644 --- a/core/ui/PageControls/more-page-actions.tid +++ b/core/ui/PageControls/more-page-actions.tid @@ -12,14 +12,14 @@ description: {{$:/language/Buttons/More/Hint}} class=<> selectedClass="tc-selected" > - <% if [match[yes]] %> + <%if [match[yes]] %> {{$:/core/images/down-arrow}} - <% endif %> - <% if [match[yes]] %> + <%endif%> + <%if [match[yes]] %> <$text text={{$:/language/Buttons/More/Caption}}/> - <% endif %> + <%endif%> <$reveal state=<> type="popup" position="below" animate="yes">
@@ -37,4 +37,4 @@ description: {{$:/language/Buttons/More/Hint}}
- \ No newline at end of file + diff --git a/core/ui/PageControls/network-activity.tid b/core/ui/PageControls/network-activity.tid index b178e07c833..7be25b26184 100644 --- a/core/ui/PageControls/network-activity.tid +++ b/core/ui/PageControls/network-activity.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/NetworkActivity/Hint}} \whitespace trim <$button message="tm-http-cancel-all-requests" tooltip={{$:/language/Buttons/NetworkActivity/Hint}} aria-label={{$:/language/Buttons/NetworkActivity/Caption}} class=<>> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/network-activity}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/NetworkActivity/Caption}}/> -<% endif %> - \ No newline at end of file +<%endif%> + diff --git a/core/ui/PageControls/new-image.tid b/core/ui/PageControls/new-image.tid index 73ebfe931c9..0cf954966a6 100644 --- a/core/ui/PageControls/new-image.tid +++ b/core/ui/PageControls/new-image.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/NewImage/Hint}} \whitespace trim <$button tooltip={{$:/language/Buttons/NewImage/Hint}} aria-label={{$:/language/Buttons/NewImage/Caption}} class=<> actions={{$:/core/ui/Actions/new-image}}> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/new-image-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/NewImage/Caption}}/> -<% endif %> +<%endif%> diff --git a/core/ui/PageControls/new-journal.tid b/core/ui/PageControls/new-journal.tid index 4923b0db41a..8330b8cb77e 100644 --- a/core/ui/PageControls/new-journal.tid +++ b/core/ui/PageControls/new-journal.tid @@ -6,14 +6,14 @@ description: {{$:/language/Buttons/NewJournal/Hint}} \whitespace trim \procedure journalButton() <$button tooltip={{$:/language/Buttons/NewJournal/Hint}} aria-label={{$:/language/Buttons/NewJournal/Caption}} class=<> actions={{$:/core/ui/Actions/new-journal}}> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/new-journal-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/NewJournal/Caption}}/> -<% endif %> +<%endif%> \end <> diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid index 8037673a5a7..f6a6e689118 100644 --- a/core/ui/PageControls/newtiddler.tid +++ b/core/ui/PageControls/newtiddler.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/NewTiddler/Hint}} \whitespace trim <$button actions={{$:/core/ui/Actions/new-tiddler}} tooltip={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<>> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/new-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/NewTiddler/Caption}}/> -<% endif %> +<%endif%> diff --git a/core/ui/PageControls/palette.tid b/core/ui/PageControls/palette.tid index 72802ee2fd9..efa016d49de 100644 --- a/core/ui/PageControls/palette.tid +++ b/core/ui/PageControls/palette.tid @@ -6,12 +6,12 @@ description: {{$:/language/Buttons/Palette/Hint}} \whitespace trim <$button popup=<> tooltip={{$:/language/Buttons/Palette/Hint}} aria-label={{$:/language/Buttons/Palette/Caption}} class=<> selectedClass="tc-selected"> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/palette}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Palette/Caption}}/> -<% endif %> +<%endif%> <$reveal state=<> type="popup" position="below" animate="yes"> diff --git a/core/ui/PageControls/print.tid b/core/ui/PageControls/print.tid index d9782b4e939..994303d255a 100644 --- a/core/ui/PageControls/print.tid +++ b/core/ui/PageControls/print.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/Print/Hint}} \whitespace trim <$button message="tm-print" tooltip={{$:/language/Buttons/Print/Hint}} aria-label={{$:/language/Buttons/Print/Caption}} class=<>> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/print-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Print/Caption}}/> -<% endif %> - \ No newline at end of file +<%endif%> + diff --git a/core/ui/PageControls/refresh.tid b/core/ui/PageControls/refresh.tid index 48553e5d663..5a8773b77f9 100644 --- a/core/ui/PageControls/refresh.tid +++ b/core/ui/PageControls/refresh.tid @@ -5,12 +5,12 @@ description: {{$:/language/Buttons/Refresh/Hint}} \whitespace trim <$button message="tm-browser-refresh" tooltip={{$:/language/Buttons/Refresh/Hint}} aria-label={{$:/language/Buttons/Refresh/Caption}} class=<>> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/refresh-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Refresh/Caption}}/> -<% endif %> - \ No newline at end of file +<%endif%> + diff --git a/core/ui/PageControls/savewiki.tid b/core/ui/PageControls/savewiki.tid index efae995cbb2..7e6a18ccc3b 100644 --- a/core/ui/PageControls/savewiki.tid +++ b/core/ui/PageControls/savewiki.tid @@ -9,13 +9,13 @@ description: {{$:/language/Buttons/SaveWiki/Hint}} <$action-sendmessage $message="tm-save-wiki" $param={{$:/config/SaveWikiButton/Template}} filename=<>/> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/save-button-dynamic}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/SaveWiki/Caption}}/> -<% endif %> +<%endif%> - \ No newline at end of file + diff --git a/core/ui/PageControls/storyview.tid b/core/ui/PageControls/storyview.tid index a5803e91d32..7738cfa9734 100644 --- a/core/ui/PageControls/storyview.tid +++ b/core/ui/PageControls/storyview.tid @@ -6,14 +6,14 @@ description: {{$:/language/Buttons/StoryView/Hint}} \whitespace trim <$button popup=<> tooltip={{$:/language/Buttons/StoryView/Hint}} aria-label={{$:/language/Buttons/StoryView/Caption}} class=<> selectedClass="tc-selected"> -<% if [match[yes]] %> +<%if [match[yes]] %> <$set name="storyview" value={{$:/view}}> <$transclude tiddler=`$:/core/images/storyview-$(storyview)$`/> -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/StoryView/Caption}}/> -<% endif %> +<%endif%> <$reveal state=<> type="popup" position="below" animate="yes"> diff --git a/core/ui/PageControls/tag-button.tid b/core/ui/PageControls/tag-button.tid index 397416df6b6..6c04804ceba 100644 --- a/core/ui/PageControls/tag-button.tid +++ b/core/ui/PageControls/tag-button.tid @@ -6,14 +6,14 @@ description: {{$:/language/Buttons/TagManager/Hint}} \whitespace trim \procedure control-panel-button(class) <$button to="$:/TagManager" tooltip={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/tag-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/TagManager/Caption}}/> -<% endif %> +<%endif%> \end diff --git a/core/ui/PageControls/theme.tid b/core/ui/PageControls/theme.tid index 1c42ff15a05..60e37a95e2b 100644 --- a/core/ui/PageControls/theme.tid +++ b/core/ui/PageControls/theme.tid @@ -6,12 +6,12 @@ description: {{$:/language/Buttons/Theme/Hint}} \whitespace trim <$button popup=<> tooltip={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<> selectedClass="tc-selected"> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/theme-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Theme/Caption}}/> -<% endif %> +<%endif%> <$reveal state=<> type="popup" position="below" animate="yes"> diff --git a/core/ui/PageControls/timestamp.tid b/core/ui/PageControls/timestamp.tid index 9e8553a659e..0186d7c12e9 100644 --- a/core/ui/PageControls/timestamp.tid +++ b/core/ui/PageControls/timestamp.tid @@ -7,26 +7,26 @@ description: {{$:/language/Buttons/Timestamp/Hint}} <$reveal type="nomatch" state="$:/config/TimestampDisable" text="yes"> <$button tooltip={{$:/language/Buttons/Timestamp/On/Hint}} aria-label={{$:/language/Buttons/Timestamp/On/Caption}} class=<>> <$action-setfield $tiddler="$:/config/TimestampDisable" $value="yes"/> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/timestamp-on}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Timestamp/On/Caption}}/> -<% endif %> +<%endif%> <$reveal type="match" state="$:/config/TimestampDisable" text="yes"> <$button tooltip={{$:/language/Buttons/Timestamp/Off/Hint}} aria-label={{$:/language/Buttons/Timestamp/Off/Caption}} class=<>> <$action-setfield $tiddler="$:/config/TimestampDisable" $value="no"/> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/timestamp-off}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Timestamp/Off/Caption}}/> -<% endif %> +<%endif%> diff --git a/core/ui/PageControls/unfold-all.tid b/core/ui/PageControls/unfold-all.tid index 84f91ae19e8..e0d26bc4991 100644 --- a/core/ui/PageControls/unfold-all.tid +++ b/core/ui/PageControls/unfold-all.tid @@ -6,12 +6,12 @@ description: {{$:/language/Buttons/UnfoldAll/Hint}} \whitespace trim <$button tooltip={{$:/language/Buttons/UnfoldAll/Hint}} aria-label={{$:/language/Buttons/UnfoldAll/Caption}} class=<>> <$action-sendmessage $message="tm-unfold-all-tiddlers" $param=<> foldedStatePrefix="$:/state/folded/"/> -<% if [match[yes]] %> +<%if [match[yes]] %> {{$:/core/images/unfold-all-button}} -<% endif %> -<% if [match[yes]] %> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/UnfoldAll/Caption}}/> -<% endif %> - \ No newline at end of file +<%endif%> + From 074f13fa6fa35a932bef99eab5be37ad1d6b41b4 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Wed, 4 Sep 2024 17:31:38 +0800 Subject: [PATCH 4/7] Add space in join operator --- core/ui/Actions/new-journal.tid | 2 +- core/ui/Actions/new-tiddler.tid | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/ui/Actions/new-journal.tid b/core/ui/Actions/new-journal.tid index bf4342e6230..92d0e807cf6 100644 --- a/core/ui/Actions/new-journal.tid +++ b/core/ui/Actions/new-journal.tid @@ -3,7 +3,7 @@ tags: $:/tags/Actions description: create a new journal tiddler \whitespace trim -\function tf.get-tags() [] [] +[join[]] +\function tf.get-tags() [] [] +[join[ ]] <$let journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}> <$wikify name="journalTitle" text="<$transclude $variable='now' format=<>/>"> <$reveal type="nomatch" state=<> text=""> diff --git a/core/ui/Actions/new-tiddler.tid b/core/ui/Actions/new-tiddler.tid index 2166aeb540c..315255abb4a 100644 --- a/core/ui/Actions/new-tiddler.tid +++ b/core/ui/Actions/new-tiddler.tid @@ -3,7 +3,7 @@ tags: $:/tags/Actions description: create a new empty tiddler \whitespace trim -\function tf.get-tags() [] [] +[join[]] +\function tf.get-tags() [] [] +[join[ ]] <$let textFieldTags={{$:/config/NewTiddler/Tags}} tagsFieldTags={{$:/config/NewTiddler/Tags!!tags}}> <$action-sendmessage $message="tm-new-tiddler" tags=<>/> From c978820fa895c52e5fc9351ecfd2c85a4eaa4ebb Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Wed, 4 Sep 2024 20:06:44 +0800 Subject: [PATCH 5/7] Rewrite buttons in plugins --- plugins/tiddlywiki/help/help.tid | 16 ++++++++-------- .../tiddlywiki/markdown-legacy/new-markdown.tid | 8 ++++---- plugins/tiddlywiki/markdown/new-markdown.tid | 8 ++++---- .../tiddlywiki/tiddlyweb/save-wiki-button.tid | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/plugins/tiddlywiki/help/help.tid b/plugins/tiddlywiki/help/help.tid index eca5ffaa70f..f29d9dbdf95 100644 --- a/plugins/tiddlywiki/help/help.tid +++ b/plugins/tiddlywiki/help/help.tid @@ -8,22 +8,22 @@ description: {{$:/language/Buttons/Help/Hint}} \whitespace trim <$list filter="[[$:/config/ShowHelp]get[text]] +[else[no]match[yes]]" variable="ignore"> <$button set="$:/config/ShowHelp" setTo="no" tooltip={{$:/language/Buttons/Help/Hint}} aria-label={{$:/language/Buttons/Help/Caption}} class="""$(tv-config-toolbar-class)$ tc-selected"""> -<$list filter="[match[yes]]"> +<%if [match[yes]] %> {{$:/core/images/help}} - -<$list filter="[match[yes]]"> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Help/Caption}}/> - +<%endif%> <$list filter="[[$:/config/ShowHelp]get[text]] +[else[no]!match[yes]]" variable="ignore"> <$button set="$:/config/ShowHelp" setTo="yes" tooltip={{$:/language/Buttons/Help/Hint}} aria-label={{$:/language/Buttons/Help/Caption}} class=<>> -<$list filter="[match[yes]]"> +<%if [match[yes]] %> {{$:/core/images/help}} - -<$list filter="[match[yes]]"> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/Help/Caption}}/> - +<%endif%> \end diff --git a/plugins/tiddlywiki/markdown-legacy/new-markdown.tid b/plugins/tiddlywiki/markdown-legacy/new-markdown.tid index 507c265a5f3..8d8f587d88a 100755 --- a/plugins/tiddlywiki/markdown-legacy/new-markdown.tid +++ b/plugins/tiddlywiki/markdown-legacy/new-markdown.tid @@ -7,10 +7,10 @@ list-after: $:/core/ui/Buttons/new-tiddler \whitespace trim <$button tooltip={{$:/language/Buttons/NewMarkdown/Hint}} aria-label={{$:/language/Buttons/NewMarkdown/Caption}} class=<>> <$action-sendmessage $message="tm-new-tiddler" type="text/markdown"/> -<$list filter="[match[yes]]"> +<%if [match[yes]] %> {{$:/plugins/tiddlywiki/markdown-legacy/images/new-markdown-button}} - -<$list filter="[match[yes]]"> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/NewMarkdown/Caption}}/> - +<%endif%> diff --git a/plugins/tiddlywiki/markdown/new-markdown.tid b/plugins/tiddlywiki/markdown/new-markdown.tid index 192543d77a9..404046360d9 100755 --- a/plugins/tiddlywiki/markdown/new-markdown.tid +++ b/plugins/tiddlywiki/markdown/new-markdown.tid @@ -7,10 +7,10 @@ list-after: $:/core/ui/Buttons/new-tiddler \whitespace trim <$button tooltip={{$:/language/Buttons/NewMarkdown/Hint}} aria-label={{$:/language/Buttons/NewMarkdown/Caption}} class=<>> <$action-sendmessage $message="tm-new-tiddler" type="text/markdown"/> -<$list filter="[match[yes]]"> +<%if [match[yes]] %> {{$:/plugins/tiddlywiki/markdown/images/new-markdown-button}} - -<$list filter="[match[yes]]"> +<%endif%> +<%if [match[yes]] %> <$text text={{$:/language/Buttons/NewMarkdown/Caption}}/> - +<%endif%> diff --git a/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid b/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid index ed4c042c7e5..63ddfc19e46 100644 --- a/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid +++ b/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid @@ -9,12 +9,12 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ \end <$button popup=<> tooltip="Status of synchronisation with server" aria-label="Server status" class=<> selectedClass="tc-selected"> -<$list filter="[match[yes]]"> +<%if [match[yes]] %> {{$:/plugins/tiddlywiki/tiddlyweb/icon/cloud}} - -<$list filter="[match[yes]]"> +<%endif%> +<%if [match[yes]] %> <$text text="Server status"/> - +<%endif%> <$reveal state=<> type="popup" position="belowleft" animate="yes"> From 63621368fc9398704822b34061ff03f1b482db63 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Tue, 10 Sep 2024 18:39:02 +0800 Subject: [PATCH 6/7] Remove tf prefix in new-journal.tid --- core/ui/Actions/new-journal.tid | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/ui/Actions/new-journal.tid b/core/ui/Actions/new-journal.tid index 92d0e807cf6..9d663e537c5 100644 --- a/core/ui/Actions/new-journal.tid +++ b/core/ui/Actions/new-journal.tid @@ -3,14 +3,14 @@ tags: $:/tags/Actions description: create a new journal tiddler \whitespace trim -\function tf.get-tags() [] [] +[join[ ]] +\function get-tags() [] [] +[join[ ]] <$let journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}> <$wikify name="journalTitle" text="<$transclude $variable='now' format=<>/>"> <$reveal type="nomatch" state=<> text=""> -<$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text={{{ [get[]] }}}/> +<$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text={{{ [get[]] }}}/> <$reveal type="match" state=<> text=""> -<$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text=<>/> +<$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text=<>/> From 34665063382d73f876d9f9d5e65b8179a87d1389 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Tue, 10 Sep 2024 18:39:47 +0800 Subject: [PATCH 7/7] Remove tf prefix in new-tiddler.tid --- core/ui/Actions/new-tiddler.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/ui/Actions/new-tiddler.tid b/core/ui/Actions/new-tiddler.tid index 315255abb4a..84713080005 100644 --- a/core/ui/Actions/new-tiddler.tid +++ b/core/ui/Actions/new-tiddler.tid @@ -3,7 +3,7 @@ tags: $:/tags/Actions description: create a new empty tiddler \whitespace trim -\function tf.get-tags() [] [] +[join[ ]] +\function get-tags() [] [] +[join[ ]] <$let textFieldTags={{$:/config/NewTiddler/Tags}} tagsFieldTags={{$:/config/NewTiddler/Tags!!tags}}> -<$action-sendmessage $message="tm-new-tiddler" tags=<>/> +<$action-sendmessage $message="tm-new-tiddler" tags=<>/>