From 1814d502a46f1158333003c5ac858265bf3d8587 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 28 Aug 2014 18:47:21 +0100 Subject: [PATCH] Convert more "tw-*" classes to "tc-*" --- core/modules/widgets/edit-bitmap.js | 6 +-- core/ui/AdvancedSearch/Filter.tid | 2 +- core/ui/EditTemplate/body.tid | 10 ++--- core/ui/EditTemplate/fields.tid | 22 +++++----- core/ui/EditTemplate/tags.tid | 6 +-- core/ui/EditTemplate/title.tid | 2 +- core/ui/EditTemplate/type.tid | 4 +- .../tiddlers/mechanisms/DraftMechanism.tid | 2 +- themes/tiddlywiki/snowwhite/base.tid | 8 ++-- themes/tiddlywiki/vanilla/base.tid | 44 +++++++++---------- 10 files changed, 53 insertions(+), 53 deletions(-) diff --git a/core/modules/widgets/edit-bitmap.js b/core/modules/widgets/edit-bitmap.js index fd80ef1a3..f73734cca 100644 --- a/core/modules/widgets/edit-bitmap.js +++ b/core/modules/widgets/edit-bitmap.js @@ -45,7 +45,7 @@ EditBitmapWidget.prototype.render = function(parent,nextSibling) { // Create our element this.canvasDomNode = $tw.utils.domMaker("canvas",{ document: this.document, - "class":"tw-edit-bitmapeditor", + "class":"tc-edit-bitmapeditor", eventListeners: [{ name: "touchstart", handlerObject: this, handlerMethod: "handleTouchStartEvent" },{ @@ -62,14 +62,14 @@ EditBitmapWidget.prototype.render = function(parent,nextSibling) { }); this.widthDomNode = $tw.utils.domMaker("input",{ document: this.document, - "class":"tw-edit-bitmapeditor-width", + "class":"tc-edit-bitmapeditor-width", eventListeners: [{ name: "change", handlerObject: this, handlerMethod: "handleWidthChangeEvent" }] }); this.heightDomNode = $tw.utils.domMaker("input",{ document: this.document, - "class":"tw-edit-bitmapeditor-height", + "class":"tc-edit-bitmapeditor-height", eventListeners: [{ name: "change", handlerObject: this, handlerMethod: "handleHeightChangeEvent" }] diff --git a/core/ui/AdvancedSearch/Filter.tid b/core/ui/AdvancedSearch/Filter.tid index 72c4f5074..5d4da4dc8 100644 --- a/core/ui/AdvancedSearch/Filter.tid +++ b/core/ui/AdvancedSearch/Filter.tid @@ -11,7 +11,7 @@ caption: {{$:/language/Search/Filter/Caption}}
<$reveal state=<> type="nomatch" text="" default=""> -
+
<$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]]"><$link to={{!!filter}}><$transclude field="description"/>
diff --git a/core/ui/EditTemplate/body.tid b/core/ui/EditTemplate/body.tid index 0c58fc600..5637c2f52 100644 --- a/core/ui/EditTemplate/body.tid +++ b/core/ui/EditTemplate/body.tid @@ -10,7 +10,7 @@ tags: $:/tags/EditTemplate <$text text={{!!_canonical_uri}}/> -<$edit-text field="_canonical_uri" class="tw-edit-fields"> +<$edit-text field="_canonical_uri" class="tc-edit-fields">
@@ -20,7 +20,7 @@ tags: $:/tags/EditTemplate <$reveal state="$:/state/showeditpreview" type="match" text="yes"> -<> <$button type="set" set="$:/state/showeditpreview" setTo="no"><> +<> <$button type="set" set="$:/state/showeditpreview" setTo="no"><>
@@ -30,7 +30,7 @@ tags: $:/tags/EditTemplate
-<$edit field="text" class="tw-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/> +<$edit field="text" class="tc-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/>
@@ -40,8 +40,8 @@ tags: $:/tags/EditTemplate <$reveal state="$:/state/showeditpreview" type="nomatch" text="yes"> -<> <$button type="set" set="$:/state/showeditpreview" setTo="yes"><> -<$edit field="text" class="tw-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/> +<> <$button type="set" set="$:/state/showeditpreview" setTo="yes"><> +<$edit field="text" class="tc-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/> diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid index 5bc00bc8f..61da63556 100644 --- a/core/ui/EditTemplate/fields.tid +++ b/core/ui/EditTemplate/fields.tid @@ -9,18 +9,18 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$ [[hide]] -[title{$(config-title)$}] \end <$fieldmangler> -
- +
+
<$list filter="[all[current]fields[]] +[sort[title]]" variable="currentField"> <$list filter=<> variable="temp"> - - + - - @@ -30,12 +30,12 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
+
<$text text=<>/>: + <$edit-text tiddler=<> field=<> placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}}/> + <$button message="tw-remove-field" param=<> class="tc-btn-invisible">{{$:/core/images/delete-button}}
-
- +
+ <> - -<$edit-text tiddler="$:/temp/newfieldname" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tw-edit-texteditor"/> - + +<$edit-text tiddler="$:/temp/newfieldname" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tc-edit-texteditor"/> + <$button message="tw-add-field" param={{$:/temp/newfieldname}} set="$:/temp/newfieldname" setTo="" class=""> <> diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid index 69f1bb4f3..c4aa34224 100644 --- a/core/ui/EditTemplate/tags.tid +++ b/core/ui/EditTemplate/tags.tid @@ -5,7 +5,7 @@ tags: $:/tags/EditTemplate \define tag-styles() background-color:$(backgroundColor)$; \end -
+
<$fieldmangler> <$list filter="[all[current]tags[]sort[title]]" storyview="pop"><$set name="backgroundColor" value={{!!color}}>> class="tw-tag-label"> <$view field="title" format="text" /> @@ -13,9 +13,9 @@ background-color:$(backgroundColor)$; -
+
-<$edit-text tiddler="$:/temp/NewTagName" tag="input" default="" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<> class="tw-edit-texteditor"/> +<$edit-text tiddler="$:/temp/NewTagName" tag="input" default="" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<> class="tc-edit-texteditor"/> <$button popup=<> class="tc-btn-invisible btn-dropdown">{{$:/core/images/down-arrow}} <$button message="tw-add-tag" param={{$:/temp/NewTagName}} set="$:/temp/NewTagName" setTo="" class=""> <> diff --git a/core/ui/EditTemplate/title.tid b/core/ui/EditTemplate/title.tid index 271de8cfd..ed2732805 100644 --- a/core/ui/EditTemplate/title.tid +++ b/core/ui/EditTemplate/title.tid @@ -1,4 +1,4 @@ title: $:/core/ui/EditTemplate/title tags: $:/tags/EditTemplate -<$edit-text field="draft.title" class="tc-titlebar tw-edit-texteditor"/> +<$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor"/> diff --git a/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid index 705cbf9a3..acd7010cf 100644 --- a/core/ui/EditTemplate/type.tid +++ b/core/ui/EditTemplate/type.tid @@ -2,11 +2,11 @@ title: $:/core/ui/EditTemplate/type tags: $:/tags/EditTemplate \define lingo-base() $:/language/EditTemplate/ -

<$fieldmangler><> <$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<> class="tw-edit-typeeditor"/> <$button popup=<> class="tc-btn-invisible btn-dropdown">{{$:/core/images/down-arrow}} <$button message="tw-remove-field" param="type" class="tc-btn-invisible tc-btn-icon">{{$:/core/images/delete-button}}

+

<$fieldmangler><> <$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<> class="tc-edit-typeeditor"/> <$button popup=<> class="tc-btn-invisible btn-dropdown">{{$:/core/images/down-arrow}} <$button message="tw-remove-field" param="type" class="tc-btn-invisible tc-btn-icon">{{$:/core/images/delete-button}}

<$reveal state=<> type="nomatch" text="" default=""> -
+
<$linkcatcher to="!!type"> <$list filter='[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]each[group]sort[group]]'>
diff --git a/editions/tw5.com/tiddlers/mechanisms/DraftMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/DraftMechanism.tid index cf143e7b6..e77c1754a 100644 --- a/editions/tw5.com/tiddlers/mechanisms/DraftMechanism.tid +++ b/editions/tw5.com/tiddlers/mechanisms/DraftMechanism.tid @@ -9,7 +9,7 @@ Several features work in concert to give the desired behaviour for draft tiddler * The ListWidget can optionally render draft tiddlers through a different template * The NavigatorWidget incorporates handlers for the following events: ** `tw-new-tiddler` for creating a new tiddler in draft mode -** `tw-edit-tiddler` for moving a tiddler into edit mode +** `tc-edit-tiddler` for moving a tiddler into edit mode ** `tw-cancel-tiddler` for cancelling a tiddler out of edit mode ** `tw-save-tiddler` for saving a draft tiddler * Draft tiddlers are automatically excluded from search operations diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid index 31f59f9e6..8280fcf3f 100644 --- a/themes/tiddlywiki/snowwhite/base.tid +++ b/themes/tiddlywiki/snowwhite/base.tid @@ -31,21 +31,21 @@ tags: [[$:/tags/stylesheet]] <> } -.tw-tiddler-frame input.tw-edit-texteditor { +.tw-tiddler-frame input.tc-edit-texteditor { <> } -.tw-edit-tags { +.tc-edit-tags { <> } -.tw-tiddler-frame .tw-edit-tags input.tw-edit-texteditor { +.tw-tiddler-frame .tc-edit-tags input.tc-edit-texteditor { <> border: none; outline: none; } -canvas.tw-edit-bitmapeditor { +canvas.tc-edit-bitmapeditor { <> } diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index cbb03913f..415e6ddf6 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -661,7 +661,7 @@ button.tw-tag-label, span.tw-tag-label { color: <>; } -.tw-tiddler-frame input.tw-edit-texteditor, .tw-tiddler-frame textarea.tw-edit-texteditor { +.tw-tiddler-frame input.tc-edit-texteditor, .tw-tiddler-frame textarea.tc-edit-texteditor { width: 100%; padding: 3px 3px 3px 3px; border: 1px solid <>; @@ -679,11 +679,11 @@ button.tw-tag-label, span.tw-tag-label { border: 1px solid <>; } -.tw-tiddler-frame input.tw-edit-texteditor { +.tw-tiddler-frame input.tc-edit-texteditor { background-color: <>; } -canvas.tw-edit-bitmapeditor { +canvas.tc-edit-bitmapeditor { border: 6px solid <>; cursor: crosshair; -moz-user-select: none; @@ -693,11 +693,11 @@ canvas.tw-edit-bitmapeditor { margin-bottom: 6px; } -.tw-edit-bitmapeditor-width { +.tc-edit-bitmapeditor-width { display: block; } -.tw-edit-bitmapeditor-height { +.tc-edit-bitmapeditor-height { display: block; } @@ -745,33 +745,33 @@ canvas.tw-edit-bitmapeditor { ** Tiddler edit mode */ -.tw-tiddler-edit-frame em.tw-edit { +.tw-tiddler-edit-frame em.tc-edit { color: <>; font-style: normal; } -.tw-edit-type-dropdown a.tc-tiddlylink-missing { +.tc-edit-type-dropdown a.tc-tiddlylink-missing { font-style: normal; } -.tw-edit-tags { +.tc-edit-tags { border: 1px solid <>; padding: 4px 8px 4px 8px; } -.tw-edit-add-tag { +.tc-edit-add-tag { display: inline-block; } -.tw-edit-add-tag .tw-add-tag-name input { +.tc-edit-add-tag .tw-add-tag-name input { width: 50%; } -.tw-edit-tags .tw-tag-label { +.tc-edit-tags .tw-tag-label { display: inline-block; } -.tw-edit-tags-list { +.tc-edit-tags-list { margin: 14px 0 14px 0; } @@ -800,48 +800,48 @@ canvas.tw-edit-bitmapeditor { width: 48%; } -.tw-edit-fields { +.tc-edit-fields { width: 100%; } -.tw-edit-fields table, .tw-edit-fields tr, .tw-edit-fields td { +.tc-edit-fields table, .tc-edit-fields tr, .tc-edit-fields td { border: none; padding: 4px; } -.tw-edit-fields > tbody > .tw-edit-field:nth-child(odd) { +.tc-edit-fields > tbody > .tc-edit-field:nth-child(odd) { background-color: <>; } -.tw-edit-fields > tbody > .tw-edit-field:nth-child(even) { +.tc-edit-fields > tbody > .tc-edit-field:nth-child(even) { background-color: <>; } -.tw-edit-field-name { +.tc-edit-field-name { text-align: right; } -.tw-edit-field-value input { +.tc-edit-field-value input { width: 100%; } -.tw-edit-field-remove { +.tc-edit-field-remove { } -.tw-edit-field-remove svg { +.tc-edit-field-remove svg { height: 1em; width: 1em; fill: <>; vertical-align: middle; } -.tw-edit-field-add-name { +.tc-edit-field-add-name { display: inline-block; width: 15%; } -.tw-edit-field-add-button { +.tc-edit-field-add-button { display: inline-block; width: 10%; }