diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid index 2197aae2b..22564b5f2 100644 --- a/core/ui/EditTemplate/fields.tid +++ b/core/ui/EditTemplate/fields.tid @@ -21,14 +21,6 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$ <$action-sendmessage $message="tm-focus-selector" $param=<>/> \end -\define delete-state-tiddlers() <$action-deletetiddler $filter="[] [] []"/> - -\define cancel-search-actions() -<$list filter="[<__storeTitle__>has[text]] [<__tiddler__>has[text]]" variable="ignore" emptyMessage="""<><$action-sendmessage $message="tm-cancel-tiddler"/>"""> -<> - -\end - \define new-field() <$vars name={{{ [get[text]] }}}> <$reveal type="nomatch" text="" default=<>> @@ -76,18 +68,12 @@ $value={{{ [get[text]] }}}/> <$fieldmangler>
- -<>   + +<>
-<$vars refreshTitle=<> storeTitle=<> searchListState=<>> -<$macrocall $name="keyboard-driven-input" tiddler=<> storeTitle=<> refreshTitle=<> - selectionStateTitle=<> tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} - focusPopup=<> class="tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} - focus={{{ [{$:/config/AutoFocus}match[fields]then[true]] ~[[false]] }}} cancelPopups="yes" - configTiddlerFilter="[[$:/config/EditMode/fieldname-filter]]" inputCancelActions=<> /> -  -<$button popup=<> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Field/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Field/Dropdown/Caption}}>{{$:/core/images/down-arrow}}  +<$edit-text tiddler=<> tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} focusPopup=<> class="tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[fields]then[true]] ~[[false]] }}} cancelPopups="yes"/> +<$button popup=<> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Field/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Field/Dropdown/Caption}}>{{$:/core/images/down-arrow}} <$reveal state=<> type="nomatch" text="" default="">
<$set name="tv-show-missing-links" value="yes"> @@ -95,38 +81,33 @@ $value={{{ [get[text]] }}}/>
<>
-<$set name="newFieldName" value={{{ [get[text]] }}}> +<$set name="newFieldName" value={{{ [get[text]] }}}> <$list filter="[!is[shadow]!is[system]fields[]search:titlesort[]] -created -creator -draft.of -draft.title -modified -modifier -tags -text -title -type" variable="currentField"> -<$list filter="[addsuffix[-primaryList]] -[get[text]]" emptyMessage="""<$link to=<> class="tc-list-item-selected"><$text text=<>/>"""> <$link to=<>> <$text text=<>/> -
<>
<$list filter="[fields[]search:titlesort[]] -[!is[shadow]!is[system]fields[]]" variable="currentField"> -<$list filter="[addsuffix[-secondaryList]] -[get[text]]" emptyMessage="""<$link to=<> class="tc-list-item-selected"><$text text=<>/>"""> <$link to=<>> <$text text=<>/> -
-
- + <$set name="currentTiddlerCSSescaped" value={{{ [escapecss[]] }}}> <$keyboard key="((add-field))" actions=<>> <$edit-text tiddler=<> tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} class="tc-edit-texteditor" tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/> -  + <$macrocall $name="new-field"/> diff --git a/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid index 81c190186..14b023fd6 100644 --- a/core/ui/EditTemplate/type.tid +++ b/core/ui/EditTemplate/type.tid @@ -4,10 +4,10 @@ tags: $:/tags/EditTemplate \define lingo-base() $:/language/EditTemplate/ \whitespace trim
-<>   +<>
<$fieldmangler> -<$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] ~[[false]] }}} cancelPopups="yes"/> <$button popup=<> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}} <$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}} +<$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<> class="tc-edit-typeeditor tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}} focus={{{ [{$:/config/AutoFocus}match[type]then[true]] ~[[false]] }}} cancelPopups="yes"/><$button popup=<> class="tc-btn-invisible tc-btn-dropdown tc-small-gap" tooltip={{$:/language/EditTemplate/Type/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Type/Dropdown/Caption}}>{{$:/core/images/down-arrow}}<$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon" tooltip={{$:/language/EditTemplate/Type/Delete/Hint}} aria-label={{$:/language/EditTemplate/Type/Delete/Caption}}>{{$:/core/images/delete-button}}
diff --git a/core/ui/ImportListing.tid b/core/ui/ImportListing.tid index ddf49a8ce..2018014b5 100644 --- a/core/ui/ImportListing.tid +++ b/core/ui/ImportListing.tid @@ -43,12 +43,12 @@ $(currentTiddler)$!!popup-$(payloadTiddler)$ <$reveal type="nomatch" state=<> text="yes" tag="div"> <$button class="tc-btn-invisible tc-btn-dropdown" set=<> setTo="yes"> -{{$:/core/images/right-arrow}} <$text text=<>/> +{{$:/core/images/right-arrow}}<$text text=<>/> <$reveal type="match" state=<> text="yes" tag="div"> <$button class="tc-btn-invisible tc-btn-dropdown" set=<> setTo="no"> -{{$:/core/images/down-arrow}} <$text text=<>/> +{{$:/core/images/down-arrow}}<$text text=<>/> diff --git a/core/ui/PaletteManager.tid b/core/ui/PaletteManager.tid index f4f0a3ba9..eb6968a84 100644 --- a/core/ui/PaletteManager.tid +++ b/core/ui/PaletteManager.tid @@ -25,10 +25,10 @@ title: $:/PaletteManager <$set name="state" value={{{ [[$:/state/palettemanager/]addsuffixaddsuffix[/]addsuffix] }}}> <$wikify name="newColourName" text="""<$macrocall $name="resolve-colour" macrocall={{{ [getindex] }}}/>"""> <$reveal state=<> type="nomatch" text="show"> -<$button tooltip=<> aria-label=<> class="tc-btn-invisible" set=<> setTo="show">{{$:/core/images/down-arrow}} <$text text=<>/>
+<$button tooltip=<> aria-label=<> class="tc-btn-invisible" set=<> setTo="show">{{$:/core/images/down-arrow}}<$text text=<> class="tc-small-gap-left"/>
<$reveal state=<> type="match" text="show"> -<$button tooltip=<> aria-label=<> class="tc-btn-invisible" actions="""<$action-deletetiddler $tiddler=<>/>""">{{$:/core/images/up-arrow}} <$text text=<>/>
+<$button tooltip=<> aria-label=<> class="tc-btn-invisible" actions="""<$action-deletetiddler $tiddler=<>/>""">{{$:/core/images/up-arrow}}<$text text=<> class="tc-small-gap-left"/>
<$reveal state=<> type="match" text="show"> <$set name="colourName" value=<>> @@ -88,6 +88,6 @@ title: $:/PaletteManager <$button message="tm-new-tiddler" param={{$:/palette}}><> -<$checkbox tiddler="$:/state/palettemanager/showexternal" field="text" checked="yes" unchecked="no"> <> +<$checkbox tiddler="$:/state/palettemanager/showexternal" field="text" checked="yes" unchecked="no"><> <> diff --git a/core/ui/SideBar/Open.tid b/core/ui/SideBar/Open.tid index 0e044ddf8..84d7c396e 100644 --- a/core/ui/SideBar/Open.tid +++ b/core/ui/SideBar/Open.tid @@ -26,7 +26,7 @@ $button$
<$list filter="[list]" history=<> storyview="pop">
-<$macrocall $name="droppable-item" button="""<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini">{{$:/core/images/close-button}} <$link to={{!!title}}><$view field="title"/>"""/> +<$macrocall $name="droppable-item" button="""<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini tc-small-gap-right">{{$:/core/images/close-button}}<$link to={{!!title}}><$view field="title"/>"""/>
<$tiddler tiddler=""> diff --git a/core/wiki/macros/list.tid b/core/wiki/macros/list.tid index e679f1fde..01b527a07 100644 --- a/core/wiki/macros/list.tid +++ b/core/wiki/macros/list.tid @@ -43,7 +43,7 @@ tags: $:/tags/Macro <$tiddler tiddler=""> <$droppable actions=<> tag="div" enable=<>>
-  +{{$:/core/images/blank}}
diff --git a/core/wiki/macros/tag-picker.tid b/core/wiki/macros/tag-picker.tid index f3d71c642..ac92aa24f 100644 --- a/core/wiki/macros/tag-picker.tid +++ b/core/wiki/macros/tag-picker.tid @@ -38,14 +38,14 @@ $actions$ <$vars tagSelectionState=<> storeTitle=<> refreshTitle=<> nonSystemTagsFilter="[tags[]!is[system]search:titlesort[]]" systemTagsFilter="[tags[]is[system]search:titlesort[]]">
- + <$macrocall $name="keyboard-driven-input" tiddler=<> storeTitle=<> refreshTitle=<> selectionStateTitle=<> inputAcceptActions="""<$macrocall $name="add-tag-actions" actions=<<__actions__>>/>""" inputCancelActions=<> tag="input" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<> class="tc-edit-texteditor tc-popup-handle" tabindex=<> focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}} filterMinLength={{$:/config/Tags/MinLength}} cancelPopups=<> configTiddlerFilter="[[$:/core/macros/tag-picker]]"/> - <$button popup=<> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}>{{$:/core/images/down-arrow}}  +<$button popup=<> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}>{{$:/core/images/down-arrow}} <$set name="tag" value={{{ [get[text]] }}}> <$button set=<> setTo="" class=""> <$action-sendmessage $message="tm-add-tag" $param=<>/> diff --git a/plugins/tiddlywiki/comments/header-view-template-segment.tid b/plugins/tiddlywiki/comments/header-view-template-segment.tid index 8dd503955..ca119e581 100644 --- a/plugins/tiddlywiki/comments/header-view-template-segment.tid +++ b/plugins/tiddlywiki/comments/header-view-template-segment.tid @@ -21,7 +21,7 @@ list-before: $:/core/ui/ViewTemplate/body

This tiddler is a comment on <$list filter="[listsort[title]]"> -<>  +<>

<$list filter="[listrole[comment]sort[title]limit[1]]" variable="ignore">