38 changes: 19 additions & 19 deletions core/modules/utils/fakedom.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var bumpSequenceNumber = function(object) {
if(sequenceNumber !== null) {
object.sequenceNumber = sequenceNumber++;
}
}
};

var TW_TextNode = function(text) {
bumpSequenceNumber(this);
Expand Down Expand Up @@ -79,7 +79,7 @@ TW_Element.prototype.insertBefore = function(node,nextSibling) {
} else {
this.appendChild(node);
}
}
};

TW_Element.prototype.removeChild = function(node) {
var p = this.children.indexOf(node);
Expand All @@ -93,9 +93,9 @@ TW_Element.prototype.hasChildNodes = function() {
};

Object.defineProperty(TW_Element.prototype, "firstChild", {
get: function() {
return this.children[0];
}
get: function() {
return this.children[0];
}
});

TW_Element.prototype.addEventListener = function(type,listener,useCapture) {
Expand All @@ -106,22 +106,22 @@ Object.defineProperty(TW_Element.prototype, "className", {
get: function() {
return this.attributes["class"] || "";
},
set: function(value) {
this.attributes["class"] = value;
}
set: function(value) {
this.attributes["class"] = value;
}
});

Object.defineProperty(TW_Element.prototype, "value", {
get: function() {
return this.attributes["value"] || "";
return this.attributes.value || "";
},
set: function(value) {
this.attributes["value"] = value;
}
set: function(value) {
this.attributes.value = value;
}
});

Object.defineProperty(TW_Element.prototype, "outerHTML", {
get: function() {
get: function() {
var output = [],attr,a,v;
output.push("<",this.tag);
if(this.attributes) {
Expand All @@ -143,7 +143,7 @@ Object.defineProperty(TW_Element.prototype, "outerHTML", {
output.push("</",this.tag,">");
}
return output.join("");
}
}
});

Object.defineProperty(TW_Element.prototype, "innerHTML", {
Expand All @@ -162,10 +162,10 @@ Object.defineProperty(TW_Element.prototype, "innerHTML", {
return b.join("");
}
},
set: function(value) {
this.isRaw = true;
this.rawHTML = value;
}
set: function(value) {
this.isRaw = true;
this.rawHTML = value;
}
});

Object.defineProperty(TW_Element.prototype, "textContent", {
Expand Down Expand Up @@ -193,7 +193,7 @@ Object.defineProperty(TW_Element.prototype, "formattedTextContent", {
b.push("\n");
}
if(this.tag === "li") {
b.push("* ")
b.push("* ");
}
$tw.utils.each(this.children,function(node) {
b.push(node.formattedTextContent);
Expand Down
4 changes: 2 additions & 2 deletions core/modules/utils/filesystem.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ exports.copyDirectory = function(srcPath,dstPath) {
if(err) {
return err;
}
};
}
}
};
copy(srcPath,dstPath);
Expand Down Expand Up @@ -70,7 +70,7 @@ exports.copyFile = function(srcPath,dstPath) {
fs.closeSync(srcFile);
fs.closeSync(dstFile);
return null;
}
};

/*
Remove trailing path separator
Expand Down
6 changes: 3 additions & 3 deletions core/modules/utils/parsetree.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ exports.addClassToParseTreeNode = function(node,classString) {

exports.addStyleToParseTreeNode = function(node,name,value) {
node.attributes = node.attributes || {};
node.attributes["style"] = node.attributes["style"] || {type: "string", value: ""};
if(node.attributes["style"].type === "string") {
node.attributes["style"].value += name + ":" + value + ";";
node.attributes.style = node.attributes.style || {type: "string", value: ""};
if(node.attributes.style.type === "string") {
node.attributes.style.value += name + ":" + value + ";";
}
};

Expand Down
9 changes: 5 additions & 4 deletions core/modules/utils/pluginmaker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,16 @@ exports.repackPlugin = function(title,additionalTiddlers,excludeTiddlers) {
throw "No such tiddler as " + title;
}
// Extract the JSON
var jsonPluginTiddler;
try {
var jsonPluginTiddler = JSON.parse(pluginTiddler.fields.text);
jsonPluginTiddler = JSON.parse(pluginTiddler.fields.text);
} catch(e) {
throw "Cannot parse plugin tiddler " + title + "\nError: " + e;
}
// Get the list of tiddlers
var tiddlers = Object.keys(jsonPluginTiddler.tiddlers);
// Add the additional tiddlers
$tw.utils.pushTop(tiddlers,additionalTiddlers)
$tw.utils.pushTop(tiddlers,additionalTiddlers);
// Remove any excluded tiddlers
for(var t=tiddlers.length-1; t>=0; t--) {
if(excludeTiddlers.indexOf(tiddlers[t]) !== -1) {
Expand Down Expand Up @@ -72,9 +73,9 @@ exports.repackPlugin = function(title,additionalTiddlers,excludeTiddlers) {
}
});
// Trigger an autosave
$tw.rootWidget.dispatchEvent({type: "tw-auto-save-wiki"});
$tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"});
// Return a heartwarming confirmation
return "Plugin " + title + " successfully saved";
}
};

})();
2 changes: 1 addition & 1 deletion core/modules/widgets/browse.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion core/modules/widgets/button.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
18 changes: 9 additions & 9 deletions core/modules/widgets/dropzone.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand All @@ -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();
Expand All @@ -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");
}
};

Expand All @@ -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) {
Expand All @@ -122,11 +122,11 @@ 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;
}
}
};
}
};

DropZoneWidget.prototype.importDataTypes = [
Expand Down Expand Up @@ -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
Expand All @@ -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])});
});
}
}
Expand Down
10 changes: 5 additions & 5 deletions core/modules/widgets/edit-bitmap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},{
Expand All @@ -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"
}]
Expand Down Expand Up @@ -120,7 +120,7 @@ EditBitmapWidget.prototype.loadCanvas = function() {
self.initCanvas(self.currCanvas,DEFAULT_IMAGE_WIDTH,DEFAULT_IMAGE_HEIGHT);
// Set the width and height input boxes
self.updateSize();
}
};
// Get the current bitmap into an image object
currImage.src = "data:" + tiddler.fields.type + ";base64," + tiddler.fields.text;
};
Expand All @@ -135,7 +135,7 @@ EditBitmapWidget.prototype.initCanvas = function(canvas,width,height,image) {
ctx.fillStyle = "#fff";
ctx.fillRect(0,0,canvas.width,canvas.height);
}
}
};

/*
** Update the input boxes with the actual size of the canvas
Expand Down
8 changes: 4 additions & 4 deletions core/modules/widgets/fieldmangler.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
]);
};

Expand Down
2 changes: 1 addition & 1 deletion core/modules/widgets/fields.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ FieldsWidget.prototype.execute = function() {
row = row.replace("$name$",fieldName);
row = row.replace("$value$",value);
row = row.replace("$encoded_value$",$tw.utils.htmlEncode(value));
text.push(row)
text.push(row);
}
}
}
Expand Down
7 changes: 2 additions & 5 deletions core/modules/widgets/keyboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,11 @@ 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) {
if(event.keyCode === self.keyInfo.keyCode &&
event.shiftKey === self.keyInfo.shiftKey &&
event.altKey === self.keyInfo.altKey &&
event.ctrlKey === self.keyInfo.ctrlKey) {
if($tw.utils.checkKeyDescriptor(event,self.keyInfo)) {
self.dispatchMessage(event);
event.preventDefault();
event.stopPropagation();
Expand Down
30 changes: 15 additions & 15 deletions core/modules/widgets/link.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ LinkWidget.prototype.render = function(parent,nextSibling) {
this.computeAttributes();
// Execute our logic
this.execute();
// Get the value of the tw-wikilinks configuration macro
var wikiLinksMacro = this.getVariable("tw-wikilinks"),
useWikiLinks = wikiLinksMacro ? !(wikiLinksMacro.trim() === "no") : true;
// Get the value of the tv-wikilinks configuration macro
var wikiLinksMacro = this.getVariable("tv-wikilinks"),
useWikiLinks = wikiLinksMacro ? (wikiLinksMacro.trim() !== "no") : true;
// Render the link if required
if(useWikiLinks) {
this.renderLink(parent,nextSibling);
Expand All @@ -60,27 +60,27 @@ 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(" "));
// Set an href
var wikiLinkTemplateMacro = this.getVariable("tw-wikilink-template"),
var wikiLinkTemplateMacro = this.getVariable("tv-wikilink-template"),
wikiLinkTemplate = wikiLinkTemplateMacro ? wikiLinkTemplateMacro.trim() : "#$uri_encoded$",
wikiLinkText = wikiLinkTemplate.replace("$uri_encoded$",encodeURIComponent(this.to));
wikiLinkText = wikiLinkText.replace("$uri_doubleencoded$",encodeURIComponent(encodeURIComponent(this.to)));
domNode.setAttribute("href",wikiLinkText);
// Set the tooltip
// HACK: Performance issues with re-parsing the tooltip prevent us defaulting the tooltip to "<$transclude field='tooltip'><$transclude field='title'/></$transclude>"
var tooltipWikiText = this.tooltip || this.getVariable("tw-wikilink-tooltip");
var tooltipWikiText = this.tooltip || this.getVariable("tv-wikilink-tooltip");
if(tooltipWikiText) {
var tooltipText = this.wiki.renderText("text/plain","text/vnd.tiddlywiki",tooltipWikiText,{
parseAsInline: true,
Expand Down Expand Up @@ -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,
Expand All @@ -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";
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions core/modules/widgets/linkcatcher.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
]);
};

Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion core/modules/widgets/list.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ListWidget.prototype.render = function(parent,nextSibling) {
// Construct the storyview
var StoryView = this.storyViews[this.storyViewName];
if(StoryView && !this.document.isTiddlyWikiFakeDom) {
this.storyview = new StoryView(this)
this.storyview = new StoryView(this);
} else {
this.storyview = null;
}
Expand Down
52 changes: 24 additions & 28 deletions core/modules/widgets/navigator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
]);
};

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -243,8 +243,8 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
// Remove the closed tiddler from the story
this.removeTitleFromStory(storyList,title);
this.saveStoryList(storyList);
// Send a notification event
this.dispatchEvent({type: "tw-auto-save-wiki"});
// Trigger an autosave
$tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"});
return false;
};

Expand Down Expand Up @@ -283,9 +283,10 @@ NavigatorWidget.prototype.makeDraftTiddler = function(targetTitle) {
Generate a title for the draft of a given tiddler
*/
NavigatorWidget.prototype.generateDraftTitle = function(title) {
var c = 0;
var c = 0,
draftTitle;
do {
var draftTitle = "Draft " + (c ? (c + 1) + " " : "") + "of '" + title + "'";
draftTitle = "Draft " + (c ? (c + 1) + " " : "") + "of '" + title + "'";
c++;
} while(this.wiki.tiddlerExists(draftTitle));
return draftTitle;
Expand All @@ -312,7 +313,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
Expand All @@ -333,8 +334,8 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
if(draftTitle !== this.storyTitle) {
this.saveStoryList(storyList);
}
// Send a notification event
this.dispatchEvent({type: "tw-auto-save-wiki"});
// Trigger an autosave
$tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"});
}
}
}
Expand Down Expand Up @@ -376,13 +377,8 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
var storyList = this.getStoryList();
// Get the template tiddler if there is one
var templateTiddler = this.wiki.getTiddler(event.param);
// Create the new tiddler
// Title the new tiddler
var title = this.wiki.generateNewTitle((templateTiddler && templateTiddler.fields.title) || "New Tiddler");
var tiddler = new $tw.Tiddler(this.wiki.getCreationFields(),{
text: "Newly created tiddler",
title: title
},this.wiki.getModificationFields());
this.wiki.addTiddler(tiddler);
// Create the draft tiddler
var draftTitle = this.generateDraftTitle(title),
draftTiddler = new $tw.Tiddler({
Expand Down Expand Up @@ -448,7 +444,7 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
newFields.text = JSON.stringify(importData,null,$tw.config.preferences.jsonSpaces);
this.wiki.addTiddler(new $tw.Tiddler(importTiddler,newFields));
// Update the story and history details
if(this.getVariable("tw-auto-open-on-import") !== "no") {
if(this.getVariable("tv-auto-open-on-import") !== "no") {
var storyList = this.getStoryList(),
history = [];
// Add it to the story
Expand Down Expand Up @@ -487,8 +483,8 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
}));
// Navigate to the $:/Import tiddler
this.addToHistory([IMPORT_TITLE]);
// Send a notification event
this.dispatchEvent({type: "tw-auto-save-wiki"});
// Trigger an autosave
$tw.rootWidget.dispatchEvent({type: "tm-auto-save-wiki"});
};

exports.navigator = NavigatorWidget;
Expand Down
2 changes: 1 addition & 1 deletion core/modules/widgets/radio.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};
Expand Down
8 changes: 4 additions & 4 deletions core/modules/widgets/reveal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ 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")
domNode.setAttribute("hidden","true");
}
this.domNodes.push(domNode);
};
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion core/modules/widgets/scrollable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ||
Expand Down
2 changes: 1 addition & 1 deletion core/modules/widgets/text.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions core/modules/widgets/tiddler.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ 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("tiddlerTagClasses",this.getTagClasses())
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();
};
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
14 changes: 9 additions & 5 deletions core/modules/widgets/widget.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Widget.prototype.evaluateMacroModule = function(name,actualParams,defaultValue)
else for(var i=0; i<actualParams.length; ++i) {
args.push(actualParams[i].value);
}
return macro.run.apply(this,args)
return macro.run.apply(this,args);
} else {
return defaultValue;
}
Expand Down Expand Up @@ -263,9 +263,14 @@ Widget.prototype.assignAttributes = function(domNode,options) {
v = undefined;
}
if(v !== undefined) {
var b = a.split(":");
// Setting certain attributes can cause a DOM error (eg xmlns on the svg element)
try {
domNode.setAttributeNS(null,a,v);
if (b.length == 2 && b[0] == "xlink"){
domNode.setAttributeNS("http://www.w3.org/1999/xlink",b[1],v);
} else {
domNode.setAttributeNS(null,a,v);
}
} catch(e) {
}
}
Expand All @@ -289,7 +294,7 @@ Construct the widget object for a parse tree node
Widget.prototype.makeChildWidget = function(parseTreeNode) {
var WidgetClass = this.widgetClasses[parseTreeNode.type];
if(!WidgetClass) {
WidgetClass = this.widgetClasses["text"];
WidgetClass = this.widgetClasses.text;
parseTreeNode = {type: "text", text: "Undefined widget '" + parseTreeNode.type + "'"};
}
return new WidgetClass(parseTreeNode,{
Expand Down Expand Up @@ -357,8 +362,7 @@ Widget.prototype.addEventListener = function(type,handler) {
} else { // The handler is a function
this.eventListeners[type] = function(event) {
return handler.call(self,event);
}

};
}
};

Expand Down
56 changes: 31 additions & 25 deletions core/modules/wiki.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,13 @@ exports.enqueueTiddlerEvent = function(title,isDeleted) {
}
};

