Merge branch 'master' into geospatial-plugin

core/images/layout-button.tid

@@ -0,0 +1,4 @@
+title: $:/core/images/layout-button
+tags: $:/tags/Image
+
+<svg width="22pt" height="22pt" class="tc-image-layout-button tc-image-button" viewBox="0 0 24 24" stroke-width="1" stroke="none"><path d="M0 0h24v24H0z" fill="none"/><rect x="2" y="2" width="7" height="7" rx="2"/><rect x="2" y="13" width="7" height="9" rx="2"/><rect x="12" y="2" width="10" height="20" rx="2"/></svg>

core/language/en-GB/Buttons.multids

@@ -59,6 +59,8 @@ Home/Caption: home
 Home/Hint: Open the default tiddlers
 Language/Caption: language
 Language/Hint: Choose the user interface language
+LayoutSwitcher/Hint: Open layout switcher
+LayoutSwitcher/Caption: layout
 Manager/Caption: tiddler manager
 Manager/Hint: Open tiddler manager
 More/Caption: more

core/language/en-GB/Help/commands.tid

@@ -0,0 +1,18 @@
+title: $:/language/Help/commands
+description: Run commands returned from a filter
+
+Sequentially run the command tokens returned from a filter
+
+```
+--commands <filter>
+```
+
+Examples
+
+```
+--commands "[enlist{$:/build-commands-as-text}]"
+```
+
+```
+--commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget<currentTiddler>]"
+```

core/modules/commands/commands.js

@@ -0,0 +1,42 @@
+/*\
+title: $:/core/modules/commands/commands.js
+type: application/javascript
+module-type: command
+
+Runs the commands returned from a filter
+
+\*/
+
+(function() {
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.info = {
+	name: "commands",
+	synchronous: true
+};
+
+var Command = function(params, commander) {
+	this.params = params;
+	this.commander = commander;
+};
+
+Command.prototype.execute = function() {
+	// Parse the filter
+	var filter = this.params[0];
+	if(!filter) {
+		return "No filter specified";
+	}
+	var commands = this.commander.wiki.filterTiddlers(filter)
+	if(commands.length === 0) {
+		return "No tiddlers found for filter '" + filter + "'";
+	}
+	this.commander.addCommandTokens(commands);
+	return null;
+};
+
+exports.Command = Command;
+
+})();

core/modules/utils/dom/modal.js

@@ -26,6 +26,8 @@ Display a modal dialogue
 	options: see below
 Options include:
 	downloadLink: Text of a big download link to include
+	event: widget event
+	variables: from event.paramObject
 */
 Modal.prototype.display = function(title,options) {
 	options = options || {};
@@ -209,6 +211,10 @@ Modal.prototype.display = function(title,options) {
 	headerWidgetNode.addEventListener("tm-close-tiddler",closeHandler,false);
 	bodyWidgetNode.addEventListener("tm-close-tiddler",closeHandler,false);
 	footerWidgetNode.addEventListener("tm-close-tiddler",closeHandler,false);
+	// Whether to close the modal dialog when the mask (area outside the modal) is clicked
+	if(tiddler.fields && (tiddler.fields["mask-closable"] === "yes" || tiddler.fields["mask-closable"] === "true")) {
+		modalBackdrop.addEventListener("click",closeHandler,false);
+	}
 	// Set the initial styles for the message
 	$tw.utils.setStyle(modalBackdrop,[
 		{opacity: "0"}

core/modules/widgets/select.js

@@ -42,6 +42,9 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
 	this.execute();
 	this.renderChildren(parent,nextSibling);
 	this.setSelectValue();
+	if(this.selectFocus == "yes") {
+		this.getSelectDomNode().focus();
+	}
 	$tw.utils.addEventListeners(this.getSelectDomNode(),[
 		{name: "change", handlerObject: this, handlerMethod: "handleChangeEvent"}
 	]);
@@ -143,6 +146,7 @@ SelectWidget.prototype.execute = function() {
 	this.selectMultiple = this.getAttribute("multiple", false);
 	this.selectSize = this.getAttribute("size");
 	this.selectTooltip = this.getAttribute("tooltip");
+	this.selectFocus = this.getAttribute("focus");
 	// Make the child widgets
 	var selectNode = {
 		type: "element",

core/ui/AdvancedSearch/FilterButtons/dropdown.tid

@@ -14,7 +14,7 @@ tags: $:/tags/AdvancedSearch/FilterButton
 <$linkcatcher actions="<$action-setfield $tiddler='$:/temp/advancedsearch' text=<<navigateTo>>/><$action-setfield $tiddler='$:/temp/advancedsearch/input' text=<<navigateTo>>/><$action-setfield $tiddler='$:/temp/advancedsearch/refresh' text='yes'/><$action-sendmessage $message='tm-focus-selector' $param='.tc-advanced-search input' />">
 <div class="tc-block-dropdown-wrapper">
 <div class="tc-block-dropdown tc-edit-type-dropdown">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]]">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]!is[draft]]">
 <$link to={{!!filter}}><$let tv-wikilinks="no"><$transclude field="description"/></$let></$link>
 </$list>
 </div>

core/ui/EditTemplate.tid

@@ -1,7 +1,12 @@
 title: $:/core/ui/EditTemplate
 
-\define delete-edittemplate-state-tiddlers() <$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix<newFieldValueTiddlerPrefix>] [<newFieldNameInputTiddler>] [<newFieldNameSelectionTiddler>] [<newTagNameTiddler>] [<newTagNameInputTiddler>] [<newTagNameSelectionTiddler>] [<typeInputTiddler>] [<typeSelectionTiddler>]"/>
+\define delete-edittemplate-state-tiddlers()
+<$set name="safeNewFieldValueTiddlerPrefix" value=<<newFieldValueTiddlerPrefix>> emptyValue=<<qualify "$:/temp/NewFieldValue">> >
+	<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix[$:/temp/NewFieldValue]prefix<safeNewFieldValueTiddlerPrefix>] [<newFieldNameInputTiddler>] [<newFieldNameSelectionTiddler>] [<newTagNameTiddler>] [<newTagNameInputTiddler>] [<newTagNameSelectionTiddler>] [<typeInputTiddler>] [<typeSelectionTiddler>]"/>
+</$set>
+\end
 
+<!-- Beware this is duplicated from fields.tid. For details see bug #7054 -->
 \define get-field-value-tiddler-filter() [subfilter<get-field-editor-filter>sha256[16]addprefix[/]addprefix<newFieldValueTiddlerPrefix>]
 \define get-field-editor-filter() [<newFieldNameTiddler>get[text]else[]] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}]
 

core/ui/EditTemplate/fields.tid

@@ -10,6 +10,10 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 [[hide]] -[title{$(config-title)$}]
 \end
 
+<!-- Beware this is duplicated from EditTemplate.tid. For details see bug #7054 -->
+\define get-field-value-tiddler-filter() [subfilter<get-field-editor-filter>sha256[16]addprefix[/]addprefix<newFieldValueTiddlerPrefix>]
+\define get-field-editor-filter() [<newFieldNameTiddler>get[text]else[]] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}]
+
 \define current-tiddler-new-field-selector()
 [data-tiddler-title="$(currentTiddlerCSSescaped)$"] .tc-edit-field-add-name-wrapper input
 \end
@@ -17,7 +21,9 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 \define new-field-actions()
 \whitespace trim
 <$action-sendmessage $message="tm-add-field" $name={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldNameTiddler>get[text]] :map[subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
-<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix<newFieldValueTiddlerPrefix>] [<storeTitle>] [<searchListState>]"/>
+<$set name="safeNewFieldValueTiddlerPrefix" value=<<newFieldValueTiddlerPrefix>> emptyValue=<<qualify "$:/temp/NewFieldValue">> >
+	<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix[$:/temp/NewFieldValue]prefix<safeNewFieldValueTiddlerPrefix>] [<storeTitle>] [<searchListState>]"/>
+</$set>
 <$action-sendmessage $message="tm-focus-selector" $param=<<current-tiddler-new-field-selector>>/>
 \end
 
@@ -52,7 +58,9 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 <$action-sendmessage $message="tm-add-field"
 $name=<<name>>
 $value={{{ [subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
-<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix<newFieldValueTiddlerPrefix>] [<storeTitle>] [<searchListState>]"/>
+<$set name="safeNewFieldValueTiddlerPrefix" value=<<newFieldValueTiddlerPrefix>> emptyValue=<<qualify "$:/temp/NewFieldValue">> >
+	<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix[$:/temp/NewFieldValue]prefix<safeNewFieldValueTiddlerPrefix>] [<storeTitle>] [<searchListState>]"/>
+</$set>
 <<lingo Fields/Add/Button>>
 </$button>
 </$reveal>
@@ -65,6 +73,7 @@ $value={{{ [subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
 \end
 \whitespace trim
 
+<$set name="newFieldValueTiddlerPrefix" value=<<newFieldValueTiddlerPrefix>> emptyValue=<<qualify "$:/temp/NewFieldValue">> >
 <div class="tc-edit-fields">
 <table class={{{ [all[current]fields[]] :filter[lookup[$:/config/EditTemplateFields/Visibility/]!match[hide]] +[count[]!match[0]] +[then[tc-edit-fields]] ~[[tc-edit-fields tc-edit-fields-small]] }}}>
 <tbody>
@@ -148,3 +157,4 @@ $value={{{ [subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
 </$vars>
 </div>
 </$fieldmangler>
+</$set>

core/ui/PageControls/layout.tid

@@ -0,0 +1,15 @@
+title: $:/core/ui/Buttons/layout
+tags: $:/tags/PageControls
+caption: {{$:/core/images/layout-button}} {{$:/language/Buttons/LayoutSwitcher/Caption}}
+description: {{$:/language/LayoutSwitcher/Description}}
+
+\whitespace trim
+<$button tooltip={{$:/language/Buttons/LayoutSwitcher/Hint}} aria-label={{$:/language/Buttons/LayoutSwitcher/Caption}} class=<<tv-config-toolbar-class>>>
+<$action-sendmessage $message="tm-show-switcher" switch="layout"/>
+<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+{{$:/core/images/layout-button}}
+</$list>
+<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<span class="tc-btn-text"><$text text={{$:/language/Buttons/LayoutSwitcher/Caption}}/></span>
+</$list>
+</$button>

core/ui/SwitcherModal.tid

@@ -1,6 +1,7 @@
 title: $:/core/ui/SwitcherModal
 subtitle: <$text text={{{[<switch>lookup[$:/language/Switcher/Subtitle/]]}}}/>
 class: tc-modal-centered
+mask-closable: yes
 
 <$tiddler tiddler={{{[<switch>lookup[$:/config/SwitcherTargets/]]}}}>
 

core/ui/ViewTemplate/unfold.tid

@@ -2,17 +2,21 @@ title: $:/core/ui/ViewTemplate/unfold
 tags: $:/tags/ViewTemplate
 
 \whitespace trim
-<$reveal tag="div" type="nomatch" state="$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar" text="hide">
+<div class="tc-reveal">
+<$list filter="[{$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar}match[show]]" variable="ignore">
 <$reveal tag="div" type="nomatch" stateTitle=<<folded-state>> text="hide" default="show" retain="yes" animate="yes">
 <$button tooltip={{$:/language/Buttons/Fold/Hint}} aria-label={{$:/language/Buttons/Fold/Caption}} class="tc-fold-banner">
 <$action-sendmessage $message="tm-fold-tiddler" $param=<<currentTiddler>> foldedState=<<folded-state>>/>
 {{$:/core/images/chevron-up}}
 </$button>
 </$reveal>
+</$list>
+<$list filter="[{$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar}match[show]] :else[<folded-state>get[text]match[hide]]" variable="ignore">
 <$reveal tag="div" type="nomatch" stateTitle=<<folded-state>> text="show" default="show" retain="yes" animate="yes">
 <$button tooltip={{$:/language/Buttons/Unfold/Hint}} aria-label={{$:/language/Buttons/Unfold/Caption}} class="tc-unfold-banner">
 <$action-sendmessage $message="tm-fold-tiddler" $param=<<currentTiddler>> foldedState=<<folded-state>>/>
 {{$:/core/images/chevron-down}}
 </$button>
 </$reveal>
-</$reveal>
+</$list>
+</div>

core/wiki/config/PageControlButtons.multids

@@ -21,4 +21,5 @@ core/ui/Buttons/print: hide
 core/ui/Buttons/storyview: hide
 core/ui/Buttons/timestamp: hide
 core/ui/Buttons/theme: hide
+core/ui/Buttons/layout: hide
 core/ui/Buttons/unfold-all: hide

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/fold-all]] [[$:/core/ui/Buttons/unfold-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/new-journal]] [[$:/core/ui/Buttons/new-image]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/export-page]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/advanced-search]] [[$:/core/ui/Buttons/manager]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/palette]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/timestamp]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/print]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/refresh]] [[$:/core/ui/Buttons/more-page-actions]]
+list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/fold-all]] [[$:/core/ui/Buttons/unfold-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/new-journal]] [[$:/core/ui/Buttons/new-image]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/export-page]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/advanced-search]] [[$:/core/ui/Buttons/manager]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/palette]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/layout]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/timestamp]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/print]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/refresh]] [[$:/core/ui/Buttons/more-page-actions]]

editions/prerelease/tiddlers/Release 5.2.4.tid

@@ -13,9 +13,13 @@ type: text/vnd.tiddlywiki
 	url:"https://raw.githubusercontent.com/Jermolene/TiddlyWiki5/0dc30086e933cf2272cddb076a9fcbedad252735/editions/tw5.com/tiddlers/images/New%20Release%20Banner.png"
 >>
 
-! Plugin Improvements
+! Major Improvements
 
-* New [[Twitter Archivist|./editions/twitter-archivist]] plugin to imports the tweets and associated media from a Twitter Archive as individual tiddlers
+New [ext[Twitter Archivist|./editions/twitter-archivist]] plugin to import the tweets and associated media from a Twitter Archive as individual tiddlers.
+
+<<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6961">> new GenesisWidget that allows the dynamic construction of another widget, where the name and attributes of the new widget can be dynamically determined, without needing to be known in advance
+
+<<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6936">> new operators for reading and formatting JSON data: [[jsonget Operator]], [[jsonindexes Operator]], [[jsontype Operator]] and [[format Operator]]
 
 ! Translation improvement
 
@@ -32,10 +36,6 @@ Improvements to the translation features of TiddlyWiki:
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6882">> the [[Translators Edition|Translate TiddlyWiki into your language]] to add an option to display the original English text underneath the text area
 * <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/6933">> "delete" button text in $:/AdvancedSearch so that it is translatable
 
-! Accessibility Improvements
-
-* 
-
 ! Usability Improvements
 
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/d62a16ee464fb9984b766b48504829a1a3eb143b">> problem with long presses on tiddler links triggering a preview on iOS/iPadOS
@@ -46,11 +46,15 @@ Improvements to the translation features of TiddlyWiki:
 * <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/6877">> default styles for [[styled runs|Styles and Classes in WikiText]]
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6881">> upgrade wizard to make the version number more prominent
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7042">> parsing of tiddlers containing CSV data for greater compatibility
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7076">> new page control button to summon the layout switcher
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7084">> folded tiddlers to ensure that the unfold button is always visible
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7072">> handling of [[Modals]] to optionally allow them to be dismissed by clicking on the background
 
 ! Widget Improvements
 
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6961">> new GenesisWidget that allows the dynamic construction of another widget, where the name and attributes of the new widget can be dynamically determined, without needing to be known in advance
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/127f660c91020dcbb43897d954066b31af729e74">> EditTextWidget to remove the default text "Type the text for the tiddler 'foo'"
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7081">> ''focus'' attribute to SelectWidget
+* <<.link-badge-removed "https://github.com/Jermolene/TiddlyWiki5/commit/1df4c29d73073788ba3859668112e8bb46171a6c">> restriction of the LetWidget being unable to create variables whose names begin with a dollar sign
 
 ! Filter improvements
 
@@ -61,10 +65,8 @@ Improvements to the translation features of TiddlyWiki:
 
 * <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7004">> support for nested [[macro definitions|Macro Definitions in WikiText]]
 * <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6976">> support for [[SystemTag: $:/tags/ClassFilters/TiddlerTemplate]] and [[SystemTag: $:/tags/ClassFilters/PageTemplate]] to assign dynamic CSS classes to both tiddler frames and the page template
-* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6936">> new operators for reading and formatting JSON data: [[jsonget Operator]], [[jsonindexes Operator]], [[jsontype Operator]] and [[format Operator]]
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/c5d3d4c26e8fe27f272dda004aec27d6b66c4f60">> safe mode to disable wiki store indexers
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/166a1565843878083fb1eba47c73b8e67b78400d">> safe mode to prevent globally disabling parser rules
-* <<.link-badge-removed "https://github.com/Jermolene/TiddlyWiki5/commit/1df4c29d73073788ba3859668112e8bb46171a6c">> restriction of the LetWidget being unable to create variables whose names begin with a dollar sign
 * <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/6735">> keyboard shortcut handling to allow to global shortcuts to override all other shortcuts
 * <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/commit/965bd090a905f5756e79124b698c894f7f72ad5b">> [[list-links Macro]] to allow the rendered field to be overriden
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6913">> [[Table-of-Contents Macros]] to allow the default icons to be overridden
@@ -72,6 +74,8 @@ Improvements to the translation features of TiddlyWiki:
 * <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/5947">> [[timeline Macro]] to override the link template
 * <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7043">> support for Unix epoch timestamps in [[date format strings|DateFormat]]
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7064">> the "big green download button" to use the defined palette colour
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7063">> new hidden setting [[to use horizontal tabs for the "more" sidebar tab|Hidden Setting: More Tabs Horizontal]]
+
 
 ! Bug Fixes
 
@@ -80,13 +84,11 @@ Improvements to the translation features of TiddlyWiki:
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7017">> issue with wikification within the advanced search filter dropdown
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7057">> the table in $:/Import to avoid creating hidden empty rows
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7008">> advanced search keyboard shortcut not navigating correctly
-
+* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7083">> erroneous display of drafts within the advanced search filter dropdown
-! Developer Improvements
-
-* 
 
 ! Node.js Improvements
 
+* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7073">> new CommandsCommand to enable command tokens to be dynamically generated from a filter
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6947">> console logging to avoid spaces and `<empty string>` message
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7014">> problem  with lazy loading deleting tiddler bodies under certian circumstances
 * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/344110e2890caf711ab8f3c4f4deaa7d86771231">> handling of ".mp4" file extension so that it defaults to video not audio
@@ -98,7 +100,7 @@ Improvements to the translation features of TiddlyWiki:
 
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/53d229592df76c6dd607e40be5bea4d5e063c48e">> performance of `wiki.getTiddler()`
 * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/81ac9874846b3ead275f67010fcfdb49f3d2f43c">> performance of variable prototype chain handling
-
+* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6056">> performance of list handling during filter processing
 
 ! Acknowledgements
 
@@ -109,12 +111,15 @@ AnthonyMuscio
 bestony
 btheado
 BramChen
+carlo-columbo
 EvidentlyCube
 FlashSystems
 flibbles
 fu-sen
 joebordes
 hoelzro
+kookma
+linonetwo
 Marxsal
 oflg
 pmario

editions/translators/tiddlers/system/PageControlButtonsVisibility.multids

@@ -13,4 +13,5 @@ core/ui/Buttons/more-page-actions: show
 core/ui/Buttons/new-journal: hide
 core/ui/Buttons/permaview: hide
 core/ui/Buttons/storyview: hide
+core/ui/Buttons/layout: hide
 core/ui/Buttons/theme: hide

editions/tw.org/tiddlers/Fundraising.tid

@@ -14,10 +14,10 @@ We do need a small amount of money on an ongoing basis to pay the costs of runni
 
 We use Open Collective to allow you to contribute towards these costs. You can contribute a one-off donation, or make an ongoing monthly commitment. Find out more:
 
-https://opencollective.com/tiddlywikidotorg
+https://opencollective.com/tiddlywiki
 
 !! Community Projects
 
 We also use Open Collective to raise funds to support the development of major new features, plugins or community infrastructure. These projects generally involve a small team of individuals getting together and making a proposal to the rest of the community.
 
-For example, the [[File Upload Plugin Project|https://opencollective.com/tiddlywikidotorg/projects/tiddlywiki-file-upload]] aims to radically simplify working with attached images.
+For example, the [[File Upload Plugin Project|https://opencollective.com/tiddlywiki/projects/tiddlywiki-file-upload]] aims to radically simplify working with attached images.

editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png.meta

@@ -0,0 +1,3 @@
+title: $:/_tw_shared/favicons/marketplace
+type: image/png
+tags: TiddlyWikiSitesMenu

editions/tw5.com/tiddlers/_tw_shared/sites/marketplace.tid

@@ -0,0 +1,6 @@
+title: $:/_tw_shared/sites/marketplace
+tags: $:/tags/TiddlyWikiSites TiddlyWikiSitesMenu
+caption: marketplace
+description: Commercial Products and Services
+url: https://talk.tiddlywiki.org/c/marketplace/22
+icon: $:/_tw_shared/favicons/marketplace

editions/tw5.com/tiddlers/_tw_shared/tags-TiddlyWikiSites.tid

@@ -1,3 +1,3 @@
 title: $:/tags/TiddlyWikiSites
-list: $:/_tw_shared/sites/tiddlywiki.com $:/_tw_shared/sites/tiddlywiki.org $:/_tw_shared/sites/talk.tiddlywiki.org $:/_tw_shared/sites/links.tiddlywiki.org $:/_tw_shared/sites/tiddlywiki.com.upgrade $:/_tw_shared/sites/tiddlywiki.com.dev $:/_tw_shared/sites/tiddlywiki.com.prerelease $:/_tw_shared/sites/classic.tiddlywiki.com
+list: $:/_tw_shared/sites/tiddlywiki.com $:/_tw_shared/sites/tiddlywiki.org $:/_tw_shared/sites/talk.tiddlywiki.org $:/_tw_shared/sites/links.tiddlywiki.org $:/_tw_shared/sites/tiddlywiki.com.upgrade $:/_tw_shared/sites/tiddlywiki.com.dev $:/_tw_shared/sites/tiddlywiki.com.prerelease $:/_tw_shared/sites/classic.tiddlywiki.com $:/_tw_shared/sites/marketplace
 tags: TiddlyWikiSitesMenu

editions/tw5.com/tiddlers/about/Funding TiddlyWiki.tid

@@ -0,0 +1,19 @@
+title: Funding TiddlyWiki
+tags: About HelloThere
+modified: 20221204165636777
+created: 20221204165636777
+
+TiddlyWiki is more useful to everybody if it is free to use, with no financial barriers to long term adoption. It is not altruism; we believe that removing or reducing barriers to adoption will help to ensure TiddlyWiki's future by making the community larger and stronger.
+
+Nonetheless, TiddlyWiki is a relatively big, complex machine that requires a significant amount of ongoing work to maintain and improve. Some community infrastructure also requires monthly fees to operate (notably the [[TiddlyWiki forum|Forums]]).
+
+The people in the community that do the work have widely varying needs:
+
+* At one end, a good proportion of the work on TiddlyWiki is performed by community members on a purely voluntary basis. For those people, the satisfaction of helping others is sufficient reward. Indeed, for many people, unpaid voluntary activities are a satisfying antidote to everyday paid work
+* At the other extreme, JeremyRuston and some other contributors are trying to make a full-time living working on TiddlyWiki by offering commercial products and services around it
+* In between, there are other people who would appreciate an ocassional token to reward them for their work
+
+To support these needs in the community, we have two initiatives:
+
+* We use [[Open Collective]] to collect donations for the infrastructure costs of the Community and to crowdfund specific developments by individuals or organisations
+* The [[TiddlyWiki Marketplace]] provides a shop window for individuals and organisations offering commercial products and services

editions/tw5.com/tiddlers/about/Open Collective.tid

@@ -0,0 +1,14 @@
+title: Open Collective
+modified: 20221204165636777
+created: 20221204165636777
+tags: About HelloThere [[Open Collective]]
+
+Open Collective is a platform for transparent fundraising and expenses for projects like TiddlyWiki. It is the official TiddlyWiki community fundraising space.
+
+https://opencollective.com/tiddlywiki
+
+You can make a fixed one-time donation, or setup a recurring contribution.
+
+The main goals listed for donations are to cover basic costs for community infrastructure like the Discourse forum, and a new goal for supporting the TiddlyWiki Core.
+
+Additionally, the community can make use of the platform for special projects - to pool funds to pay for development, design, or anything else. The [[File Upload Plugin|https://opencollective.com/tiddlywiki/projects/tiddlywiki-file-upload]] is the first of these, and we want to welcome others to launch projects here.

editions/tw5.com/tiddlers/commands/CommandsCommand.tid

@@ -0,0 +1,8 @@
+created: 20221204202531478
+modified: 20221204202531478
+tags: Commands
+title: CommandsCommand
+type: text/vnd.tiddlywiki
+caption: commands
+
+{{$:/language/Help/commands}}

editions/tw5.com/tiddlers/community/plugins/_JD Mobile Layout plugin_ by JD.tid

@@ -1,5 +1,4 @@
 created: 20171107181449175
-creator: Ste Willson
 modified: 20210106151027136
 tags: [[Community Plugins]]
 title: "JD Mobile Layout plugin" by JD

editions/tw5.com/tiddlers/community/resources/_Dropboard_ by Reid Gould.tid

@@ -1,5 +1,4 @@
 created: 20171111192738730
-creator: MAS
 modified: 20210106151027013
 tags: [[Other Resources]]
 title: "Dropboard" by Reid Gould

editions/tw5.com/tiddlers/community/resources/_Hacks_ by Thomas Elmiger.tid

@@ -1,7 +1,5 @@
 created: 20161226165024380
-creator: Thomas Elmiger
 modified: 20210106151027097
-modifier: Thomas Elmiger
 tags: [[Other Resources]]
 title: "Hacks" by Thomas Elmiger
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/community/resources/_MathCell_ by Ste Wilson.tid

@@ -1,5 +1,4 @@
 created: 20161226165024380
-creator: Ste Willson
 modified: 20210106151027156
 tags: [[Other Resources]]
 title: "MathCell" by Stephen Kimmel

editions/tw5.com/tiddlers/community/resources/_TiddlyServer_ by Matt Lauber.tid

@@ -1,5 +1,4 @@
 created: 20161226165024380
-creator: Matt Lauber
 modified: 20211113230709926
 tags: [[Other Resources]]
 title: "TiddlyServer" by Matt Lauber

editions/tw5.com/tiddlers/community/resources/_X3DOM for TiddlyWiki 5_ by Jamal Wills.tid

@@ -1,5 +1,4 @@
 created: 20171107175718679
-creator: Ste Willson
 modified: 20210106151027400
 tags: [[Other Resources]]
 title: "X3DOM for TiddlyWiki 5" by Jamal Wills

editions/tw5.com/tiddlers/definitions/Federatial.tid

@@ -1,9 +1,21 @@
 created: 20130825154900000
 modified: 20170718160846820
+modified: 20221204165636777
 tags: Definitions
 title: Federatial
 type: text/vnd.tiddlywiki
 
-Federatial Limited is a software consultancy founded by JeremyRuston, the creator of TiddlyWiki. Federatial helps organisations explore new user interaction concepts through rapid prototyping of sophisticated web-based tools.
+Federatial Limited helps organisations explore new user interaction concepts through rapid prototyping of sophisticated web-based tools. Services include:
+
+* Consultancy advice on TiddlyWiki adoption
+* Development of custom solutions based on TiddlyWiki
+* Multi-user TiddlyWiki hosting – no outages since 2016
+* Sponsorship of TiddlyWiki core development
 
 See https://federatial.com/ and https://twitter.com/federatial for more information.
+
+JeremyRuston founded Federatial Limited in 2011 to support his work on TiddlyWiki for the advertised 25 years. Since then, Federatial has been privileged to have worked with a wide range of fantastic clients in very different sectors, on some very diverse projects:
+
+* For a law firm in the Washington DC, developing a custom multi-user ~TiddlyWiki application. It replaced a Microsoft Word document hosted on ~SharePoint that had grown to 18,000 pages and 10 million words, and was increasingly unwieldy to manage. We converted the document to a non-linear TiddlyWiki structure. Startup, searching and browsing are an order of magnitude faster than using Word and ~SharePoint
+* For a publishing firm in Paris, devising a new TiddlyWiki-based format for interactive electronic publications (including conversion from the established EPUB format). See https://twpub-tools.org/
+* For a charity in London, maintaining a multiuser instance of TiddlyWiki running on Amazon's serverless infrastructure. It has more than 1,000 users, and over 15,000 tiddlers in 500 interlinked wikis. See https://manuals.annafreud.org/ambit

editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid

@@ -4,6 +4,8 @@ tags: Definitions
 title: TiddlyWikiClassic
 type: text/vnd.tiddlywiki
 
-"~TiddlyWiki Classic" refers to versions prior to 5.0, before TiddlyWiki was completely rewritten from the ground up. TiddlyWiki Classic is still being maintained at:
+[img[TiddlyWiki Classic.png]]
+
+"~TiddlyWiki Classic" refers to versions prior to 5.0, before TiddlyWiki was completely rewritten. TiddlyWiki Classic is still actively maintained at:
 
 https://classic.tiddlywiki.com/

editions/tw5.com/tiddlers/features/Modals.tid

@@ -13,9 +13,12 @@ The tiddler to be displayed can contain the following optional fields that are u
 |subtitle|The subtitle text for a modal, displayed in a `h3` html tag|
 |class|An additional class to apply to the modal wrapper|
 |help|An optional external link that will be displayed at the left of the footer with the text "Help"|
+|mask-closable|When set to ''yes'' or ''true'', will close the modal dialog when the mask (area outside the modal) is clicked|
 
 Note that the footer and subtitle fields are not limited to plain text, and wiki text features such as widgets and transclusions can be used as well.
 
 Modals are displayed with the [[WidgetMessage: tm-modal]].
 
 <$button message="tm-modal" param="SampleWizard">Open demo modal</$button>
+
+<<.tip """<$macrocall $name=".from-version" version="5.2.4"/> allow using "mask-closable" field""">>

editions/tw5.com/tiddlers/hellothere/HelloThere.tid

@@ -1,34 +1,38 @@
 created: 20130822170200000
 list: [[A Gentle Guide to TiddlyWiki]] [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[What happened to the original TiddlyWiki?]]
-modified: 20220802122551819
+modified: 20221204165636777
 tags: TableOfContents
 title: HelloThere
 type: text/vnd.tiddlywiki
 
-''Have you ever had the feeling that your head is not quite big enough to hold everything you need to remember?''
+!! ''Welcome to TiddlyWiki, a unique [[non-linear|Philosophy of Tiddlers]] notebook for [[capturing|Creating and editing tiddlers]], [[organising|Structuring TiddlyWiki]] and [[sharing|Sharing your tiddlers with others]] complex information''
-
-Welcome to TiddlyWiki, a unique [[non-linear|Philosophy of Tiddlers]] notebook for [[capturing|Creating and editing tiddlers]], [[organising|Structuring TiddlyWiki]] and [[sharing|Sharing your tiddlers with others]] complex information.
 
 Use it to keep your [[to-do list|TaskManagementExample]], to plan an [[essay or novel|"TiddlyWiki for Scholars" by Alberto Molina]], or to organise your wedding. Record every thought that crosses your brain, or build a flexible and responsive website.
 
-<div style="font-size:0.7em;text-align:center;margin-top:2em;margin-bottom:2em;">
-<<list-thumbnails filter:"[tag[HelloThumbnail]]" width:"168" height:"95">>
-</div>
-
 Unlike conventional online services, TiddlyWiki lets you choose where to keep your data, guaranteeing that in the decades to come you will [[still be able to use|Future Proof]] the notes you take today.
 
-<div style="font-size:0.7em;text-align:center;margin:3em auto;">
+!! ''Find Out More''
+
+<div class="tc-cards">
+<$list filter="[tag[HelloThumbnail]]">
+<$macrocall $name="flex-card" captionField="caption" descriptionField="text"/>
+</$list>
+</div>
+
+!! ''~TiddlyWiki Hubs''
+
+<div class="tc-cards" style="font-size:0.7em;text-align:center;margin:3em auto;">
 <a href="https://talk.tiddlywiki.org/" class="tc-btn-big-green" style="border-radius:4px;background-color:#FF8C19;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/help}} ~TalkTW
 </a>
 <a href="https://www.youtube.com/c/JeremyRuston" class="tc-btn-big-green" style="border-radius:4px;background-color:#e52d27;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/video}} ~YouTube
 </a>
-<a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="border-radius:4px;background-color:#5E9FCA;" target="_blank" rel="noopener noreferrer">
+<a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="border-radius:4px;background-color:#1DA1F2;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/twitter}} Twitter
 </a>
 <a rel="me" href="https://fosstodon.org/@TiddlyWiki" class="tc-btn-big-green" style="border-radius:4px;background-color:#2b90d9;" target="_blank" rel="noopener noreferrer">
-{{$:/core/images/mastodon}} Mastodon
+{{$:/core/images/globe}} Mastodon
 </a>
 <a href="https://github.com/Jermolene/TiddlyWiki5" class="tc-btn-big-green" style="border-radius:4px;background-color:#444;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} ~GitHub
@@ -38,16 +42,10 @@ Unlike conventional online services, TiddlyWiki lets you choose where to keep yo
 </a>
 </div>
 
-<<<.tc-big-quote
+!! ''Testimonials & Reviews''
-''The ~TiddlyWiki is the best software I've ever found for organising my ideas.''
 
-It's well worth spending an hour or so playing with it to see how it can help you. This will be time well-spent and will change how you think and how you organise your ideas.
+<div class="tc-cards">
-<<< [[Joe Armstrong, Co-inventor of Erlang|https://joearms.github.io/]]
+<$list filter="[tag[Testimonial]]">
-
+<$macrocall $name="flex-card" class="tc-card-quote" captionField="caption" descriptionField="text"/>
-<<<.tc-big-quote
+</$list>
-''~TiddlyWiki gets a Gearhead rating of 6 out of 5 (it's that good).''
+</div>
-
-Finding code that works flawlessly after just two or three years is magical enough but after seven years?!
-<<< [[Mark Gibbs, Network World|http://www.networkworld.com/article/3028098/open-source-tools/tiddlywiki-a-free-open-source-wiki-revisited.html]]
-
-<div style="font-size:0.7em;text-align:center;margin:3em auto;">{{Product Hunt Link}}</div>

editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid

@@ -1,5 +1,5 @@
 created: 20150414070451144
-list: [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Gentle Guide]] [[HelloThumbnail - Grok TiddlyWiki]] [[HelloThumbnail - Firefox Apocalypse]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - TiddlyWikiLinks]] [[HelloThumbnail - TiddlyMap]] [[HelloThumbnail - HelpingTiddlyWiki]] [[HelloThumbnail - Developers]] [[HelloThumbnail - Classic]]
+list: [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Grok TiddlyWiki]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - TiddlyWikiLinks]] [[HelloThumbnail - Developers]] [[HelloThumbnail - Funding]] [[HelloThumbnail - Marketplace]] [[HelloThumbnail - Federatial]]
 modified: 20150414070948246
 title: HelloThumbnail
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Classic.tid

@@ -1,6 +0,0 @@
-title: HelloThumbnail - Classic
-tags: HelloThumbnail
-color: #D5B7EA
-image: TiddlyWiki Classic.png
-caption: ~TiddlyWiki Classic
-link: TiddlyWikiClassic

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Developers.tid

@@ -1,7 +0,0 @@
-title: HelloThumbnail - Developers
-tags: HelloThumbnail
-color: #6B6E98
-background-color: #EAE57D
-image: Dev Thumbnail.jpg
-caption: Developers
-link: Developers

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Funding.tid

@@ -0,0 +1,10 @@
+background-color: #EDB431
+caption: How is ~TiddlyWiki Funded?
+color: #ff0
+image: Funding.png
+link: Funding TiddlyWiki
+tags: HelloThumbnail
+title: HelloThumbnail - Funding
+ribbon-text: NEW
+
+Find out how you can help support ~TiddlyWiki financially

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Gentle Guide.tid

@@ -1,11 +0,0 @@
-background-color: #EDB431
-caption: A Gentle Guide
-color: #fff
-created: 20150325172634195
-image: Motovun Jack.jpg
-link: A Gentle Guide to TiddlyWiki
-modified: 20150414071032492
-tags: HelloThumbnail
-title: HelloThumbnail - Gentle Guide
-type: text/vnd.tiddlywiki
-

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid

@@ -4,3 +4,5 @@ color: #D5B7EA
 image: Grok TiddlyWiki Banner
 caption: Grok ~TiddlyWiki
 link: "Grok TiddlyWiki" by Soren Bjornstad
+
+A guided tutorial through ~TiddlyWiki

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - HelpingTiddlyWiki.tid

@@ -1,7 +0,0 @@
-title: HelloThumbnail - HelpingTiddlyWiki
-tags: HelloThumbnail
-color: #B7D5EA
-background-color: #fff
-caption: Helping ~TiddlyWiki
-link: HelpingTiddlyWiki
-image: Tiddler Poster.png

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Introduction Video.tid

@@ -6,3 +6,5 @@ icon: {{$:/core/images/video}}
 caption: Introduction to ~TiddlyWiki
 link: Introduction Video
 image: Introduction Video Thumbnail.jpg
+
+Short video introducing basic ~TiddlyWiki concepts

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Latest Version.tid

@@ -1,6 +1,14 @@
 title: HelloThumbnail - Latest Version
 tags: HelloThumbnail
-caption: What's New in <<version>>
+caption: What's New in v<<version>>
 link: Releases
 image: New Release Banner
 color: #fff
+
+\define prerelease-regexp() [0-9]+\.[0-9]+\.[0-9]+\-prerelease
+<$list filter="[<version>!regexp<prerelease-regexp>]" variable="ignore">
+The latest version v<<version>> of ~TiddlyWiki (released on <$view field="released" tiddler={{{ [<version>addprefix[Release ]] }}} format="date" template="DDth MMM YYYY"/>)
+</$list>
+<$list filter="[<version>regexp<prerelease-regexp>]" variable="ignore">
+This is a prerelease build for testing and review
+</$list>

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Marketplace.tid

@@ -0,0 +1,10 @@
+title: HelloThumbnail - Marketplace
+tags: HelloThumbnail
+color: #6B6E98
+background-color: #EAE57D
+image: TiddlyWiki Marketplace Banner
+caption: ~TiddlyWiki Marketplace
+link: TiddlyWiki Marketplace
+ribbon-text: NEW
+
+Explore commercial products and services for ~TiddlyWiki

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2017.tid

@@ -1,8 +0,0 @@
-title: HelloThumbnail - TWEUM2017
-tags: HelloThumbnail-disabled
-color: #fff
-background-color: #000
-icon: <span style="font-size:3.5em;font-weight:bold;text-shadow:1px 1px 3px rgba(0,0,0,1);">2017</span>
-image: TWEUM Thumbnail.jpg
-caption: European Meetup 2017
-link: TiddlyWiki European Meetup 2017

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyMap.tid

@@ -1,6 +0,0 @@
-title: HelloThumbnail - TiddlyMap
-tags: HelloThumbnail
-color: #D5B7EA
-image: TiddlyMap.png
-caption: ~TiddlyMap Plugin
-link: TiddlyMap Plugin by Felix Küppers

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyWikiLinks.tid

@@ -2,5 +2,7 @@ title: HelloThumbnail - TiddlyWikiLinks
 tags: HelloThumbnail
 color: #D5B7EA
 image: TiddlyWikiLinks
-caption: links.tiddlywiki.com
+caption: links.tiddlywiki.org
 link: Community Links Aggregator
+
+Links to ~TiddlyWiki-related content collected by the community

editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Federatial.tid

@@ -0,0 +1,11 @@
+background-color: #EDB431
+caption: Federatial
+color: #ff0
+image: Federatial.png
+link: Federatial
+tags: HelloThumbnail
+title: HelloThumbnail - Federatial
+type: text/vnd.tiddlywiki
+ribbon-text: NEW
+
+Support the development of ~TiddlyWiki by hiring Jeremy Ruston through Federatial Limited

editions/tw5.com/tiddlers/images/Dev Thumbnail.jpg.meta

@@ -1,3 +0,0 @@
-title: Dev Thumbnail.jpg
-type: image/jpeg
-tags: picture

editions/tw5.com/tiddlers/images/Federatial.png.meta

@@ -0,0 +1,3 @@
+title: Federatial.png
+type: image/png
+tags: picture

editions/tw5.com/tiddlers/images/Funding.png.meta

@@ -1,3 +1,3 @@
-title: TiddlyMap.png
+title: Funding.png
 type: image/png
 tags: picture

editions/tw5.com/tiddlers/images/Marketplace Banner.png.meta

@@ -0,0 +1,3 @@
+title: TiddlyWiki Marketplace Banner
+type: image/jpeg
+tags: picture

editions/tw5.com/tiddlers/marketplace/TiddlyWiki Marketplace.tid

@@ -0,0 +1,18 @@
+title: TiddlyWiki Marketplace
+tags: Community
+modified: 20221204165636777
+created: 20221204165636777
+
+<span style="float:right;">[img width=200px [TiddlyWiki Marketplace Banner]]</span>
+
+Welcome to the TiddlyWiki Marketplace. This new forum is designed to provide a space for individuals and organizations to offer commercial products and services that are built around TiddlyWiki:
+
+* Paid hosting services
+* Custom solution development
+* Training courses
+* One-to-one training sessions
+* "Fix my wiki" debugging sessions
+
+<a href="https://talk.tiddlywiki.org/c/marketplace/22" class="tc-btn-big-green" style="border-radius:4px;background-color:#ff5c48;" target="_blank" rel="noopener noreferrer">
+~TiddlyWiki Marketplace
+</a>

editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-modal.tid

@@ -10,12 +10,14 @@ type: text/vnd.tiddlywiki
 |paramObject |Hashmap of variables to be provided to the modal, contains all extra parameters passed to the widget sending the message. |
 |rootwindow |<<.from-version 5.1.18>> ''yes'' or ''true'' will always display a modal in the wiki-root-window |
 
-The "currentTiddler" variable is set to the title of the modal tiddler, but can be overridden by specifying a different value in `paramObject`.
-
 The modal message is usually generated with the ButtonWidget. The modal message is handled by the TiddlyWiki core.
 
 [[Fields within the tiddler|Modals]] being displayed in the modal can be used to customize its appearance.
 
+!! paramObject
+
+The "currentTiddler" variable is set to the title of the modal tiddler, but can be overridden by specifying a different value in `paramObject`.
+
 ! Example
 
 Here is an example of displaying a modal and passing parameters to it:

editions/tw5.com/tiddlers/saving/Emergency Tiddler Export.tid

@@ -2,7 +2,7 @@ caption: Emergency Export
 color: #7986CB
 created: 20180309211328412
 delivery: Saver
-description: Awkward but useful emergency technique for saving tiddlers
+description: Retrieve and save tiddlers when saving is broken
 method: save
 modified: 20200507202809334
 tags: Android Chrome Firefox [[Internet Explorer]] Linux Mac Opera Safari Saving Windows Edge

editions/tw5.com/tiddlers/saving/Saving with Polly.tid

@@ -9,6 +9,7 @@ modified: 20220223160414274
 tags: Chrome Firefox [[Internet Explorer]] Linux Mac Opera Safari Saving Windows Edge
 title: Saving with Polly
 type: text/vnd.tiddlywiki
+ribbon-text: NEW
 
 [[Polly|https://github.com/Marxsal/polly]] is a batch file system using Windows //~PowerShell// to restore ~TiddlyWiki files from a specified download directory to their original home directory.
 

editions/tw5.com/tiddlers/saving/Saving.tid

@@ -54,7 +54,7 @@ Available methods for saving changes with ~TiddlyWiki:
 </div>
 
 <!-- Page content -->
-<div class="content">
+<div class="tc-cards">
 <$wikify text=<<alltagsfilter>> name="alltagsfilterwikified">
 <$list filter=<<alltagsfilterwikified>>>
 {{||$:/_tw5.com-card-template}}

editions/tw5.com/tiddlers/saving/TiddlyBucket - Save to AWS or Google Storage.tid

@@ -8,6 +8,7 @@ modified: 20221126192853897
 tags: Chrome Firefox [[Internet Explorer]] Linux Mac Opera Safari Saving Windows iOS Edge
 title: TiddlyBucket - Save to AWS or Google Storage
 type: text/vnd.tiddlywiki
+ribbon-text: NEW
 
 ~TiddlyBucket - Save to AWS or Google Storage using Go
 

editions/tw5.com/tiddlers/system/tw5.com-card-template.tid

@@ -3,19 +3,4 @@ modified: 20220719134613555
 title: $:/_tw5.com-card-template
 type: text/vnd.tiddlywiki
 
-\define tw-card-template(bordercolor:"")
+<$macrocall $name="flex-card" bordercolor={{!!color}} captionField="caption" subtitle={{{ [{!!community-author}!is[blank]addprefix[by ]] }}}/>
-\whitespace trim
-<div class="tc-card" style="border-top: 5px solid $bordercolor$;">
-	<$link>
-		<$let tv-wikilinks=no>
-			<div class="tc-card-title"><$transclude field="caption"><$view field="title"/></$transclude></div>
-			<div class="tc-card-author">
-				<$list filter="[is[current]has[community-author]]">by&nbsp;{{!!community-author}}</$list>
-			</div>
-			<p><$view field="description"/></p>
-		</$let>
-	</$link>
-</div>
-\end
-
-<$macrocall $name="tw-card-template" bordercolor={{!!color}}/>

editions/tw5.com/tiddlers/system/tw5.com-styles.tid

@@ -122,64 +122,183 @@ type: text/vnd.tiddlywiki
 	margin-left: 10px;
 }
 
-.tc-card {
+.tc-cards {
-	margin: 15px;
+	display: flex;
-	padding: 10px 20px;
+	flex-wrap: wrap;
-	border-radius: 10px;
+	justify-content: space-evenly;
-	border-top: 5px solid #45D3D3;
+	width: 100%;
-	box-shadow: 0 8px 17px -8px #A3A5AE;
+	padding: 0.5em;
-	background-color: #FFF;
+	background: <<colour background>>;
-	width: 200px;
+	border-color: rgba(34,36,38,.15);
-	transition: box-shadow 0.3s ease-in-out;
+	box-shadow: 0 2px 25px 0 rgb(34 36 38 / 5%) inset;
-	font-size: 13px;
-	line-height: 18px;
 }
 
-.tc-card:hover {
+.tc-tiddlylink.tc-card {
-	box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3);
+	font-weight: normal;
+	max-width: 100%;
+	position: relative;
+	display: flex;
+	flex-direction: column;
+	background: <<colour background>>;
+	color: <<colour foreground>>;
+	width: 200px;
+	min-height: 0;
+	padding: 0 0 0.5em 0;
+	margin: 0.5em;
+	border: none;
+	border-radius: 8px;
+	box-shadow: 0 1px 3px 0 #d4d4d5, 0 0 0 1px #d4d4d5;
+	transition: box-shadow 0.3s ease,transform .3s ease;
 }
-.tc-card:hover .tc-card-title {
+
-	color: #1462ff;
+@media (max-width: 500px) {
+	
+	.tc-cards {
+		padding: 0;
+	}
+
+	.tc-tiddlylink.tc-card {
+		margin: 0.25em;
+		width: 45%;
+	}
+
+}
+
+.tc-tiddlylink.tc-card.tc-card-quote {
+	width: 320px;
+	box-shadow: none;
+	background-color: #effdff;
+}
+
+.tc-card-accent {
+	border-top-left-radius: 8px;
+	border-top-right-radius: 8px;
+}
+
+.tc-tiddlylink.tc-card:hover {
+	color: <<colour foreground>>;
+	background: <<colour notification-background>>;
+	text-decoration: none;
+	cursor: pointer;
+	box-shadow: 0 1px 5px 0 #bcbdbd, 0 0 0 1px #d4d4d5;
+	transform: translateY(-3px);
+}
+
+.tc-card-ribbon-wrapper {
+	line-height: 0;
+	width: 75px;
+	height: 75px;
+	position: absolute;
+	right: 0;
+	overflow: hidden;
+	top: 0;
+	z-index: 849;
+	pointer-events: none;
+}
+
+.tc-card-ribbon {
+	transition: top 0.3s ease-in-out;
+	top: 15px;
+	right: -77px;
+	position: absolute;
+	transform: rotate(45deg);
+	background-color: red;
+	box-shadow: 0px 0px 2px 0px rgb(0 0 0 / 50%);
+}
+
+.tc-tiddlylink.tc-card:hover .tc-card-ribbon {
+	top: -77px;
+}
+
+.tc-card-ribbon-inner {
+	font-size: 10px;
+	line-height: 13px;
+	font-weight: 700;
+	color: white;
+	text-decoration: none;
+	text-shadow: 0 -1px rgb(0 0 0 / 50%);
+	width: 200px;
+	display: inline-block;
+	padding: 2px 0;
+	text-align: center;
+}
+
+.tc-card-image {
+	line-height: 0;
+	overflow: hidden;
+}
+
+.tc-card-image img {
+	border-top-left-radius: 8px;
+	border-top-right-radius: 8px;
+	width: 100%;
+	transition: transform 0.3s ease-in-out;
+}
+
+.tc-tiddlylink.tc-card:hover .tc-card-image img {
+	transform: scale(1.05);
 }
 
 .tc-card-title {
-	text-align: center;
 	font-size: 1.2em;
+	line-height: 1.2;
 	font-weight: 600;
-	transition: color 0.2s ease-in-out;
+	transition: color 0.3s ease-in-out;
-	padding: 10px 0;
+	padding: 0 10px;
+	margin: 0.5em 0;
 }
 
+.tc-card-subtitle,
 .tc-card-author {
-	text-align: center;
+	font-size: 0.8em;
+	line-height: 1.2;
+	color: <<colour muted-foreground>>;
+	padding: 0 10px;
+	margin: 0.5em 0;
 	font-style: italic;
 }
 
-.tc-card p {
+.tc-card-body {
-	height: 67px;
+	font-size: 0.9em;
-	overflow: hidden;
+	line-height: 1.2;
+	padding: 0 10px;
 	margin: 0;
-	padding: 13px 0;
 }
 
-.tc-card a {
+.tc-card-body-wrapper {
-	color: #222;
+	position: relative;
 }
 
-.tc-card a:hover {
+.tc-tiddlylink.tc-card.tc-card-quote .tc-card-body:before {
-	text-decoration:none;
+	font-family: Georgia, serif;
+	color: <<colour blockquote-bar>>;
+	content: open-quote;
+	font-size: 5em;
+	line-height: 1;
+	float: left;
+}
+
+.tc-tiddlylink.tc-card.tc-card-quote .tc-card-body:after {
+	font-family: Georgia, serif;
+	color: <<colour blockquote-bar>>;
+	content: close-quote;
+	font-size: 5em;
+	line-height: 1;
+	float: right;
+}
+
+.tc-tiddlylink.tc-card .tc-card-body-clear {
+	clear: both;
+}
+
+.tc-card-body > p {
+	margin: 0.25em 0;
 }
 
 .tc-card a:active, .tc-card a:focus, .tc-btn-download:active, .tc-btn-download:focus{
 	outline: none; 
 }
 
-div.content {
-	padding: 1px 16px;
-	display: flex;
-	flex-wrap: wrap;
-}
-
 .tc-btn-download {
 	padding: 10px 30px;
 	border-radius: 5px;

editions/tw5.com/tiddlers/system/wikitext-macros.tid

@@ -94,3 +94,38 @@ That renders as:
 
 <<tw-code $tiddler$>>
 \end
+
+\define flex-card(class,bordercolor:"",imageField:"image",captionField:"caption",subtitle:"",descriptionField:"description",linkField:"link")
+\whitespace trim
+<$link class={{{ [<__class__>addprefix[tc-card ]] }}} to={{{ [<currentTiddler>get<__linkField__>else<currentTiddler>] }}}>
+	<div class="tc-card-accent" style.borderTop={{{ [<__bordercolor__>!is[blank]addprefix[5px solid ]] }}}>
+		<$list filter="[<currentTiddler>has[ribbon-text]]" variable="ignore">
+			<div class="tc-card-ribbon-wrapper">
+				<div class="tc-card-ribbon" style.backgroundColor={{{ [<currentTiddler>get[ribbon-color]else[red]] }}}>
+					<div class="tc-card-ribbon-inner">
+						<$text text={{!!ribbon-text}}/>
+					</div>
+				</div>
+			</div>
+		</$list>
+		<$list filter="[<currentTiddler>has<__imageField__>]" variable="ignore">
+			<div class="tc-card-image">
+				<$image source={{{ [<currentTiddler>get<__imageField__>] }}}/>
+			</div>
+		</$list>
+		<div class="tc-card-title"><$transclude field=<<__captionField__>>><$view field="title"/></$transclude></div>
+		<$list filter="[<__subtitle__>!is[blank]]" variable="ignore">
+			<div class="tc-card-subtitle">
+				<$text text=<<__subtitle__>>/>
+			</div>
+		</$list>
+		<div class="tc-card-body-wrapper">
+			<div class="tc-card-body">
+				<$transclude field=<<__descriptionField__>> mode="block"/>
+			</div>
+			<div class="tc-card-body-clear">
+			</div>
+		</div>
+	</div>
+</$link>
+\end

editions/tw5.com/tiddlers/testimonials/Testimonials - Joe Armstrong.tid

@@ -0,0 +1,8 @@
+title: Testimonials - Joe Armstrong
+tags: Testimonial
+caption: Joe Armstrong, Co-inventor of Erlang
+extlink: https://joearms.github.io/
+
+The ~TiddlyWiki is the best software I've ever found for organising my ideas.
+
+It's well worth spending an hour or so playing with it to see how it can help you. This will be time well-spent and will change how you think and how you organise your ideas.

editions/tw5.com/tiddlers/testimonials/Testimonials - Network World.tid

@@ -0,0 +1,8 @@
+title: Testimonials - Network World
+tags: Testimonial
+caption: Mark Gibbs, Network World
+extlink: http://www.networkworld.com/article/3028098/open-source-tools/tiddlywiki-a-free-open-source-wiki-revisited.html
+
+~TiddlyWiki gets a Gearhead rating of 6 out of 5 (it's that good).
+
+Finding code that works flawlessly after just two or three years is magical enough but after seven years?!

editions/tw5.com/tiddlers/testimonials/Testimonials - Product Hunt.tid

@@ -0,0 +1,6 @@
+title: Testimonials - Product Hunt
+tags: Testimonial
+caption: Product Hunt
+extlink: https://www.producthunt.com/posts/tiddlywiki-2?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-tiddlywiki-2
+
+<div style="text-align:center;">{{Product Hunt Link}}</div>

editions/tw5.com/tiddlers/widgets/SelectWidget.tid

@@ -40,6 +40,7 @@ The content of the `<$select>` widget should be one or more HTML `<option>` or `
 |multiple |If present, switches to multiple selection mode |
 |size |The number of rows to display in multiple selection mode |
 |actions |A string containing ActionWidgets to be triggered when the key combination is detected |
+|focus |<<.from-version "5.2.4">> Optional. Set to "yes" to automatically focus the HTML select element after creation |
 
 ! Examples
 

languages/de-DE/Buttons.multids

@@ -17,7 +17,9 @@ ControlPanel/Hint: Öffne das Control-Panel
 CopyToClipboard/Caption: Kopiere in die Zwischenablage
 CopyToClipboard/Hint: Kopiere diesen Text in die Zwischenablage
 Delete/Caption: Löschen
-Delete/Hint: Lösche diesen Tiddler
+Delete/Hint: Lösche den Tiddler
+DeleteTiddlers/Caption: Lösche Tiddler
+DeleteTiddlers/Hint: Lösche diese Tiddler
 Edit/Caption: Bearbeiten
 Edit/Hint: Bearbeite diesen Tiddler
 Encryption/Caption: Verschlüsselung
@@ -57,6 +59,8 @@ Home/Caption: Home
 Home/Hint: Öffnen der Standard-Tiddler
 Language/Caption: Sprache
 Language/Hint: Auswahldialog für die Systemsprache
+LayoutSwitcher/Hint: Öffne den Layout Selektor
+LayoutSwitcher/Caption: Layout
 Manager/Caption: Tiddler Manager
 Manager/Hint: Öffne den Tiddler Manager
 More/Caption: mehr

languages/de-DE/Help/commands.tid

@@ -0,0 +1,14 @@
+title: $:/language/Help/commands
+description: Ausführen von Befehlen aus einem Tiddler
+
+Sequentielle Abarbeitung von Befehlen aus einem Tiddler. 
+
+```
+--commands <filter>
+```
+
+Beispiele
+
+`--commands "[enlist{$:/build-commands-as-text}]"`
+
+`--commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget<currentTiddler>]"`

languages/de-DE/Misc.multids

@@ -8,6 +8,7 @@ CloseAll/Button: alle schließen
 ColourPicker/Recent: Kürzlich:
 ConfirmCancelTiddler: Wollen Sie die Änderungen im Tiddler: "<$text text=<<title>>/>" verwerfen?
 ConfirmDeleteTiddler: Wollen Sie den Tiddler: "<$text text=<<title>>/>" löschen?
+ConfirmDeleteTiddlers: Wollen Sie <<resultCount>> Tiddler löschen?
 ConfirmOverwriteTiddler: Tiddler: "<$text text=<<title>>/>" existiert! OK überschreibt den tiddler!
 ConfirmEditShadowTiddler: Sie sind dabei, einen Schatten-Tiddler zu verändern. Zukünftige, automatische Anpassungen werden dadurch unterdrückt. Sie können Ihre Änderungen rückgängig machen, indem Sie diesen Tiddler wieder löschen. Wollen Sie den Tiddler: "<$text text=<<title>>/>" ändern?
 ConfirmAction: Möchten Sie weitermachen? 

languages/pl-PL/Buttons.multids

@@ -59,6 +59,8 @@ Home/Caption: strona główna
 Home/Hint: Otwórz domyślne tiddlery
 Language/Caption: języki
 Language/Hint: Zmień jezyk interfejsu
+LayoutSwitcher/Hint: Otwórz przełacznik układu
+LayoutSwitcher/Caption: układ
 Manager/Caption: menedżer tiddlerów
 Manager/Hint: Otwórz menedżer tiddlerów
 More/Caption: więcej

languages/pl-PL/Help/commands.tid

@@ -0,0 +1,18 @@
+title: $:/language/Help/commands
+description: Uruchom komendy zwrócone przez filtr
+
+Uruchamia komendy zwrócone przez filtr.
+
+```
+--commands <filter>
+```
+
+Dla przykładu:
+
+```
+--commands "[enlist{$:/build-commands-as-text}]"
+```
+
+```
+--commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget<currentTiddler>]"
+```

languages/zh-Hans/Buttons.multids

@@ -59,6 +59,8 @@ Info/Caption: 信息
 Info/Hint: 显示此条目的信息
 Language/Caption: 语言
 Language/Hint: 选择用户界面语言
+LayoutSwitcher/Hint: 开启布局切换器
+LayoutSwitcher/Caption: 布局
 Manager/Caption: 条目管理器
 Manager/Hint: 开启条目管理器
 More/Caption: 更多

languages/zh-Hans/Help/commands.tid

@@ -0,0 +1,18 @@
+title: $:/language/Help/commands
+description: 运行从筛选器传回的命令
+
+按顺序运行从筛选器传回的命令符记
+
+```
+--commands <filter>
+```
+
+示例
+
+```
+--commands "[enlist{$:/build-commands-as-text}]"
+```
+
+```
+--commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget<currentTiddler>]"
+```

languages/zh-Hant/Buttons.multids

@@ -59,6 +59,8 @@ Info/Caption: 資訊
 Info/Hint: 顯示此條目的資訊
 Language/Caption: 語言
 Language/Hint: 選擇使用者介面語言
+LayoutSwitcher/Hint: 開啟版面切換器
+LayoutSwitcher/Caption: 版面
 Manager/Caption: 條目管理器
 Manager/Hint: 開啟條目管理器
 More/Caption: 更多

languages/zh-Hant/Help/commands.tid

@@ -0,0 +1,18 @@
+title: $:/language/Help/commands
+description: 執行從篩選器傳回的命令
+
+按順序執行從篩選器傳回的命令符記
+
+```
+--commands <filter>
+```
+
+範例
+
+```
+--commands "[enlist{$:/build-commands-as-text}]"
+```
+
+```
+--commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget<currentTiddler>]"
+```

themes/tiddlywiki/vanilla/base.tid

@@ -30,6 +30,10 @@ background-size:` {{$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize}}`
 <$text text={{{ [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]subtract[1]addsuffix[px]] ~[{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}] }}}/>
 \end
 
+\define tiddler-width()
+	<$text text={{$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth}}/>
+\end
+
 \define if-fluid-fixed(text,hiddenSidebarText)
 <$reveal state="$:/themes/tiddlywiki/vanilla/options/sidebarlayout" type="match" text="fluid-fixed">
 $text$
@@ -144,7 +148,7 @@ pre {
 	display: block;
 	margin-top: 1em;
 	margin-bottom: 1em;
-	word-break: normal;
+	word-break: break-word;
 	word-wrap: break-word;
 	white-space: {{$:/themes/tiddlywiki/vanilla/options/codewrapping}};
 	background-color: <<colour pre-background>>;
@@ -1173,6 +1177,28 @@ button.tc-btn-invisible.tc-remove-tag-button {
 	}
 }
 
+
+/* prevent overflow for table content for small screens*/
+@media (max-width: <<sidebarbreakpoint>>) {
+	.tc-tiddler-frame tr {
+		word-wrap: anywhere;
+	}
+
+	.tc-tiddler-frame table blockquote {
+		margin-left: 12.5px;
+		margin-right: 12.5px; 
+	}
+
+	.tc-tiddler-frame table dd {
+		margin-left: 12.5px;
+	}
+
+	.tc-tiddler-frame table ol,
+	.tc-tiddler-frame table ul {
+		padding-left: 20px;
+	}
+}
+
 .tc-site-title,
 .tc-titlebar {
 	font-weight: normal;
@@ -1525,6 +1551,10 @@ html body.tc-body.tc-single-tiddler-window {
 	fill: <<colour toolbar-done-button>>;
 }
 
+.tc-page-controls svg.tc-image-layout-button {
+	fill: <<colour toolbar-options-button>>;
+}
+
 /*
 ** Tiddler edit mode
 */