diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid index b63a02ee2..4d6dec5d6 100644 --- a/core/ui/EditTemplate.tid +++ b/core/ui/EditTemplate.tid @@ -1,7 +1,12 @@ title: $:/core/ui/EditTemplate -\define delete-edittemplate-state-tiddlers() <$action-deletetiddler $filter="[] [prefix] [] [] [] [] [] [] []"/> +\define delete-edittemplate-state-tiddlers() +<$set name="safeNewFieldValueTiddlerPrefix" value=<> emptyValue=<> > + <$action-deletetiddler $filter="[] [prefix[$:/temp/NewFieldValue]prefix] [] [] [] [] [] [] []"/> + +\end + \define get-field-value-tiddler-filter() [subfiltersha256[16]addprefix[/]addprefix] \define get-field-editor-filter() [get[text]else[]] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}] diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid index 6173d9b76..6a767517b 100644 --- a/core/ui/EditTemplate/fields.tid +++ b/core/ui/EditTemplate/fields.tid @@ -10,6 +10,10 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$ [[hide]] -[title{$(config-title)$}] \end + +\define get-field-value-tiddler-filter() [subfiltersha256[16]addprefix[/]addprefix] +\define get-field-editor-filter() [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={{{ [get[text]] }}} $value={{{ [get[text]] :map[subfilterget[text]] }}}/> -<$action-deletetiddler $filter="[] [prefix] [] []"/> +<$set name="safeNewFieldValueTiddlerPrefix" value=<> emptyValue=<> > + <$action-deletetiddler $filter="[] [prefix[$:/temp/NewFieldValue]prefix] [] []"/> + <$action-sendmessage $message="tm-focus-selector" $param=<>/> \end @@ -52,7 +58,9 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$ <$action-sendmessage $message="tm-add-field" $name=<> $value={{{ [subfilterget[text]] }}}/> -<$action-deletetiddler $filter="[] [prefix] [] []"/> +<$set name="safeNewFieldValueTiddlerPrefix" value=<> emptyValue=<> > + <$action-deletetiddler $filter="[] [prefix[$:/temp/NewFieldValue]prefix] [] []"/> + <> @@ -65,6 +73,7 @@ $value={{{ [subfilterget[text]] }}}/> \end \whitespace trim +<$set name="newFieldValueTiddlerPrefix" value=<> emptyValue=<> >
@@ -148,3 +157,4 @@ $value={{{ [subfilterget[text]] }}}/> + \ No newline at end of file diff --git a/editions/tw.org/tiddlers/Fundraising.tid b/editions/tw.org/tiddlers/Fundraising.tid index 0ccc5736b..0c521caea 100644 --- a/editions/tw.org/tiddlers/Fundraising.tid +++ b/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. diff --git a/editions/tw5.com/tiddlers/about/Open Collective.tid b/editions/tw5.com/tiddlers/about/Open Collective.tid index 8d096cdc8..1113535c3 100644 --- a/editions/tw5.com/tiddlers/about/Open Collective.tid +++ b/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. diff --git a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid index 16b2f46ff..06b9b7210 100644 --- a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid +++ b/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; } diff --git a/languages/de-DE/Buttons.multids b/languages/de-DE/Buttons.multids index 15094f23a..4615d41c0 100644 --- a/languages/de-DE/Buttons.multids +++ b/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 diff --git a/languages/de-DE/Help/commands.tid b/languages/de-DE/Help/commands.tid new file mode 100644 index 000000000..b7de1b86f --- /dev/null +++ b/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 +``` + +Beispiele + +`--commands "[enlist{$:/build-commands-as-text}]"` + +`--commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget]"` \ No newline at end of file diff --git a/languages/de-DE/Misc.multids b/languages/de-DE/Misc.multids index 32c8b9d13..da5b15411 100644 --- a/languages/de-DE/Misc.multids +++ b/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=<>/>" 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? diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index c1536d941..1689444f7 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/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;