diff --git a/boot/boot.css.tid b/boot/boot.css.tid
index 44293a5b7..2cf486be8 100644
--- a/boot/boot.css.tid
+++ b/boot/boot.css.tid
@@ -9,7 +9,7 @@ Basic styles used before we boot up the parsing engine
Error message and password prompt
*/
-.tw-password-wrapper, .tw-error-form {
+.tc-password-wrapper, .tc-error-form {
font-family: sans-serif;
z-index: 20000;
position: fixed;
@@ -22,7 +22,7 @@ Error message and password prompt
border-radius: 8px;
}
-.tw-error-form {
+.tc-error-form {
color: #fff;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
background-color: rgb(255, 75, 75);
@@ -31,32 +31,32 @@ Error message and password prompt
margin-left: -244px; /* - width/2 - paddingHorz/2 - border */
}
-.tw-error-form div {
+.tc-error-form div {
padding-bottom: 1em;
}
-.tw-error-prompt {
+.tc-error-prompt {
color: #000;
text-shadow: none;
}
-.tw-password-wrapper {
+.tc-password-wrapper {
color: #000;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: rgb(197, 235, 183);
border: 8px solid rgb(164, 197, 152);
}
-.tw-password-wrapper form {
+.tc-password-wrapper form {
text-align: left;
}
-.tw-password-wrapper h1 {
+.tc-password-wrapper h1 {
font-size: 16px;
line-height: 20px;
padding-bottom: 16px;
}
-.tw-password-wrapper input {
+.tc-password-wrapper input {
width: 100%;
}
diff --git a/boot/boot.js b/boot/boot.js
index a28aab306..32294c881 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -139,10 +139,10 @@ $tw.utils.error = function(err) {
// Display an error message to the user
var dm = $tw.utils.domMaker,
heading = dm("h1",{text: errHeading}),
- prompt = dm("div",{text: promptMsg, "class": "tw-error-prompt"}),
+ prompt = dm("div",{text: promptMsg, "class": "tc-error-prompt"}),
message = dm("div",{text: err}),
button = dm("button",{text: "close"}),
- form = dm("form",{children: [heading,prompt,message,button], "class": "tw-error-form"});
+ form = dm("form",{children: [heading,prompt,message,button], "class": "tc-error-form"});
document.body.insertBefore(form,document.body.firstChild);
form.addEventListener("submit",function(event) {
document.body.removeChild(form);
@@ -447,7 +447,7 @@ $tw.utils.PasswordPrompt = function() {
// Store of pending password prompts
this.passwordPrompts = [];
// Create the wrapper
- this.promptWrapper = $tw.utils.domMaker("div",{"class":"tw-password-wrapper"});
+ this.promptWrapper = $tw.utils.domMaker("div",{"class":"tc-password-wrapper"});
document.body.appendChild(this.promptWrapper);
// Hide the empty wrapper
this.setWrapperDisplay();
@@ -480,18 +480,15 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
children = [dm("h1",{text: options.serviceName})];
if(!options.noUserName) {
children.push(dm("input",{
- attributes: {type: "text", name: "username", placeholder: "Username"},
- "class": "input-small"
+ attributes: {type: "text", name: "username", placeholder: "Username"}
}));
}
children.push(dm("input",{
- attributes: {type: "password", name: "password", placeholder: "Password"},
- "class": "input-small"
+ attributes: {type: "password", name: "password", placeholder: "Password"}
}));
if(options.canCancel) {
children.push(dm("button",{
text: "Cancel",
- "class": "btn",
eventListeners: [{
name: "click",
handlerFunction: function(event) {
@@ -503,11 +500,9 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
}
children.push(dm("button",{
attributes: {type: "submit"},
- text: submitText,
- "class": "btn"
+ text: submitText
}));
var form = dm("form",{
- "class": "form-inline",
attributes: {autocomplete: "off"},
children: children
});
diff --git a/contributing.md b/contributing.md
index 9c4a9ca54..e2b294730 100644
--- a/contributing.md
+++ b/contributing.md
@@ -1,3 +1,3 @@
-TiddlyWiki5 welcomes contributions to its code and documentation via GitHub . Please take a moment to read these notes to help make the process as smooth as possible.
Coding Style Code contributions should follow the TiddlyWiki Coding Style Guidelines .
See ReportingBugs for information about how TiddlyWiki handles bug reports.
Contributor License Agreement Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).
This is a first pass at a CLA for TiddlyWiki . Please let us know if we missed something important. If we do have to make essential changes to the CLA, there is a possibility that all contributors will need to sign it again
How to sign the CLA Create a GitHub pull request to add your name to cla-individual.md or cla-entity.md, with the date in the format (YYYY/MM/DD).
eg: Jeremy Ruston, @Jermolene, 2011/11/22
Thank you!
Attribution The CLA documents used for this project were created using Harmony Project Templates . "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity"
-
This file was automatically generated by TiddlyWiki5
+
TiddlyWiki5 welcomes contributions to its code and documentation via GitHub . Please take a moment to read these notes to help make the process as smooth as possible.
Coding Style Code contributions should follow the TiddlyWiki Coding Style Guidelines .
See ReportingBugs for information about how TiddlyWiki handles bug reports.
Contributor License Agreement Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).
This is a first pass at a CLA for TiddlyWiki . Please let us know if we missed something important. If we do have to make essential changes to the CLA, there is a possibility that all contributors will need to sign it again
How to sign the CLA Create a GitHub pull request to add your name to cla-individual.md or cla-entity.md, with the date in the format (YYYY/MM/DD).
eg: Jeremy Ruston, @Jermolene, 2011/11/22
Thank you!
Attribution The CLA documents used for this project were created using Harmony Project Templates . "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity"
+
This file was automatically generated by TiddlyWiki5
\ No newline at end of file
diff --git a/core/images/cancel-button.tid b/core/images/cancel-button.tid
index 2ce32e674..34acf1bf4 100644
--- a/core/images/cancel-button.tid
+++ b/core/images/cancel-button.tid
@@ -1,4 +1,4 @@
title: $:/core/images/cancel-button
tags: $:/tags/Image
-
+
+
+
+
+
diff --git a/core/images/delete-button.tid b/core/images/delete-button.tid
index c0c25b50e..3e5c807f2 100644
--- a/core/images/delete-button.tid
+++ b/core/images/delete-button.tid
@@ -1,4 +1,4 @@
title: $:/core/images/delete-button
tags: $:/tags/Image
-
+
diff --git a/core/images/full-screen-button.tid b/core/images/full-screen-button.tid
index ca96994c1..acc6edbd6 100644
--- a/core/images/full-screen-button.tid
+++ b/core/images/full-screen-button.tid
@@ -1,7 +1,7 @@
title: $:/core/images/full-screen-button
tags: $:/tags/Image
-
+
+
+
diff --git a/core/images/info-button.tid b/core/images/info-button.tid
index 6da295c56..f19df45bc 100644
--- a/core/images/info-button.tid
+++ b/core/images/info-button.tid
@@ -1,4 +1,4 @@
title: $:/core/images/info-button
tags: $:/tags/Image
-
+
diff --git a/core/images/menu-button.tid b/core/images/menu-button.tid
index 32f6239cb..beffcfac7 100644
--- a/core/images/menu-button.tid
+++ b/core/images/menu-button.tid
@@ -1,4 +1,4 @@
title: $:/core/images/menu-button
tags: $:/tags/Image
-
+
diff --git a/core/images/new-button.tid b/core/images/new-button.tid
index 760181001..758496661 100644
--- a/core/images/new-button.tid
+++ b/core/images/new-button.tid
@@ -1,4 +1,4 @@
title: $:/core/images/new-button
tags: $:/tags/Image
-
+
diff --git a/core/images/permaview-button.tid b/core/images/permaview-button.tid
index 2684406b9..360d80865 100644
--- a/core/images/permaview-button.tid
+++ b/core/images/permaview-button.tid
@@ -1,7 +1,7 @@
title: $:/core/images/permaview-button
tags: $:/tags/Image
-
+
+
diff --git a/core/images/right-arrow.tid b/core/images/right-arrow.tid
index 73c2545ef..4627076e0 100644
--- a/core/images/right-arrow.tid
+++ b/core/images/right-arrow.tid
@@ -1,4 +1,4 @@
title: $:/core/images/right-arrow
tags: $:/tags/Image
-
+
diff --git a/core/images/storyview-classic.tid b/core/images/storyview-classic.tid
index 86fa1c21e..3e64fd5d1 100644
--- a/core/images/storyview-classic.tid
+++ b/core/images/storyview-classic.tid
@@ -1,7 +1,7 @@
title: $:/core/images/storyview-classic
tags: $:/tags/Image
-
+
+
+
+
+
+
diff --git a/core/language/en-GB/Modals/Download.tid b/core/language/en-GB/Modals/Download.tid
index 6f366abe5..49ea95d59 100644
--- a/core/language/en-GB/Modals/Download.tid
+++ b/core/language/en-GB/Modals/Download.tid
@@ -1,7 +1,7 @@
title: $:/language/Modals/Download
type: text/vnd.tiddlywiki
subtitle: Download changes
-footer: <$button message="tw-close-tiddler" class="btn btn-primary">Close
+footer: <$button message="tm-close-tiddler">Close
help: http://tiddlywiki.com/static/DownloadingChanges.html
Your browser only supports manual saving.
diff --git a/core/language/en-GB/Modals/SaveInstructions.tid b/core/language/en-GB/Modals/SaveInstructions.tid
index 7f95f0bb7..61f46dea0 100644
--- a/core/language/en-GB/Modals/SaveInstructions.tid
+++ b/core/language/en-GB/Modals/SaveInstructions.tid
@@ -1,7 +1,7 @@
title: $:/language/Modals/SaveInstructions
type: text/vnd.tiddlywiki
subtitle: Save your work
-footer: <$button message="tw-close-tiddler" class="btn btn-primary">Close
+footer: <$button message="tm-close-tiddler">Close
help: http://tiddlywiki.com/static/SavingChanges.html
Your changes to this wiki need to be saved as a ~TiddlyWiki HTML file.
diff --git a/core/modules/filters/prefix.js b/core/modules/filters/prefix.js
index 470dbfd1a..49bb8110f 100644
--- a/core/modules/filters/prefix.js
+++ b/core/modules/filters/prefix.js
@@ -19,13 +19,13 @@ exports.prefix = function(source,operator,options) {
var results = [];
if(operator.prefix === "!") {
source(function(tiddler,title) {
- if(title.substr(0,operator.operand.length).toLowerCase() !== operator.operand.toLowerCase()) {
+ if(title.substr(0,operator.operand.length) !== operator.operand) {
results.push(title);
}
});
} else {
source(function(tiddler,title) {
- if(title.substr(0,operator.operand.length).toLowerCase() === operator.operand.toLowerCase()) {
+ if(title.substr(0,operator.operand.length) === operator.operand) {
results.push(title);
}
});
diff --git a/core/modules/filters/removeprefix.js b/core/modules/filters/removeprefix.js
index b7f5c5cf4..3e93dcd00 100644
--- a/core/modules/filters/removeprefix.js
+++ b/core/modules/filters/removeprefix.js
@@ -18,7 +18,7 @@ Export our filter function
exports.removeprefix = function(source,operator,options) {
var results = [];
source(function(tiddler,title) {
- if(title.substr(0,operator.operand.length).toLowerCase() === operator.operand.toLowerCase()) {
+ if(title.substr(0,operator.operand.length) === operator.operand) {
results.push(title.substr(operator.operand.length));
}
});
diff --git a/core/modules/filters/removesuffix.js b/core/modules/filters/removesuffix.js
new file mode 100644
index 000000000..0dac6e598
--- /dev/null
+++ b/core/modules/filters/removesuffix.js
@@ -0,0 +1,28 @@
+/*\
+title: $:/core/modules/filters/removesuffix.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for removing a suffix from each title in the list. Titles that do not end with the suffix are removed.
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.removesuffix = function(source,operator,options) {
+ var results = [];
+ source(function(tiddler,title) {
+ if(title.substr(-operator.operand.length) === operator.operand) {
+ results.push(title.substr(0,title.length - operator.operand.length));
+ }
+ });
+ return results;
+};
+
+})();
diff --git a/core/modules/filters/suffix.js b/core/modules/filters/suffix.js
new file mode 100644
index 000000000..a93733cc8
--- /dev/null
+++ b/core/modules/filters/suffix.js
@@ -0,0 +1,36 @@
+/*\
+title: $:/core/modules/filters/suffix.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for checking if a title ends with a suffix
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.suffix = function(source,operator,options) {
+ var results = [];
+ if(operator.prefix === "!") {
+ source(function(tiddler,title) {
+ if(title.substr(-operator.operand.length) !== operator.operand) {
+ results.push(title);
+ }
+ });
+ } else {
+ source(function(tiddler,title) {
+ if(title.substr(-operator.operand.length) === operator.operand) {
+ results.push(title);
+ }
+ });
+ }
+ return results;
+};
+
+})();
diff --git a/core/modules/parsers/csvparser.js b/core/modules/parsers/csvparser.js
index 408638f80..0e6c9f7bc 100644
--- a/core/modules/parsers/csvparser.js
+++ b/core/modules/parsers/csvparser.js
@@ -19,7 +19,7 @@ var CsvParser = function(type,text,options) {
"type": "element", "tag": "table", "children": [{
"type": "element", "tag": "tbody", "children": []
}], "attributes": {
- "class": {"type": "string", "value": "tw-csv-table"}
+ "class": {"type": "string", "value": "tc-csv-table"}
}
}]
}];
diff --git a/core/modules/parsers/wikiparser/rules/extlink.js b/core/modules/parsers/wikiparser/rules/extlink.js
index abc4debd4..539d0f11b 100644
--- a/core/modules/parsers/wikiparser/rules/extlink.js
+++ b/core/modules/parsers/wikiparser/rules/extlink.js
@@ -41,7 +41,7 @@ exports.parse = function() {
tag: "a",
attributes: {
href: {type: "string", value: this.match[0]},
- "class": {type: "string", value: "tw-tiddlylink-external"},
+ "class": {type: "string", value: "tc-tiddlylink-external"},
target: {type: "string", value: "_blank"}
},
children: [{
diff --git a/core/modules/parsers/wikiparser/rules/macrodef.js b/core/modules/parsers/wikiparser/rules/macrodef.js
index a57e62c37..819e9fe25 100644
--- a/core/modules/parsers/wikiparser/rules/macrodef.js
+++ b/core/modules/parsers/wikiparser/rules/macrodef.js
@@ -62,6 +62,8 @@ exports.parse = function() {
} else {
// Otherwise, the end of the definition is marked by the end of the line
reEnd = /(\r?\n)/mg;
+ // Move past any whitespace
+ this.parser.pos = $tw.utils.skipWhiteSpace(this.parser.source,this.parser.pos);
}
// Find the end of the definition
reEnd.lastIndex = this.parser.pos;
diff --git a/core/modules/parsers/wikiparser/rules/prettyextlink.js b/core/modules/parsers/wikiparser/rules/prettyextlink.js
index 960c410c0..45bcbbf43 100644
--- a/core/modules/parsers/wikiparser/rules/prettyextlink.js
+++ b/core/modules/parsers/wikiparser/rules/prettyextlink.js
@@ -73,7 +73,7 @@ exports.parseLink = function(source,pos) {
tag: "a",
start: pos,
attributes: {
- "class": {type: "string", value: "tw-tiddlylink-external"},
+ "class": {type: "string", value: "tc-tiddlylink-external"},
},
children: [textNode]
};
diff --git a/core/modules/parsers/wikiparser/rules/prettylink.js b/core/modules/parsers/wikiparser/rules/prettylink.js
index 2b6cfeb22..12683b3eb 100644
--- a/core/modules/parsers/wikiparser/rules/prettylink.js
+++ b/core/modules/parsers/wikiparser/rules/prettylink.js
@@ -44,7 +44,7 @@ exports.parse = function() {
tag: "a",
attributes: {
href: {type: "string", value: link},
- "class": {type: "string", value: "tw-tiddlylink-external"},
+ "class": {type: "string", value: "tc-tiddlylink-external"},
target: {type: "string", value: "_blank"}
},
children: [{
diff --git a/core/modules/parsers/wikiparser/rules/quoteblock.js b/core/modules/parsers/wikiparser/rules/quoteblock.js
index c2c1884a8..8f83c57e8 100644
--- a/core/modules/parsers/wikiparser/rules/quoteblock.js
+++ b/core/modules/parsers/wikiparser/rules/quoteblock.js
@@ -45,7 +45,7 @@ exports.init = function(parser) {
};
exports.parse = function() {
- var classes = ["tw-quote"];
+ var classes = ["tc-quote"];
// Get all the details of the match
var reEndString = "^" + this.match[1] + "(?!<)";
// Move past the 0);
+ $tw.utils.toggleClass($tw.pageContainer,"tc-modal-displayed",this.modalCount > 0);
}
};
diff --git a/core/modules/utils/dom/notifier.js b/core/modules/utils/dom/notifier.js
index c2f25c2a9..31c5c8c92 100644
--- a/core/modules/utils/dom/notifier.js
+++ b/core/modules/utils/dom/notifier.js
@@ -35,7 +35,7 @@ Notifier.prototype.display = function(title,options) {
return;
}
// Add classes
- $tw.utils.addClass(notification,"tw-notification");
+ $tw.utils.addClass(notification,"tc-notification");
// Render the body of the notification
var widgetNode = this.wiki.makeTranscludeWidget(title,{parentWidget: $tw.rootWidget, document: document});
widgetNode.render(notification,null);
diff --git a/core/modules/utils/dom/popup.js b/core/modules/utils/dom/popup.js
index e7d93dbf8..da207d921 100644
--- a/core/modules/utils/dom/popup.js
+++ b/core/modules/utils/dom/popup.js
@@ -26,15 +26,15 @@ Popup.prototype.show = function(options) {
this.title = options.title;
this.wiki = options.wiki;
this.anchorDomNode = options.domNode;
- $tw.utils.addClass(this.anchorDomNode,"tw-popup");
+ $tw.utils.addClass(this.anchorDomNode,"tc-popup");
this.rootElement.addEventListener("click",this,false);
};
Popup.prototype.handleEvent = function(event) {
- // Dismiss the popup if we get a click on an element that doesn't have .tw-popup class
+ // Dismiss the popup if we get a click on an element that doesn't have .tc-popup class
if(event.type === "click") {
var node = event.target;
- while(node && !$tw.utils.hasClass(node,"tw-popup")) {
+ while(node && !$tw.utils.hasClass(node,"tc-popup")) {
node = node.parentNode;
}
if(!node) {
@@ -45,7 +45,7 @@ Popup.prototype.handleEvent = function(event) {
Popup.prototype.cancel = function() {
if(this.anchorDomNode) {
- $tw.utils.removeClass(this.anchorDomNode,"tw-popup");
+ $tw.utils.removeClass(this.anchorDomNode,"tc-popup");
this.anchorDomNode = null;
}
this.rootElement.removeEventListener("click",this,false);
diff --git a/core/modules/utils/dom/scroller.js b/core/modules/utils/dom/scroller.js
index 8ff0e04c6..786c54321 100644
--- a/core/modules/utils/dom/scroller.js
+++ b/core/modules/utils/dom/scroller.js
@@ -13,7 +13,7 @@ Module that creates a $tw.utils.Scroller object prototype that manages scrolling
"use strict";
/*
-Event handler for when the `tw-scroll` event hits the document body
+Event handler for when the `tm-scroll` event hits the document body
*/
var PageScroller = function() {
this.idRequestFrame = null;
@@ -44,7 +44,7 @@ PageScroller.prototype.cancelScroll = function() {
Handle an event
*/
PageScroller.prototype.handleEvent = function(event) {
- if(event.type === "tw-scroll") {
+ if(event.type === "tm-scroll") {
return this.scrollIntoView(event.target);
}
return true;
diff --git a/core/modules/widgets/browse.js b/core/modules/widgets/browse.js
index bebf0a889..fdf77c02e 100644
--- a/core/modules/widgets/browse.js
+++ b/core/modules/widgets/browse.js
@@ -40,7 +40,7 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
// Add a click event handler
domNode.addEventListener("change",function (event) {
self.wiki.readFiles(event.target.files,function(tiddlerFieldsArray) {
- self.dispatchEvent({type: "tw-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)});
+ self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)});
});
return false;
},false);
diff --git a/core/modules/widgets/button.js b/core/modules/widgets/button.js
index cfe05a8c0..01334d463 100644
--- a/core/modules/widgets/button.js
+++ b/core/modules/widgets/button.js
@@ -101,7 +101,7 @@ ButtonWidget.prototype.isPoppedUp = function() {
ButtonWidget.prototype.navigateTo = function(event) {
var bounds = this.domNodes[0].getBoundingClientRect();
this.dispatchEvent({
- type: "tw-navigate",
+ type: "tm-navigate",
navigateTo: this.to,
navigateFromTitle: this.getVariable("storyTiddler"),
navigateFromNode: this,
diff --git a/core/modules/widgets/dropzone.js b/core/modules/widgets/dropzone.js
index 62f787a7e..30f1ddb5c 100644
--- a/core/modules/widgets/dropzone.js
+++ b/core/modules/widgets/dropzone.js
@@ -35,7 +35,7 @@ DropZoneWidget.prototype.render = function(parent,nextSibling) {
this.execute();
// Create element
var domNode = this.document.createElement("div");
- domNode.className = "tw-dropzone";
+ domNode.className = "tc-dropzone";
// Add event handlers
$tw.utils.addEventListeners(domNode,[
{name: "dragenter", handlerObject: this, handlerMethod: "handleDragEnterEvent"},
@@ -57,7 +57,7 @@ DropZoneWidget.prototype.handleDragEnterEvent = function(event) {
this.dragEnterCount = (this.dragEnterCount || 0) + 1;
// If we're entering for the first time we need to apply highlighting
if(this.dragEnterCount === 1) {
- $tw.utils.addClass(this.domNodes[0],"tw-dragover");
+ $tw.utils.addClass(this.domNodes[0],"tc-dragover");
}
// Tell the browser that we're ready to handle the drop
event.preventDefault();
@@ -80,7 +80,7 @@ DropZoneWidget.prototype.handleDragLeaveEvent = function(event) {
this.dragEnterCount = (this.dragEnterCount || 0) - 1;
// Remove highlighting if we're leaving externally
if(this.dragEnterCount <= 0) {
- $tw.utils.removeClass(this.domNodes[0],"tw-dragover");
+ $tw.utils.removeClass(this.domNodes[0],"tc-dragover");
}
};
@@ -94,10 +94,10 @@ DropZoneWidget.prototype.handleDropEvent = function(event) {
// Reset the enter count
this.dragEnterCount = 0;
// Remove highlighting
- $tw.utils.removeClass(this.domNodes[0],"tw-dragover");
+ $tw.utils.removeClass(this.domNodes[0],"tc-dragover");
// Import any files in the drop
var numFiles = this.wiki.readFiles(dataTransfer.files,function(tiddlerFieldsArray) {
- self.dispatchEvent({type: "tw-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)});
+ self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)});
});
// Try to import the various data types we understand
if(numFiles === 0) {
@@ -122,7 +122,7 @@ DropZoneWidget.prototype.importData = function(dataTransfer) {
if(!tiddlerFields.title) {
tiddlerFields.title = this.wiki.generateNewTitle("Untitled");
}
- this.dispatchEvent({type: "tw-import-tiddlers", param: JSON.stringify([tiddlerFields])});
+ this.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify([tiddlerFields])});
return;
}
}
@@ -188,7 +188,7 @@ DropZoneWidget.prototype.handlePasteEvent = function(event) {
if(item.kind === "file") {
// Import any files
this.wiki.readFile(item.getAsFile(),function(tiddlerFieldsArray) {
- self.dispatchEvent({type: "tw-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)});
+ self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify(tiddlerFieldsArray)});
});
} else if(item.kind === "string") {
// Create tiddlers from string items
@@ -199,7 +199,7 @@ DropZoneWidget.prototype.handlePasteEvent = function(event) {
text: str,
type: type
};
- self.dispatchEvent({type: "tw-import-tiddlers", param: JSON.stringify([tiddlerFields])});
+ self.dispatchEvent({type: "tm-import-tiddlers", param: JSON.stringify([tiddlerFields])});
});
}
}
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/modules/widgets/fieldmangler.js b/core/modules/widgets/fieldmangler.js
index afb60b577..0c44d666a 100644
--- a/core/modules/widgets/fieldmangler.js
+++ b/core/modules/widgets/fieldmangler.js
@@ -17,10 +17,10 @@ var Widget = require("$:/core/modules/widgets/widget.js").widget;
var FieldManglerWidget = function(parseTreeNode,options) {
this.initialise(parseTreeNode,options);
this.addEventListeners([
- {type: "tw-remove-field", handler: "handleRemoveFieldEvent"},
- {type: "tw-add-field", handler: "handleAddFieldEvent"},
- {type: "tw-remove-tag", handler: "handleRemoveTagEvent"},
- {type: "tw-add-tag", handler: "handleAddTagEvent"}
+ {type: "tm-remove-field", handler: "handleRemoveFieldEvent"},
+ {type: "tm-add-field", handler: "handleAddFieldEvent"},
+ {type: "tm-remove-tag", handler: "handleRemoveTagEvent"},
+ {type: "tm-add-tag", handler: "handleAddTagEvent"}
]);
};
diff --git a/core/modules/widgets/keyboard.js b/core/modules/widgets/keyboard.js
index 6ec9b4a04..c30649f86 100644
--- a/core/modules/widgets/keyboard.js
+++ b/core/modules/widgets/keyboard.js
@@ -37,7 +37,7 @@ KeyboardWidget.prototype.render = function(parent,nextSibling) {
var domNode = this.document.createElement("div");
// Assign classes
var classes = (this["class"] || "").split(" ");
- classes.push("tw-keyboard");
+ classes.push("tc-keyboard");
domNode.className = classes.join(" ");
// Add a keyboard event handler
domNode.addEventListener("keydown",function (event) {
diff --git a/core/modules/widgets/link.js b/core/modules/widgets/link.js
index b5cd89fd8..572e253f4 100755
--- a/core/modules/widgets/link.js
+++ b/core/modules/widgets/link.js
@@ -60,15 +60,15 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
if(this.linkClasses) {
classes.push(this.linkClasses);
}
- classes.push("tw-tiddlylink");
+ classes.push("tc-tiddlylink");
if(this.isShadow) {
- classes.push("tw-tiddlylink-shadow");
+ classes.push("tc-tiddlylink-shadow");
}
if(this.isMissing && !this.isShadow) {
- classes.push("tw-tiddlylink-missing");
+ classes.push("tc-tiddlylink-missing");
} else {
if(!this.isMissing) {
- classes.push("tw-tiddlylink-resolves");
+ classes.push("tc-tiddlylink-resolves");
}
}
domNode.setAttribute("class",classes.join(" "));
@@ -110,7 +110,7 @@ LinkWidget.prototype.handleClickEvent = function (event) {
// Send the click on it's way as a navigate event
var bounds = this.domNodes[0].getBoundingClientRect();
this.dispatchEvent({
- type: "tw-navigate",
+ type: "tm-navigate",
navigateTo: this.to,
navigateFromTitle: this.getVariable("storyTiddler"),
navigateFromNode: this,
@@ -126,18 +126,18 @@ LinkWidget.prototype.handleClickEvent = function (event) {
LinkWidget.prototype.handleDragStartEvent = function(event) {
if(this.to) {
// Set the dragging class on the element being dragged
- $tw.utils.addClass(event.target,"tw-tiddlylink-dragging");
+ $tw.utils.addClass(event.target,"tc-tiddlylink-dragging");
// Create the drag image elements
this.dragImage = this.document.createElement("div");
- this.dragImage.className = "tw-tiddler-dragger";
+ this.dragImage.className = "tc-tiddler-dragger";
var inner = this.document.createElement("div");
- inner.className = "tw-tiddler-dragger-inner";
+ inner.className = "tc-tiddler-dragger-inner";
inner.appendChild(this.document.createTextNode(this.to));
this.dragImage.appendChild(inner);
this.document.body.appendChild(this.dragImage);
// Astoundingly, we need to cover the dragger up: http://www.kryogenix.org/code/browser/custom-drag-image.html
var cover = this.document.createElement("div");
- cover.className = "tw-tiddler-dragger-cover";
+ cover.className = "tc-tiddler-dragger-cover";
cover.style.left = (inner.offsetLeft - 16) + "px";
cover.style.top = (inner.offsetTop - 16) + "px";
cover.style.width = (inner.offsetWidth + 32) + "px";
@@ -170,7 +170,7 @@ LinkWidget.prototype.handleDragStartEvent = function(event) {
LinkWidget.prototype.handleDragEndEvent = function(event) {
// Remove the dragging class on the element being dragged
- $tw.utils.removeClass(event.target,"tw-tiddlylink-dragging");
+ $tw.utils.removeClass(event.target,"tc-tiddlylink-dragging");
// Delete the drag image element
if(this.dragImage) {
this.dragImage.parentNode.removeChild(this.dragImage);
diff --git a/core/modules/widgets/linkcatcher.js b/core/modules/widgets/linkcatcher.js
index b24a81907..51738d6d8 100644
--- a/core/modules/widgets/linkcatcher.js
+++ b/core/modules/widgets/linkcatcher.js
@@ -17,7 +17,7 @@ var Widget = require("$:/core/modules/widgets/widget.js").widget;
var LinkCatcherWidget = function(parseTreeNode,options) {
this.initialise(parseTreeNode,options);
this.addEventListeners([
- {type: "tw-navigate", handler: "handleNavigateEvent"}
+ {type: "tm-navigate", handler: "handleNavigateEvent"}
]);
};
@@ -63,7 +63,7 @@ LinkCatcherWidget.prototype.refresh = function(changedTiddlers) {
};
/*
-Handle a tw-navigate event
+Handle a tm-navigate event
*/
LinkCatcherWidget.prototype.handleNavigateEvent = function(event) {
if(this.catchTo) {
diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js
index 8b06289ad..6257fabef 100755
--- a/core/modules/widgets/navigator.js
+++ b/core/modules/widgets/navigator.js
@@ -19,17 +19,17 @@ var Widget = require("$:/core/modules/widgets/widget.js").widget;
var NavigatorWidget = function(parseTreeNode,options) {
this.initialise(parseTreeNode,options);
this.addEventListeners([
- {type: "tw-navigate", handler: "handleNavigateEvent"},
- {type: "tw-edit-tiddler", handler: "handleEditTiddlerEvent"},
- {type: "tw-delete-tiddler", handler: "handleDeleteTiddlerEvent"},
- {type: "tw-save-tiddler", handler: "handleSaveTiddlerEvent"},
- {type: "tw-cancel-tiddler", handler: "handleCancelTiddlerEvent"},
- {type: "tw-close-tiddler", handler: "handleCloseTiddlerEvent"},
- {type: "tw-close-all-tiddlers", handler: "handleCloseAllTiddlersEvent"},
- {type: "tw-close-other-tiddlers", handler: "handleCloseOtherTiddlersEvent"},
- {type: "tw-new-tiddler", handler: "handleNewTiddlerEvent"},
- {type: "tw-import-tiddlers", handler: "handleImportTiddlersEvent"},
- {type: "tw-perform-import", handler: "handlePerformImportEvent"}
+ {type: "tm-navigate", handler: "handleNavigateEvent"},
+ {type: "tm-edit-tiddler", handler: "handleEditTiddlerEvent"},
+ {type: "tm-delete-tiddler", handler: "handleDeleteTiddlerEvent"},
+ {type: "tm-save-tiddler", handler: "handleSaveTiddlerEvent"},
+ {type: "tm-cancel-tiddler", handler: "handleCancelTiddlerEvent"},
+ {type: "tm-close-tiddler", handler: "handleCloseTiddlerEvent"},
+ {type: "tm-close-all-tiddlers", handler: "handleCloseAllTiddlersEvent"},
+ {type: "tm-close-other-tiddlers", handler: "handleCloseOtherTiddlersEvent"},
+ {type: "tm-new-tiddler", handler: "handleNewTiddlerEvent"},
+ {type: "tm-import-tiddlers", handler: "handleImportTiddlersEvent"},
+ {type: "tm-perform-import", handler: "handlePerformImportEvent"}
]);
};
@@ -140,7 +140,7 @@ NavigatorWidget.prototype.addToHistory = function(title,fromPageRect) {
};
/*
-Handle a tw-navigate event
+Handle a tm-navigate event
*/
NavigatorWidget.prototype.handleNavigateEvent = function(event) {
this.addToStory(event.navigateTo,event.navigateFromTitle);
@@ -310,7 +310,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
));
}
if(!isRename && !this.wiki.isDraftModified(title)) {
- event.type = "tw-cancel-tiddler";
+ event.type = "tm-cancel-tiddler";
this.dispatchEvent(event);
} else if(isConfirmed) {
// Save the draft tiddler as the real tiddler
diff --git a/core/modules/widgets/radio.js b/core/modules/widgets/radio.js
index 6b60f3943..dc14046a1 100644
--- a/core/modules/widgets/radio.js
+++ b/core/modules/widgets/radio.js
@@ -101,7 +101,7 @@ RadioWidget.prototype.execute = function() {
if(this.radioClass !== "") {
this.radioClass += " ";
}
- this.radioClass += "tw-radio";
+ this.radioClass += "tc-radio";
// Make the child widgets
this.makeChildWidgets();
};
diff --git a/core/modules/widgets/reveal.js b/core/modules/widgets/reveal.js
index ab82c2192..b2229631a 100755
--- a/core/modules/widgets/reveal.js
+++ b/core/modules/widgets/reveal.js
@@ -32,13 +32,13 @@ RevealWidget.prototype.render = function(parent,nextSibling) {
this.execute();
var domNode = this.document.createElement(this.parseTreeNode.isBlock ? "div" : "span");
var classes = this["class"].split(" ") || [];
- classes.push("tw-reveal");
+ classes.push("tc-reveal");
domNode.className = classes.join(" ");
parent.insertBefore(domNode,nextSibling);
this.renderChildren(domNode,null);
if(!domNode.isTiddlyWikiFakeDom && this.type === "popup" && this.isOpen) {
this.positionPopup(domNode);
- $tw.utils.addClass(domNode,"tw-popup"); // Make sure that clicks don't dismiss popups within the revealed content
+ $tw.utils.addClass(domNode,"tc-popup"); // Make sure that clicks don't dismiss popups within the revealed content
}
if(!this.isOpen) {
domNode.setAttribute("hidden","true")
@@ -187,7 +187,7 @@ RevealWidget.prototype.updateState = function() {
// Animate our DOM node
if(!domNode.isTiddlyWikiFakeDom && this.type === "popup" && this.isOpen) {
this.positionPopup(domNode);
- $tw.utils.addClass(domNode,"tw-popup"); // Make sure that clicks don't dismiss popups within the revealed content
+ $tw.utils.addClass(domNode,"tc-popup"); // Make sure that clicks don't dismiss popups within the revealed content
}
if(this.isOpen) {
diff --git a/core/modules/widgets/scrollable.js b/core/modules/widgets/scrollable.js
index aa3d8c63e..cee4f03ce 100644
--- a/core/modules/widgets/scrollable.js
+++ b/core/modules/widgets/scrollable.js
@@ -18,7 +18,7 @@ var ScrollableWidget = function(parseTreeNode,options) {
this.initialise(parseTreeNode,options);
this.scaleFactor = 1;
this.addEventListeners([
- {type: "tw-scroll", handler: "handleScrollEvent"}
+ {type: "tm-scroll", handler: "handleScrollEvent"}
]);
if($tw.browser) {
this.requestAnimationFrame = window.requestAnimationFrame ||
diff --git a/core/modules/widgets/text.js b/core/modules/widgets/text.js
index e3ebc4f70..e3212f590 100755
--- a/core/modules/widgets/text.js
+++ b/core/modules/widgets/text.js
@@ -30,7 +30,7 @@ TextNodeWidget.prototype.render = function(parent,nextSibling) {
this.parentDomNode = parent;
this.computeAttributes();
this.execute();
- var text = this.getAttribute("text",this.parseTreeNode.text);
+ var text = this.getAttribute("text",this.parseTreeNode.text || "");
text = text.replace(/\r/mg,"");
var textNode = this.document.createTextNode(text);
parent.insertBefore(textNode,nextSibling);
diff --git a/core/modules/widgets/tiddler.js b/core/modules/widgets/tiddler.js
index 1300bd991..fcc4fabf1 100755
--- a/core/modules/widgets/tiddler.js
+++ b/core/modules/widgets/tiddler.js
@@ -41,9 +41,9 @@ TiddlerWidget.prototype.execute = function() {
this.tiddlerTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
// Set context variables
this.setVariable("currentTiddler",this.tiddlerTitle);
- this.setVariable("missingTiddlerClass",(this.wiki.tiddlerExists(this.tiddlerTitle) || this.wiki.isShadowTiddler(this.tiddlerTitle)) ? "tw-tiddler-exists" : "tw-tiddler-missing");
- this.setVariable("shadowTiddlerClass",this.wiki.isShadowTiddler(this.tiddlerTitle) ? "tw-tiddler-shadow" : "");
- this.setVariable("systemTiddlerClass",this.wiki.isSystemTiddler(this.tiddlerTitle) ? "tw-tiddler-system" : "");
+ this.setVariable("missingTiddlerClass",(this.wiki.tiddlerExists(this.tiddlerTitle) || this.wiki.isShadowTiddler(this.tiddlerTitle)) ? "tc-tiddler-exists" : "tc-tiddler-missing");
+ this.setVariable("shadowTiddlerClass",this.wiki.isShadowTiddler(this.tiddlerTitle) ? "tc-tiddler-shadow" : "");
+ this.setVariable("systemTiddlerClass",this.wiki.isSystemTiddler(this.tiddlerTitle) ? "tc-tiddler-system" : "");
this.setVariable("tiddlerTagClasses",this.getTagClasses())
// Construct the child widgets
this.makeChildWidgets();
@@ -57,7 +57,7 @@ TiddlerWidget.prototype.getTagClasses = function() {
if(tiddler) {
var tags = [];
$tw.utils.each(tiddler.fields.tags,function(tag) {
- tags.push("tw-tagged-" + encodeURIComponent(tag));
+ tags.push("tc-tagged-" + encodeURIComponent(tag));
});
return tags.join(" ");
} else {
@@ -70,7 +70,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
*/
TiddlerWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
- if(changedAttributes.tiddler || changedTiddlers[this.tiddlerTitle]) {
+ if(changedAttributes.tiddler) {
this.refreshSelf();
return true;
} else {
diff --git a/core/templates/alltiddlers.template.html.tid b/core/templates/alltiddlers.template.html.tid
index bb1d8f3c6..64e6e51fb 100644
--- a/core/templates/alltiddlers.template.html.tid
+++ b/core/templates/alltiddlers.template.html.tid
@@ -2,6 +2,9 @@ title: $:/core/templates/alltiddlers.template.html
type: text/vnd.tiddlywiki-html
\define tw-wikilink-template() #$uri_encoded$
+\define tw-config-toolbar-icons() no
+\define tw-config-toolbar-text() no
+\define tw-config-toolbar-class() tc-btn-invisible
\rules only filteredtranscludeinline transcludeinline
@@ -19,9 +22,9 @@ type: text/vnd.tiddlywiki-html
{{$:/core/ui/PageStylesheet||$:/core/templates/wikified-tiddler}}
-
+
{{$:/StaticBanner||$:/core/templates/html-tiddler}}
-
+
{{$:/core/templates/alltiddlers.content||$:/core/templates/html-tiddler}}
diff --git a/core/templates/static.template.html.tid b/core/templates/static.template.html.tid
index a4da2cda0..434ff1cd0 100644
--- a/core/templates/static.template.html.tid
+++ b/core/templates/static.template.html.tid
@@ -2,6 +2,9 @@ title: $:/core/templates/static.template.html
type: text/vnd.tiddlywiki-html
\define tw-wikilink-template() static/$uri_doubleencoded$.html
+\define tw-config-toolbar-icons() no
+\define tw-config-toolbar-text() no
+\define tw-config-toolbar-class() tc-btn-invisible
\rules only filteredtranscludeinline transcludeinline
@@ -19,7 +22,7 @@ type: text/vnd.tiddlywiki-html
{{$:/core/ui/PageStylesheet||$:/core/templates/wikified-tiddler}}
-
+
{{$:/StaticBanner||$:/core/templates/html-tiddler}}
{{$:/core/ui/PageTemplate||$:/core/templates/html-tiddler}}
diff --git a/core/templates/static.tiddler.html.tid b/core/templates/static.tiddler.html.tid
index 679c82dac..7e6824f3a 100644
--- a/core/templates/static.tiddler.html.tid
+++ b/core/templates/static.tiddler.html.tid
@@ -1,6 +1,9 @@
title: $:/core/templates/static.tiddler.html
\define tw-wikilink-template() $uri_doubleencoded$.html
+\define tw-config-toolbar-icons() no
+\define tw-config-toolbar-text() no
+\define tw-config-toolbar-class() tc-btn-invisible
`
@@ -12,9 +15,9 @@ title: $:/core/templates/static.tiddler.html
`{{$:/core/wiki/title}}`
-
+
`{{$:/StaticBanner||$:/core/templates/html-tiddler}}`
-
+
`<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]">
<$view tiddler="$:/core/ui/ViewTemplate" format="htmlwikified"/>
`
diff --git a/core/templates/tiddlywiki5.html.tid b/core/templates/tiddlywiki5.html.tid
index cd4fcf4d2..3f8701f18 100644
--- a/core/templates/tiddlywiki5.html.tid
+++ b/core/templates/tiddlywiki5.html.tid
@@ -21,7 +21,7 @@ title: $:/core/templates/tiddlywiki5.html
{{{ [all[shadows+tiddlers]tag[$:/core/wiki/rawmarkup]] [all[shadows+tiddlers]tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}}
-
+
{{$:/boot/boot.css||$:/core/templates/css-tiddler}}
diff --git a/core/ui/AdvancedSearch.tid b/core/ui/AdvancedSearch.tid
index f1e5e1e0c..b7aa7426a 100644
--- a/core/ui/AdvancedSearch.tid
+++ b/core/ui/AdvancedSearch.tid
@@ -1,5 +1,5 @@
title: $:/AdvancedSearch
-
+
<>
diff --git a/core/ui/AdvancedSearch/Filter.tid b/core/ui/AdvancedSearch/Filter.tid
index 9703d9ca6..b86b48942 100644
--- a/core/ui/AdvancedSearch/Filter.tid
+++ b/core/ui/AdvancedSearch/Filter.tid
@@ -7,11 +7,11 @@ caption: {{$:/language/Search/Filter/Caption}}
<
>
-<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/> <$button popup=<> class="btn-invisible">{{$:/core/images/down-arrow}} <$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}
+<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/> <$button popup=<> class="tc-btn-invisible">{{$:/core/images/down-arrow}} <$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}
-
+
<$reveal state=<
> type="nomatch" text="" default="">
-
+
<$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]]"><$link to={{!!filter}}><$transclude field="description"/>
@@ -21,7 +21,7 @@ caption: {{$:/language/Search/Filter/Caption}}
<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
-
+
<>
<$list filter={{$:/temp/advancedsearch}} template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/AdvancedSearch/Shadows.tid b/core/ui/AdvancedSearch/Shadows.tid
index 39d170c1c..b9fb02726 100644
--- a/core/ui/AdvancedSearch/Shadows.tid
+++ b/core/ui/AdvancedSearch/Shadows.tid
@@ -7,13 +7,13 @@ caption: {{$:/language/Search/Shadows/Caption}}
<
>
-<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}
+<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}
<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
-
+
<
>
diff --git a/core/ui/AdvancedSearch/Standard.tid b/core/ui/AdvancedSearch/Standard.tid
index d93da904f..ddc99be78 100644
--- a/core/ui/AdvancedSearch/Standard.tid
+++ b/core/ui/AdvancedSearch/Standard.tid
@@ -7,13 +7,13 @@ caption: {{$:/language/Search/Standard/Caption}}
<>
-<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}
+<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}
<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
-
+
<
>
diff --git a/core/ui/AdvancedSearch/System.tid b/core/ui/AdvancedSearch/System.tid
index 17d080798..dd51f323e 100644
--- a/core/ui/AdvancedSearch/System.tid
+++ b/core/ui/AdvancedSearch/System.tid
@@ -7,13 +7,13 @@ caption: {{$:/language/Search/System/Caption}}
<>
-<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}
+<$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/><$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}
<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
-
+
<
>
diff --git a/core/ui/AlertTemplate.tid b/core/ui/AlertTemplate.tid
index 051729e45..c4e457b75 100644
--- a/core/ui/AlertTemplate.tid
+++ b/core/ui/AlertTemplate.tid
@@ -1,14 +1,14 @@
title: $:/core/ui/AlertTemplate
-