From f6ff0a7f715bdf12dfba6556f72c49ea2c3016b0 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Wed, 10 Sep 2014 09:13:21 +0100 Subject: [PATCH] Deprecate `$:/tags/stylesheet` in favour of `$:/tags/Stylesheet` A warning message appears at the top of the story river if any `$:/tags/stylesheet` tags are found. Fixing the first half of #824 --- core/ui/PageStylesheet.tid | 4 ++++ core/ui/PageTemplate/story.tid | 6 ++++++ editions/highlightdemo/tiddlers/HelloThere.tid | 2 +- editions/tw5.com/tiddlers/concepts/SystemTags.tid | 2 +- editions/tw5.com/tiddlers/dev/Naming of System Tiddlers.tid | 2 +- editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid | 2 +- editions/tw5.com/tiddlers/system/tw5.com-styles.tid | 2 +- plugins/tiddlywiki/codemirror/files/tiddlywiki.files | 4 ++-- plugins/tiddlywiki/codemirror/styles.tid | 2 +- plugins/tiddlywiki/d3/base.tid | 2 +- plugins/tiddlywiki/github-fork-ribbon/styles.tid | 2 +- plugins/tiddlywiki/highlight/files/tiddlywiki.files | 2 +- plugins/tiddlywiki/highlight/styles.tid | 2 +- plugins/tiddlywiki/jasmine/files/tiddlywiki.files | 2 +- plugins/tiddlywiki/tw2parser/image-css.tid | 2 +- plugins/tiddlywiki/upgrade/styles.tid | 2 +- themes/tiddlywiki/centralised/styles.tid | 2 +- themes/tiddlywiki/readonly/styles.tid | 2 +- themes/tiddlywiki/seamless/base.tid | 2 +- themes/tiddlywiki/snowwhite/base.tid | 2 +- themes/tiddlywiki/starlight/styles.tid | 2 +- themes/tiddlywiki/stickytitles/styles.tid | 2 +- themes/tiddlywiki/vanilla/base.tid | 2 +- 23 files changed, 32 insertions(+), 22 deletions(-) diff --git a/core/ui/PageStylesheet.tid b/core/ui/PageStylesheet.tid index c48afda55..4f07f6ad7 100644 --- a/core/ui/PageStylesheet.tid +++ b/core/ui/PageStylesheet.tid @@ -6,4 +6,8 @@ title: $:/core/ui/PageStylesheet <$transclude mode="block"/> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]"> +<$transclude mode="block"/> + + diff --git a/core/ui/PageTemplate/story.tid b/core/ui/PageTemplate/story.tid index 0654ba46f..a281bf5fe 100644 --- a/core/ui/PageTemplate/story.tid +++ b/core/ui/PageTemplate/story.tid @@ -3,6 +3,12 @@ tags: $:/tags/PageTemplate
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/stylesheet]!has[draft.of]]"> + +WARNING: tag "$:/tags/stylesheet" on <$link><$view field="title"/> should be replaced with "$:/tags/Stylesheet" + + +
<$list filter="[all[shadows+tiddlers]tag[$:/tags/AboveStory]!has[draft.of]]"> diff --git a/editions/highlightdemo/tiddlers/HelloThere.tid b/editions/highlightdemo/tiddlers/HelloThere.tid index af56fc02d..d59659d73 100644 --- a/editions/highlightdemo/tiddlers/HelloThere.tid +++ b/editions/highlightdemo/tiddlers/HelloThere.tid @@ -14,6 +14,6 @@ To add this plugin to your own TiddlyWiki5, just drag this link to the browser w ! Adding Themes -You can add themes from highlight.js by copying the CSS to a new tiddler and tagging it with [[$:/tags/stylesheet]]. The available themes can be found on GitHub: +You can add themes from highlight.js by copying the CSS to a new tiddler and tagging it with [[$:/tags/Stylesheet]]. The available themes can be found on GitHub: https://github.com/isagalaev/highlight.js/tree/master/src/styles diff --git a/editions/tw5.com/tiddlers/concepts/SystemTags.tid b/editions/tw5.com/tiddlers/concepts/SystemTags.tid index 2264c1eb1..a146942ad 100644 --- a/editions/tw5.com/tiddlers/concepts/SystemTags.tid +++ b/editions/tw5.com/tiddlers/concepts/SystemTags.tid @@ -31,7 +31,7 @@ These are the available system tags * {{$:/tags/Palette||$:/core/ui/TagTemplate}} for colour palettes * {{$:/tags/RawMarkup||$:/core/ui/TagTemplate}} for raw markup to be included in the generated HTML file * {{$:/tags/SideBar||$:/core/ui/TagTemplate}} for sidebar tabs -* {{$:/tags/stylesheet||$:/core/ui/TagTemplate}} to indicate that a tiddler should be applied as a CSS stylesheet +* {{$:/tags/Stylesheet||$:/core/ui/TagTemplate}} to indicate that a tiddler should be applied as a CSS stylesheet * {{$:/tags/TiddlerInfo||$:/core/ui/TagTemplate}} for tiddler info panel tabs * {{$:/tags/TiddlerInfo/Advanced||$:/core/ui/TagTemplate}} for tabs under the advanced tiddler tab * {{$:/tags/TopLeftBar||$:/core/ui/TagTemplate}} for the top left bar diff --git a/editions/tw5.com/tiddlers/dev/Naming of System Tiddlers.tid b/editions/tw5.com/tiddlers/dev/Naming of System Tiddlers.tid index c94eec93c..2949ae7c4 100644 --- a/editions/tw5.com/tiddlers/dev/Naming of System Tiddlers.tid +++ b/editions/tw5.com/tiddlers/dev/Naming of System Tiddlers.tid @@ -20,7 +20,7 @@ The system tiddlers provided as part of the core are named according to the foll |`$:/plugins/*` |lowercase |Plugin tiddlers, and plugin content | |`$:/snippets/*` |//inconsistent// |Reusable snippets (will be replaced by macros) | |`$:/state/*` |lowercase |User interface state tiddlers | -|`$:/tags/*` |~CamelCase |User interface configuration tags (currently `$:/tags/stylesheet` is inconsistent) | +|`$:/tags/*` |~CamelCase |User interface configuration tags | |`$:/temp/*` |lowercase |Temporary tiddlers that shouldn't be saved | |`$:/themes/*` |lowercase |Theme plugins | diff --git a/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid b/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid index 78d674bcf..d76282f47 100644 --- a/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid +++ b/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid @@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki The usual way of modifying the appearance of a TiddlyWiki is to use one of the available themes, or to modify the [[colour palette|ColourPalettes]]. -You can also use custom CSS stylesheets by tagging tiddlers with `$:/tags/stylesheet`. For example, create a tiddler with the tag `$:/tags/stylesheet` and the following content in order to change the page background colour to red: +You can also use custom CSS stylesheets by tagging tiddlers with `$:/tags/Stylesheet`. For example, create a tiddler with the tag `$:/tags/Stylesheet` and the following content in order to change the page background colour to red: ``` html body.tc-body { diff --git a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid index 0d6823e8c..827a1371b 100644 --- a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid +++ b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid @@ -1,5 +1,5 @@ title: $:/_tw5.com-styles -tags: $:/tags/stylesheet +tags: $:/tags/Stylesheet @media (min-width: 600px) { diff --git a/plugins/tiddlywiki/codemirror/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror/files/tiddlywiki.files index 65c15a2cf..bad0677f6 100644 --- a/plugins/tiddlywiki/codemirror/files/tiddlywiki.files +++ b/plugins/tiddlywiki/codemirror/files/tiddlywiki.files @@ -12,14 +12,14 @@ "fields": { "type": "text/css", "title": "$:/plugins/tiddlywiki/codemirror/lib/codemirror.css", - "tags": "[[$:/tags/stylesheet]]" + "tags": "[[$:/tags/Stylesheet]]" } },{ "file": "addon/dialog/dialog.css", "fields": { "type": "text/css", "title": "$:/plugins/tiddlywiki/codemirror/addon/dialog/dialog.css", - "tags": "[[$:/tags/stylesheet]]" + "tags": "[[$:/tags/Stylesheet]]" } },{ "file": "addon/dialog/dialog.js", diff --git a/plugins/tiddlywiki/codemirror/styles.tid b/plugins/tiddlywiki/codemirror/styles.tid index 00e481472..5158856df 100644 --- a/plugins/tiddlywiki/codemirror/styles.tid +++ b/plugins/tiddlywiki/codemirror/styles.tid @@ -1,5 +1,5 @@ title: $:/plugins/tiddlywiki/codemirror/styles -tags: [[$:/tags/stylesheet]] +tags: [[$:/tags/Stylesheet]] /* Make the editor resize to fit its content */ diff --git a/plugins/tiddlywiki/d3/base.tid b/plugins/tiddlywiki/d3/base.tid index 6b99dde1e..c3d4ef11c 100644 --- a/plugins/tiddlywiki/d3/base.tid +++ b/plugins/tiddlywiki/d3/base.tid @@ -1,5 +1,5 @@ title: $:/plugins/tiddlywiki/d3/base.tid -tags: [[$:/tags/stylesheet]] +tags: [[$:/tags/Stylesheet]] \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline diff --git a/plugins/tiddlywiki/github-fork-ribbon/styles.tid b/plugins/tiddlywiki/github-fork-ribbon/styles.tid index bd695c1b0..66bddbc7e 100644 --- a/plugins/tiddlywiki/github-fork-ribbon/styles.tid +++ b/plugins/tiddlywiki/github-fork-ribbon/styles.tid @@ -1,5 +1,5 @@ title: $:/plugins/tiddlywiki/github-fork-ribbon/styles -tags: [[$:/tags/stylesheet]] +tags: [[$:/tags/Stylesheet]] /* Left will inherit from right (so we don't need to duplicate code */ .github-fork-ribbon { diff --git a/plugins/tiddlywiki/highlight/files/tiddlywiki.files b/plugins/tiddlywiki/highlight/files/tiddlywiki.files index fe28d1567..716dc8cc3 100644 --- a/plugins/tiddlywiki/highlight/files/tiddlywiki.files +++ b/plugins/tiddlywiki/highlight/files/tiddlywiki.files @@ -15,7 +15,7 @@ "fields": { "type": "text/css", "title": "$:/plugins/tiddlywiki/highlight/highlight.css", - "tags": "[[$:/tags/stylesheet]]" + "tags": "[[$:/tags/Stylesheet]]" } } ] diff --git a/plugins/tiddlywiki/highlight/styles.tid b/plugins/tiddlywiki/highlight/styles.tid index 3e99f23a6..cbba3930d 100644 --- a/plugins/tiddlywiki/highlight/styles.tid +++ b/plugins/tiddlywiki/highlight/styles.tid @@ -1,5 +1,5 @@ title: $:/plugins/tiddlywiki/highlight/styles -tags: [[$:/tags/stylesheet]] +tags: [[$:/tags/Stylesheet]] /* Tomorrow Night Theme */ diff --git a/plugins/tiddlywiki/jasmine/files/tiddlywiki.files b/plugins/tiddlywiki/jasmine/files/tiddlywiki.files index feaecefcb..7ad85c79d 100644 --- a/plugins/tiddlywiki/jasmine/files/tiddlywiki.files +++ b/plugins/tiddlywiki/jasmine/files/tiddlywiki.files @@ -13,7 +13,7 @@ "fields": { "type": "text/css", "title": "$:/plugins/tiddlywiki/jasmine/jasmine.css", - "tags": "[[$:/tags/stylesheet]]" + "tags": "[[$:/tags/Stylesheet]]" } },{ "file": "jasmine.js", diff --git a/plugins/tiddlywiki/tw2parser/image-css.tid b/plugins/tiddlywiki/tw2parser/image-css.tid index b408bea40..68d8c78fb 100644 --- a/plugins/tiddlywiki/tw2parser/image-css.tid +++ b/plugins/tiddlywiki/tw2parser/image-css.tid @@ -1,4 +1,4 @@ -tags: $:/tags/stylesheet +tags: $:/tags/Stylesheet title: $:/plugins/tiddlywiki/tw2parser/image-css type: text/plain diff --git a/plugins/tiddlywiki/upgrade/styles.tid b/plugins/tiddlywiki/upgrade/styles.tid index e7c9805e5..944c6a918 100644 --- a/plugins/tiddlywiki/upgrade/styles.tid +++ b/plugins/tiddlywiki/upgrade/styles.tid @@ -1,5 +1,5 @@ title: $:/plugins/tiddlywiki/upgrade/styles -tags: $:/tags/stylesheet +tags: $:/tags/Stylesheet .tc-upgrade-wizard-wrapper { width: 100%; diff --git a/themes/tiddlywiki/centralised/styles.tid b/themes/tiddlywiki/centralised/styles.tid index 1be0ebb02..92bfe47bd 100644 --- a/themes/tiddlywiki/centralised/styles.tid +++ b/themes/tiddlywiki/centralised/styles.tid @@ -1,5 +1,5 @@ title: $:/themes/tiddlywiki/centralised/styles.tid -tags: [[$:/tags/stylesheet]] +tags: [[$:/tags/Stylesheet]] \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline diff --git a/themes/tiddlywiki/readonly/styles.tid b/themes/tiddlywiki/readonly/styles.tid index 46736dab7..59ec38a1e 100644 --- a/themes/tiddlywiki/readonly/styles.tid +++ b/themes/tiddlywiki/readonly/styles.tid @@ -1,5 +1,5 @@ title: $:/themes/tiddlywiki/readonly/styles.tid -tags: [[$:/tags/stylesheet]] +tags: [[$:/tags/Stylesheet]] \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline diff --git a/themes/tiddlywiki/seamless/base.tid b/themes/tiddlywiki/seamless/base.tid index dd4db090b..159b5fa36 100644 --- a/themes/tiddlywiki/seamless/base.tid +++ b/themes/tiddlywiki/seamless/base.tid @@ -1,5 +1,5 @@ title: $:/themes/tiddlywiki/seamless/base -tags: [[$:/tags/stylesheet]] +tags: [[$:/tags/Stylesheet]] list-after: $:/themes/tiddlywiki/vanilla/base \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid index 4fff5e8a9..d7af9b38b 100644 --- a/themes/tiddlywiki/snowwhite/base.tid +++ b/themes/tiddlywiki/snowwhite/base.tid @@ -1,5 +1,5 @@ title: $:/themes/tiddlywiki/snowwhite/base -tags: [[$:/tags/stylesheet]] +tags: [[$:/tags/Stylesheet]] \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline diff --git a/themes/tiddlywiki/starlight/styles.tid b/themes/tiddlywiki/starlight/styles.tid index bd3027045..164bbb54e 100644 --- a/themes/tiddlywiki/starlight/styles.tid +++ b/themes/tiddlywiki/starlight/styles.tid @@ -1,5 +1,5 @@ title: $:/themes/tiddlywiki/starlight/styles.tid -tags: [[$:/tags/stylesheet]] +tags: [[$:/tags/Stylesheet]] \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline diff --git a/themes/tiddlywiki/stickytitles/styles.tid b/themes/tiddlywiki/stickytitles/styles.tid index 48c2ac674..3276d5cfe 100644 --- a/themes/tiddlywiki/stickytitles/styles.tid +++ b/themes/tiddlywiki/stickytitles/styles.tid @@ -1,5 +1,5 @@ title: $:/themes/tiddlywiki/stickytitles/styles.tid -tags: [[$:/tags/stylesheet]] +tags: [[$:/tags/Stylesheet]] \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index bc21888ec..d8dbad1d3 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -1,5 +1,5 @@ title: $:/themes/tiddlywiki/vanilla/base -tags: [[$:/tags/stylesheet]] +tags: [[$:/tags/Stylesheet]] \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline /*