From 406dbd0883a1eb29cf506d0c50cb5d6c2a8beb8d Mon Sep 17 00:00:00 2001 From: twMat Date: Thu, 4 Aug 2022 20:18:06 +0200 Subject: [PATCH 1/8] Update Releases.tid (#6880) --- editions/tw5.com/tiddlers/releasenotes/Releases.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/releasenotes/Releases.tid b/editions/tw5.com/tiddlers/releasenotes/Releases.tid index 5f91c3b4e..7257c19d9 100644 --- a/editions/tw5.com/tiddlers/releasenotes/Releases.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Releases.tid @@ -4,6 +4,6 @@ tags: About title: Releases type: text/vnd.tiddlywiki -New releases of TiddlyWiki, TiddlyDesktop and TiddlyFox are announced via the [[official discussion groups|Forums]] and [[Twitter|https://twitter.com/TiddlyWiki]] (you can also subscribe to an Atom/RSS feed of [[TiddlyWiki releases from GitHub|https://github.com/jermolene/tiddlywiki5/releases.atom]]) +New releases of TiddlyWiki and TiddlyDesktop are announced via the [[official discussion groups|Forums]] and [[Twitter|https://twitter.com/TiddlyWiki]] (you can also subscribe to an Atom/RSS feed of [[TiddlyWiki releases from GitHub|https://github.com/jermolene/tiddlywiki5/releases.atom]]) <> From 90d6a0f1a6c34af4bb6397c4f598da3699b73707 Mon Sep 17 00:00:00 2001 From: Guang Li Date: Fri, 5 Aug 2022 22:59:53 +0800 Subject: [PATCH 2/8] Update readme.tid (#6883) --- plugins/tiddlywiki/dynannotate/docs/readme.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/tiddlywiki/dynannotate/docs/readme.tid b/plugins/tiddlywiki/dynannotate/docs/readme.tid index dcdef9799..83875ca4d 100644 --- a/plugins/tiddlywiki/dynannotate/docs/readme.tid +++ b/plugins/tiddlywiki/dynannotate/docs/readme.tid @@ -108,11 +108,11 @@ The selection tracker triggers an action string whenever the browser text select The selection tracker works within DOM subtrees that have the following structure: -* The outer wrapper element has the attribute `data-selection-action-title` containing the title of the tiddler containing the action string to be invoked when the selection changes +* The outer wrapper element has the attribute `data-selection-actions-title` containing the title of the tiddler containing the action string to be invoked when the selection changes * Each child element of the outer element must have a unique `id` attribute to identify it ``` -
+
Content text
From a572979cc46a1e54484f58d05e76035286a612eb Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Fri, 5 Aug 2022 17:16:39 +0200 Subject: [PATCH 3/8] Add global option to show default text below the edit textarea (#6882) --- .../translators/macros/translatableStringEditor.tid | 6 ++++++ plugins/tiddlywiki/translators/system/styles.tid | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/plugins/tiddlywiki/translators/macros/translatableStringEditor.tid b/plugins/tiddlywiki/translators/macros/translatableStringEditor.tid index ec1a9585a..a9a09e399 100644 --- a/plugins/tiddlywiki/translators/macros/translatableStringEditor.tid +++ b/plugins/tiddlywiki/translators/macros/translatableStringEditor.tid @@ -10,6 +10,10 @@ tags: $:/tags/Macro <$list filter="""$(editFieldsFilter)$""" variable="editorField"> <$edit-text tag="$(editorTagName)$" field=<> type="text" class="tc-edit-texteditor" minHeight="10px"/> +<$reveal state="$:/state/showEnglishText" type=match text="show" tag="p"> +Default text: +
<$view tiddler="$:/core" subtiddler=<> field=<>/>
+
@@ -60,6 +64,8 @@ Delete translation //<$count filter=<>/> translatable tiddlers in this group// +<$checkbox tiddler="$:/state/showEnglishText" field="text" checked="show" unchecked="hide" default="hide"> Show the default text below editor field + <$radio tiddler="$:/plugins/tiddlywiki/translators/editorTag" value="textarea"> Multi-line editors
<$radio tiddler="$:/plugins/tiddlywiki/translators/editorTag" value="input"> Single-line editors diff --git a/plugins/tiddlywiki/translators/system/styles.tid b/plugins/tiddlywiki/translators/system/styles.tid index 14b7a2177..61c47405d 100644 --- a/plugins/tiddlywiki/translators/system/styles.tid +++ b/plugins/tiddlywiki/translators/system/styles.tid @@ -12,4 +12,9 @@ tags: $:/tags/Stylesheet .tc-translators-string-table .tc-drop-down { min-width: 500px; +} + +.tc-tiddler-frame textarea.tc-edit-texteditor, +.tc-tiddler-frame input.tc-edit-texteditor { + background-color: #feffef; } \ No newline at end of file From 8420f8430fab298b9f34c3b211a1b943631f75c6 Mon Sep 17 00:00:00 2001 From: BALLOON | FU-SEN Date: Sat, 6 Aug 2022 18:07:47 +0900 Subject: [PATCH 4/8] Minor adjustments to Japanese language files (#6884) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since there was a mixture of "Desumasu-style"(ですます調) and "Dearu-style"(である調), the unification (that is unique to Japanese) --- languages/ja-JP/ControlPanel.multids | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/languages/ja-JP/ControlPanel.multids b/languages/ja-JP/ControlPanel.multids index d5781d432..25755365c 100644 --- a/languages/ja-JP/ControlPanel.multids +++ b/languages/ja-JP/ControlPanel.multids @@ -107,7 +107,7 @@ Plugins/Updates/Caption: 更新 Plugins/Updates/Hint: インストールされているプラグインの更新が可能です Plugins/Updates/UpdateAll/Caption: <> プラグインの更新 Saving/Caption: 保存 -Saving/DownloadSaver/AutoSave/Description: ダウンロードセーバーの自動保存を許可します +Saving/DownloadSaver/AutoSave/Description: ダウンロードセーバーの自動保存を許可 Saving/DownloadSaver/AutoSave/Hint: ダウンロードセーバーの自動保存を有効にします Saving/DownloadSaver/Caption: ダウンロードセーバー Saving/DownloadSaver/Hint: この設定は HTML5 対応ダウンロードセーバーに適用されます @@ -148,7 +148,7 @@ Settings/AutoSave/Disabled/Description: 自動的に保存しない Settings/AutoSave/Enabled/Description: 自動的に保存する Settings/AutoSave/Hint: 自動的に保存するかどうかを設定します Settings/CamelCase/Caption: Camel Case Wiki リンク -Settings/CamelCase/Description: 自動で ~CamelCase リンクを有効にします +Settings/CamelCase/Description: 自動で ~CamelCase リンクを有効にする Settings/CamelCase/Hint: ~CamelCase フレーズの自動リンクをグローバルに無効にすることができます。有効にするには再読み込みが必要です Settings/Caption: 設定 Settings/DefaultMoreSidebarTab/Caption: デフォルトのサイドバー 詳しく タブ @@ -156,13 +156,13 @@ Settings/DefaultMoreSidebarTab/Hint: デフォルトで表示されるサイド Settings/DefaultSidebarTab/Caption: 標準サイドバータブ Settings/DefaultSidebarTab/Hint: 標準で表示されるサイドバータブを指定します Settings/EditorToolbar/Caption: エディターツールバー -Settings/EditorToolbar/Description: エディターツールバーを表示します +Settings/EditorToolbar/Description: エディターツールバーを表示 Settings/EditorToolbar/Hint: エディターツールバーの有効・無効を切り替えます: Settings/Hint: TiddlyWiki の動作を設定します Settings/InfoPanelMode/Caption: Tiddler 情報パネルモード Settings/InfoPanelMode/Hint: Tiddler 情報パネルが閉じる時間: -Settings/InfoPanelMode/Popup/Description: Tiddler 情報パネルが自動的に閉じるタイミングを制御します -Settings/InfoPanelMode/Sticky/Description: Tiddler 情報パネルは、明示的に閉じるまで開いたままになります +Settings/InfoPanelMode/Popup/Description: Tiddler 情報パネルが自動的に閉じるタイミングを制御する +Settings/InfoPanelMode/Sticky/Description: Tiddler 情報パネルを明示的に閉じるまで開いたままにする Settings/LinkToBehaviour/Caption: Tiddler を開く動作 Settings/LinkToBehaviour/InsideRiver/Hint: Tiddler 表示部 //内// の動作 Settings/LinkToBehaviour/OpenAbove: 現在の Tiddler 上に開く @@ -171,13 +171,13 @@ Settings/LinkToBehaviour/OpenAtTop: Tiddler 表示部の上に開く Settings/LinkToBehaviour/OpenBelow: 現在の Tiddler 下に開く Settings/LinkToBehaviour/OutsideRiver/Hint: Tiddler 表示部 //外// の動作 Settings/MissingLinks/Caption: Wiki リンク -Settings/MissingLinks/Description: 欠落している Tiddler へのリンクを有効にします +Settings/MissingLinks/Description: 欠落 Tiddler へのリンクを有効にする Settings/MissingLinks/Hint: まだ存在しない Tiddler にリンクするかどうかを選択します Settings/NavigationAddressBar/Caption: ナビゲーションアドレスバー Settings/NavigationAddressBar/Hint: ナビゲーションアドレスバーの動作: Settings/NavigationAddressBar/No/Description: アドレスバーを変更しない Settings/NavigationAddressBar/Permalink/Description: Tiddler をアドレスに含める -Settings/NavigationAddressBar/Permaview/Description: 開く Tiddler と現在開いている Tiddler をアドレスに含めます +Settings/NavigationAddressBar/Permaview/Description: 開く Tiddler と現在開いている Tiddler をアドレスに含める Settings/NavigationHistory/Caption: 操作履歴 Settings/NavigationHistory/Hint: Tiddler を操作したときのブラウザの履歴の設定: Settings/NavigationHistory/No/Description: 履歴を残さない @@ -215,7 +215,7 @@ Theme/Prompt: 現在のテーマ: TiddlerColour/Caption: Tiddler の色 TiddlerColour/Hint: このルールカスケードは、Tiddler の色（アイコンと関連するタグピルに使用される）を動的に選択するために使用されます。 TiddlerFields/Caption: Tiddler 項目 -TiddlerFields/Hint: 以下はこの TiddlyWiki で使用されているすべての Tiddler 項目の一覧です（システム Tiddler も含みますが、隠し Tiddler は含んでいません）。 +TiddlerFields/Hint: 以下はこの TiddlyWiki で使用されているすべての Tiddler 項目の一覧です（システム Tiddler も含みますが、隠し Tiddler は含んでいません） TiddlerIcon/Caption: Tiddler アイコン TiddlerIcon/Hint: このルールカスケードは Tiddler のアイコンを動的に選択するために使用されます。 Toolbars/Caption: ツールバー From d7b9e6fb02d38bc7a56b08cca96425faacf61999 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Tue, 9 Aug 2022 18:42:01 +0200 Subject: [PATCH 5/8] Getting started new table layout (#6894) * change core GettingStarted tiddler table layout * rename tc-table-no-grid to tc-table-no-border --- core/language/en-GB/GettingStarted.tid | 7 +++--- themes/tiddlywiki/vanilla/base.tid | 34 ++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/core/language/en-GB/GettingStarted.tid b/core/language/en-GB/GettingStarted.tid index ae6e3b167..a3073a521 100644 --- a/core/language/en-GB/GettingStarted.tid +++ b/core/language/en-GB/GettingStarted.tid @@ -9,9 +9,10 @@ Before you start storing important information in ~TiddlyWiki it is vital to mak
-|<$link to="$:/SiteTitle"><> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> | -|<$link to="$:/SiteSubtitle"><> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> | -|<$link to="$:/DefaultTiddlers"><> |<>
<$edit tag="textarea" tiddler="$:/DefaultTiddlers"/>
//<>// | +|tc-table-no-border tc-first-col-min-width tc-first-link-nowrap|k +| <$link to="$:/SiteTitle"><>|<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> | +| <$link to="$:/SiteSubtitle"><>|<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> | +|^ <$link to="$:/DefaultTiddlers"><>
<>|<$edit tag="textarea" tiddler="$:/DefaultTiddlers"/>
//<>// |
See the [[control panel|$:/ControlPanel]] for more options. diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index b3a726d30..f50df6bcd 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -293,6 +293,10 @@ pre > code { color: inherit; } +/* +Table defaults +*/ + table { border: 1px solid <>; width: auto; @@ -320,10 +324,40 @@ table tfoot tr td { background-color: <>; } +/* +Table utility classes +*/ + +/* Remove borders from table as used in eg: GettingStarted*/ +.tc-table-no-border, +.tc-table-no-border th, +.tc-table-no-border td { + border: initial; +} + +/* First column in table width will fit to text.*/ +/* This rule makes most sense with tc-first-link-nowrap*/ +.tc-first-col-min-width td:nth-child(1) { + width: 1%; +} + +/* First link A element will not wrap */ +.tc-first-link-nowrap:first-of-type a { + white-space: nowrap; +} + +/* +CSV parser plugin +*/ + .tc-csv-table { white-space: nowrap; } +/* +Tiddler frame in story river +*/ + .tc-tiddler-frame img, .tc-tiddler-frame svg, .tc-tiddler-frame canvas, From 2ff5bd5a0f6d28c4e2c102a538ea1c866189f886 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Tue, 9 Aug 2022 18:44:45 +0200 Subject: [PATCH 6/8] Fix removing a field with empty name (#6888) * allow us to remove a field with empty key * fix typo in if clause --- core/modules/widgets/action-deletefield.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/modules/widgets/action-deletefield.js b/core/modules/widgets/action-deletefield.js index 5857ef64d..54068471e 100644 --- a/core/modules/widgets/action-deletefield.js +++ b/core/modules/widgets/action-deletefield.js @@ -36,7 +36,7 @@ Compute the internal state of the widget */ DeleteFieldWidget.prototype.execute = function() { this.actionTiddler = this.getAttribute("$tiddler",this.getVariable("currentTiddler")); - this.actionField = this.getAttribute("$field"); + this.actionField = this.getAttribute("$field",null); }; /* @@ -59,7 +59,7 @@ DeleteFieldWidget.prototype.invokeAction = function(triggeringWidget,event) { tiddler = this.wiki.getTiddler(self.actionTiddler), removeFields = {}, hasChanged = false; - if(this.actionField && tiddler) { + if((this.actionField !== null) && tiddler) { removeFields[this.actionField] = undefined; if(this.actionField in tiddler.fields) { hasChanged = true; From f87ab06414c921448b4a41bb38bc9739cf95555f Mon Sep 17 00:00:00 2001 From: Bram Chen Date: Wed, 10 Aug 2022 16:06:57 +0800 Subject: [PATCH 7/8] Update chinese language files (#6895) * Change core GettingStarted tiddler table layout * Revise wording --- languages/zh-Hans/ControlPanel.multids | 2 +- languages/zh-Hans/GettingStarted.tid | 7 ++++--- languages/zh-Hant/ControlPanel.multids | 2 +- languages/zh-Hant/GettingStarted.tid | 7 ++++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/languages/zh-Hans/ControlPanel.multids b/languages/zh-Hans/ControlPanel.multids index 767ff52d5..988d5ac9b 100644 --- a/languages/zh-Hans/ControlPanel.multids +++ b/languages/zh-Hans/ControlPanel.multids @@ -24,7 +24,7 @@ Basics/Subtitle/Prompt: 副标题 Basics/SystemTiddlers/Prompt: 系统条目数量 Basics/Tags/Prompt: 标签数量 Basics/Tiddlers/Prompt: 一般条目数量 -Basics/Title/Prompt: 标题 +Basics/Title/Prompt: 此 ~TiddlyWiki 的标题 Basics/Username/Prompt: 编辑者署名 Basics/Version/Prompt: ~TiddlyWiki 版本 Cascades/Caption: 级联 diff --git a/languages/zh-Hans/GettingStarted.tid b/languages/zh-Hans/GettingStarted.tid index 20cc2329a..47b3098cd 100644 --- a/languages/zh-Hans/GettingStarted.tid +++ b/languages/zh-Hans/GettingStarted.tid @@ -9,9 +9,10 @@ title: GettingStarted
-|<$link to="$:/SiteTitle"><> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> | -|<$link to="$:/SiteSubtitle"><> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> | -|<$link to="$:/DefaultTiddlers"><> |<>
<$edit tag="textarea" tiddler="$:/DefaultTiddlers"/>
//<>// | +|tc-table-no-border tc-first-col-min-width tc-first-link-nowrap|k +| <$link to="$:/SiteTitle"><>|<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> | +| <$link to="$:/SiteSubtitle"><>|<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> | +|^ <$link to="$:/DefaultTiddlers"><>
<>|<$edit tag="textarea" tiddler="$:/DefaultTiddlers"/>
//<>// |
请参阅[[控制台|$:/ControlPanel]]查看更多选项。 \ No newline at end of file diff --git a/languages/zh-Hant/ControlPanel.multids b/languages/zh-Hant/ControlPanel.multids index 025c149b4..65b09be63 100644 --- a/languages/zh-Hant/ControlPanel.multids +++ b/languages/zh-Hant/ControlPanel.multids @@ -24,7 +24,7 @@ Basics/Subtitle/Prompt: 副標題 Basics/SystemTiddlers/Prompt: 系統條目數量 Basics/Tags/Prompt: 標籤數量 Basics/Tiddlers/Prompt: 一般條目數量 -Basics/Title/Prompt: 標題 +Basics/Title/Prompt: 此 ~TiddlyWiki 的標題 Basics/Username/Prompt: 編輯者署名 Basics/Version/Prompt: ~TiddlyWiki 版本 Cascades/Caption: 級聯 diff --git a/languages/zh-Hant/GettingStarted.tid b/languages/zh-Hant/GettingStarted.tid index a3b8f3a6c..36468d96a 100644 --- a/languages/zh-Hant/GettingStarted.tid +++ b/languages/zh-Hant/GettingStarted.tid @@ -9,9 +9,10 @@ title: GettingStarted
-|<$link to="$:/SiteTitle"><> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> | -|<$link to="$:/SiteSubtitle"><> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> | -|<$link to="$:/DefaultTiddlers"><> |<>
<$edit tag="textarea" tiddler="$:/DefaultTiddlers"/>
//<>// | +|tc-table-no-border tc-first-col-min-width tc-first-link-nowrap|k +| <$link to="$:/SiteTitle"><>|<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> | +| <$link to="$:/SiteSubtitle"><>|<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> | +|^ <$link to="$:/DefaultTiddlers"><>
<>|<$edit tag="textarea" tiddler="$:/DefaultTiddlers"/>
//<>// |
請參閱[[控制台|$:/ControlPanel]]查看更多選項。 \ No newline at end of file From 953b89fd6b8c0bb004a7ed3adbfcbbc836861f67 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Wed, 17 Aug 2022 15:54:15 +0200 Subject: [PATCH 8/8] CSS: Make input and button elements consistent for all browsers (#6910) --- themes/tiddlywiki/vanilla/base.tid | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index f50df6bcd..cbb8b1784 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -76,16 +76,17 @@ $else$ -webkit-box-sizing: border-box; } -input[type="search"] { - outline-offset: initial; -} - +/* +** Button default styles. Makes them look consistent for all browsers +*/ html button { line-height: 1.2; color: <>; fill: <>; background: <>; - border-color: <>; + border: 1px solid <>; + border-radius: 3px; + padding: 2px 5px; } button:disabled svg { @@ -221,8 +222,19 @@ dl dt { margin-top: 6px; } -button, textarea, input, select { - outline-color: <>; +/* +** Definition for text input elements so they look consistent for all browsers +*/ + +textarea, input, select { + border: 2px solid <>; + background-color: <>; +} + +/* Input elements accessibility -- overwrite the reset */ +:focus-visible { + outline: 2px solid <>; + outline-offset: -2px; /* same as in reset.css [type='search'] but for more elements */ } textarea, @@ -231,7 +243,6 @@ input[type=search], input[type=""], input:not([type]) { color: <>; - background: <>; } input[type="checkbox"] { @@ -1174,6 +1185,7 @@ button.tc-btn-invisible.tc-remove-tag-button { .tc-tiddler-frame .tc-tiddler-controls { float: right; + padding: 3px; /* make space for outline */ } .tc-tiddler-controls .tc-drop-down {