From 049b4418334787c19d40c903178de9510c142da9 Mon Sep 17 00:00:00 2001 From: pmario Date: Tue, 30 Apr 2024 15:09:52 +0200 Subject: [PATCH] new tooltips and improved keyboard tab handling --- core/language/en-GB/Search.multids | 12 ++++-- .../AdvancedSearch/Variables_ItemTemplate.tid | 2 +- core/wiki/macros/dumpvariables.tid | 40 ++++++++++++------- .../vanilla/flexible-form-styles.tid | 6 +-- 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/core/language/en-GB/Search.multids b/core/language/en-GB/Search.multids index b797b0a51..ca842314c 100644 --- a/core/language/en-GB/Search.multids +++ b/core/language/en-GB/Search.multids @@ -19,19 +19,25 @@ System/Caption: System System/Hint: Search for system tiddlers System/Matches: //<> matches// Variables/Caption: Variables +Variables/Content: Variable content Variables/Clear/Exclude: Clear exlude Variables/Clear/Search: Clear search Variables/Exclude: Exclude: +Variables/Exclude/Edit: Edit +Variables/Function/Content: Function content Variables/Exclude/Hide: Hide exclude input -Variables/Exclude/Hint: Filter eg: [prefix[.]] -Variables/Exclude/Save: Create exclude filter +Variables/Exclude/Hint: Exclude Filter eg: [prefix[.]] +Variables/Exclude/Save: Create new exclude filter Variables/Exclude/Show: Show exclude input +Variables/Exclude/Show/Config: Show saved exclude configurations Variables/Exclude/Description: EDIT ME - Description is shown in the dropdown Variables/ExpandAll: Expand all: Variables/FoldAll: Fold all: Variables/Filter: Search: -Variables/Filter/Hint: Text eg: .attr +Variables/Filter/Hint: Search Variable Name eg: .attr Variables/Hint: Filter global variables +Variables/Info/Toggle/Show: Show details search input +Variables/Info/Toggle/Hide: Hide details search input Variables/Matches: //<> matches// Variables/Search: Search Variables Variables/Search/Details: Search tiddler text, tags: diff --git a/core/ui/AdvancedSearch/Variables_ItemTemplate.tid b/core/ui/AdvancedSearch/Variables_ItemTemplate.tid index e1febd401..840d6ee22 100644 --- a/core/ui/AdvancedSearch/Variables_ItemTemplate.tid +++ b/core/ui/AdvancedSearch/Variables_ItemTemplate.tid @@ -11,6 +11,6 @@ title: $:/core/ui/AdvancedSearch/Variables/ItemTemplate <$transclude field="description"/> -<$button actions=<> class="tc-btn-invisible tc-small-gap-left"> +<$button actions=<> class="tc-btn-invisible tc-small-gap-left" tooltip={{$:/language/Search/Variables/Exclude/Edit}}> {{$:/core/images/edit-button}} diff --git a/core/wiki/macros/dumpvariables.tid b/core/wiki/macros/dumpvariables.tid index 6f634e8df..568cf02d4 100644 --- a/core/wiki/macros/dumpvariables.tid +++ b/core/wiki/macros/dumpvariables.tid @@ -71,7 +71,7 @@ tags: $:/tags/Global \procedure dv-clearStatesButton() <> -<$button class="tc-btn-invisible tc-tiny-gap-left"> +<$button class="tc-btn-invisible tc-tiny-gap-left" tooltip={{$:/language/Search/Variables/FoldAll}}> <$action-deletetiddler $filter="[prefix]"/> {{$:/core/images/fold-all-button}} @@ -96,7 +96,7 @@ tags: $:/tags/Global \procedure dv-expandAllStatesButton() <> -<$button class="tc-btn-invisible"> +<$button class="tc-btn-invisible" tooltip={{$:/language/Search/Variables/ExpandAll}}> <$action-setfield $tiddler=<> text={{{ [get[text]] +[toggle[yes],[no]] }}} /> @@ -155,7 +155,7 @@ tags: $:/tags/Global <> -

<$text text=`${ [subfilter] +

<$text text=`${ [subfilter] +[search::some] +[filter] +[!filter] @@ -176,24 +176,28 @@ tags: $:/tags/Global {{$:/core/images/right-arrow}} <% endif %> <$text text=<>/> - <% if [prefix[\function]] %> - - <$text text={{{ [format:variable[$firstLine$]] }}}/> - <% endif %> + <% if [prefix[\function]] %> + + + <$text text={{{ [format:variable[$firstLine$]] }}}/> + + <% endif %> <% if [get[text]match[yes]] %> - <$button actions=<> class="tc-btn-invisible tc-small-gap-left"> + <$button actions=<> + class="tc-btn-invisible tc-small-gap-left" + > <% if [get[text]match[yes]] %> - {{$:/core/images/up-arrow}} + {{$:/core/images/up-arrow}} <% else %> - {{$:/core/images/advanced-search-button}} + {{$:/core/images/advanced-search-button}} <% endif %>

<% if [get[text]match[yes]] %>
- <> + <> <$edit-text tiddler=<> tag=input class="tc-fluid-input tc-small-gap-left"/>
<> @@ -201,7 +205,7 @@ tags: $:/tags/Global <% if [prefix[\function]] %> <$codeblock code={{{ [getvariable[value]] }}}/> <% endif %> - <$codeblock code={{{ [getvariable[]] }}}/> + 
<$text text={{{ [getvariable[]] }}}/>
<% endif %> @@ -380,7 +384,12 @@ tags: $:/tags/Global \end \procedure dv-addNewVariableFilter() -<$button tag="a" actions=<> class="tc-tiddlylink"> +<$button tag="a" + actions=<> + class="tc-tiddlylink" + aria-label={{$:/language/Search/Variables/Exclude/Save}} + tabindex="0" +> <$text text={{$:/language/Search/Variables/Exclude/Save}}/> @@ -389,7 +398,10 @@ tags: $:/tags/Global \procedure moreVariablesPopup() - <$button popup=<> class="tc-btn-invisible"> + <$button popup=<> + class="tc-btn-invisible" + tooltip={{$:/language/Search/Variables/Exclude/Show/Config}} + > {{$:/core/images/down-arrow}} diff --git a/themes/tiddlywiki/vanilla/flexible-form-styles.tid b/themes/tiddlywiki/vanilla/flexible-form-styles.tid index df74b43a9..60a1e0393 100644 --- a/themes/tiddlywiki/vanilla/flexible-form-styles.tid +++ b/themes/tiddlywiki/vanilla/flexible-form-styles.tid @@ -21,7 +21,7 @@ tags: $:/tags/Stylesheet .tc-dv-type { grid-area: tc-dv-type; display: grid; - grid-column-gap: .5em; + grid-column-gap: 0.3em; grid-row-gap: 0.2em; grid-template-columns: 5.3em; grid-template-areas: @@ -29,14 +29,14 @@ tags: $:/tags/Stylesheet } .tc-dv-filterOptions { - border: 1px solid <>; + padding: 0 .3em; } .tc-dv-sort { grid-area: tc-dv-sort; display: grid; - grid-column-gap: 0.5em; + grid-column-gap: 0.3em; grid-row-gap: 0.2em; grid-template-columns: 6em 9em; grid-template-areas: