Merge branch 'master' into parameterised-transclusions

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>

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/about/Open Collective.tid

@@ -5,10 +5,10 @@ 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/tiddlywikidotorg
+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/tiddlywikidotorg/projects/tiddlywiki-file-upload]] is the first of these, and we want to welcome others to launch projects here.
+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/system/tw5.com-styles.tid

@@ -192,6 +192,7 @@ type: text/vnd.tiddlywiki
 	right: 0;
 	overflow: hidden;
 	top: 0;
+	z-index: 849;
 	pointer-events: none;
 }
 

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? 

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;