From a9380655a0b145d060975e04e8a8d4893825197c Mon Sep 17 00:00:00 2001 From: twMat Date: Wed, 24 May 2023 11:57:19 +0200 Subject: [PATCH 1/9] Update Story Tiddler Template.tid (#7483) improved phrasing (ref previous PR) --- editions/tw5.com/tiddlers/concepts/Story Tiddler Template.tid | 2 ++ 1 file changed, 2 insertions(+) diff --git a/editions/tw5.com/tiddlers/concepts/Story Tiddler Template.tid b/editions/tw5.com/tiddlers/concepts/Story Tiddler Template.tid index 448079454..50ef0d87c 100644 --- a/editions/tw5.com/tiddlers/concepts/Story Tiddler Template.tid +++ b/editions/tw5.com/tiddlers/concepts/Story Tiddler Template.tid @@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki "Story tiddler template" refers to the template used to display a tiddler within the story river. +The core story tiddler template can be found in $:/core/ui/StoryTiddlerTemplate + The [[Story Tiddler Template Cascade]] is used to choose the template to be used for a particular tiddler. By default, the edit template is used for tiddlers in draft mode, and the view template used otherwise. See also: From 442e3f1e972a1514e6e65a41f68b7d619a164245 Mon Sep 17 00:00:00 2001 From: twMat Date: Wed, 24 May 2023 18:26:53 +0200 Subject: [PATCH 2/9] Update Field Editor Cascade.tid (#7488) --- editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid b/editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid index 2211786e8..48eeba1af 100644 --- a/editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid +++ b/editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid @@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki The field editor cascade is a [[cascade|Cascades]] used to choose a template for rendering the field editor within the [[EditTemplate|$:/core/ui/EditTemplate/fields]]. +Core field editor cascades can be found in $:/core/ui/EditTemplate/fields and $:/core/ui/EditTemplate + The default field editor cascade only contains one element: # Use the tiddler $:/core/ui/EditTemplate/fieldEditor/default to render the field @@ -14,4 +16,4 @@ See [[Customizing EditTemplate field rendering]] for more details. You can see the current settings for the field editor cascade in $:/ControlPanel under the ''Info'' -> ''Advanced'' -> ''Cascades'' -> ''Field Editor'' tab. -<> \ No newline at end of file +<> From 86524aafbdbc1b5c8ef43c46c790e911e3dee052 Mon Sep 17 00:00:00 2001 From: twMat Date: Wed, 24 May 2023 18:29:10 +0200 Subject: [PATCH 3/9] Update Tiddler Icon Cascade.tid (#7487) --- editions/tw5.com/tiddlers/concepts/Tiddler Icon Cascade.tid | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/concepts/Tiddler Icon Cascade.tid b/editions/tw5.com/tiddlers/concepts/Tiddler Icon Cascade.tid index 01af98e1a..4eef508c1 100644 --- a/editions/tw5.com/tiddlers/concepts/Tiddler Icon Cascade.tid +++ b/editions/tw5.com/tiddlers/concepts/Tiddler Icon Cascade.tid @@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki The tiddler icon cascade is a [[cascade|Cascades]] used to choose which icon should be used for a particular tiddler. +The core tiddler icon cascade can be found in $:/core/ui/TiddlerIcon + The default tiddler icon cascade consists of: # If the tiddler has an ''icon'' field, use the value as the title of the icon tiddler @@ -13,4 +15,4 @@ The default tiddler icon cascade consists of: You can see the current settings for the tiddler icon cascade in $:/ControlPanel under the ''Info'' -> ''Advanced'' -> ''Cascades'' -> ''Tiddler Icon'' tab. -<> \ No newline at end of file +<> From f2c458a7222956b0625fcd05f98c4162f83686d2 Mon Sep 17 00:00:00 2001 From: twMat Date: Wed, 24 May 2023 18:30:53 +0200 Subject: [PATCH 4/9] Update Field Editor Cascade.tid (#7486) Co-authored-by: Jeremy Ruston --- editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid b/editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid index 48eeba1af..114a2fb05 100644 --- a/editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid +++ b/editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid @@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki The field editor cascade is a [[cascade|Cascades]] used to choose a template for rendering the field editor within the [[EditTemplate|$:/core/ui/EditTemplate/fields]]. -Core field editor cascades can be found in $:/core/ui/EditTemplate/fields and $:/core/ui/EditTemplate +The core field editor cascade can be found in $:/core/ui/EditTemplate/fields The default field editor cascade only contains one element: From fec7e8791dfc9cc66e96f5dc27c1293fef824c5f Mon Sep 17 00:00:00 2001 From: twMat Date: Wed, 24 May 2023 18:31:18 +0200 Subject: [PATCH 5/9] Update View Template Title Cascade.tid (#7485) --- .../tw5.com/tiddlers/concepts/View Template Title Cascade.tid | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/concepts/View Template Title Cascade.tid b/editions/tw5.com/tiddlers/concepts/View Template Title Cascade.tid index ef3a29c48..cac8f5ac5 100644 --- a/editions/tw5.com/tiddlers/concepts/View Template Title Cascade.tid +++ b/editions/tw5.com/tiddlers/concepts/View Template Title Cascade.tid @@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki The view template title cascade is a [[cascade|Cascades]] used by the default view template to choose the template for displaying the tiddler title. +The core view template title cascade can be found in $:/core/ui/ViewTemplate/title + The default view template title cascade consists of: # If the tiddler title starts with `$:/` then use the template $:/core/ui/ViewTemplate/title/system which causes the `$:/` prefix to be displayed in pale text @@ -13,4 +15,4 @@ The default view template title cascade consists of: You can see the current settings for the view template title cascade in $:/ControlPanel under the ''Info'' -> ''Advanced'' -> ''Cascades'' -> ''View Template Title'' tab. -<> \ No newline at end of file +<> From 5d0043012a37305b53f0951f75d37f47a0c487f7 Mon Sep 17 00:00:00 2001 From: twMat Date: Wed, 24 May 2023 18:35:17 +0200 Subject: [PATCH 6/9] Update Edit Template Body Cascade.tid (#7484) --- .../tw5.com/tiddlers/concepts/Edit Template Body Cascade.tid | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/concepts/Edit Template Body Cascade.tid b/editions/tw5.com/tiddlers/concepts/Edit Template Body Cascade.tid index 25b2553a4..141138283 100644 --- a/editions/tw5.com/tiddlers/concepts/Edit Template Body Cascade.tid +++ b/editions/tw5.com/tiddlers/concepts/Edit Template Body Cascade.tid @@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki The edit template body cascade is a [[cascade|Cascades]] used by the default edit template to choose the template for displaying the tiddler body. +The core edit template body cascade can be found in $:/core/ui/EditTemplate/body + The default edit template body cascade consists of: # If the tiddler has the field ''_canonical_uri'' then use the template $:/core/ui/EditTemplate/body/canonical-uri to display the remote URL @@ -13,4 +15,4 @@ The default edit template body cascade consists of: You can see the current settings for the view template body cascade in $:/ControlPanel under the ''Info'' -> ''Advanced'' -> ''Cascades'' -> ''Edit Template Body'' tab. -<> \ No newline at end of file +<> From fb79bebef4a6eb71efa9ef3f711c86b0705e904f Mon Sep 17 00:00:00 2001 From: twMat Date: Wed, 24 May 2023 22:03:10 +0200 Subject: [PATCH 7/9] Update Tiddler Colour Cascade.tid (updated PR) (#7491) --- editions/tw5.com/tiddlers/concepts/Tiddler Colour Cascade.tid | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/concepts/Tiddler Colour Cascade.tid b/editions/tw5.com/tiddlers/concepts/Tiddler Colour Cascade.tid index 1a290938e..8ec685929 100644 --- a/editions/tw5.com/tiddlers/concepts/Tiddler Colour Cascade.tid +++ b/editions/tw5.com/tiddlers/concepts/Tiddler Colour Cascade.tid @@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki The tiddler colour cascade is a [[cascade|Cascades]] used to choose which colour should be used for a particular tiddler. +Core tiddler colour cascades can be found in $:/core/macros/tag, $:/core/ui/Components/tag-link, $:/core/ui/EditTemplate/tags, $:/core/ui/TagPickerTagTemplate, $:/core/ui/TagTemplate and $:/core/ui/ViewTemplate/title + The default tiddler colour cascade consists of: # If the tiddler has a ''color'' field, use the value as the colour @@ -13,4 +15,4 @@ The default tiddler colour cascade consists of: You can see the current settings for the tiddler colour cascade in $:/ControlPanel under the ''Info'' -> ''Advanced'' -> ''Cascades'' -> ''Tiddler Colour'' tab. -<> \ No newline at end of file +<> From 86e5fbce5d2b3e7c23754247c9b29eeacffa60b0 Mon Sep 17 00:00:00 2001 From: Tavin Cole Date: Thu, 25 May 2023 18:36:35 +0200 Subject: [PATCH 8/9] Sign CLA (#7495) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 873450447..ac868477f 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -529,3 +529,5 @@ HuanC Fu, @hffqyd, 2023/03/03 Michelle Saad, @michsa, 2023-03-08 Carmine Guida, @carmineguida, 2023-05-17 + +Tavin Cole, @tavin, 2023/05/25 From df323fe3c97a8fd37b98dc3acefc40d5569580d2 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Mon, 29 May 2023 12:45:41 +0100 Subject: [PATCH 9/9] Simplify content shown for users without JavaScript Saves 15% of the size of index.html Fixes #7501 --- editions/tw5.com/tiddlers/system/static.content.tid | 8 -------- 1 file changed, 8 deletions(-) diff --git a/editions/tw5.com/tiddlers/system/static.content.tid b/editions/tw5.com/tiddlers/system/static.content.tid index 3725b25ac..13ab4c926 100644 --- a/editions/tw5.com/tiddlers/system/static.content.tid +++ b/editions/tw5.com/tiddlers/system/static.content.tid @@ -17,14 +17,6 @@ It looks like this browser doesn't run JavaScript. You can use one of these stat --- -{{HelloThere}} - {{TiddlyWiki}} -{{Features}} - -{{Community}} - -{{HelpingTiddlyWiki}} -