exports.getSizeOfTiddlerEventQueue = function() {
return $tw.utils.count(this.changedTiddlers);
};

exports.clearTiddlerEventQueue = function() {
this.changedTiddlers = Object.create(null);
this.changeCount = Object.create(null)
this.changeCount = Object.create(null);
};

exports.getChangeCount = function(title) {
Expand All @@ -172,12 +176,12 @@ Generate an unused title from the specified base
exports.generateNewTitle = function(baseTitle,options) {
options = options || {};
var c = 0,
title = baseTitle;
title = baseTitle;
while(this.tiddlerExists(title) || this.isShadowTiddler(title)) {
title = baseTitle +
(options.prefix || " ") +
(++c);
};
}
return title;
};

Expand Down Expand Up @@ -457,7 +461,7 @@ exports.getTagMap = function() {
for(var index=0; index<tagArray.length; index++) {
var tag = tagArray[index];
if($tw.utils.hop(tags,tag)) {
tags[tag].push(title)
tags[tag].push(title);
} else {
tags[tag] = [title];
}
Expand Down Expand Up @@ -596,7 +600,7 @@ exports.getTiddlerData = function(titleOrTiddler,defaultData) {
var tiddler = titleOrTiddler,
data;
if(!(tiddler instanceof $tw.Tiddler)) {
tiddler = this.getTiddler(tiddler)
tiddler = this.getTiddler(tiddler);
}
if(tiddler && tiddler.fields.text) {
switch(tiddler.fields.type) {
Expand Down Expand Up @@ -679,26 +683,26 @@ exports.getGlobalCache = function(cacheName,initializer) {

exports.clearGlobalCache = function() {
this.globalCache = Object.create(null);
}
};

// Return the named cache object for a tiddler. If the cache doesn't exist then the initializer function is invoked to create it
exports.getCacheForTiddler = function(title,cacheName,initializer) {

// Temporarily disable caching so that tweakParseTreeNode() works
return initializer();

this.caches = this.caches || Object.create(null);
var caches = this.caches[title];
if(caches && caches[cacheName]) {
return caches[cacheName];
} else {
if(!caches) {
caches = Object.create(null);
this.caches[title] = caches;
}
caches[cacheName] = initializer();
return caches[cacheName];
}
// this.caches = this.caches || Object.create(null);
// var caches = this.caches[title];
// if(caches && caches[cacheName]) {
// return caches[cacheName];
// } else {
// if(!caches) {
// caches = Object.create(null);
// this.caches[title] = caches;
// }
// caches[cacheName] = initializer();
// return caches[cacheName];
// }
};

// Clear all caches associated with a particular tiddler
Expand Down Expand Up @@ -789,16 +793,16 @@ var tweakParser = function(parser) {
exports.parseText = function(type,text,options) {
var parser = this.old_parseText(type,text,options);
if(parser) {
tweakParser(parser)
};
tweakParser(parser);
}
return parser;
};

exports.parseTiddler = function(title,options) {
var parser = this.old_parseTiddler(title,options);
if(parser) {
tweakParser(parser)
};
tweakParser(parser);
}
return parser;
};

Expand Down Expand Up @@ -957,7 +961,9 @@ Options available:
*/
exports.search = function(text,options) {
options = options || {};
var self = this,t;
var self = this,
t,
invert = !!options.invert;
// Convert the search string into a regexp for each term
var terms, searchTermsRegExps,
flags = options.caseSensitive ? "" : "i";
Expand Down Expand Up @@ -1007,7 +1013,7 @@ exports.search = function(text,options) {
var results = [],
source = options.source || this.each;
source(function(tiddler,title) {
if(!!searchTiddler(title) === !options.invert) {
if(searchTiddler(title) !== options.invert) {
results.push(title);
}
});
Expand Down Expand Up @@ -1056,7 +1062,7 @@ exports.readFiles = function(files,callback) {
callback(result);
}
});
};
}
return files.length;
};

Expand Down
9 changes: 6 additions & 3 deletions core/templates/alltiddlers.template.html.tid
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
title: $:/core/templates/alltiddlers.template.html
type: text/vnd.tiddlywiki-html

\define tw-wikilink-template() #$uri_encoded$
\define tv-wikilink-template() #$uri_encoded$
\define tv-config-toolbar-icons() no
\define tv-config-toolbar-text() no
\define tv-config-toolbar-class() tc-btn-invisible
\rules only filteredtranscludeinline transcludeinline
<!doctype html>
<html>
Expand All @@ -19,9 +22,9 @@ type: text/vnd.tiddlywiki-html
{{$:/core/ui/PageStylesheet||$:/core/templates/wikified-tiddler}}
</style>
</head>
<body class="tw-body">
<body class="tc-body">
{{$:/StaticBanner||$:/core/templates/html-tiddler}}
<section class="story-river">
<section class="tc-story-river">
{{$:/core/templates/alltiddlers.content||$:/core/templates/html-tiddler}}
</section>
</body>
Expand Down
7 changes: 5 additions & 2 deletions core/templates/static.template.html.tid
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
title: $:/core/templates/static.template.html
type: text/vnd.tiddlywiki-html

\define tw-wikilink-template() static/$uri_doubleencoded$.html
\define tv-wikilink-template() static/$uri_doubleencoded$.html
\define tv-config-toolbar-icons() no
\define tv-config-toolbar-text() no
\define tv-config-toolbar-class() tc-btn-invisible
\rules only filteredtranscludeinline transcludeinline
<!doctype html>
<html>
Expand All @@ -19,7 +22,7 @@ type: text/vnd.tiddlywiki-html
{{$:/core/ui/PageStylesheet||$:/core/templates/wikified-tiddler}}
</style>
</head>
<body class="tw-body">
<body class="tc-body">
{{$:/StaticBanner||$:/core/templates/html-tiddler}}
{{$:/core/ui/PageTemplate||$:/core/templates/html-tiddler}}
</body>
Expand Down
9 changes: 6 additions & 3 deletions core/templates/static.tiddler.html.tid
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
title: $:/core/templates/static.tiddler.html

\define tw-wikilink-template() $uri_doubleencoded$.html
\define tv-wikilink-template() $uri_doubleencoded$.html
\define tv-config-toolbar-icons() no
\define tv-config-toolbar-text() no
\define tv-config-toolbar-class() tc-btn-invisible
`<!doctype html>
<html>
<head>
Expand All @@ -12,9 +15,9 @@ title: $:/core/templates/static.tiddler.html
<link rel="stylesheet" href="static.css">
<title>`{{$:/core/wiki/title}}`</title>
</head>
<body class="tw-body">
<body class="tc-body">
`{{$:/StaticBanner||$:/core/templates/html-tiddler}}`
<section class="story-river">
<section class="tc-story-river">
`<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]">
<$view tiddler="$:/core/ui/ViewTemplate" format="htmlwikified"/>
</$importvariables>`
Expand Down
2 changes: 1 addition & 1 deletion core/templates/tiddlywiki5.html.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ title: $:/core/templates/tiddlywiki5.html
<!--~~ Raw markup ~~-->
{{{ [all[shadows+tiddlers]tag[$:/core/wiki/rawmarkup]] [all[shadows+tiddlers]tag[$:/tags/RawMarkup]] ||$:/core/templates/plain-text-tiddler}}}
</head>
<body class="tw-body">
<body class="tc-body">
<!--~~ Static styles ~~-->
<div id="styleArea">
{{$:/boot/boot.css||$:/core/templates/css-tiddler}}
Expand Down
2 changes: 1 addition & 1 deletion core/ui/AdvancedSearch.tid
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
title: $:/AdvancedSearch

<div class="tw-advanced-search">
<div class="tc-advanced-search">
<<tabs "[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch]!has[draft.of]]" "$:/core/ui/AdvancedSearch/System">>
</div>
8 changes: 4 additions & 4 deletions core/ui/AdvancedSearch/Filter.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ caption: {{$:/language/Search/Filter/Caption}}

<<lingo Filter/Hint>>

<div class="tw-search tw-advanced-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/> <$button popup=<<qualify "$:/state/filterDropdown">> class="btn-invisible">{{$:/core/images/down-arrow}}</$button> <$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>
<div class="tc-search tc-advanced-search"><$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/> <$button popup=<<qualify "$:/state/filterDropdown">> class="tc-btn-invisible">{{$:/core/images/down-arrow}}</$button> <$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> <$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}</$link></$reveal></div>

<div class="tw-block-dropdown-wrapper">
<div class="tc-block-dropdown-wrapper">
<$reveal state=<<qualify "$:/state/filterDropdown">> type="nomatch" text="" default="">
<div class="tw-block-dropdown tw-edit-type-dropdown">
<div class="tc-block-dropdown tc-edit-type-dropdown">
<$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]]"><$link to={{!!filter}}><$transclude field="description"/></$link>
</$list>
</div>
Expand All @@ -21,7 +21,7 @@ caption: {{$:/language/Search/Filter/Caption}}
</$linkcatcher>

<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
<div class="tw-search-results">
<div class="tc-search-results">
<<lingo Filter/Matches>>
<$list filter={{$:/temp/advancedsearch}} template="$:/core/ui/ListItemTemplate"/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions core/ui/AdvancedSearch/Shadows.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ caption: {{$:/language/Search/Shadows/Caption}}

<<lingo Shadows/Hint>>

<div class="tw-search"><$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}}</$link></$reveal></div>
<div class="tc-search"><$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}}</$link></$reveal></div>

</$linkcatcher>

<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">

<div class="tw-search-results">
<div class="tc-search-results">

<<lingo Shadows/Matches>>

Expand Down
4 changes: 2 additions & 2 deletions core/ui/AdvancedSearch/Standard.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ caption: {{$:/language/Search/Standard/Caption}}

<<lingo Standard/Hint>>

<div class="tw-search"><$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}}</$link></$reveal></div>
<div class="tc-search"><$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}}</$link></$reveal></div>

</$linkcatcher>

<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">

<div class="tw-search-results">
<div class="tc-search-results">

<<lingo Standard/Matches>>

Expand Down
4 changes: 2 additions & 2 deletions core/ui/AdvancedSearch/System.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ caption: {{$:/language/Search/System/Caption}}

<<lingo System/Hint>>

<div class="tw-search"><$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}}</$link></$reveal></div>
<div class="tc-search"><$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}}</$link></$reveal></div>

</$linkcatcher>

<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">

<div class="tw-search-results">
<div class="tc-search-results">

<<lingo System/Matches>>

Expand Down
12 changes: 6 additions & 6 deletions core/ui/AlertTemplate.tid
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
title: $:/core/ui/AlertTemplate

<div class="tw-alert">
<div class="tw-alert-toolbar">
<$button message="tw-delete-tiddler" class="btn-invisible">
<div class="tc-alert">
<div class="tc-alert-toolbar">
<$button message="tm-delete-tiddler" class="tc-btn-invisible">
{{$:/core/images/delete-button}}</$button>
</div>
<div class="tw-alert-subtitle">
<$view field="component"/> - <$view field="modified" format="date" template="0hh:0mm:0ss DD MM YYYY"/> <$reveal type="nomatch" state="!!count" text=""><span class="tw-alert-highlight">(count: <$view field="count"/>)</span></$reveal>
<div class="tc-alert-subtitle">
<$view field="component"/> - <$view field="modified" format="date" template="0hh:0mm:0ss DD MM YYYY"/> <$reveal type="nomatch" state="!!count" text=""><span class="tc-alert-highlight">(count: <$view field="count"/>)</span></$reveal>
</div>
<div class="tw-alert-body">
<div class="tc-alert-body">

<$transclude/>

Expand Down
2 changes: 1 addition & 1 deletion core/ui/BinaryWarning.tid
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
title: $:/core/ui/BinaryWarning

\define lingo-base() $:/language/BinaryWarning/
<div class="tw-binary-warning">
<div class="tc-binary-warning">

<<lingo Prompt>>

Expand Down
2 changes: 1 addition & 1 deletion core/ui/ControlPanel.tid
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
title: $:/ControlPanel

<div class="tw-control-panel">
<div class="tc-control-panel">
<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel]!has[draft.of]]" "$:/core/ui/ControlPanel/Basics">>
</div>
2 changes: 1 addition & 1 deletion core/ui/ControlPanel/Advanced.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ caption: {{$:/language/ControlPanel/Advanced/Caption}}

{{$:/language/ControlPanel/Advanced/Hint}}

<div class="tw-control-panel">
<div class="tc-control-panel">
<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Advanced]!has[draft.of]]" "$:/core/ui/ControlPanel/Advanced/TiddlerFields">>
</div>
2 changes: 1 addition & 1 deletion core/ui/ControlPanel/Appearance.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ caption: {{$:/language/ControlPanel/Appearance/Caption}}

{{$:/language/ControlPanel/Appearance/Hint}}

<div class="tw-control-panel">
<div class="tc-control-panel">
<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance]!has[draft.of]]" "$:/core/ui/ControlPanel/Appearance/Theme">>
</div>
4 changes: 2 additions & 2 deletions core/ui/ControlPanel/Appearance/Toolbars.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ caption: {{$:/language/ControlPanel/Appearance/Toolbars/Caption}}

{{$:/language/ControlPanel/Appearance/Toolbars/Hint}}

<div class="tw-control-panel">
<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance/Toolbars]!has[draft.of]]" "$:/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar" "$:/state/tabs/controlpanel/toolbars" "tw-vertical">>
<div class="tc-control-panel">
<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance/Toolbars]!has[draft.of]]" "$:/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar" "$:/state/tabs/controlpanel/toolbars" "tc-vertical">>
</div>
6 changes: 3 additions & 3 deletions core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ $:/config/EditToolbarButtons/Visibility/$(listItem)$

{{$:/language/ControlPanel/Appearance/Toolbars/EditToolbar/Hint}}

<$set name="tw-config-toolbar-icons" value="yes">
<$set name="tv-config-toolbar-icons" value="yes">

<$set name="tw-config-toolbar-text" value="yes">
<$set name="tv-config-toolbar-text" value="yes">

<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem">

<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tw-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>

</$list>

Expand Down
6 changes: 3 additions & 3 deletions core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ $:/config/PageControlButtons/Visibility/$(listItem)$

{{$:/language/ControlPanel/Appearance/Toolbars/PageControls/Hint}}

<$set name="tw-config-toolbar-icons" value="yes">
<$set name="tv-config-toolbar-icons" value="yes">

<$set name="tw-config-toolbar-text" value="yes">
<$set name="tv-config-toolbar-text" value="yes">

<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">

<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tw-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>

</$list>

Expand Down
6 changes: 3 additions & 3 deletions core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$

{{$:/language/ControlPanel/Appearance/Toolbars/ViewToolbar/Hint}}

<$set name="tw-config-toolbar-icons" value="yes">
<$set name="tv-config-toolbar-icons" value="yes">

<$set name="tw-config-toolbar-text" value="yes">
<$set name="tv-config-toolbar-text" value="yes">

<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem">

<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tw-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>

</$list>

Expand Down
16 changes: 8 additions & 8 deletions core/ui/ControlPanel/Plugins.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@ $(currentTiddler)$/icon
$:/config/Plugins/Disabled/$(currentTiddler)$
\end
\define plugin-table-body(type,disabledMessage)
<div class="tw-plugin-info-chunk">
<div class="tc-plugin-info-chunk">
<$reveal type="nomatch" state=<<popup-state>> text="yes">
<$button class="btn-invisible btn-dropdown" set=<<popup-state>> setTo="yes">
<$button class="tc-btn-invisible tc-btn-dropdown" set=<<popup-state>> setTo="yes">
{{$:/core/images/right-arrow}}
</$button>
</$reveal>
<$reveal type="match" state=<<popup-state>> text="yes">
<$button class="btn-invisible btn-dropdown" set=<<popup-state>> setTo="no">
<$button class="tc-btn-invisible tc-btn-dropdown" set=<<popup-state>> setTo="no">
{{$:/core/images/down-arrow}}
</$button>
</$reveal>
</div>
<div class="tw-plugin-info-chunk">
<div class="tc-plugin-info-chunk">
<$transclude tiddler=<<currentTiddler>> subtiddler=<<plugin-icon-title>>>
<$transclude tiddler="$:/core/images/plugin-generic-$type$"/>
</$transclude>
</div>
<div class="tw-plugin-info-chunk">
<div class="tc-plugin-info-chunk">
<div>
''<$view field="description"><$view field="title"/></$view>'' $disabledMessage$
</div>
Expand All @@ -50,17 +50,17 @@ $:/config/Plugins/Disabled/$(currentTiddler)$
<$list filter="[!has[draft.of]plugin-type[$type$]sort[description]]" emptyMessage=<<lingo "Empty/Hint">>>
<$set name="popup-state" value=<<popup-state-macro>>>
<$reveal type="nomatch" state=<<plugin-disable-title>> text="yes">
<$link to={{!!title}} class="tw-plugin-info">
<$link to={{!!title}} class="tc-plugin-info">
<<plugin-table-body type:"$type$">>
</$link>
</$reveal>
<$reveal type="match" state=<<plugin-disable-title>> text="yes">
<$link to={{!!title}} class="tw-plugin-info tw-plugin-info-disabled">
<$link to={{!!title}} class="tc-plugin-info tc-plugin-info-disabled">
<<plugin-table-body type:"$type$" disabledMessage:"<$macrocall $name='lingo' title='Disabled/Status'/>">>
</$link>
</$reveal>
<$reveal type="match" text="yes" state=<<popup-state>>>
<div class="tw-plugin-info-dropdown">
<div class="tc-plugin-info-dropdown">
<$list filter="[all[current]] -[[$:/core]]">
<div style="float:right;">
<$reveal type="nomatch" state=<<plugin-disable-title>> text="yes">
Expand Down
2 changes: 1 addition & 1 deletion core/ui/ControlPanel/Tools.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ caption: {{$:/language/ControlPanel/Tools/Caption}}

! <<lingo Export/Heading>>

<$button message="tw-download-file" param="$:/core/templates/alltiddlers.template.html" class="btn-big-green"><<lingo Export/AllAsStaticHTML/Caption>> {{$:/core/images/save-button}}</$button>
<$button message="tm-download-file" param="$:/core/templates/alltiddlers.template.html" class="tc-btn-big-green"><<lingo Export/AllAsStaticHTML/Caption>> {{$:/core/images/save-button}}</$button>

! <<lingo Encryption/Heading>>

Expand Down
6 changes: 3 additions & 3 deletions core/ui/EditTemplate.tid
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
title: $:/core/ui/EditTemplate

\define frame-classes()
tw-tiddler-frame tw-tiddler-edit-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$
tc-tiddler-frame tc-tiddler-edit-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$
\end
<div class=<<frame-classes>>>
<$set name="storyTiddler" value=<<currentTiddler>>>
<$keyboard key="escape" message="tw-cancel-tiddler">
<$keyboard key="ctrl+enter" message="tw-save-tiddler">
<$keyboard key="escape" message="tm-cancel-tiddler">
<$keyboard key="ctrl+enter" message="tm-save-tiddler">
<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditTemplate]!has[draft.of]]" variable="listItem">
<$transclude tiddler=<<listItem>>/>
</$list>
Expand Down
18 changes: 9 additions & 9 deletions core/ui/EditTemplate/body.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ tags: $:/tags/EditTemplate
\define lingo-base() $:/language/EditTemplate/Body/
<$list filter="[is[current]has[_canonical_uri]]">

<div class="tw-message-box">
<div class="tc-message-box">

<<lingo External/Hint>>

<a href={{!!_canonical_uri}}><$text text={{!!_canonical_uri}}/></a>

<$edit-text field="_canonical_uri" class="tw-edit-fields"></$edit-text>
<$edit-text field="_canonical_uri" class="tc-edit-fields"></$edit-text>

</div>

Expand All @@ -20,17 +20,17 @@ tags: $:/tags/EditTemplate

<$reveal state="$:/state/showeditpreview" type="match" text="yes">

<em class="tw-edit"><<lingo Hint>></em> <$button type="set" set="$:/state/showeditpreview" setTo="no"><<lingo Preview/Button/Hide>></$button>
<em class="tc-edit"><<lingo Hint>></em> <$button type="set" set="$:/state/showeditpreview" setTo="no"><<lingo Preview/Button/Hide>></$button>

<div class="tw-tiddler-preview">
<div class="tw-tiddler-preview-preview">
<div class="tc-tiddler-preview">
<div class="tc-tiddler-preview-preview">

<$transclude />

</div>

<div class="tw-tiddler-preview-edit">
<$edit field="text" class="tw-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/>
<div class="tc-tiddler-preview-edit">
<$edit field="text" class="tc-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/>

</div>

Expand All @@ -40,8 +40,8 @@ tags: $:/tags/EditTemplate

<$reveal state="$:/state/showeditpreview" type="nomatch" text="yes">

<em class="tw-edit"><<lingo Hint>></em> <$button type="set" set="$:/state/showeditpreview" setTo="yes"><<lingo Preview/Button/Show>></$button>
<$edit field="text" class="tw-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/>
<em class="tc-edit"><<lingo Hint>></em> <$button type="set" set="$:/state/showeditpreview" setTo="yes"><<lingo Preview/Button/Show>></$button>
<$edit field="text" class="tc-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/>

</$reveal>

Expand Down
4 changes: 2 additions & 2 deletions core/ui/EditTemplate/controls.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ tags: $:/tags/EditTemplate
\define config-title()
$:/config/EditToolbarButtons/Visibility/$(listItem)$
\end
<div class="tw-tiddler-title">
<div class="tc-tiddler-title">
<$view field="title"/>
<span class="tw-tiddler-controls titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list></span>
<span class="tc-tiddler-controls tc-titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list></span>
<div style="clear: both;"></div>
</div>
26 changes: 13 additions & 13 deletions core/ui/EditTemplate/fields.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
[[hide]] -[title{$(config-title)$}]
\end
<$fieldmangler>
<div class="tw-edit-fields">
<table class="tw-edit-fields">
<div class="tc-edit-fields">
<table class="tc-edit-fields">
<tbody>
<$list filter="[all[current]fields[]] +[sort[title]]" variable="currentField">
<$list filter=<<config-filter>> variable="temp">
<tr class="tw-edit-field">
<td class="tw-edit-field-name">
<tr class="tc-edit-field">
<td class="tc-edit-field-name">
<$text text=<<currentField>>/>:</td>
<td class="tw-edit-field-value">
<td class="tc-edit-field-value">
<$edit-text tiddler=<<currentTiddler>> field=<<currentField>> placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}}/>
</td>
<td class="tw-edit-field-remove">
<$button message="tw-remove-field" param=<<currentField>> class="btn-invisible">{{$:/core/images/delete-button}}</$button>
<td class="tc-edit-field-remove">
<$button message="tm-remove-field" param=<<currentField>> class="tc-btn-invisible">{{$:/core/images/delete-button}}</$button>
</td>
</tr>
</$list>
Expand All @@ -30,13 +30,13 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
</table>
</div>

<div class="tw-edit-field-add">
<em class="tw-edit">
<div class="tc-edit-field-add">
<em class="tc-edit">
<<lingo Fields/Add/Prompt>>
</em> <span class="tw-edit-field-add-name">
<$edit-text tiddler="$:/temp/newfieldname" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tw-edit-texteditor"/>
</span> <span class="tw-edit-field-add-button">
<$button message="tw-add-field" param={{$:/temp/newfieldname}} set="$:/temp/newfieldname" setTo="" class="">
</em> <span class="tc-edit-field-add-name">
<$edit-text tiddler="$:/temp/newfieldname" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tc-edit-texteditor"/>
</span> <span class="tc-edit-field-add-button">
<$button message="tm-add-field" param={{$:/temp/newfieldname}} set="$:/temp/newfieldname" setTo="" class="">
<<lingo Fields/Add/Button>>
</$button>
</span>
Expand Down
4 changes: 2 additions & 2 deletions core/ui/EditTemplate/shadow.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ tags: $:/tags/EditTemplate

\define lingo-base() $:/language/EditTemplate/Shadow/
<$list filter="[all[current]get[draft.of]is[shadow]!is[tiddler]]">
<div class="tw-message-box">
<div class="tc-message-box">

<<lingo Warning>>

</div>
</$list>

<$list filter="[all[current]get[draft.of]is[shadow]is[tiddler]]">
<div class="tw-message-box">
<div class="tc-message-box">

<<lingo OverriddenWarning>>

Expand Down
24 changes: 12 additions & 12 deletions core/ui/EditTemplate/tags.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,35 @@ tags: $:/tags/EditTemplate
\define tag-styles()
background-color:$(backgroundColor)$;
\end
<div class="tw-edit-tags">
<div class="tc-edit-tags">
<$fieldmangler>
<$list filter="[all[current]tags[]sort[title]]" storyview="pop"><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label">
<$list filter="[all[current]tags[]sort[title]]" storyview="pop"><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tc-tag-label">
<$view field="title" format="text" />
<$button message="tw-remove-tag" param={{!!title}} class="btn-invisible tw-remove-tag-button">&times;</$button></span>
<$button message="tm-remove-tag" param={{!!title}} class="tc-btn-invisible tc-remove-tag-button">&times;</$button></span>
</$set>
</$list>

<div class="tw-edit-add-tag">
<span class="tw-add-tag-name">
<$edit-text tiddler="$:/temp/NewTagName" tag="input" default="" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<<qualify "$:/state/popup/tags-auto-complete">> class="tw-edit-texteditor"/>
</span> <$button popup=<<qualify "$:/state/popup/tags-auto-complete">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <span class="tw-add-tag-button">
<$button message="tw-add-tag" param={{$:/temp/NewTagName}} set="$:/temp/NewTagName" setTo="" class="">
<div class="tc-edit-add-tag">
<span class="tc-add-tag-name">
<$edit-text tiddler="$:/temp/NewTagName" tag="input" default="" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-edit-texteditor"/>
</span> <$button popup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-btn-invisible tc-btn-dropdown">{{$:/core/images/down-arrow}}</$button> <span class="tc-add-tag-button">
<$button message="tm-add-tag" param={{$:/temp/NewTagName}} set="$:/temp/NewTagName" setTo="" class="">
<<lingo Tags/Add/Button>>
</$button>
</span>
</div>

<div class="tw-block-dropdown-wrapper">
<div class="tc-block-dropdown-wrapper">

<$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default="">

<div class="tw-block-dropdown">
<div class="tc-block-dropdown">

<$linkcatcher set="$:/temp/NewTagName" setTo="" message="tw-add-tag">
<$linkcatcher set="$:/temp/NewTagName" setTo="" message="tm-add-tag">
<$list filter="[!is[shadow]tags[]search{$:/temp/NewTagName}sort[title]]">
<$link>
<$set name="backgroundColor" value={{!!color}}>
<span style=<<tag-styles>> class="tw-tag-label">
<span style=<<tag-styles>> class="tc-tag-label">
<$view field="title" format="text"/>
</span>
</$set>
Expand Down
2 changes: 1 addition & 1 deletion core/ui/EditTemplate/title.tid
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title: $:/core/ui/EditTemplate/title
tags: $:/tags/EditTemplate

<$edit-text field="draft.title" class="titlebar tw-edit-texteditor"/>
<$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor"/>
8 changes: 4 additions & 4 deletions core/ui/EditTemplate/type.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ title: $:/core/ui/EditTemplate/type
tags: $:/tags/EditTemplate

\define lingo-base() $:/language/EditTemplate/
<p><$fieldmangler><em class="tw-edit"><<lingo Type/Prompt>></em> <$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tw-edit-typeeditor"/> <$button popup=<<qualify "$:/state/popup/type-dropdown">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <$button message="tw-remove-field" param="type" class="btn-invisible btn-icon">{{$:/core/images/delete-button}}</$button></$fieldmangler></p>
<p><$fieldmangler><em class="tc-edit"><<lingo Type/Prompt>></em> <$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor"/> <$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible tc-btn-dropdown">{{$:/core/images/down-arrow}}</$button> <$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon">{{$:/core/images/delete-button}}</$button></$fieldmangler></p>

<div class="tw-block-dropdown-wrapper">
<div class="tc-block-dropdown-wrapper">
<$reveal state=<<qualify "$:/state/popup/type-dropdown">> type="nomatch" text="" default="">
<div class="tw-block-dropdown tw-edit-type-dropdown">
<div class="tc-block-dropdown tc-edit-type-dropdown">
<$linkcatcher to="!!type">
<$list filter='[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]each[group]sort[group]]'>
<div class="tw-dropdown-item">
<div class="tc-dropdown-item">
<$text text={{!!group}}/>
</div>
<$list filter="[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]group{!!group}] +[sort[description]]"><$link to={{!!name}}><$view field="description"/> (<$view field="name"/>)</$link>
Expand Down
6 changes: 3 additions & 3 deletions core/ui/EditToolbar/cancel.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/EditToolbar
caption: {{$:/core/images/cancel-button}} {{$:/language/Buttons/Cancel/Caption}}
description: {{$:/language/Buttons/Cancel/Hint}}

<$button message="tw-cancel-tiddler" title={{$:/language/Buttons/Cancel/Hint}} aria-label={{$:/language/Buttons/Cancel/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-cancel-tiddler" title={{$:/language/Buttons/Cancel/Hint}} aria-label={{$:/language/Buttons/Cancel/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/cancel-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Cancel/Caption}}/>
</$list>
</$button>
6 changes: 3 additions & 3 deletions core/ui/EditToolbar/delete.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/EditToolbar
caption: {{$:/core/images/delete-button}} {{$:/language/Buttons/Delete/Caption}}
description: {{$:/language/Buttons/Delete/Hint}}

<$button message="tw-delete-tiddler" title={{$:/language/Buttons/Delete/Hint}} aria-label={{$:/language/Buttons/Delete/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-delete-tiddler" title={{$:/language/Buttons/Delete/Hint}} aria-label={{$:/language/Buttons/Delete/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/delete-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Delete/Caption}}/>
</$list>
</$button>
6 changes: 3 additions & 3 deletions core/ui/EditToolbar/save.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/EditToolbar
caption: {{$:/core/images/done-button}} {{$:/language/Buttons/Save/Caption}}
description: {{$:/language/Buttons/Save/Hint}}

<$button message="tw-save-tiddler" title={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-save-tiddler" title={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/done-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Save/Caption}}/>
</$list>
</$button>
4 changes: 2 additions & 2 deletions core/ui/ImportListing.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ selection-$(payloadTiddler)$
</td>
<td>
<$reveal type="nomatch" state=<<previewPopupState>> text="yes">
<$button class="btn-invisible btn-dropdown" set=<<previewPopupState>> setTo="yes">
<$button class="tc-btn-invisible tc-btn-dropdown" set=<<previewPopupState>> setTo="yes">
{{$:/core/images/right-arrow}}&nbsp;<$text text=<<payloadTiddler>>/>
</$button>
</$reveal>
<$reveal type="match" state=<<previewPopupState>> text="yes">
<$button class="btn-invisible btn-dropdown" set=<<previewPopupState>> setTo="no">
<$button class="tc-btn-invisible tc-btn-dropdown" set=<<previewPopupState>> setTo="no">
{{$:/core/images/down-arrow}}&nbsp;<$text text=<<payloadTiddler>>/>
</$button>
</$reveal>
Expand Down
2 changes: 1 addition & 1 deletion core/ui/ListItemTemplate.tid
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
title: $:/core/ui/ListItemTemplate

<div class="tw-menu-list-item">
<div class="tc-menu-list-item">
<$link to={{!!title}}>
<$view field="title"/>
</$link>
Expand Down
6 changes: 3 additions & 3 deletions core/ui/MissingTemplate.tid
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
title: $:/core/ui/MissingTemplate

<div class="tw-tiddler-missing">
<$button popup=<<qualify "$:/state/popup/missing">> class="btn-invisible tw-missing-tiddler-label">
<div class="tc-tiddler-missing">
<$button popup=<<qualify "$:/state/popup/missing">> class="tc-btn-invisible tc-missing-tiddler-label">
<$view field="title" format="text" />
</$button>
<$reveal state=<<qualify "$:/state/popup/missing">> type="popup" position="below" animate="yes">
<div class="tw-drop-down">
<div class="tc-drop-down">
<$transclude tiddler="$:/core/ui/ListItemTemplate"/>
<hr>
<$list filter="[all[current]backlinks[]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
Expand Down
10 changes: 5 additions & 5 deletions core/ui/MoreSideBar/Tags.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ title: $:/core/ui/MoreSideBar/Tags
tags: $:/tags/MoreSideBar
caption: {{$:/language/SideBar/Tags/Caption}}

<$set name="tw-config-toolbar-icons" value="yes">
<$set name="tv-config-toolbar-icons" value="yes">

<$set name="tw-config-toolbar-text" value="yes">
<$set name="tv-config-toolbar-text" value="yes">

<$set name="tw-config-toolbar-class" value="">
<$set name="tv-config-toolbar-class" value="">

{{$:/core/ui/Buttons/tag-manager}}

Expand All @@ -18,10 +18,10 @@ caption: {{$:/language/SideBar/Tags/Caption}}

<$list filter="[tags[]!is[system]sort[title]]">

<$transclude tiddler="$:/core/ui/TagTemplate"/> <small class="tw-menu-list-count"><$count filter="[all[current]tagging[]]"/></small>
<$transclude tiddler="$:/core/ui/TagTemplate"/> <small class="tc-menu-list-count"><$count filter="[all[current]tagging[]]"/></small>

</$list>

----

{{$:/core/ui/UntaggedTemplate}} <small class="tw-menu-list-count"><$count filter="[untagged[]!is[system]] -[tags[]]"/></small>
{{$:/core/ui/UntaggedTemplate}} <small class="tc-menu-list-count"><$count filter="[untagged[]!is[system]] -[tags[]]"/></small>
4 changes: 2 additions & 2 deletions core/ui/MoreSideBar/Types.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ tags: $:/tags/MoreSideBar
caption: {{$:/language/SideBar/Types/Caption}}

<$list filter="[!is[system]has[type]each[type]sort[type]] -[type[text/vnd.tiddlywiki]]">
<div class="tw-menu-list-item">
<div class="tc-menu-list-item">
<$view field="type"/>
<$list filter="[type{!!type}!is[system]sort[title]]">
<div class="tw-menu-list-subitem">
<div class="tc-menu-list-subitem">
<$link to={{!!title}}><$view field="title"/></$link>
</div>
</$list>
Expand Down
6 changes: 3 additions & 3 deletions core/ui/PageControls/closeall.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/PageControls
caption: {{$:/core/images/close-all-button}} {{$:/language/Buttons/CloseAll/Caption}}
description: {{$:/language/Buttons/CloseAll/Hint}}

<$button message="tw-close-all-tiddlers" title={{$:/language/Buttons/CloseAll/Hint}} aria-label={{$:/language/Buttons/CloseAll/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-close-all-tiddlers" title={{$:/language/Buttons/CloseAll/Hint}} aria-label={{$:/language/Buttons/CloseAll/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/close-all-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/CloseAll/Caption}}/>
</$list>
</$button>
6 changes: 3 additions & 3 deletions core/ui/PageControls/controlpanel.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/PageControls
caption: {{$:/core/images/options-button}} {{$:/language/Buttons/ControlPanel/Caption}}
description: {{$:/language/Buttons/ControlPanel/Hint}}

<$button to="$:/ControlPanel" title={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button to="$:/ControlPanel" title={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/options-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/ControlPanel/Caption}}/>
</$list>
</$button>
12 changes: 6 additions & 6 deletions core/ui/PageControls/encryption.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ caption: {{$:/core/images/locked-padlock}} {{$:/language/Buttons/Encryption/Capt
description: {{$:/language/Buttons/Encryption/Hint}}

<$reveal type="match" state="$:/isEncrypted" text="yes">
<$button message="tw-clear-password" title={{$:/language/Buttons/Encryption/ClearPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/ClearPassword/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-clear-password" title={{$:/language/Buttons/Encryption/ClearPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/ClearPassword/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/locked-padlock}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Encryption/ClearPassword/Caption}}/>
</$list>
</$button>
</$reveal>
<$reveal type="nomatch" state="$:/isEncrypted" text="yes">
<$button message="tw-set-password" title={{$:/language/Buttons/Encryption/SetPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/SetPassword/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-set-password" title={{$:/language/Buttons/Encryption/SetPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/SetPassword/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/unlocked-padlock}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Encryption/SetPassword/Caption}}/>
</$list>
</$button>
Expand Down
6 changes: 3 additions & 3 deletions core/ui/PageControls/full-screen.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/PageControls
caption: {{$:/core/images/full-screen-button}} {{$:/language/Buttons/FullScreen/Caption}}
description: {{$:/language/Buttons/FullScreen/Hint}}

<$button message="tw-full-screen" title={{$:/language/Buttons/FullScreen/Hint}} aria-label={{$:/language/Buttons/FullScreen/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-full-screen" title={{$:/language/Buttons/FullScreen/Hint}} aria-label={{$:/language/Buttons/FullScreen/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/full-screen-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/FullScreen/Caption}}/>
</$list>
</$button>
6 changes: 3 additions & 3 deletions core/ui/PageControls/home.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/PageControls
caption: {{$:/core/images/home-button}} {{$:/language/Buttons/Home/Caption}}
description: {{$:/language/Buttons/Home/Hint}}

<$button message="tw-home" title={{$:/language/Buttons/Home/Hint}} aria-label={{$:/language/Buttons/Home/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-home" title={{$:/language/Buttons/Home/Hint}} aria-label={{$:/language/Buttons/Home/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/home-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Home/Caption}}/>
</$list>
</$button>
8 changes: 4 additions & 4 deletions core/ui/PageControls/import.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ tags: $:/tags/PageControls
caption: {{$:/core/images/import-button}} {{$:/language/Buttons/Import/Caption}}
description: {{$:/language/Buttons/Import/Hint}}

<div class="tw-file-input-wrapper">
<$button title={{$:/language/Buttons/Import/Hint}} aria-label={{$:/language/Buttons/Import/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<div class="tc-file-input-wrapper">
<$button title={{$:/language/Buttons/Import/Hint}} aria-label={{$:/language/Buttons/Import/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/import-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Import/Caption}}/>
</$list>
</$button>
Expand Down
14 changes: 7 additions & 7 deletions core/ui/PageControls/language.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ description: {{$:/language/Buttons/Language/Hint}}
\define flag-title()
$(languagePluginTitle)$/icon
\end
<$button popup=<<qualify "$:/state/popup/language">> title={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<<tw-config-toolbar-class>> selectedClass="tw-selected">
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<span class="tw-image-button">
<$button popup=<<qualify "$:/state/popup/language">> title={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
<span class="tc-image-button">
<$set name="languagePluginTitle" value={{$:/language}}>
<$image source=<<flag-title>>/>
</$set>
</span>
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Language/Caption}}/>
</$list>
</$button>
<$reveal state=<<qualify "$:/state/popup/language">> type="popup" position="below" animate="yes">
<div class="tw-drop-down">
<div class="tc-drop-down">
<$linkcatcher to="$:/language">
<$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]]">
<$link>
<span class="tw-drop-down-bullet">
<span class="tc-drop-down-bullet">
<$reveal type="match" state="$:/language" text=<<currentTiddler>>>
&bull;
</$reveal>
<$reveal type="nomatch" state="$:/language" text=<<currentTiddler>>>
&nbsp;
</$reveal>
</span>
<span class="tw-image-button">
<span class="tc-image-button">
<$set name="languagePluginTitle" value=<<currentTiddler>>>
<$transclude subtiddler=<<flag-title>>>
<$list filter="[all[current]field:title[$:/languages/en-GB]]">
Expand Down
14 changes: 7 additions & 7 deletions core/ui/PageControls/more-page-actions.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ description: {{$:/language/Buttons/More/Hint}}
\define config-title()
$:/config/PageControlButtons/Visibility/$(listItem)$
\end
<$button popup=<<qualify "$:/state/popup/more">> title={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<<tw-config-toolbar-class>> selectedClass="tw-selected">
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button popup=<<qualify "$:/state/popup/more">> title={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/down-arrow}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/More/Caption}}/>
</$list>
</$button>
<$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes">

<div class="tw-drop-down">
<div class="tc-drop-down">

<$set name="tw-config-toolbar-icons" value="yes">
<$set name="tv-config-toolbar-icons" value="yes">

<$set name="tw-config-toolbar-text" value="yes">
<$set name="tv-config-toolbar-text" value="yes">

<$set name="tw-config-toolbar-class" value="btn-invisible">
<$set name="tv-config-toolbar-class" value="tc-btn-invisible">

<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]] -[[$:/core/ui/Buttons/more-page-actions]]" variable="listItem">

Expand Down
6 changes: 3 additions & 3 deletions core/ui/PageControls/newtiddler.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/PageControls
caption: {{$:/core/images/new-button}} {{$:/language/Buttons/NewTiddler/Caption}}
description: {{$:/language/Buttons/NewTiddler/Hint}}

<$button message="tw-new-tiddler" title={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-new-tiddler" title={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/new-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/NewTiddler/Caption}}/>
</$list>
</$button>
6 changes: 3 additions & 3 deletions core/ui/PageControls/refresh.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/PageControls
caption: {{$:/core/images/refresh-button}} {{$:/language/Buttons/Refresh/Caption}}
description: {{$:/language/Buttons/Refresh/Hint}}

<$button message="tw-browser-refresh" title={{$:/language/Buttons/Refresh/Hint}} aria-label={{$:/language/Buttons/Refresh/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-browser-refresh" title={{$:/language/Buttons/Refresh/Hint}} aria-label={{$:/language/Buttons/Refresh/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/refresh-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Refresh/Caption}}/>
</$list>
</$button>
8 changes: 4 additions & 4 deletions core/ui/PageControls/savewiki.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ tags: $:/tags/PageControls
caption: {{$:/core/images/save-button}} {{$:/language/Buttons/SaveWiki/Caption}}
description: {{$:/language/Buttons/SaveWiki/Hint}}

<$button message="tw-save-wiki" param={{$:/config/SaveWikiButton/Template}} title={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class=<<tw-config-toolbar-class>>>
<span class="tw-dirty-indicator">
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-save-wiki" param={{$:/config/SaveWikiButton/Template}} title={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class=<<tv-config-toolbar-class>>>
<span class="tc-dirty-indicator">
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/save-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/SaveWiki/Caption}}/>
</$list>
</span>
Expand Down
10 changes: 5 additions & 5 deletions core/ui/PageControls/storyview.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ description: {{$:/language/Buttons/StoryView/Hint}}
\define icon()
$:/core/images/storyview-$(storyview)$
\end
<$button popup=<<qualify "$:/state/popup/storyview">> title={{$:/language/Buttons/StoryView/Hint}} aria-label={{$:/language/Buttons/StoryView/Caption}} class=<<tw-config-toolbar-class>> selectedClass="tw-selected">
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button popup=<<qualify "$:/state/popup/storyview">> title={{$:/language/Buttons/StoryView/Hint}} aria-label={{$:/language/Buttons/StoryView/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
<$set name="storyview" value={{$:/view}}>
<$transclude tiddler=<<icon>>/>
</$set>
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/StoryView/Caption}}/>
</$list>
</$button>
<$reveal state=<<qualify "$:/state/popup/storyview">> type="popup" position="below" animate="yes">
<div class="tw-drop-down">
<div class="tc-drop-down">
<$linkcatcher to="$:/view">
<$list filter="[storyviews[]]" variable="storyview">
<$link to=<<storyview>>>
<span class="tw-drop-down-bullet">
<span class="tc-drop-down-bullet">
<$reveal type="match" state="$:/view" text=<<storyview>>>
&bull;
</$reveal>
Expand Down
6 changes: 3 additions & 3 deletions core/ui/PageControls/tag-button.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/PageControls
caption: {{$:/core/images/tag-button}} {{$:/language/Buttons/TagManager/Caption}}
description: {{$:/language/Buttons/TagManager/Hint}}

<$button to="$:/TagManager" title={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button to="$:/TagManager" title={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/tag-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/TagManager/Caption}}/>
</$list>
</$button>
10 changes: 5 additions & 5 deletions core/ui/PageControls/theme.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ tags: $:/tags/PageControls
caption: {{$:/core/images/theme-button}} {{$:/language/Buttons/Theme/Caption}}
description: {{$:/language/Buttons/Theme/Hint}}

<$button popup=<<qualify "$:/state/popup/theme">> title={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<<tw-config-toolbar-class>> selectedClass="tw-selected">
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button popup=<<qualify "$:/state/popup/theme">> title={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/theme-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Theme/Caption}}/>
</$list>
</$button>
<$reveal state=<<qualify "$:/state/popup/theme">> type="popup" position="below" animate="yes">
<div class="tw-drop-down">
<div class="tc-drop-down">
<$linkcatcher to="$:/theme">
<$list filter="[plugin-type[theme]sort[title]]" variable="themeTitle">
<$link to=<<themeTitle>>>
<span class="tw-drop-down-bullet">
<span class="tc-drop-down-bullet">
<$reveal type="match" state="$:/theme" text=<<themeTitle>>>
&bull;
</$reveal>
Expand Down
8 changes: 4 additions & 4 deletions core/ui/PageTemplate.tid
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
title: $:/core/ui/PageTemplate

\define containerClasses()
tw-page-container tw-page-view-$(themeTitle)$ tw-language-$(languageTitle)$
tc-page-container tc-page-view-$(themeTitle)$ tc-language-$(languageTitle)$
\end

<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]">

<$set name="tw-config-toolbar-icons" value={{$:/config/Toolbar/Icons}}>
<$set name="tv-config-toolbar-icons" value={{$:/config/Toolbar/Icons}}>

<$set name="tw-config-toolbar-text" value={{$:/config/Toolbar/Text}}>
<$set name="tv-config-toolbar-text" value={{$:/config/Toolbar/Text}}>

<$set name="tw-config-toolbar-class" value="btn-invisible">
<$set name="tv-config-toolbar-class" value="tc-btn-invisible">

<$set name="themeTitle" value={{$:/view}}>

Expand Down
2 changes: 1 addition & 1 deletion core/ui/PageTemplate/alerts.tid
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
title: $:/core/ui/PageTemplate/alerts
tags: $:/tags/PageTemplate

<div class="tw-alerts">
<div class="tc-alerts">

<$list filter="[all[shadows+tiddlers]tag[$:/tags/Alert]!has[draft.of]]" template="$:/core/ui/AlertTemplate" storyview="pop"/>

Expand Down
10 changes: 5 additions & 5 deletions core/ui/PageTemplate/sidebar.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ tags: $:/tags/PageTemplate
\define config-title()
$:/config/PageControlButtons/Visibility/$(listItem)$
\end
<$scrollable fallthrough="no" class="tw-sidebar-scrollable">
<$scrollable fallthrough="no" class="tc-sidebar-scrollable">

<div class="sidebar-header">
<div class="tc-sidebar-header">

<$reveal state="$:/state/sidebar" type="match" text="yes" default="yes" retain="yes">

<h1 class="tw-site-title">
<h1 class="tc-site-title">

<$transclude tiddler="$:/SiteTitle" mode="inline"/>

</h1>

<div class="tw-site-subtitle">
<div class="tc-site-subtitle">

<$transclude tiddler="$:/SiteSubtitle" mode="inline"/>

</div>

<div class="tw-page-controls">
<div class="tc-page-controls">
<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
<$reveal type="nomatch" state=<<config-title>> text="hide">
<$transclude tiddler=<<listItem>> mode="inline"/>
Expand Down
2 changes: 1 addition & 1 deletion core/ui/PageTemplate/story.tid
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
title: $:/core/ui/PageTemplate/story
tags: $:/tags/PageTemplate

<section class="story-river">
<section class="tc-story-river">

<section class="story-backdrop">

Expand Down
2 changes: 1 addition & 1 deletion core/ui/PageTemplate/topleftbar.tid
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
title: $:/core/ui/PageTemplate/topleftbar
tags: $:/tags/PageTemplate

<span class="tw-topbar tw-topbar-left">
<span class="tc-topbar tc-topbar-left">

<$list filter="[all[shadows+tiddlers]tag[$:/tags/TopLeftBar]!has[draft.of]]" variable="listItem">

Expand Down
2 changes: 1 addition & 1 deletion core/ui/PageTemplate/toprightbar.tid
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
title: $:/core/ui/PageTemplate/toprightbar
tags: $:/tags/PageTemplate

<span class="tw-topbar tw-topbar-right">
<span class="tc-topbar tc-topbar-right">

<$list filter="[all[shadows+tiddlers]tag[$:/tags/TopRightBar]!has[draft.of]]" variable="listItem">

Expand Down
4 changes: 2 additions & 2 deletions core/ui/SideBar/More.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ title: $:/core/ui/SideBar/More
tags: $:/tags/SideBar
caption: {{$:/language/SideBar/More/Caption}}

<div class="tw-more-sidebar">
<<tabs "[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" "$:/core/ui/MoreSideBar/Tags" "$:/state/tab/moresidebar" "tw-vertical">>
<div class="tc-more-sidebar">
<<tabs "[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" "$:/core/ui/MoreSideBar/Tags" "$:/state/tab/moresidebar" "tc-vertical">>
</div>
4 changes: 2 additions & 2 deletions core/ui/SideBar/Open.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ caption: {{$:/language/SideBar/Open/Caption}}
\define lingo-base() $:/language/CloseAll/
<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">

<$button message="tw-close-tiddler" title={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="btn-invisible btn-mini">&times;</$button> <$link to={{!!title}}><$view field="title"/></$link>
<$button message="tm-close-tiddler" title={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini">&times;</$button> <$link to={{!!title}}><$view field="title"/></$link>

</$list>

<$button message="tw-close-all-tiddlers" class="btn-invisible btn-mini"><<lingo Button>></$button>
<$button message="tm-close-all-tiddlers" class="tc-btn-invisible tc-btn-mini"><<lingo Button>></$button>
8 changes: 4 additions & 4 deletions core/ui/SideBar/Tools.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ $:/config/PageControlButtons/Visibility/$(listItem)$

<<lingo Basics/Version/Prompt>> <<version>>

<$set name="tw-config-toolbar-icons" value="yes">
<$set name="tv-config-toolbar-icons" value="yes">

<$set name="tw-config-toolbar-text" value="yes">
<$set name="tv-config-toolbar-text" value="yes">

<$set name="tw-config-toolbar-class" value="">
<$set name="tv-config-toolbar-class" value="">

<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">

<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tw-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>

</$list>

Expand Down
10 changes: 5 additions & 5 deletions core/ui/SideBarLists.tid
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
title: $:/core/ui/SideBarLists

<div class="tw-sidebar-lists">
<div class="tc-sidebar-lists">

<div class="tw-search">
<div class="tc-search">
<$edit-text tiddler="$:/temp/search" type="search" tag="input"/>
<$reveal state="$:/temp/search" type="nomatch" text="">
<$linkcatcher to="$:/temp/search">
<$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link>
<$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}</$link>
</$linkcatcher>
</$reveal>
<$reveal state="$:/temp/search" type="match" text="">&nbsp;<$link to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="btn-invisible">&hellip;</$link>
<$reveal state="$:/temp/search" type="match" text="">&nbsp;<$link to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="tc-btn-invisible">&hellip;</$link>
</$reveal>
</div>

<$reveal state="$:/temp/search" type="nomatch" text="">

<div class="tw-search-results">
<div class="tc-search-results">

{{$:/language/Search/Matches}}

Expand Down
6 changes: 3 additions & 3 deletions core/ui/TagManager.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ title: $:/TagManager
</$list>
\end
\define iconEditor(title)
<div class="tw-drop-down-wrapper">
<$edit-text field="icon" tag="input" size="20"/> <$button popup=<<qualify "$:/state/popup/icon/$title$">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button>
<div class="tc-drop-down-wrapper">
<$edit-text field="icon" tag="input" size="20"/> <$button popup=<<qualify "$:/state/popup/icon/$title$">> class="tc-btn-invisible tc-btn-dropdown">{{$:/core/images/down-arrow}}</$button>
<$reveal state=<<qualify "$:/state/popup/icon/$title$">> type="popup" position="belowleft" text="" default="">
<div class="tw-drop-down">
<div class="tc-drop-down">
<$linkcatcher to="$title$!!icon">
<<iconEditorTab type:"!">>
<hr/>
Expand Down
6 changes: 3 additions & 3 deletions core/ui/TagTemplate.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ title: $:/core/ui/TagTemplate
\define tag-styles()
background-color:$(backgroundColor)$;
\end
<span class="tw-tag-list-item">
<span class="tc-tag-list-item">
<$set name="backgroundColor" value={{!!color}}>
<$button popup=<<qualify "$:/state/popup/tag">> class="btn-invisible tw-tag-label" style=<<tag-styles>>>
<$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-tag-label" style=<<tag-styles>>>
<$transclude tiddler={{!!icon}}/> <$view field="title" format="text" />
</$button>
</$set>
<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes"><div class="tw-drop-down"><$transclude tiddler="$:/core/ui/ListItemTemplate"/>
<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes"><div class="tc-drop-down"><$transclude tiddler="$:/core/ui/ListItemTemplate"/>
<hr>
<$list filter="[all[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/>
</div>
Expand Down
6 changes: 3 additions & 3 deletions core/ui/TiddlerFieldTemplate.tid
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
title: $:/core/ui/TiddlerFieldTemplate

<tr class="tw-view-field">
<td class="tw-view-field-name">
<tr class="tc-view-field">
<td class="tc-view-field-name">
<$text text=<<listItem>>/>
</td>
<td class="tw-view-field-value">
<td class="tc-view-field-value">
<$view field=<<listItem>>/>
</td>
</tr>
2 changes: 1 addition & 1 deletion core/ui/TiddlerFields.tid
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
title: $:/core/ui/TiddlerFields

<table class="tw-view-field-table">
<table class="tc-view-field-table">
<tbody>
<$list filter="[all[current]fields[]sort[title]] -text" template="$:/core/ui/TiddlerFieldTemplate" variable="listItem"/>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion core/ui/TiddlerInfo.tid
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
title: $:/core/ui/TiddlerInfo

<<tabs "[all[shadows+tiddlers]tag[$:/tags/TiddlerInfo]!has[draft.of]]" "$:/core/ui/TiddlerInfo/Tools">>
<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/TiddlerInfo]!has[draft.of]]" default={{$:/config/TiddlerInfo/Default}}/>
8 changes: 4 additions & 4 deletions core/ui/TiddlerInfo/Tools.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ caption: {{$:/language/TiddlerInfo/Tools/Caption}}
\define config-title()
$:/config/ViewToolbarButtons/Visibility/$(listItem)$
\end
<$set name="tw-config-toolbar-icons" value="yes">
<$set name="tv-config-toolbar-icons" value="yes">

<$set name="tw-config-toolbar-text" value="yes">
<$set name="tv-config-toolbar-text" value="yes">

<$set name="tw-config-toolbar-class" value="">
<$set name="tv-config-toolbar-class" value="">

<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem">

<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tw-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>

</$list>

Expand Down
4 changes: 2 additions & 2 deletions core/ui/TopRightBar/menu.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ title: $:/core/ui/TopBar/menu
tags: $:/tags/TopRightBar

<$reveal state="$:/state/sidebar" type="nomatch" text="no">
<$button set="$:/state/sidebar" setTo="no" title={{$:/language/Buttons/HideSideBar/Hint}} aria-label={{$:/language/Buttons/HideSideBar/Caption}} class="btn-invisible">{{$:/core/images/chevron-right}}</$button>
<$button set="$:/state/sidebar" setTo="no" title={{$:/language/Buttons/HideSideBar/Hint}} aria-label={{$:/language/Buttons/HideSideBar/Caption}} class="tc-btn-invisible">{{$:/core/images/chevron-right}}</$button>
</$reveal>
<$reveal state="$:/state/sidebar" type="match" text="no">
<$button set="$:/state/sidebar" setTo="yes" title={{$:/language/Buttons/ShowSideBar/Hint}} aria-label={{$:/language/Buttons/ShowSideBar/Caption}} class="btn-invisible">{{$:/core/images/chevron-left}}</$button>
<$button set="$:/state/sidebar" setTo="yes" title={{$:/language/Buttons/ShowSideBar/Hint}} aria-label={{$:/language/Buttons/ShowSideBar/Caption}} class="tc-btn-invisible">{{$:/core/images/chevron-left}}</$button>
</$reveal>
4 changes: 2 additions & 2 deletions core/ui/UntaggedTemplate.tid
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
title: $:/core/ui/UntaggedTemplate

\define lingo-base() $:/language/SideBar/
<$button popup=<<qualify "$:/state/popup/tag">> class="btn-invisible tw-untagged-label tw-tag-label">
<$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-untagged-label tc-tag-label">
<<lingo Tags/Untagged/Caption>>
</$button>
<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below">
<div class="tw-drop-down">
<div class="tc-drop-down">
<$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]" template="$:/core/ui/ListItemTemplate"/>
</div>
</$reveal>
2 changes: 1 addition & 1 deletion core/ui/ViewTemplate.tid
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
title: $:/core/ui/ViewTemplate

\define frame-classes()
tw-tiddler-frame tw-tiddler-view-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$ $(tiddlerTagClasses)$
tc-tiddler-frame tc-tiddler-view-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$ $(tiddlerTagClasses)$
\end
<$set name="storyTiddler" value=<<currentTiddler>>><$set name="tiddlerInfoState" value=<<qualify "$:/state/popup/tiddler-info">>><$tiddler tiddler=<<currentTiddler>>><div class=<<frame-classes>>><$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
</div>
Expand Down
2 changes: 1 addition & 1 deletion core/ui/ViewTemplate/body.tid
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
title: $:/core/ui/ViewTemplate/body
tags: $:/tags/ViewTemplate

<div class="body">
<div class="tc-tiddler-body">

<$list filter="[all[current]!has[plugin-type]]">

Expand Down
2 changes: 1 addition & 1 deletion core/ui/ViewTemplate/classic.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tags: $:/tags/ViewTemplate $:/tags/EditTemplate

\define lingo-base() $:/language/ClassicWarning/
<$list filter="[all[current]type[text/x-tiddlywiki]]">
<div class="tw-message-box">
<div class="tc-message-box">

<<lingo Hint>>

Expand Down
6 changes: 3 additions & 3 deletions core/ui/ViewTemplate/import.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ tags: $:/tags/ViewTemplate

<$list filter="[all[current]field:plugin-type[import]]">

<div class="tw-import">
<div class="tc-import">

<<lingo Listing/Hint>>

{{||$:/core/ui/ImportListing}}

<$button message="tw-delete-tiddler" param=<<currentTiddler>>><<lingo Listing/Cancel/Caption>></$button>
<$button message="tw-perform-import" param=<<currentTiddler>>><<lingo Listing/Import/Caption>></$button>
<$button message="tm-delete-tiddler" param=<<currentTiddler>>><<lingo Listing/Cancel/Caption>></$button>
<$button message="tm-perform-import" param=<<currentTiddler>>><<lingo Listing/Import/Caption>></$button>

</div>

Expand Down
2 changes: 1 addition & 1 deletion core/ui/ViewTemplate/subtitle.tid
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
title: $:/core/ui/ViewTemplate/subtitle
tags: $:/tags/ViewTemplate

<div class="tw-subtitle">
<div class="tc-subtitle">
<$link to={{!!modifier}}>
<$view field="modifier"/>
</$link> <$view field="modified" format="relativedate"/>
Expand Down
2 changes: 1 addition & 1 deletion core/ui/ViewTemplate/tags.tid
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title: $:/core/ui/ViewTemplate/tags
tags: $:/tags/ViewTemplate

<div class="tw-tags-wrapper"><$list filter="[all[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/></div>
<div class="tc-tags-wrapper"><$list filter="[all[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/></div>
14 changes: 7 additions & 7 deletions core/ui/ViewTemplate/title.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ fill:$(foregroundColor)$;
\define config-title()
$:/config/ViewToolbarButtons/Visibility/$(listItem)$
\end
<div class="tw-tiddler-title">
<h2 class="titlebar">
<span class="tw-tiddler-controls">
<div class="tc-tiddler-title">
<h2 class="tc-titlebar">
<span class="tc-tiddler-controls">
<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list>
</span>
<$set name="foregroundColor" value={{!!color}}>
Expand All @@ -18,18 +18,18 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
</span>
</$set>
<$list filter="[all[current]removeprefix[$:/]]">
<span class="title" title={{$:/language/SystemTiddler/Tooltip}}>
<span class="tw-system-title-prefix">$:/</span><$text text=<<currentTiddler>>/>
<span class="tc-title" title={{$:/language/SystemTiddler/Tooltip}}>
<span class="tc-system-title-prefix">$:/</span><$text text=<<currentTiddler>>/>
</span>
</$list>
<$list filter="[all[current]!prefix[$:/]]">
<span class="title">
<span class="tc-title">
<$view field="title"/>
</span>
</$list>
</h2>

<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tw-tiddler-info tw-popup" animate="yes" retain="yes">
<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup" animate="yes" retain="yes">

<$transclude tiddler="$:/core/ui/TiddlerInfo"/>

Expand Down
6 changes: 3 additions & 3 deletions core/ui/ViewToolbar/clone.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar
caption: {{$:/core/images/clone-button}} {{$:/language/Buttons/Clone/Caption}}
description: {{$:/language/Buttons/Clone/Hint}}

<$button message="tw-new-tiddler" param=<<currentTiddler>> title={{$:/language/Buttons/Clone/Hint}} aria-label={{$:/language/Buttons/Clone/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-new-tiddler" param=<<currentTiddler>> title={{$:/language/Buttons/Clone/Hint}} aria-label={{$:/language/Buttons/Clone/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/clone-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Clone/Caption}}/>
</$list>
</$button>
6 changes: 3 additions & 3 deletions core/ui/ViewToolbar/close-others.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar
caption: {{$:/core/images/close-others-button}} {{$:/language/Buttons/CloseOthers/Caption}}
description: {{$:/language/Buttons/CloseOthers/Hint}}

<$button message="tw-close-other-tiddlers" param=<<currentTiddler>> title={{$:/language/Buttons/CloseOthers/Hint}} aria-label={{$:/language/Buttons/CloseOthers/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-close-other-tiddlers" param=<<currentTiddler>> title={{$:/language/Buttons/CloseOthers/Hint}} aria-label={{$:/language/Buttons/CloseOthers/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/close-others-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/CloseOthers/Caption}}/>
</$list>
</$button>
6 changes: 3 additions & 3 deletions core/ui/ViewToolbar/close.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar
caption: {{$:/core/images/close-button}} {{$:/language/Buttons/Close/Caption}}
description: {{$:/language/Buttons/Close/Hint}}

<$button message="tw-close-tiddler" title={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-close-tiddler" title={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/close-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Close/Caption}}/>
</$list>
</$button>
6 changes: 3 additions & 3 deletions core/ui/ViewToolbar/edit.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar
caption: {{$:/core/images/edit-button}} {{$:/language/Buttons/Edit/Caption}}
description: {{$:/language/Buttons/Edit/Hint}}

<$button message="tw-edit-tiddler" title={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-edit-tiddler" title={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/edit-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Edit/Caption}}/>
</$list>
</$button>
6 changes: 3 additions & 3 deletions core/ui/ViewToolbar/info.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar
caption: {{$:/core/images/info-button}} {{$:/language/Buttons/Info/Caption}}
description: {{$:/language/Buttons/Info/Hint}}

<$button popup=<<tiddlerInfoState>> title={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class=<<tw-config-toolbar-class>> selectedClass="tw-selected">
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button popup=<<tiddlerInfoState>> title={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/info-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Info/Caption}}/>
</$list>
</$button>
12 changes: 6 additions & 6 deletions core/ui/ViewToolbar/more-tiddler-actions.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ description: {{$:/language/Buttons/More/Hint}}
\define config-title()
$:/config/ViewToolbarButtons/Visibility/$(listItem)$
\end
<$button popup=<<qualify "$:/state/popup/more">> title={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<<tw-config-toolbar-class>> selectedClass="tw-selected">
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button popup=<<qualify "$:/state/popup/more">> title={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/down-arrow}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/More/Caption}}/>
</$list>
</$button>
<$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes">
<div class="tw-drop-down">
<$set name="tw-config-toolbar-icons" value="yes">
<$set name="tw-config-toolbar-text" value="yes">
<div class="tc-drop-down">
<$set name="tv-config-toolbar-icons" value="yes">
<$set name="tv-config-toolbar-text" value="yes">
<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] -[[$:/core/ui/Buttons/more-tiddler-actions]]" variable="listItem">
<$reveal type="match" state=<<config-title>> text="hide">
<$transclude tiddler=<<listItem>>/>
Expand Down
6 changes: 3 additions & 3 deletions core/ui/ViewToolbar/permalink.tid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ tags: $:/tags/ViewToolbar
caption: {{$:/core/images/permalink-button}} {{$:/language/Buttons/Permalink/Caption}}
description: {{$:/language/Buttons/Permalink/Hint}}

<$button message="tw-permalink" title={{$:/language/Buttons/Permalink/Hint}} aria-label={{$:/language/Buttons/Permalink/Caption}} class=<<tw-config-toolbar-class>>>
<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
<$button message="tm-permalink" title={{$:/language/Buttons/Permalink/Hint}} aria-label={{$:/language/Buttons/Permalink/Caption}} class=<<tv-config-toolbar-class>>>
<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
{{$:/core/images/permalink-button}}
</$list>
<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
<$text text={{$:/language/Buttons/Permalink/Caption}}/>
</$list>
</$button>
Loading