diff --git a/core/images/cancel-button.tid b/core/images/cancel-button.tid index cae4c167a..2bca34874 100644 --- a/core/images/cancel-button.tid +++ b/core/images/cancel-button.tid @@ -2,5 +2,7 @@ title: $:/core/images/cancel-button tags: $:/tags/Image - + + + \ No newline at end of file diff --git a/core/images/export-button.tid b/core/images/export-button.tid index 79f7cb777..86633bc1f 100644 --- a/core/images/export-button.tid +++ b/core/images/export-button.tid @@ -3,7 +3,6 @@ tags: $:/tags/Image - - + diff --git a/core/images/save-button.tid b/core/images/save-button.tid index bfe4f0eff..f45acee94 100644 --- a/core/images/save-button.tid +++ b/core/images/save-button.tid @@ -3,6 +3,6 @@ tags: $:/tags/Image - + diff --git a/core/modules/widgets/action-setfield.js b/core/modules/widgets/action-setfield.js index 07291ed0d..600d7a2da 100644 --- a/core/modules/widgets/action-setfield.js +++ b/core/modules/widgets/action-setfield.js @@ -58,7 +58,7 @@ Invoke the action associated with this widget */ SetFieldWidget.prototype.invokeAction = function(triggeringWidget,event) { var self = this; - if(this.actionField || this.actionIndex) { + if(this.actionValue) { this.wiki.setText(this.actionTiddler,this.actionField,this.actionIndex,this.actionValue); } $tw.utils.each(this.attributes,function(attribute,name) { diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid index 604326cdd..714954a35 100644 --- a/core/ui/ControlPanel/Basics.tid +++ b/core/ui/ControlPanel/Basics.tid @@ -3,6 +3,17 @@ tags: $:/tags/ControlPanel/Info caption: {{$:/language/ControlPanel/Basics/Caption}} \define lingo-base() $:/language/ControlPanel/Basics/ + +\define show-filter-count(filter) +<$button class="tc-btn-invisible"> +<$action-setfield $tiddler="$:/temp/advancedsearch" $value="""$filter$"""/> +<$action-setfield $tiddler="$:/state/tab--1498284803" $value="$:/core/ui/AdvancedSearch/Filter"/> +<$action-navigate $to="$:/AdvancedSearch"/> +''<$count filter="""$filter$"""/>'' +{{$:/core/images/advanced-search-button}} + +\end + |<> |''<>'' | |<$link to="$:/SiteTitle"><> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> | |<$link to="$:/SiteSubtitle"><> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> | @@ -12,8 +23,8 @@ caption: {{$:/language/ControlPanel/Basics/Caption}} |<$link to="$:/config/NewJournal/Title"><> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> | |<$link to="$:/config/NewJournal/Tags"><> |<$edit-text tiddler="$:/config/NewJournal/Tags" default="" tag="input"/> | |<> |{{$:/snippets/minilanguageswitcher}} | -|<> |''<$count filter="[!is[system]]"/>'' | -|<> |''<$count filter="[tags[]]"/>'' | -|<> |''<$count filter="[is[system]]"/>'' | -|<> |''<$count filter="[all[shadows]]"/>'' | -|<> |''<$count filter="[is[tiddler]is[shadow]]"/>'' | +|<> |<> | +|<> |<> | +|<> |<> | +|<> |<> | +|<> |<> | diff --git a/core/ui/EditToolbar/cancel.tid b/core/ui/EditToolbar/cancel.tid index f5e01e3c8..a06e8690c 100644 --- a/core/ui/EditToolbar/cancel.tid +++ b/core/ui/EditToolbar/cancel.tid @@ -10,4 +10,4 @@ description: {{$:/language/Buttons/Cancel/Hint}} <$list filter="[prefix[yes]]"> <$text text={{$:/language/Buttons/Cancel/Caption}}/> - + \ No newline at end of file