diff --git a/core/images/layout-button.tid b/core/images/layout-button.tid new file mode 100755 index 000000000..19371cde1 --- /dev/null +++ b/core/images/layout-button.tid @@ -0,0 +1,4 @@ +title: $:/core/images/layout-button +tags: $:/tags/Image + + \ No newline at end of file diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids index 7cf1c9955..85a71ac08 100644 --- a/core/language/en-GB/Buttons.multids +++ b/core/language/en-GB/Buttons.multids @@ -59,6 +59,8 @@ Home/Caption: home Home/Hint: Open the default tiddlers Language/Caption: language Language/Hint: Choose the user interface language +LayoutSwitcher/Hint: Open layout switcher +LayoutSwitcher/Caption: layout Manager/Caption: tiddler manager Manager/Hint: Open tiddler manager More/Caption: more diff --git a/core/language/en-GB/Help/commands.tid b/core/language/en-GB/Help/commands.tid new file mode 100644 index 000000000..454159b44 --- /dev/null +++ b/core/language/en-GB/Help/commands.tid @@ -0,0 +1,18 @@ +title: $:/language/Help/commands +description: Run commands returned from a filter + +Sequentially run the command tokens returned from a filter + +``` +--commands +``` + +Examples + +``` +--commands "[enlist{$:/build-commands-as-text}]" +``` + +``` +--commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget]" +``` diff --git a/core/modules/commands/commands.js b/core/modules/commands/commands.js new file mode 100644 index 000000000..813f19064 --- /dev/null +++ b/core/modules/commands/commands.js @@ -0,0 +1,42 @@ +/*\ +title: $:/core/modules/commands/commands.js +type: application/javascript +module-type: command + +Runs the commands returned from a filter + +\*/ + +(function() { + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +exports.info = { + name: "commands", + synchronous: true +}; + +var Command = function(params, commander) { + this.params = params; + this.commander = commander; +}; + +Command.prototype.execute = function() { + // Parse the filter + var filter = this.params[0]; + if(!filter) { + return "No filter specified"; + } + var commands = this.commander.wiki.filterTiddlers(filter) + if(commands.length === 0) { + return "No tiddlers found for filter '" + filter + "'"; + } + this.commander.addCommandTokens(commands); + return null; +}; + +exports.Command = Command; + +})(); diff --git a/core/modules/editor/factory.js b/core/modules/editor/factory.js index 118f44f43..90ab66ae9 100644 --- a/core/modules/editor/factory.js +++ b/core/modules/editor/factory.js @@ -298,7 +298,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) { Propogate keydown events to our container for the keyboard widgets benefit */ EditTextWidget.prototype.propogateKeydownEvent = function(event) { - var newEvent = this.cloneEvent(event,["keyCode","which","metaKey","ctrlKey","altKey","shiftKey"]); + var newEvent = this.cloneEvent(event,["keyCode","code","which","key","metaKey","ctrlKey","altKey","shiftKey"]); return !this.parentDomNode.dispatchEvent(newEvent); }; diff --git a/core/modules/utils/dom/dom.js b/core/modules/utils/dom/dom.js index 330d184cc..20aa6896d 100644 --- a/core/modules/utils/dom/dom.js +++ b/core/modules/utils/dom/dom.js @@ -12,6 +12,8 @@ Various static DOM-related utility functions. /*global $tw: false */ "use strict"; +var Popup = require("$:/core/modules/utils/dom/popup.js"); + /* Determines whether element 'a' contains element 'b' Code thanks to John Resig, http://ejohn.org/blog/comparing-document-position/ @@ -294,8 +296,21 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) { }); if(selectedNode.offsetLeft) { - // Add a variable with a popup coordinate string for the selected node - variables["tv-popup-coords"] = "(" + selectedNode.offsetLeft + "," + selectedNode.offsetTop +"," + selectedNode.offsetWidth + "," + selectedNode.offsetHeight + ")"; + // Add variables with a (relative and absolute) popup coordinate string for the selected node + var nodeRect = { + left: selectedNode.offsetLeft, + top: selectedNode.offsetTop, + width: selectedNode.offsetWidth, + height: selectedNode.offsetHeight + }; + variables["tv-popup-coords"] = Popup.buildCoordinates(Popup.coordinatePrefix.csOffsetParent,nodeRect); + + var absRect = $tw.utils.extend({}, nodeRect); + for (var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) { + absRect.left += currentNode.offsetLeft; + absRect.top += currentNode.offsetTop; + } + variables["tv-popup-abs-coords"] = Popup.buildCoordinates(Popup.coordinatePrefix.csAbsolute,absRect); // Add variables for offset of selected node variables["tv-selectednode-posx"] = selectedNode.offsetLeft.toString(); diff --git a/core/modules/utils/dom/modal.js b/core/modules/utils/dom/modal.js index 58fe34efe..1e620aa9a 100644 --- a/core/modules/utils/dom/modal.js +++ b/core/modules/utils/dom/modal.js @@ -26,6 +26,8 @@ Display a modal dialogue options: see below Options include: downloadLink: Text of a big download link to include + event: widget event + variables: from event.paramObject */ Modal.prototype.display = function(title,options) { options = options || {}; @@ -209,6 +211,10 @@ Modal.prototype.display = function(title,options) { headerWidgetNode.addEventListener("tm-close-tiddler",closeHandler,false); bodyWidgetNode.addEventListener("tm-close-tiddler",closeHandler,false); footerWidgetNode.addEventListener("tm-close-tiddler",closeHandler,false); + // Whether to close the modal dialog when the mask (area outside the modal) is clicked + if(tiddler.fields && (tiddler.fields["mask-closable"] === "yes" || tiddler.fields["mask-closable"] === "true")) { + modalBackdrop.addEventListener("click",closeHandler,false); + } // Set the initial styles for the message $tw.utils.setStyle(modalBackdrop,[ {opacity: "0"} diff --git a/core/modules/utils/dom/popup.js b/core/modules/utils/dom/popup.js index 5eed80c88..017e7da8f 100644 --- a/core/modules/utils/dom/popup.js +++ b/core/modules/utils/dom/popup.js @@ -22,6 +22,19 @@ var Popup = function(options) { this.popups = []; // Array of {title:,wiki:,domNode:} objects }; +/* +Global regular expression for parsing the location of a popup. +This is also used by the Reveal widget. +*/ +exports.popupLocationRegExp = /^(@?)\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/ + +/* +Objekt containing the available prefixes for coordinates build with the `buildCoordinates` function: + - csOffsetParent: Uses a coordinate system based on the offset parent (no prefix). + - csAbsolute: Use an absolute coordinate system (prefix "@"). +*/ +exports.coordinatePrefix = { csOffsetParent: "", csAbsolute: "@" } + /* Trigger a popup open or closed. Parameters are in a hashmap: title: title of the tiddler where the popup details are stored @@ -136,8 +149,17 @@ Popup.prototype.show = function(options) { height: options.domNode.offsetHeight }; } - var popupRect = "(" + rect.left + "," + rect.top + "," + - rect.width + "," + rect.height + ")"; + if(options.absolute && options.domNode) { + // Walk the offsetParent chain and add the position of the offsetParents to make + // the position absolute to the root node of the page. + var currentNode = options.domNode.offsetParent; + while(currentNode) { + rect.left += currentNode.offsetLeft; + rect.top += currentNode.offsetTop; + currentNode = currentNode.offsetParent; + } + } + var popupRect = exports.buildCoordinates(options.absolute?exports.coordinatePrefix.csAbsolute:exports.coordinatePrefix.csOffsetParent,rect); if(options.noStateReference) { options.wiki.setText(options.title,"text",undefined,popupRect); } else { @@ -172,13 +194,54 @@ Popup.prototype.cancel = function(level) { }; /* -Returns true if the specified title and text identifies an active popup +Returns true if the specified title and text identifies an active popup. +This function is safe to call, even if the popup class was not initialized. */ -Popup.prototype.readPopupState = function(text) { - var popupLocationRegExp = /^\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/; - return popupLocationRegExp.test(text); +exports.readPopupState = function(text) { + return exports.popupLocationRegExp.test(text); }; +/* +Parses a coordinate string in the format `(x,y,w,h)` or `@(x,y,z,h)` and returns +an object containing the position, width and height. The absolute-Mark is boolean +value that indicates the coordinate system of the coordinates. If they start with +an `@`, `absolute` is set to true and the coordinates are relative to the root +element. If the initial `@` is missing, they are relative to the offset parent +element and `absoute` is false. +This function is safe to call, even if the popup class was not initialized. +*/ +exports.parseCoordinates = function(coordinates) { + var match = exports.popupLocationRegExp.exec(coordinates); + if(match) { + return { + absolute: (match[1] === "@"), + left: parseFloat(match[2]), + top: parseFloat(match[3]), + width: parseFloat(match[4]), + height: parseFloat(match[5]) + }; + } else { + return false; + } +} + +/* +Builds a coordinate string from a coordinate system identifier and an object +containing the left, top, width and height values. +Use constants defined in coordinatePrefix to specify a coordinate system. +If one of the parameters is invalid for building a coordinate string `(0,0,0,0)` +will be returned. +This function is safe to call, even if the popup class was not initialized. +*/ +exports.buildCoordinates = function(prefix,position) { + var coord = prefix + "(" + position.left + "," + position.top + "," + position.width + "," + position.height + ")"; + if (exports.popupLocationRegExp.test(coord)) { + return coord; + } else { + return "(0,0,0,0)"; + } +} + exports.Popup = Popup; })(); diff --git a/core/modules/utils/linked-list.js b/core/modules/utils/linked-list.js index 45f22f90a..917069d16 100644 --- a/core/modules/utils/linked-list.js +++ b/core/modules/utils/linked-list.js @@ -15,10 +15,11 @@ function LinkedList() { LinkedList.prototype.clear = function() { // LinkedList performs the duty of both the head and tail node - this.next = Object.create(null); - this.prev = Object.create(null); - this.first = undefined; - this.last = undefined; + this.next = new LLMap(); + this.prev = new LLMap(); + // Linked list head initially points to itself + this.next.set(null, null); + this.prev.set(null, null); this.length = 0; }; @@ -41,28 +42,29 @@ Push behaves like array.push and accepts multiple string arguments. But it also accepts a single array argument too, to be consistent with its other methods. */ LinkedList.prototype.push = function(/* values */) { - var values = arguments; + var i, values = arguments; if($tw.utils.isArray(values[0])) { values = values[0]; } - for(var i = 0; i < values.length; i++) { + for(i = 0; i < values.length; i++) { _assertString(values[i]); } - for(var i = 0; i < values.length; i++) { + for(i = 0; i < values.length; i++) { _linkToEnd(this,values[i]); } return this.length; }; LinkedList.prototype.pushTop = function(value) { + var t; if($tw.utils.isArray(value)) { - for (var t=0; t 1) { nextEntry.shift(); prevEntry.shift(); } else { - list.next[value] = undefined; - list.prev[value] = undefined; + list.next.set(value,undefined); + list.prev.set(value,undefined); } list.length -= 1; }; // Sticks the given node onto the end of the list. function _linkToEnd(list,value) { - if(list.first === undefined) { - list.first = value; + var old = list.next.get(value); + var last = list.prev.get(null); + // Does it already exists? + if(old !== undefined) { + if(!Array.isArray(old)) { + old = [old]; + list.next.set(value,old); + list.prev.set(value,[list.prev.get(value)]); + } + old.push(null); + list.prev.get(value).push(last); } else { - // Does it already exists? - if(list.first === value || list.prev[value] !== undefined) { - if(typeof list.next[value] === "string") { - list.next[value] = [list.next[value]]; - list.prev[value] = [list.prev[value]]; - } else if(typeof list.next[value] === "undefined") { - // list.next[value] must be undefined. - // Special case. List already has 1 value. It's at the end. - list.next[value] = []; - list.prev[value] = [list.prev[value]]; - } - list.prev[value].push(list.last); - // We do NOT append a new value onto "next" list. Iteration will - // figure out it must point to End-of-List on its own. - } else { - list.prev[value] = list.last; - } - // Make the old last point to this new one. - if(typeof list.next[list.last] === "object") { - list.next[list.last].push(value); - } else { - list.next[list.last] = value; - } + list.next.set(value,null); + list.prev.set(value,last); + } + // Make the old last point to this new one. + if(value !== last) { + var array = list.next.get(last); + if(Array.isArray(array)) { + array[array.length-1] = value; + } else { + list.next.set(last,value); + } + list.prev.set(null,value); + } else { + // Edge case, the pushed value was already the last value. + // The second-to-last nextPtr for that value must point to itself now. + var array = list.next.get(last); + array[array.length-2] = value; } - list.last = value; list.length += 1; }; @@ -195,6 +189,20 @@ function _assertString(value) { } }; +var LLMap = function() { + this.map = Object.create(null); +}; + +// Just a wrapper so our object map can also accept null. +LLMap.prototype = { + set: function(key,val) { + (key === null) ? (this.null = val) : (this.map[key] = val); + }, + get: function(key) { + return (key === null) ? this.null : this.map[key]; + } +}; + exports.LinkedList = LinkedList; })(); diff --git a/core/modules/widgets/action-popup.js b/core/modules/widgets/action-popup.js index 2903532b6..a3ce20165 100644 --- a/core/modules/widgets/action-popup.js +++ b/core/modules/widgets/action-popup.js @@ -14,6 +14,8 @@ Action widget to trigger a popup. var Widget = require("$:/core/modules/widgets/widget.js").widget; +var Popup = require("$:/core/modules/utils/dom/popup.js"); + var ActionPopupWidget = function(parseTreeNode,options) { this.initialise(parseTreeNode,options); }; @@ -57,20 +59,20 @@ Invoke the action associated with this widget */ ActionPopupWidget.prototype.invokeAction = function(triggeringWidget,event) { // Trigger the popup - var popupLocationRegExp = /^\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/, - match = popupLocationRegExp.exec(this.actionCoords || ""); - if(match) { + var coordinates = Popup.parseCoordinates(this.actionCoords || ""); + if(coordinates) { $tw.popup.triggerPopup({ domNode: null, domNodeRect: { - left: parseFloat(match[1]), - top: parseFloat(match[2]), - width: parseFloat(match[3]), - height: parseFloat(match[4]) + left: coordinates.left, + top: coordinates.top, + width: coordinates.width, + height: coordinates.height }, title: this.actionState, wiki: this.wiki, - floating: this.floating + floating: this.floating, + absolute: coordinates.absolute }); } else { $tw.popup.cancel(0); diff --git a/core/modules/widgets/button.js b/core/modules/widgets/button.js index a32820e8b..a724d8448 100644 --- a/core/modules/widgets/button.js +++ b/core/modules/widgets/button.js @@ -14,6 +14,8 @@ Button widget var Widget = require("$:/core/modules/widgets/widget.js").widget; +var Popup = require("$:/core/modules/utils/dom/popup.js"); + var ButtonWidget = function(parseTreeNode,options) { this.initialise(parseTreeNode,options); }; @@ -147,7 +149,7 @@ ButtonWidget.prototype.isSelected = function() { ButtonWidget.prototype.isPoppedUp = function() { var tiddler = this.popupTitle ? this.wiki.getTiddler(this.popupTitle) : this.wiki.getTiddler(this.popup); - var result = tiddler && tiddler.fields.text ? $tw.popup.readPopupState(tiddler.fields.text) : false; + var result = tiddler && tiddler.fields.text ? Popup.readPopupState(tiddler.fields.text) : false; return result; }; @@ -173,6 +175,7 @@ ButtonWidget.prototype.triggerPopup = function(event) { if(this.popupTitle) { $tw.popup.triggerPopup({ domNode: this.domNodes[0], + absolute: (this.popupAbsCoords === "yes"), title: this.popupTitle, wiki: this.wiki, noStateReference: true @@ -180,6 +183,7 @@ ButtonWidget.prototype.triggerPopup = function(event) { } else { $tw.popup.triggerPopup({ domNode: this.domNodes[0], + absolute: (this.popupAbsCoords === "yes"), title: this.popup, wiki: this.wiki }); @@ -223,6 +227,7 @@ ButtonWidget.prototype.execute = function() { this.setField = this.getAttribute("setField"); this.setIndex = this.getAttribute("setIndex"); this.popupTitle = this.getAttribute("popupTitle"); + this.popupAbsCoords = this.getAttribute("popupAbsCoords", "no"); this.tabIndex = this.getAttribute("tabindex"); this.isDisabled = this.getAttribute("disabled","no"); // Make child widgets @@ -252,7 +257,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of */ ButtonWidget.prototype.refresh = function(changedTiddlers) { var changedAttributes = this.computeAttributes(); - if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) { + if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) { this.refreshSelf(); return true; } else if(changedAttributes["class"]) { diff --git a/core/modules/widgets/reveal.js b/core/modules/widgets/reveal.js index 46e55e99e..3e3510f75 100755 --- a/core/modules/widgets/reveal.js +++ b/core/modules/widgets/reveal.js @@ -14,6 +14,8 @@ Reveal widget var Widget = require("$:/core/modules/widgets/widget.js").widget; +var Popup = require("$:/core/modules/utils/dom/popup.js"); + var RevealWidget = function(parseTreeNode,options) { this.initialise(parseTreeNode,options); }; @@ -94,6 +96,13 @@ RevealWidget.prototype.positionPopup = function(domNode) { left = Math.max(0,left); top = Math.max(0,top); } + if (this.popup.absolute) { + // Traverse the offsetParent chain and correct the offset to make it relative to the parent node. + for (var offsetParentDomNode = domNode.offsetParent; offsetParentDomNode; offsetParentDomNode = offsetParentDomNode.offsetParent) { + left -= offsetParentDomNode.offsetLeft; + top -= offsetParentDomNode.offsetTop; + } + } domNode.style.left = left + "px"; domNode.style.top = top + "px"; }; @@ -183,19 +192,11 @@ RevealWidget.prototype.compareStateText = function(state) { }; RevealWidget.prototype.readPopupState = function(state) { - var popupLocationRegExp = /^\((-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+),(-?[0-9\.E]+)\)$/, - match = popupLocationRegExp.exec(state); + this.popup = Popup.parseCoordinates(state); // Check if the state matches the location regexp - if(match) { + if(this.popup) { // If so, we're open this.isOpen = true; - // Get the location - this.popup = { - left: parseFloat(match[1]), - top: parseFloat(match[2]), - width: parseFloat(match[3]), - height: parseFloat(match[4]) - }; } else { // If not, we're closed this.isOpen = false; diff --git a/core/modules/widgets/select.js b/core/modules/widgets/select.js index 8272a2783..cd789423f 100644 --- a/core/modules/widgets/select.js +++ b/core/modules/widgets/select.js @@ -42,6 +42,9 @@ SelectWidget.prototype.render = function(parent,nextSibling) { this.execute(); this.renderChildren(parent,nextSibling); this.setSelectValue(); + if(this.selectFocus == "yes") { + this.getSelectDomNode().focus(); + } $tw.utils.addEventListeners(this.getSelectDomNode(),[ {name: "change", handlerObject: this, handlerMethod: "handleChangeEvent"} ]); @@ -143,6 +146,7 @@ SelectWidget.prototype.execute = function() { this.selectMultiple = this.getAttribute("multiple", false); this.selectSize = this.getAttribute("size"); this.selectTooltip = this.getAttribute("tooltip"); + this.selectFocus = this.getAttribute("focus"); // Make the child widgets var selectNode = { type: "element", diff --git a/core/ui/AdvancedSearch/FilterButtons/dropdown.tid b/core/ui/AdvancedSearch/FilterButtons/dropdown.tid index b1d400aeb..44878af77 100644 --- a/core/ui/AdvancedSearch/FilterButtons/dropdown.tid +++ b/core/ui/AdvancedSearch/FilterButtons/dropdown.tid @@ -14,7 +14,7 @@ tags: $:/tags/AdvancedSearch/FilterButton <$linkcatcher actions="<$action-setfield $tiddler='$:/temp/advancedsearch' text=<>/><$action-setfield $tiddler='$:/temp/advancedsearch/input' text=<>/><$action-setfield $tiddler='$:/temp/advancedsearch/refresh' text='yes'/><$action-sendmessage $message='tm-focus-selector' $param='.tc-advanced-search input' />">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]]"> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]!is[draft]]"> <$link to={{!!filter}}><$let tv-wikilinks="no"><$transclude field="description"/>
diff --git a/core/ui/PageControls/layout.tid b/core/ui/PageControls/layout.tid new file mode 100644 index 000000000..703bbcb1b --- /dev/null +++ b/core/ui/PageControls/layout.tid @@ -0,0 +1,15 @@ +title: $:/core/ui/Buttons/layout +tags: $:/tags/PageControls +caption: {{$:/core/images/layout-button}} {{$:/language/Buttons/LayoutSwitcher/Caption}} +description: {{$:/language/LayoutSwitcher/Description}} + +\whitespace trim +<$button tooltip={{$:/language/Buttons/LayoutSwitcher/Hint}} aria-label={{$:/language/Buttons/LayoutSwitcher/Caption}} class=<>> +<$action-sendmessage $message="tm-show-switcher" switch="layout"/> +<$list filter="[match[yes]]"> +{{$:/core/images/layout-button}} + +<$list filter="[match[yes]]"> +<$text text={{$:/language/Buttons/LayoutSwitcher/Caption}}/> + + diff --git a/core/ui/SideBar/More.tid b/core/ui/SideBar/More.tid index 93c25aec2..35edb52bf 100644 --- a/core/ui/SideBar/More.tid +++ b/core/ui/SideBar/More.tid @@ -3,6 +3,6 @@ tags: $:/tags/SideBar caption: {{$:/language/SideBar/More/Caption}} \whitespace trim -
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" default={{$:/config/DefaultMoreSidebarTab}} state="$:/state/tab/moresidebar" class="tc-vertical tc-sidebar-tabs-more" explicitState="$:/state/tab/moresidebar-1850697562"/> +
+<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" default={{$:/config/DefaultMoreSidebarTab}} state="$:/state/tab/moresidebar" class={{{ [{$:/config/ui/SideBar/More/horizontal}match[yes]then[tc-sidebar-tabs-more]else[tc-vertical tc-sidebar-tabs-more]] }}} explicitState="$:/state/tab/moresidebar-1850697562"/>
diff --git a/core/ui/SwitcherModal.tid b/core/ui/SwitcherModal.tid index 3477f5778..320bbc363 100644 --- a/core/ui/SwitcherModal.tid +++ b/core/ui/SwitcherModal.tid @@ -1,6 +1,7 @@ title: $:/core/ui/SwitcherModal subtitle: <$text text={{{[lookup[$:/language/Switcher/Subtitle/]]}}}/> class: tc-modal-centered +mask-closable: yes <$tiddler tiddler={{{[lookup[$:/config/SwitcherTargets/]]}}}> diff --git a/core/ui/ViewTemplate/unfold.tid b/core/ui/ViewTemplate/unfold.tid index 68fc27117..9b09f71a4 100644 --- a/core/ui/ViewTemplate/unfold.tid +++ b/core/ui/ViewTemplate/unfold.tid @@ -2,17 +2,21 @@ title: $:/core/ui/ViewTemplate/unfold tags: $:/tags/ViewTemplate \whitespace trim -<$reveal tag="div" type="nomatch" state="$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar" text="hide"> +
+<$list filter="[{$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar}match[show]]" variable="ignore"> <$reveal tag="div" type="nomatch" stateTitle=<> text="hide" default="show" retain="yes" animate="yes"> <$button tooltip={{$:/language/Buttons/Fold/Hint}} aria-label={{$:/language/Buttons/Fold/Caption}} class="tc-fold-banner"> <$action-sendmessage $message="tm-fold-tiddler" $param=<> foldedState=<>/> {{$:/core/images/chevron-up}} + +<$list filter="[{$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar}match[show]] :else[get[text]match[hide]]" variable="ignore"> <$reveal tag="div" type="nomatch" stateTitle=<> text="show" default="show" retain="yes" animate="yes"> <$button tooltip={{$:/language/Buttons/Unfold/Hint}} aria-label={{$:/language/Buttons/Unfold/Caption}} class="tc-unfold-banner"> <$action-sendmessage $message="tm-fold-tiddler" $param=<> foldedState=<>/> {{$:/core/images/chevron-down}} - + +
\ No newline at end of file diff --git a/core/wiki/config/PageControlButtons.multids b/core/wiki/config/PageControlButtons.multids index f880b3399..a437251f5 100644 --- a/core/wiki/config/PageControlButtons.multids +++ b/core/wiki/config/PageControlButtons.multids @@ -21,4 +21,5 @@ core/ui/Buttons/print: hide core/ui/Buttons/storyview: hide core/ui/Buttons/timestamp: hide core/ui/Buttons/theme: hide +core/ui/Buttons/layout: hide core/ui/Buttons/unfold-all: hide diff --git a/core/wiki/tags/PageControls.tid b/core/wiki/tags/PageControls.tid index 4d5972827..c6234751c 100644 --- a/core/wiki/tags/PageControls.tid +++ b/core/wiki/tags/PageControls.tid @@ -1,2 +1,2 @@ title: $:/tags/PageControls -list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/fold-all]] [[$:/core/ui/Buttons/unfold-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/new-journal]] [[$:/core/ui/Buttons/new-image]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/export-page]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/advanced-search]] [[$:/core/ui/Buttons/manager]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/palette]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/timestamp]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/print]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/refresh]] [[$:/core/ui/Buttons/more-page-actions]] +list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/fold-all]] [[$:/core/ui/Buttons/unfold-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/new-journal]] [[$:/core/ui/Buttons/new-image]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/export-page]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/advanced-search]] [[$:/core/ui/Buttons/manager]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/palette]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/layout]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/timestamp]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/print]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/refresh]] [[$:/core/ui/Buttons/more-page-actions]] diff --git a/editions/prerelease/tiddlers/Release 5.2.4.tid b/editions/prerelease/tiddlers/Release 5.2.4.tid index aa6d9baec..e21fe7d98 100644 --- a/editions/prerelease/tiddlers/Release 5.2.4.tid +++ b/editions/prerelease/tiddlers/Release 5.2.4.tid @@ -13,9 +13,13 @@ type: text/vnd.tiddlywiki url:"https://raw.githubusercontent.com/Jermolene/TiddlyWiki5/0dc30086e933cf2272cddb076a9fcbedad252735/editions/tw5.com/tiddlers/images/New%20Release%20Banner.png" >> -! Plugin Improvements +! Major Improvements -* New [[Twitter Archivist|./editions/twitter-archivist]] plugin to imports the tweets and associated media from a Twitter Archive as individual tiddlers +New [ext[Twitter Archivist|./editions/twitter-archivist]] plugin to import the tweets and associated media from a Twitter Archive as individual tiddlers. + +<<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6961">> new GenesisWidget that allows the dynamic construction of another widget, where the name and attributes of the new widget can be dynamically determined, without needing to be known in advance + +<<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6936">> new operators for reading and formatting JSON data: [[jsonget Operator]], [[jsonindexes Operator]], [[jsontype Operator]] and [[format Operator]] ! Translation improvement @@ -32,10 +36,6 @@ Improvements to the translation features of TiddlyWiki: * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6882">> the [[Translators Edition|Translate TiddlyWiki into your language]] to add an option to display the original English text underneath the text area * <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/6933">> "delete" button text in $:/AdvancedSearch so that it is translatable -! Accessibility Improvements - -* - ! Usability Improvements * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/d62a16ee464fb9984b766b48504829a1a3eb143b">> problem with long presses on tiddler links triggering a preview on iOS/iPadOS @@ -46,11 +46,15 @@ Improvements to the translation features of TiddlyWiki: * <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/6877">> default styles for [[styled runs|Styles and Classes in WikiText]] * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6881">> upgrade wizard to make the version number more prominent * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7042">> parsing of tiddlers containing CSV data for greater compatibility +* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7076">> new page control button to summon the layout switcher +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7084">> folded tiddlers to ensure that the unfold button is always visible +* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7072">> handling of [[Modals]] to optionally allow them to be dismissed by clicking on the background ! Widget Improvements -* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6961">> new GenesisWidget that allows the dynamic construction of another widget, where the name and attributes of the new widget can be dynamically determined, without needing to be known in advance * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/127f660c91020dcbb43897d954066b31af729e74">> EditTextWidget to remove the default text "Type the text for the tiddler 'foo'" +* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7081">> ''focus'' attribute to SelectWidget +* <<.link-badge-removed "https://github.com/Jermolene/TiddlyWiki5/commit/1df4c29d73073788ba3859668112e8bb46171a6c">> restriction of the LetWidget being unable to create variables whose names begin with a dollar sign ! Filter improvements @@ -61,10 +65,8 @@ Improvements to the translation features of TiddlyWiki: * <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7004">> support for nested [[macro definitions|Macro Definitions in WikiText]] * <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6976">> support for [[SystemTag: $:/tags/ClassFilters/TiddlerTemplate]] and [[SystemTag: $:/tags/ClassFilters/PageTemplate]] to assign dynamic CSS classes to both tiddler frames and the page template -* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6936">> new operators for reading and formatting JSON data: [[jsonget Operator]], [[jsonindexes Operator]], [[jsontype Operator]] and [[format Operator]] * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/c5d3d4c26e8fe27f272dda004aec27d6b66c4f60">> safe mode to disable wiki store indexers * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/166a1565843878083fb1eba47c73b8e67b78400d">> safe mode to prevent globally disabling parser rules -* <<.link-badge-removed "https://github.com/Jermolene/TiddlyWiki5/commit/1df4c29d73073788ba3859668112e8bb46171a6c">> restriction of the LetWidget being unable to create variables whose names begin with a dollar sign * <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/6735">> keyboard shortcut handling to allow to global shortcuts to override all other shortcuts * <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/commit/965bd090a905f5756e79124b698c894f7f72ad5b">> [[list-links Macro]] to allow the rendered field to be overriden * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6913">> [[Table-of-Contents Macros]] to allow the default icons to be overridden @@ -72,6 +74,8 @@ Improvements to the translation features of TiddlyWiki: * <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/5947">> [[timeline Macro]] to override the link template * <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7043">> support for Unix epoch timestamps in [[date format strings|DateFormat]] * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7064">> the "big green download button" to use the defined palette colour +* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7063">> new hidden setting [[to use horizontal tabs for the "more" sidebar tab|Hidden Setting: More Tabs Horizontal]] + ! Bug Fixes @@ -80,13 +84,11 @@ Improvements to the translation features of TiddlyWiki: * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7017">> issue with wikification within the advanced search filter dropdown * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7057">> the table in $:/Import to avoid creating hidden empty rows * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7008">> advanced search keyboard shortcut not navigating correctly - -! Developer Improvements - -* +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7083">> erroneous display of drafts within the advanced search filter dropdown ! Node.js Improvements +* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7073">> new CommandsCommand to enable command tokens to be dynamically generated from a filter * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6947">> console logging to avoid spaces and `` message * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7014">> problem with lazy loading deleting tiddler bodies under certian circumstances * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/344110e2890caf711ab8f3c4f4deaa7d86771231">> handling of ".mp4" file extension so that it defaults to video not audio @@ -98,7 +100,7 @@ Improvements to the translation features of TiddlyWiki: * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/53d229592df76c6dd607e40be5bea4d5e063c48e">> performance of `wiki.getTiddler()` * <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/commit/81ac9874846b3ead275f67010fcfdb49f3d2f43c">> performance of variable prototype chain handling - +* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/6056">> performance of list handling during filter processing ! Acknowledgements @@ -109,12 +111,15 @@ AnthonyMuscio bestony btheado BramChen +carlo-columbo EvidentlyCube FlashSystems flibbles fu-sen joebordes hoelzro +kookma +linonetwo Marxsal oflg pmario diff --git a/editions/test/tiddlers/tests/test-linked-list.js b/editions/test/tiddlers/tests/test-linked-list.js index 16bb33f61..de477257d 100644 --- a/editions/test/tiddlers/tests/test-linked-list.js +++ b/editions/test/tiddlers/tests/test-linked-list.js @@ -59,10 +59,35 @@ describe("LinkedList class tests", function() { return pair; }; + // This returns an array in reverse using a LinkList's prev member. Thus + // testing that prev is not corrupt. It doesn't exist in the LinkList module + // itself to avoid full support for it. Maybe that will change later. + function toReverseArray(list) { + var visits = Object.create(null), + value = list.prev.get(null), + array = []; + while(value !== null) { + array.push(value); + var prev = list.prev.get(value); + if(Array.isArray(prev)) { + var i = (visits[value] || prev.length) - 1; + visits[value] = i; + value = prev[i]; + } else { + value = prev; + } + } + return array; + }; + // compares an array and a linked list to make sure they match up function compare(pair) { - expect(pair.list.toArray()).toEqual(pair.array); + var forward = pair.list.toArray(); + expect(forward).toEqual(pair.array); expect(pair.list.length).toBe(pair.array.length); + // Now we reverse the linked list and test it back to front, thus + // confirming that the list.prev isn't corrupt. + expect(toReverseArray(pair.list)).toEqual(forward.reverse()); return pair; }; @@ -115,7 +140,7 @@ describe("LinkedList class tests", function() { // for list.last to be anything other than a string, but I // can't figure out how to make that corruption manifest a problem. // So I dig into its private members. Bleh... - expect(typeof pair.list.last).toBe("string"); + expect(typeof pair.list.prev.get(null)).toBe("string"); }); it("can pushTop value linked to by a repeat item", function() { diff --git a/editions/test/tiddlers/tests/test-popup.js b/editions/test/tiddlers/tests/test-popup.js new file mode 100644 index 000000000..455da2b9b --- /dev/null +++ b/editions/test/tiddlers/tests/test-popup.js @@ -0,0 +1,63 @@ +/*\ +title: test-popup.js +type: application/javascript +tags: [[$:/tags/test-spec]] + +Tests some utility function of the Popup prototype. + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +describe("Popup tests", function() { + + it("parseCoordinates should parse valid coordinates", function() { + var popup = require("$:/core/modules/utils/dom/popup.js"); + + expect(popup.parseCoordinates("(1,2,3,4)")).toEqual({absolute: false, left: 1, top: 2, width: 3, height: 4}); + expect(popup.parseCoordinates("(1.5,2.6,3.7,4.8)")).toEqual({absolute: false, left: 1.5, top: 2.6, width: 3.7, height: 4.8}); + expect(popup.parseCoordinates("@(1,2,3,4)")).toEqual({absolute: true, left: 1, top: 2, width: 3, height: 4}); + expect(popup.parseCoordinates("@(1.5,2.6,3.7,4.8)")).toEqual({absolute: true, left: 1.5, top: 2.6, width: 3.7, height: 4.8}); + }); + + it("parseCoordinates should not parse invalid coordinates", function() { + var popup = require("$:/core/modules/utils/dom/popup.js"); + + expect(popup.parseCoordinates("#(1,2,3,4)")).toEqual(false); + expect(popup.parseCoordinates("(1,2,3,4")).toEqual(false); + expect(popup.parseCoordinates("(1,2,3)")).toEqual(false); + }); + + it("buildCoordinates should create valid coordinates", function() { + var popup = require("$:/core/modules/utils/dom/popup.js"); + + var coordinates = { + left: 1.5, + top: 2.6, + width: 3.7, + height: 4.8 + }; + + expect(popup.buildCoordinates(popup.coordinatePrefix.csOffsetParent, coordinates)).toEqual("(1.5,2.6,3.7,4.8)"); + expect(popup.buildCoordinates(popup.coordinatePrefix.csAbsolute, coordinates)).toEqual("@(1.5,2.6,3.7,4.8)"); + }); + + it("buildCoordinates should detect invalid input", function() { + var popup = require("$:/core/modules/utils/dom/popup.js"); + + var coordinates = { + left: "invalid", + top: 2.6, + width: 3.7, + height: 4.8 + }; + + expect(popup.buildCoordinates(popup.coordinatePrefix.csOffsetParent, coordinates)).toEqual("(0,0,0,0)"); + expect(popup.buildCoordinates("dummy", coordinates)).toEqual("(0,0,0,0)"); + }); +}); + +})(); diff --git a/editions/translators/tiddlers/system/PageControlButtonsVisibility.multids b/editions/translators/tiddlers/system/PageControlButtonsVisibility.multids index 65f2405ec..714479946 100644 --- a/editions/translators/tiddlers/system/PageControlButtonsVisibility.multids +++ b/editions/translators/tiddlers/system/PageControlButtonsVisibility.multids @@ -13,4 +13,5 @@ core/ui/Buttons/more-page-actions: show core/ui/Buttons/new-journal: hide core/ui/Buttons/permaview: hide core/ui/Buttons/storyview: hide +core/ui/Buttons/layout: hide core/ui/Buttons/theme: hide diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png b/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png new file mode 100644 index 000000000..881947506 Binary files /dev/null and b/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png differ diff --git a/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png.meta b/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png.meta new file mode 100644 index 000000000..aa3f9d11a --- /dev/null +++ b/editions/tw5.com/tiddlers/_tw_shared/favicons/markplace.png.meta @@ -0,0 +1,3 @@ +title: $:/_tw_shared/favicons/marketplace +type: image/png +tags: TiddlyWikiSitesMenu diff --git a/editions/tw5.com/tiddlers/_tw_shared/sites/marketplace.tid b/editions/tw5.com/tiddlers/_tw_shared/sites/marketplace.tid new file mode 100644 index 000000000..53b14585d --- /dev/null +++ b/editions/tw5.com/tiddlers/_tw_shared/sites/marketplace.tid @@ -0,0 +1,6 @@ +title: $:/_tw_shared/sites/marketplace +tags: $:/tags/TiddlyWikiSites TiddlyWikiSitesMenu +caption: marketplace +description: Commercial Products and Services +url: https://talk.tiddlywiki.org/c/marketplace/22 +icon: $:/_tw_shared/favicons/marketplace diff --git a/editions/tw5.com/tiddlers/_tw_shared/tags-TiddlyWikiSites.tid b/editions/tw5.com/tiddlers/_tw_shared/tags-TiddlyWikiSites.tid index 0dadeb2e3..00e567510 100644 --- a/editions/tw5.com/tiddlers/_tw_shared/tags-TiddlyWikiSites.tid +++ b/editions/tw5.com/tiddlers/_tw_shared/tags-TiddlyWikiSites.tid @@ -1,3 +1,3 @@ title: $:/tags/TiddlyWikiSites -list: $:/_tw_shared/sites/tiddlywiki.com $:/_tw_shared/sites/tiddlywiki.org $:/_tw_shared/sites/talk.tiddlywiki.org $:/_tw_shared/sites/links.tiddlywiki.org $:/_tw_shared/sites/tiddlywiki.com.upgrade $:/_tw_shared/sites/tiddlywiki.com.dev $:/_tw_shared/sites/tiddlywiki.com.prerelease $:/_tw_shared/sites/classic.tiddlywiki.com +list: $:/_tw_shared/sites/tiddlywiki.com $:/_tw_shared/sites/tiddlywiki.org $:/_tw_shared/sites/talk.tiddlywiki.org $:/_tw_shared/sites/links.tiddlywiki.org $:/_tw_shared/sites/tiddlywiki.com.upgrade $:/_tw_shared/sites/tiddlywiki.com.dev $:/_tw_shared/sites/tiddlywiki.com.prerelease $:/_tw_shared/sites/classic.tiddlywiki.com $:/_tw_shared/sites/marketplace tags: TiddlyWikiSitesMenu diff --git a/editions/tw5.com/tiddlers/about/Funding TiddlyWiki.tid b/editions/tw5.com/tiddlers/about/Funding TiddlyWiki.tid new file mode 100644 index 000000000..938631d55 --- /dev/null +++ b/editions/tw5.com/tiddlers/about/Funding TiddlyWiki.tid @@ -0,0 +1,19 @@ +title: Funding TiddlyWiki +tags: About HelloThere +modified: 20221204165636777 +created: 20221204165636777 + +TiddlyWiki is more useful to everybody if it is free to use, with no financial barriers to long term adoption. It is not altruism; we believe that removing or reducing barriers to adoption will help to ensure TiddlyWiki's future by making the community larger and stronger. + +Nonetheless, TiddlyWiki is a relatively big, complex machine that requires a significant amount of ongoing work to maintain and improve. Some community infrastructure also requires monthly fees to operate (notably the [[TiddlyWiki forum|Forums]]). + +The people in the community that do the work have widely varying needs: + +* At one end, a good proportion of the work on TiddlyWiki is performed by community members on a purely voluntary basis. For those people, the satisfaction of helping others is sufficient reward. Indeed, for many people, unpaid voluntary activities are a satisfying antidote to everyday paid work +* At the other extreme, JeremyRuston and some other contributors are trying to make a full-time living working on TiddlyWiki by offering commercial products and services around it +* In between, there are other people who would appreciate an ocassional token to reward them for their work + +To support these needs in the community, we have two initiatives: + +* We use [[Open Collective]] to collect donations for the infrastructure costs of the Community and to crowdfund specific developments by individuals or organisations +* The [[TiddlyWiki Marketplace]] provides a shop window for individuals and organisations offering commercial products and services diff --git a/editions/tw5.com/tiddlers/about/Open Collective.tid b/editions/tw5.com/tiddlers/about/Open Collective.tid new file mode 100644 index 000000000..8d096cdc8 --- /dev/null +++ b/editions/tw5.com/tiddlers/about/Open Collective.tid @@ -0,0 +1,14 @@ +title: Open Collective +modified: 20221204165636777 +created: 20221204165636777 +tags: About HelloThere [[Open Collective]] + +Open Collective is a platform for transparent fundraising and expenses for projects like TiddlyWiki. It is the official TiddlyWiki community fundraising space. + +https://opencollective.com/tiddlywikidotorg + +You can make a fixed one-time donation, or setup a recurring contribution. + +The main goals listed for donations are to cover basic costs for community infrastructure like the Discourse forum, and a new goal for supporting the TiddlyWiki Core. + +Additionally, the community can make use of the platform for special projects - to pool funds to pay for development, design, or anything else. The [[File Upload Plugin|https://opencollective.com/tiddlywikidotorg/projects/tiddlywiki-file-upload]] is the first of these, and we want to welcome others to launch projects here. diff --git a/editions/tw5.com/tiddlers/commands/CommandsCommand.tid b/editions/tw5.com/tiddlers/commands/CommandsCommand.tid new file mode 100644 index 000000000..84d819a84 --- /dev/null +++ b/editions/tw5.com/tiddlers/commands/CommandsCommand.tid @@ -0,0 +1,8 @@ +created: 20221204202531478 +modified: 20221204202531478 +tags: Commands +title: CommandsCommand +type: text/vnd.tiddlywiki +caption: commands + +{{$:/language/Help/commands}} diff --git a/editions/tw5.com/tiddlers/community/plugins/_JD Mobile Layout plugin_ by JD.tid b/editions/tw5.com/tiddlers/community/plugins/_JD Mobile Layout plugin_ by JD.tid index 6bd891b23..6c1593a09 100644 --- a/editions/tw5.com/tiddlers/community/plugins/_JD Mobile Layout plugin_ by JD.tid +++ b/editions/tw5.com/tiddlers/community/plugins/_JD Mobile Layout plugin_ by JD.tid @@ -1,5 +1,4 @@ created: 20171107181449175 -creator: Ste Willson modified: 20210106151027136 tags: [[Community Plugins]] title: "JD Mobile Layout plugin" by JD diff --git a/editions/tw5.com/tiddlers/community/resources/_Dropboard_ by Reid Gould.tid b/editions/tw5.com/tiddlers/community/resources/_Dropboard_ by Reid Gould.tid index 6f0eb3523..efda31cbe 100644 --- a/editions/tw5.com/tiddlers/community/resources/_Dropboard_ by Reid Gould.tid +++ b/editions/tw5.com/tiddlers/community/resources/_Dropboard_ by Reid Gould.tid @@ -1,5 +1,4 @@ created: 20171111192738730 -creator: MAS modified: 20210106151027013 tags: [[Other Resources]] title: "Dropboard" by Reid Gould diff --git a/editions/tw5.com/tiddlers/community/resources/_Hacks_ by Thomas Elmiger.tid b/editions/tw5.com/tiddlers/community/resources/_Hacks_ by Thomas Elmiger.tid index 8d9cb326b..dac485c6c 100644 --- a/editions/tw5.com/tiddlers/community/resources/_Hacks_ by Thomas Elmiger.tid +++ b/editions/tw5.com/tiddlers/community/resources/_Hacks_ by Thomas Elmiger.tid @@ -1,7 +1,5 @@ created: 20161226165024380 -creator: Thomas Elmiger modified: 20210106151027097 -modifier: Thomas Elmiger tags: [[Other Resources]] title: "Hacks" by Thomas Elmiger type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/community/resources/_MathCell_ by Ste Wilson.tid b/editions/tw5.com/tiddlers/community/resources/_MathCell_ by Ste Wilson.tid index 20957e433..d804f9052 100644 --- a/editions/tw5.com/tiddlers/community/resources/_MathCell_ by Ste Wilson.tid +++ b/editions/tw5.com/tiddlers/community/resources/_MathCell_ by Ste Wilson.tid @@ -1,5 +1,4 @@ created: 20161226165024380 -creator: Ste Willson modified: 20210106151027156 tags: [[Other Resources]] title: "MathCell" by Stephen Kimmel diff --git a/editions/tw5.com/tiddlers/community/resources/_TiddlyServer_ by Matt Lauber.tid b/editions/tw5.com/tiddlers/community/resources/_TiddlyServer_ by Matt Lauber.tid index 4b1e660c2..6a65fe825 100644 --- a/editions/tw5.com/tiddlers/community/resources/_TiddlyServer_ by Matt Lauber.tid +++ b/editions/tw5.com/tiddlers/community/resources/_TiddlyServer_ by Matt Lauber.tid @@ -1,5 +1,4 @@ created: 20161226165024380 -creator: Matt Lauber modified: 20211113230709926 tags: [[Other Resources]] title: "TiddlyServer" by Matt Lauber diff --git a/editions/tw5.com/tiddlers/community/resources/_X3DOM for TiddlyWiki 5_ by Jamal Wills.tid b/editions/tw5.com/tiddlers/community/resources/_X3DOM for TiddlyWiki 5_ by Jamal Wills.tid index 4df710ad4..c7e2790e2 100644 --- a/editions/tw5.com/tiddlers/community/resources/_X3DOM for TiddlyWiki 5_ by Jamal Wills.tid +++ b/editions/tw5.com/tiddlers/community/resources/_X3DOM for TiddlyWiki 5_ by Jamal Wills.tid @@ -1,5 +1,4 @@ created: 20171107175718679 -creator: Ste Willson modified: 20210106151027400 tags: [[Other Resources]] title: "X3DOM for TiddlyWiki 5" by Jamal Wills diff --git a/editions/tw5.com/tiddlers/concepts/CoordinateSystems.tid b/editions/tw5.com/tiddlers/concepts/CoordinateSystems.tid new file mode 100644 index 000000000..9b66f941b --- /dev/null +++ b/editions/tw5.com/tiddlers/concepts/CoordinateSystems.tid @@ -0,0 +1,42 @@ +created: 20220810201659784 +modified: 20220810201659784 +tags: Concepts +title: Coordinate Systems +type: text/vnd.tiddlywiki + +TiddlyWiki (primarily the RevealWidget) supports two coordinate systems for positioning popups (see PopupMechanism to learn more about popups). + +<<.from-version "5.2.4">> We introduced absolute coordinates that may not work with all extensions and plugins. For maximum backwards compatibility, use absolute coordinates only where necessary. + +!! Relative coordinate system + +The default coordinate system is relative to the nearest positioned ancestor element. This is either: + +* an element with a non-static position, or +* a ''td'', ''th'', ''table'' in case the element itself is static positioned. + +For tiddlers the nearest positioned ancestor element mostly is the body of the tiddler. Read the next chapter to learn about the exceptions. + +Relative coordinates are expressed in the form ''(x,y,w,h)''. Where ''x'' and ''y'' represent the position and ''w'' and ''h'' the width and height of the element. + +!! Absolute coordinate system + +The relative coordinate system works flawless most of the time. Problems occure if the target element (for example, a popup) and the source element (the triggering button) do not share the same positioned ancherstor element. This is often the case if the popup is declared outside a table and the triggering button is declared within a table cell. In this case the coordiante systems have different origins and the popup will be displayed in the wrong location. + +Absolute coordinates can fix this problem by using the root element of the page (the upper-left corner of the page) as the origin of the coordinate system. Absolute coordinates are expressed in the form ''@(x,y,w,h)''. Where ''x'' and ''y'' represent the position and ''w'' and ''h'' the width and height of the element. The leading ''@''-symbol marks these coordinates as absolute. + +The ButtonWidget has an option (''popupAbsCoords'') to put absolute coordinates into the state tiddler. The DraggableWidget and the EventCatcherWidget provide the absolute coordinate of an event within the attribute `tv-popup-abs-coords`. + + +!! Example + +The following example shows a popup that is triggerd from within a table cell. The table cell is the nearest positioned ancestor element. The popup was defined outside the table cell. The button using relative coordinates will open the popup in the wrong location because the button and the popup do not agree on the same coordinate system. Using absolute coordinates fixes this problem. + +< +
+Popup +
+ + +| Table Row 1 |<$button popup="$:/state/CoordinateSampleReveal">Relative coordinates| +| Table Row 2 |<$button popup="$:/state/CoordinateSampleReveal" popupAbsCoords="yes">Absolute coordinates|'>> diff --git a/editions/tw5.com/tiddlers/definitions/Federatial.tid b/editions/tw5.com/tiddlers/definitions/Federatial.tid index b2ebdf83b..ce256709d 100644 --- a/editions/tw5.com/tiddlers/definitions/Federatial.tid +++ b/editions/tw5.com/tiddlers/definitions/Federatial.tid @@ -1,9 +1,21 @@ created: 20130825154900000 modified: 20170718160846820 +modified: 20221204165636777 tags: Definitions title: Federatial type: text/vnd.tiddlywiki -Federatial Limited is a software consultancy founded by JeremyRuston, the creator of TiddlyWiki. Federatial helps organisations explore new user interaction concepts through rapid prototyping of sophisticated web-based tools. +Federatial Limited helps organisations explore new user interaction concepts through rapid prototyping of sophisticated web-based tools. Services include: + +* Consultancy advice on TiddlyWiki adoption +* Development of custom solutions based on TiddlyWiki +* Multi-user TiddlyWiki hosting – no outages since 2016 +* Sponsorship of TiddlyWiki core development See https://federatial.com/ and https://twitter.com/federatial for more information. + +JeremyRuston founded Federatial Limited in 2011 to support his work on TiddlyWiki for the advertised 25 years. Since then, Federatial has been privileged to have worked with a wide range of fantastic clients in very different sectors, on some very diverse projects: + +* For a law firm in the Washington DC, developing a custom multi-user ~TiddlyWiki application. It replaced a Microsoft Word document hosted on ~SharePoint that had grown to 18,000 pages and 10 million words, and was increasingly unwieldy to manage. We converted the document to a non-linear TiddlyWiki structure. Startup, searching and browsing are an order of magnitude faster than using Word and ~SharePoint +* For a publishing firm in Paris, devising a new TiddlyWiki-based format for interactive electronic publications (including conversion from the established EPUB format). See https://twpub-tools.org/ +* For a charity in London, maintaining a multiuser instance of TiddlyWiki running on Amazon's serverless infrastructure. It has more than 1,000 users, and over 15,000 tiddlers in 500 interlinked wikis. See https://manuals.annafreud.org/ambit diff --git a/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid b/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid index 583abf9bc..7af89352c 100644 --- a/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid +++ b/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid @@ -4,6 +4,8 @@ tags: Definitions title: TiddlyWikiClassic type: text/vnd.tiddlywiki -"~TiddlyWiki Classic" refers to versions prior to 5.0, before TiddlyWiki was completely rewritten from the ground up. TiddlyWiki Classic is still being maintained at: +[img[TiddlyWiki Classic.png]] + +"~TiddlyWiki Classic" refers to versions prior to 5.0, before TiddlyWiki was completely rewritten. TiddlyWiki Classic is still actively maintained at: https://classic.tiddlywiki.com/ diff --git a/editions/tw5.com/tiddlers/features/Modals.tid b/editions/tw5.com/tiddlers/features/Modals.tid index 56b596947..045822958 100644 --- a/editions/tw5.com/tiddlers/features/Modals.tid +++ b/editions/tw5.com/tiddlers/features/Modals.tid @@ -13,9 +13,12 @@ The tiddler to be displayed can contain the following optional fields that are u |subtitle|The subtitle text for a modal, displayed in a `h3` html tag| |class|An additional class to apply to the modal wrapper| |help|An optional external link that will be displayed at the left of the footer with the text "Help"| +|mask-closable|When set to ''yes'' or ''true'', will close the modal dialog when the mask (area outside the modal) is clicked| Note that the footer and subtitle fields are not limited to plain text, and wiki text features such as widgets and transclusions can be used as well. Modals are displayed with the [[WidgetMessage: tm-modal]]. <$button message="tm-modal" param="SampleWizard">Open demo modal + +<<.tip """<$macrocall $name=".from-version" version="5.2.4"/> allow using "mask-closable" field""">> diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid index e9d93b70e..dec5d87b4 100644 --- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid +++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid @@ -1,34 +1,38 @@ created: 20130822170200000 list: [[A Gentle Guide to TiddlyWiki]] [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[What happened to the original TiddlyWiki?]] -modified: 20220802122551819 +modified: 20221204165636777 tags: TableOfContents title: HelloThere type: text/vnd.tiddlywiki -''Have you ever had the feeling that your head is not quite big enough to hold everything you need to remember?'' - -Welcome to TiddlyWiki, a unique [[non-linear|Philosophy of Tiddlers]] notebook for [[capturing|Creating and editing tiddlers]], [[organising|Structuring TiddlyWiki]] and [[sharing|Sharing your tiddlers with others]] complex information. +!! ''Welcome to TiddlyWiki, a unique [[non-linear|Philosophy of Tiddlers]] notebook for [[capturing|Creating and editing tiddlers]], [[organising|Structuring TiddlyWiki]] and [[sharing|Sharing your tiddlers with others]] complex information'' Use it to keep your [[to-do list|TaskManagementExample]], to plan an [[essay or novel|"TiddlyWiki for Scholars" by Alberto Molina]], or to organise your wedding. Record every thought that crosses your brain, or build a flexible and responsive website. -
-<> -
- Unlike conventional online services, TiddlyWiki lets you choose where to keep your data, guaranteeing that in the decades to come you will [[still be able to use|Future Proof]] the notes you take today. -
+!! ''Find Out More'' + +
+<$list filter="[tag[HelloThumbnail]]"> +<$macrocall $name="flex-card" captionField="caption" descriptionField="text"/> + +
+ +!! ''~TiddlyWiki Hubs'' + +
{{$:/core/images/help}} ~TalkTW {{$:/core/images/video}} ~YouTube - + {{$:/core/images/twitter}} Twitter -{{$:/core/images/mastodon}} Mastodon +{{$:/core/images/globe}} Mastodon {{$:/core/images/github}} ~GitHub @@ -38,16 +42,10 @@ Unlike conventional online services, TiddlyWiki lets you choose where to keep yo
-<<<.tc-big-quote -''The ~TiddlyWiki is the best software I've ever found for organising my ideas.'' +!! ''Testimonials & Reviews'' -It's well worth spending an hour or so playing with it to see how it can help you. This will be time well-spent and will change how you think and how you organise your ideas. -<<< [[Joe Armstrong, Co-inventor of Erlang|https://joearms.github.io/]] - -<<<.tc-big-quote -''~TiddlyWiki gets a Gearhead rating of 6 out of 5 (it's that good).'' - -Finding code that works flawlessly after just two or three years is magical enough but after seven years?! -<<< [[Mark Gibbs, Network World|http://www.networkworld.com/article/3028098/open-source-tools/tiddlywiki-a-free-open-source-wiki-revisited.html]] - -
{{Product Hunt Link}}
+
+<$list filter="[tag[Testimonial]]"> +<$macrocall $name="flex-card" class="tc-card-quote" captionField="caption" descriptionField="text"/> + +
\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid b/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid index f50bccca6..cd304e703 100644 --- a/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid +++ b/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid @@ -1,5 +1,5 @@ created: 20150414070451144 -list: [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Gentle Guide]] [[HelloThumbnail - Grok TiddlyWiki]] [[HelloThumbnail - Firefox Apocalypse]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - TiddlyWikiLinks]] [[HelloThumbnail - TiddlyMap]] [[HelloThumbnail - HelpingTiddlyWiki]] [[HelloThumbnail - Developers]] [[HelloThumbnail - Classic]] +list: [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Grok TiddlyWiki]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - TiddlyWikiLinks]] [[HelloThumbnail - Developers]] [[HelloThumbnail - Funding]] [[HelloThumbnail - Marketplace]] [[HelloThumbnail - Federatial]] modified: 20150414070948246 title: HelloThumbnail type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Classic.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Classic.tid deleted file mode 100644 index ec4af8412..000000000 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Classic.tid +++ /dev/null @@ -1,6 +0,0 @@ -title: HelloThumbnail - Classic -tags: HelloThumbnail -color: #D5B7EA -image: TiddlyWiki Classic.png -caption: ~TiddlyWiki Classic -link: TiddlyWikiClassic diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Developers.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Developers.tid deleted file mode 100644 index 141c8c90f..000000000 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Developers.tid +++ /dev/null @@ -1,7 +0,0 @@ -title: HelloThumbnail - Developers -tags: HelloThumbnail -color: #6B6E98 -background-color: #EAE57D -image: Dev Thumbnail.jpg -caption: Developers -link: Developers diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Funding.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Funding.tid new file mode 100644 index 000000000..bc48ec0c0 --- /dev/null +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Funding.tid @@ -0,0 +1,10 @@ +background-color: #EDB431 +caption: How is ~TiddlyWiki Funded? +color: #ff0 +image: Funding.png +link: Funding TiddlyWiki +tags: HelloThumbnail +title: HelloThumbnail - Funding +ribbon-text: NEW + +Find out how you can help support ~TiddlyWiki financially \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Gentle Guide.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Gentle Guide.tid deleted file mode 100644 index 9dda9420f..000000000 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Gentle Guide.tid +++ /dev/null @@ -1,11 +0,0 @@ -background-color: #EDB431 -caption: A Gentle Guide -color: #fff -created: 20150325172634195 -image: Motovun Jack.jpg -link: A Gentle Guide to TiddlyWiki -modified: 20150414071032492 -tags: HelloThumbnail -title: HelloThumbnail - Gentle Guide -type: text/vnd.tiddlywiki - diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid index a8cb2d5be..f076ced60 100644 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Grok TiddlyWiki.tid @@ -4,3 +4,5 @@ color: #D5B7EA image: Grok TiddlyWiki Banner caption: Grok ~TiddlyWiki link: "Grok TiddlyWiki" by Soren Bjornstad + +A guided tutorial through ~TiddlyWiki \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - HelpingTiddlyWiki.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - HelpingTiddlyWiki.tid deleted file mode 100644 index 46f477bca..000000000 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - HelpingTiddlyWiki.tid +++ /dev/null @@ -1,7 +0,0 @@ -title: HelloThumbnail - HelpingTiddlyWiki -tags: HelloThumbnail -color: #B7D5EA -background-color: #fff -caption: Helping ~TiddlyWiki -link: HelpingTiddlyWiki -image: Tiddler Poster.png diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Introduction Video.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Introduction Video.tid index 15ce2b073..aa34f87b5 100644 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Introduction Video.tid +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Introduction Video.tid @@ -6,3 +6,5 @@ icon: {{$:/core/images/video}} caption: Introduction to ~TiddlyWiki link: Introduction Video image: Introduction Video Thumbnail.jpg + +Short video introducing basic ~TiddlyWiki concepts \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Latest Version.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Latest Version.tid index 32498bfc4..25b0bb36a 100644 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Latest Version.tid +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Latest Version.tid @@ -1,6 +1,14 @@ title: HelloThumbnail - Latest Version tags: HelloThumbnail -caption: What's New in <> +caption: What's New in v<> link: Releases image: New Release Banner color: #fff + +\define prerelease-regexp() [0-9]+\.[0-9]+\.[0-9]+\-prerelease +<$list filter="[!regexp]" variable="ignore"> +The latest version v<> of ~TiddlyWiki (released on <$view field="released" tiddler={{{ [addprefix[Release ]] }}} format="date" template="DDth MMM YYYY"/>) + +<$list filter="[regexp]" variable="ignore"> +This is a prerelease build for testing and review + diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Marketplace.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Marketplace.tid new file mode 100644 index 000000000..39a72569c --- /dev/null +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Marketplace.tid @@ -0,0 +1,10 @@ +title: HelloThumbnail - Marketplace +tags: HelloThumbnail +color: #6B6E98 +background-color: #EAE57D +image: TiddlyWiki Marketplace Banner +caption: ~TiddlyWiki Marketplace +link: TiddlyWiki Marketplace +ribbon-text: NEW + +Explore commercial products and services for ~TiddlyWiki \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2017.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2017.tid deleted file mode 100644 index 658ada797..000000000 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2017.tid +++ /dev/null @@ -1,8 +0,0 @@ -title: HelloThumbnail - TWEUM2017 -tags: HelloThumbnail-disabled -color: #fff -background-color: #000 -icon: 2017 -image: TWEUM Thumbnail.jpg -caption: European Meetup 2017 -link: TiddlyWiki European Meetup 2017 diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyMap.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyMap.tid deleted file mode 100644 index 26feee0d9..000000000 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyMap.tid +++ /dev/null @@ -1,6 +0,0 @@ -title: HelloThumbnail - TiddlyMap -tags: HelloThumbnail -color: #D5B7EA -image: TiddlyMap.png -caption: ~TiddlyMap Plugin -link: TiddlyMap Plugin by Felix Küppers diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyWikiLinks.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyWikiLinks.tid index a5b3e44ad..221a3ae10 100644 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyWikiLinks.tid +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TiddlyWikiLinks.tid @@ -2,5 +2,7 @@ title: HelloThumbnail - TiddlyWikiLinks tags: HelloThumbnail color: #D5B7EA image: TiddlyWikiLinks -caption: links.tiddlywiki.com +caption: links.tiddlywiki.org link: Community Links Aggregator + +Links to ~TiddlyWiki-related content collected by the community \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Federatial.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Federatial.tid new file mode 100644 index 000000000..9d76619a7 --- /dev/null +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Federatial.tid @@ -0,0 +1,11 @@ +background-color: #EDB431 +caption: Federatial +color: #ff0 +image: Federatial.png +link: Federatial +tags: HelloThumbnail +title: HelloThumbnail - Federatial +type: text/vnd.tiddlywiki +ribbon-text: NEW + +Support the development of ~TiddlyWiki by hiring Jeremy Ruston through Federatial Limited \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ More Tabs Horizontal.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ More Tabs Horizontal.tid new file mode 100644 index 000000000..59d58d633 --- /dev/null +++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ More Tabs Horizontal.tid @@ -0,0 +1,7 @@ +created: 20221128092648000 +modified: 20221128092903706 +tags: [[Hidden Settings]] +title: Hidden Setting: More Tabs Horizontal +type: text/vnd.tiddlywiki + +Set the $:/config/ui/SideBar/More/horizontal tiddler to ''yes'', to align the ''More -> Tabs'' in horizontal orientation. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/images/Dev Thumbnail.jpg b/editions/tw5.com/tiddlers/images/Dev Thumbnail.jpg deleted file mode 100644 index 1a26d1aee..000000000 Binary files a/editions/tw5.com/tiddlers/images/Dev Thumbnail.jpg and /dev/null differ diff --git a/editions/tw5.com/tiddlers/images/Dev Thumbnail.jpg.meta b/editions/tw5.com/tiddlers/images/Dev Thumbnail.jpg.meta deleted file mode 100644 index b52891518..000000000 --- a/editions/tw5.com/tiddlers/images/Dev Thumbnail.jpg.meta +++ /dev/null @@ -1,3 +0,0 @@ -title: Dev Thumbnail.jpg -type: image/jpeg -tags: picture diff --git a/editions/tw5.com/tiddlers/images/Federatial.png b/editions/tw5.com/tiddlers/images/Federatial.png new file mode 100644 index 000000000..3adde3a11 Binary files /dev/null and b/editions/tw5.com/tiddlers/images/Federatial.png differ diff --git a/editions/tw5.com/tiddlers/images/Federatial.png.meta b/editions/tw5.com/tiddlers/images/Federatial.png.meta new file mode 100644 index 000000000..528629786 --- /dev/null +++ b/editions/tw5.com/tiddlers/images/Federatial.png.meta @@ -0,0 +1,3 @@ +title: Federatial.png +type: image/png +tags: picture diff --git a/editions/tw5.com/tiddlers/images/Funding.png b/editions/tw5.com/tiddlers/images/Funding.png new file mode 100644 index 000000000..b55be8441 Binary files /dev/null and b/editions/tw5.com/tiddlers/images/Funding.png differ diff --git a/editions/tw5.com/tiddlers/images/TiddlyMap.png.meta b/editions/tw5.com/tiddlers/images/Funding.png.meta similarity index 58% rename from editions/tw5.com/tiddlers/images/TiddlyMap.png.meta rename to editions/tw5.com/tiddlers/images/Funding.png.meta index 986f25906..b9caa4a72 100644 --- a/editions/tw5.com/tiddlers/images/TiddlyMap.png.meta +++ b/editions/tw5.com/tiddlers/images/Funding.png.meta @@ -1,3 +1,3 @@ -title: TiddlyMap.png +title: Funding.png type: image/png tags: picture diff --git a/editions/tw5.com/tiddlers/images/Marketplace Banner.png b/editions/tw5.com/tiddlers/images/Marketplace Banner.png new file mode 100644 index 000000000..51275547a Binary files /dev/null and b/editions/tw5.com/tiddlers/images/Marketplace Banner.png differ diff --git a/editions/tw5.com/tiddlers/images/Marketplace Banner.png.meta b/editions/tw5.com/tiddlers/images/Marketplace Banner.png.meta new file mode 100644 index 000000000..b693c99e3 --- /dev/null +++ b/editions/tw5.com/tiddlers/images/Marketplace Banner.png.meta @@ -0,0 +1,3 @@ +title: TiddlyWiki Marketplace Banner +type: image/jpeg +tags: picture diff --git a/editions/tw5.com/tiddlers/images/TiddlyMap.png b/editions/tw5.com/tiddlers/images/TiddlyMap.png deleted file mode 100644 index bed2ab345..000000000 Binary files a/editions/tw5.com/tiddlers/images/TiddlyMap.png and /dev/null differ diff --git a/editions/tw5.com/tiddlers/marketplace/TiddlyWiki Marketplace.tid b/editions/tw5.com/tiddlers/marketplace/TiddlyWiki Marketplace.tid new file mode 100644 index 000000000..3de695de3 --- /dev/null +++ b/editions/tw5.com/tiddlers/marketplace/TiddlyWiki Marketplace.tid @@ -0,0 +1,18 @@ +title: TiddlyWiki Marketplace +tags: Community +modified: 20221204165636777 +created: 20221204165636777 + +[img width=200px [TiddlyWiki Marketplace Banner]] + +Welcome to the TiddlyWiki Marketplace. This new forum is designed to provide a space for individuals and organizations to offer commercial products and services that are built around TiddlyWiki: + +* Paid hosting services +* Custom solution development +* Training courses +* One-to-one training sessions +* "Fix my wiki" debugging sessions + + +~TiddlyWiki Marketplace + diff --git a/editions/tw5.com/tiddlers/mechanisms/PopupMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/PopupMechanism.tid index 60566a329..79f3de4c5 100644 --- a/editions/tw5.com/tiddlers/mechanisms/PopupMechanism.tid +++ b/editions/tw5.com/tiddlers/mechanisms/PopupMechanism.tid @@ -8,6 +8,7 @@ The popup mechanism allows blocks of content to be selectively displayed and pos * [[StateTiddlers|StateMechanism]] to record whether a popup is currently displayed or not * The RevealWidget to selectively display the popup content +** <<.from-version "5.2.4">> For positioning the popups relative or absolute coordinates can be used. See [[Coordinate Systems]] for more information about usage and format. ** For "sticky" popups — those that don't close when clicking inside one — set the ''class'' attribute to `tc-popup-keep` * The ButtonWidget to trigger the display of the popup by setting the state tiddler appropriately diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-modal.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-modal.tid index b6db37eef..9a5d8ccd1 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-modal.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-modal.tid @@ -10,12 +10,14 @@ type: text/vnd.tiddlywiki |paramObject |Hashmap of variables to be provided to the modal, contains all extra parameters passed to the widget sending the message. | |rootwindow |<<.from-version 5.1.18>> ''yes'' or ''true'' will always display a modal in the wiki-root-window | -The "currentTiddler" variable is set to the title of the modal tiddler, but can be overridden by specifying a different value in `paramObject`. - The modal message is usually generated with the ButtonWidget. The modal message is handled by the TiddlyWiki core. [[Fields within the tiddler|Modals]] being displayed in the modal can be used to customize its appearance. +!! paramObject + +The "currentTiddler" variable is set to the title of the modal tiddler, but can be overridden by specifying a different value in `paramObject`. + ! Example Here is an example of displaying a modal and passing parameters to it: diff --git a/editions/tw5.com/tiddlers/saving/Emergency Tiddler Export.tid b/editions/tw5.com/tiddlers/saving/Emergency Tiddler Export.tid index 59a1f4484..92b78788b 100644 --- a/editions/tw5.com/tiddlers/saving/Emergency Tiddler Export.tid +++ b/editions/tw5.com/tiddlers/saving/Emergency Tiddler Export.tid @@ -2,7 +2,7 @@ caption: Emergency Export color: #7986CB created: 20180309211328412 delivery: Saver -description: Awkward but useful emergency technique for saving tiddlers +description: Retrieve and save tiddlers when saving is broken method: save modified: 20200507202809334 tags: Android Chrome Firefox [[Internet Explorer]] Linux Mac Opera Safari Saving Windows Edge diff --git a/editions/tw5.com/tiddlers/saving/Saving with Polly.tid b/editions/tw5.com/tiddlers/saving/Saving with Polly.tid index 60ae74087..103c9e0c7 100644 --- a/editions/tw5.com/tiddlers/saving/Saving with Polly.tid +++ b/editions/tw5.com/tiddlers/saving/Saving with Polly.tid @@ -9,6 +9,7 @@ modified: 20220223160414274 tags: Chrome Firefox [[Internet Explorer]] Linux Mac Opera Safari Saving Windows Edge title: Saving with Polly type: text/vnd.tiddlywiki +ribbon-text: NEW [[Polly|https://github.com/Marxsal/polly]] is a batch file system using Windows //~PowerShell// to restore ~TiddlyWiki files from a specified download directory to their original home directory. diff --git a/editions/tw5.com/tiddlers/saving/Saving.tid b/editions/tw5.com/tiddlers/saving/Saving.tid index 8210bba1f..9b55b1d1d 100644 --- a/editions/tw5.com/tiddlers/saving/Saving.tid +++ b/editions/tw5.com/tiddlers/saving/Saving.tid @@ -54,7 +54,7 @@ Available methods for saving changes with ~TiddlyWiki:
-
+
<$wikify text=<> name="alltagsfilterwikified"> <$list filter=<>> {{||$:/_tw5.com-card-template}} diff --git a/editions/tw5.com/tiddlers/saving/TiddlyBucket - Save to AWS or Google Storage.tid b/editions/tw5.com/tiddlers/saving/TiddlyBucket - Save to AWS or Google Storage.tid new file mode 100644 index 000000000..d4aefdb0e --- /dev/null +++ b/editions/tw5.com/tiddlers/saving/TiddlyBucket - Save to AWS or Google Storage.tid @@ -0,0 +1,15 @@ +caption: ~TiddlyBucket +color: #f48fb1 +created: 20221126192148031 +delivery: Protocol +description: Save to AWS or Google Storage +method: save +modified: 20221126192853897 +tags: Chrome Firefox [[Internet Explorer]] Linux Mac Opera Safari Saving Windows iOS Edge +title: TiddlyBucket - Save to AWS or Google Storage +type: text/vnd.tiddlywiki +ribbon-text: NEW + +~TiddlyBucket - Save to AWS or Google Storage using Go + +This tool replicates the ~TiddlyWeb backend API and can read and write the tiddler files to a local directory like the canonical ~TiddlyWiki5 app. But, in addition, it can do the same with a given a Google Cloud Storage bucket or AWS S3 bucket. Written in the Go programming language \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/system/tw5.com-card-template.tid b/editions/tw5.com/tiddlers/system/tw5.com-card-template.tid index 50d0b1163..a2400a739 100644 --- a/editions/tw5.com/tiddlers/system/tw5.com-card-template.tid +++ b/editions/tw5.com/tiddlers/system/tw5.com-card-template.tid @@ -3,19 +3,4 @@ modified: 20220719134613555 title: $:/_tw5.com-card-template type: text/vnd.tiddlywiki -\define tw-card-template(bordercolor:"") -\whitespace trim -
- <$link> - <$let tv-wikilinks=no> -
<$transclude field="caption"><$view field="title"/>
-
- <$list filter="[is[current]has[community-author]]">by {{!!community-author}} -
-

<$view field="description"/>

- - -
-\end - -<$macrocall $name="tw-card-template" bordercolor={{!!color}}/> +<$macrocall $name="flex-card" bordercolor={{!!color}} captionField="caption" subtitle={{{ [{!!community-author}!is[blank]addprefix[by ]] }}}/> diff --git a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid index db6e09c16..16b2f46ff 100644 --- a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid +++ b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid @@ -122,62 +122,180 @@ type: text/vnd.tiddlywiki margin-left: 10px; } -.tc-card { - margin: 15px; - padding: 10px 20px; - border-radius: 10px; - border-top: 5px solid #45D3D3; - box-shadow: 0 8px 17px -8px #A3A5AE; - background-color: #FFF; - width: 200px; - transition: box-shadow 0.3s ease-in-out; - font-size: 13px; - line-height: 18px; +.tc-cards { + display: flex; + flex-wrap: wrap; + justify-content: space-evenly; + width: 100%; + padding: 0.5em; + background: <>; + border-color: rgba(34,36,38,.15); + box-shadow: 0 2px 25px 0 rgb(34 36 38 / 5%) inset; } -.tc-card:hover { - box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3); +.tc-tiddlylink.tc-card { + font-weight: normal; + max-width: 100%; + position: relative; + display: flex; + flex-direction: column; + background: <>; + color: <>; + width: 200px; + min-height: 0; + padding: 0 0 0.5em 0; + margin: 0.5em; + border: none; + border-radius: 8px; + box-shadow: 0 1px 3px 0 #d4d4d5, 0 0 0 1px #d4d4d5; + transition: box-shadow 0.3s ease,transform .3s ease; } -.tc-card:hover .tc-card-title { - color: #1462ff; + +@media (max-width: 500px) { + + .tc-cards { + padding: 0; + } + + .tc-tiddlylink.tc-card { + margin: 0.25em; + width: 45%; + } + +} + +.tc-tiddlylink.tc-card.tc-card-quote { + width: 320px; + box-shadow: none; + background-color: #effdff; +} + +.tc-card-accent { + border-top-left-radius: 8px; + border-top-right-radius: 8px; +} + +.tc-tiddlylink.tc-card:hover { + color: <>; + background: <>; + text-decoration: none; + cursor: pointer; + box-shadow: 0 1px 5px 0 #bcbdbd, 0 0 0 1px #d4d4d5; + transform: translateY(-3px); +} + +.tc-card-ribbon-wrapper { + line-height: 0; + width: 75px; + height: 75px; + position: absolute; + right: 0; + overflow: hidden; + top: 0; + pointer-events: none; +} + +.tc-card-ribbon { + transition: top 0.3s ease-in-out; + top: 15px; + right: -77px; + position: absolute; + transform: rotate(45deg); + background-color: red; + box-shadow: 0px 0px 2px 0px rgb(0 0 0 / 50%); +} + +.tc-tiddlylink.tc-card:hover .tc-card-ribbon { + top: -77px; +} + +.tc-card-ribbon-inner { + font-size: 10px; + line-height: 13px; + font-weight: 700; + color: white; + text-decoration: none; + text-shadow: 0 -1px rgb(0 0 0 / 50%); + width: 200px; + display: inline-block; + padding: 2px 0; + text-align: center; +} + +.tc-card-image { + line-height: 0; + overflow: hidden; +} + +.tc-card-image img { + border-top-left-radius: 8px; + border-top-right-radius: 8px; + width: 100%; + transition: transform 0.3s ease-in-out; +} + +.tc-tiddlylink.tc-card:hover .tc-card-image img { + transform: scale(1.05); } .tc-card-title { - text-align: center; font-size: 1.2em; + line-height: 1.2; font-weight: 600; - transition: color 0.2s ease-in-out; - padding: 10px 0; + transition: color 0.3s ease-in-out; + padding: 0 10px; + margin: 0.5em 0; } +.tc-card-subtitle, .tc-card-author { - text-align: center; + font-size: 0.8em; + line-height: 1.2; + color: <>; + padding: 0 10px; + margin: 0.5em 0; font-style: italic; } -.tc-card p { - height: 67px; - overflow: hidden; +.tc-card-body { + font-size: 0.9em; + line-height: 1.2; + padding: 0 10px; margin: 0; - padding: 13px 0; } -.tc-card a { - color: #222; +.tc-card-body-wrapper { + position: relative; } -.tc-card a:hover { - text-decoration:none; +.tc-tiddlylink.tc-card.tc-card-quote .tc-card-body:before { + font-family: Georgia, serif; + color: <>; + content: open-quote; + font-size: 5em; + line-height: 1; + float: left; +} + +.tc-tiddlylink.tc-card.tc-card-quote .tc-card-body:after { + font-family: Georgia, serif; + color: <>; + content: close-quote; + font-size: 5em; + line-height: 1; + float: right; +} + +.tc-tiddlylink.tc-card .tc-card-body-clear { + clear: both; +} + +.tc-card-body > p { + margin: 0.25em 0; } .tc-card a:active, .tc-card a:focus, .tc-btn-download:active, .tc-btn-download:focus{ - outline: none; -} - -div.content { - padding: 1px 16px; - display: flex; - flex-wrap: wrap; + outline: none; } .tc-btn-download { diff --git a/editions/tw5.com/tiddlers/system/wikitext-macros.tid b/editions/tw5.com/tiddlers/system/wikitext-macros.tid index 70f62bfb7..a867def4f 100644 --- a/editions/tw5.com/tiddlers/system/wikitext-macros.tid +++ b/editions/tw5.com/tiddlers/system/wikitext-macros.tid @@ -94,3 +94,38 @@ That renders as: <> \end + +\define flex-card(class,bordercolor:"",imageField:"image",captionField:"caption",subtitle:"",descriptionField:"description",linkField:"link") +\whitespace trim +<$link class={{{ [<__class__>addprefix[tc-card ]] }}} to={{{ [get<__linkField__>else] }}}> +
!is[blank]addprefix[5px solid ]] }}}> + <$list filter="[has[ribbon-text]]" variable="ignore"> +
+
get[ribbon-color]else[red]] }}}> +
+ <$text text={{!!ribbon-text}}/> +
+
+
+ + <$list filter="[has<__imageField__>]" variable="ignore"> +
+ <$image source={{{ [get<__imageField__>] }}}/> +
+ +
<$transclude field=<<__captionField__>>><$view field="title"/>
+ <$list filter="[<__subtitle__>!is[blank]]" variable="ignore"> +
+ <$text text=<<__subtitle__>>/> +
+ +
+
+ <$transclude field=<<__descriptionField__>> mode="block"/> +
+
+
+
+
+ +\end diff --git a/editions/tw5.com/tiddlers/testimonials/Testimonials - Joe Armstrong.tid b/editions/tw5.com/tiddlers/testimonials/Testimonials - Joe Armstrong.tid new file mode 100644 index 000000000..2f110d20f --- /dev/null +++ b/editions/tw5.com/tiddlers/testimonials/Testimonials - Joe Armstrong.tid @@ -0,0 +1,8 @@ +title: Testimonials - Joe Armstrong +tags: Testimonial +caption: Joe Armstrong, Co-inventor of Erlang +extlink: https://joearms.github.io/ + +The ~TiddlyWiki is the best software I've ever found for organising my ideas. + +It's well worth spending an hour or so playing with it to see how it can help you. This will be time well-spent and will change how you think and how you organise your ideas. diff --git a/editions/tw5.com/tiddlers/testimonials/Testimonials - Network World.tid b/editions/tw5.com/tiddlers/testimonials/Testimonials - Network World.tid new file mode 100644 index 000000000..9c78f84cc --- /dev/null +++ b/editions/tw5.com/tiddlers/testimonials/Testimonials - Network World.tid @@ -0,0 +1,8 @@ +title: Testimonials - Network World +tags: Testimonial +caption: Mark Gibbs, Network World +extlink: http://www.networkworld.com/article/3028098/open-source-tools/tiddlywiki-a-free-open-source-wiki-revisited.html + +~TiddlyWiki gets a Gearhead rating of 6 out of 5 (it's that good). + +Finding code that works flawlessly after just two or three years is magical enough but after seven years?! diff --git a/editions/tw5.com/tiddlers/testimonials/Testimonials - Product Hunt.tid b/editions/tw5.com/tiddlers/testimonials/Testimonials - Product Hunt.tid new file mode 100644 index 000000000..388b1daa6 --- /dev/null +++ b/editions/tw5.com/tiddlers/testimonials/Testimonials - Product Hunt.tid @@ -0,0 +1,6 @@ +title: Testimonials - Product Hunt +tags: Testimonial +caption: Product Hunt +extlink: https://www.producthunt.com/posts/tiddlywiki-2?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-tiddlywiki-2 + +
{{Product Hunt Link}}
diff --git a/editions/tw5.com/tiddlers/widgets/ActionPopupWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionPopupWidget.tid index e423b6576..590e25a92 100644 --- a/editions/tw5.com/tiddlers/widgets/ActionPopupWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ActionPopupWidget.tid @@ -1,6 +1,6 @@ caption: action-popup created: 20200303114556528 -modified: 20210501203451387 +modified: 20220815205132124 tags: Widgets ActionWidgets title: ActionPopupWidget type: text/vnd.tiddlywiki @@ -15,10 +15,11 @@ The ''action-popup'' widget is invisible. Any content within it is ignored. |!Attribute |!Description | |$state |The title of the state tiddler for the popup | -|$coords |Optional coordinates for the handle to which popup is positioned (in the format `(x,y,w,h)`) | +|$coords |Optional coordinates for the handle to which popup is positioned (see [[Coordinate Systems]] for the supported formats) | |$floating |<<.from-version "5.2.0">> Optional. Defaults to `no`. Set to `yes` to create a popup that must be closed explicitly. | -<<.from-version "5.1.23">> If the ''$coords'' attribute is missing or empty then all popups are cancelled. +<<.from-version "5.1.23">> If the ''$coords'' attribute is missing or empty then all popups are cancelled.
+<<.from-version "5.2.4">> The ''$coords'' attribute supports absolute and relative coordinates. See [[Coordinate Systems]] for more information. <<.tip "Delete the state tiddler for a floating popup to close it.">> diff --git a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid index e94504659..da61838af 100644 --- a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid @@ -1,6 +1,6 @@ caption: button created: 20131024141900000 -modified: 20211009121239795 +modified: 20220810192251345 tags: Widgets TriggeringWidgets title: ButtonWidget type: text/vnd.tiddlywiki @@ -37,6 +37,7 @@ The content of the `<$button>` widget is displayed within the button. |default |Default value if <<.attr set>> tiddler is missing for testing against <<.attr setTo>> to determine <<.attr selectedClass>> | |popup |Title of a state tiddler for a popup that is toggled when the button is clicked. See PopupMechanism for details | |popupTitle |Title of a state tiddler for a popup that is toggled when the button is clicked. In difference to the <<.attr popup>> attribute, ''no'' TextReference is used. See PopupMechanism for details | +|popupAbsCoords |<<.from-version "5.2.4">> If set to ''yes'' writes absolute coordinates to the tiddler referenced by the <<.attr popup>>. If set to ''no'' (the default) uses relative coordinates. See [[Coordinate Systems]] for details | |aria-label |Optional [[Accessibility]] label | |tooltip |Optional tooltip | |class |An optional CSS class name to be assigned to the HTML element| diff --git a/editions/tw5.com/tiddlers/widgets/DraggableWidget.tid b/editions/tw5.com/tiddlers/widgets/DraggableWidget.tid index fc65c4e74..c25b15791 100644 --- a/editions/tw5.com/tiddlers/widgets/DraggableWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/DraggableWidget.tid @@ -41,7 +41,8 @@ The LinkWidget incorporates the functionality of the DraggableWidget via the ''d |!Variables |!Description | |`modifier` |The [[modifier Variable]] contains the Modifier Key held while dragging | |`dom-*` |All DOM attributes of the node being dragged are made available as variables, with the prefix `dom-` | -|`tv-popup-coords` |A co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the DOM node that's being dragged where the event originated | +|`tv-popup-coords` |A relative co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the DOM node matching the selector where the event originated (see [[Coordinate Systems]] for more information) | +|`tv-popup-abs-coords` |<<.from-version "5.2.4">> An absolute co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the DOM node matching the selector where the event originated (see [[Coordinate Systems]] for more information) | |`tv-selectednode-posx` |`x` offset position of the dragged DOM node | |`tv-selectednode-posy` |`y` offset position of the dragged DOM node | |`tv-selectednode-width` |`offsetWidth` of the dragged DOM node | diff --git a/editions/tw5.com/tiddlers/widgets/EventCatcherWidget.tid b/editions/tw5.com/tiddlers/widgets/EventCatcherWidget.tid index f0c8c257c..5c2568a19 100644 --- a/editions/tw5.com/tiddlers/widgets/EventCatcherWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/EventCatcherWidget.tid @@ -1,5 +1,5 @@ created: 20201123113532200 -modified: 20220507184043398 +modified: 20221012194222875 tags: Widgets TriggeringWidgets title: EventCatcherWidget type: text/vnd.tiddlywiki @@ -10,7 +10,7 @@ type: text/vnd.tiddlywiki //This is an advanced widget intended for use by those familiar with HTML, CSS and JavaScript handling of DOM events.// -The event catcher widget traps DOM-initiated Javascript events dispatched within its child content, and allows invoking a series of ActionWidgets in response to those events. +The event catcher widget traps DOM-initiated Javascript events dispatched within its child content, and allows invoking a series of ActionWidgets in response to those events. In order for the events to be trapped: @@ -47,7 +47,8 @@ The following variables are made available to the actions: |`event-mousebutton` |The mouse button (if any) used to trigger the event (can be "left", "right" or "middle"). Note that not all event types support the mousebutton property | |`event-type` |The type property of the JavaScript event | |`event-detail-*` |Any properties in the detail attribute of the event are made available with the prefix `event-detail-` | -|`tv-popup-coords` |A co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the DOM node matching the selector where the event originated | +|`tv-popup-coords` |A relative co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the DOM node matching the selector where the event originated (see [[Coordinate Systems]] for more information) | +|`tv-popup-abs-coords` |<<.from-version "5.2.4">> An absolute co-ordinate string that can be used with the ActionPopupWidget to trigger a popup at the DOM node matching the selector where the event originated (see [[Coordinate Systems]] for more information) | |`tv-widgetnode-width` |<<.from-version "5.2.3">> `offsetWidth` of the DOM node created by the eventcatcher widget | |`tv-widgetnode-height` |<<.from-version "5.2.3">> `offsetHeight` of the DOM node created by the eventcatcher widget | |`tv-selectednode-posx` |`x` offset position of the selected DOM node | diff --git a/editions/tw5.com/tiddlers/widgets/SelectWidget.tid b/editions/tw5.com/tiddlers/widgets/SelectWidget.tid index d2acb49f9..b46f0359f 100644 --- a/editions/tw5.com/tiddlers/widgets/SelectWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/SelectWidget.tid @@ -40,6 +40,7 @@ The content of the `<$select>` widget should be one or more HTML `
-请参阅[[控制台|$:/ControlPanel]]查看更多选项。 \ No newline at end of file +可在[[控制台|$:/ControlPanel]]查看更多选项。 \ No newline at end of file diff --git a/languages/zh-Hans/Help/commands.tid b/languages/zh-Hans/Help/commands.tid new file mode 100644 index 000000000..68f86f20c --- /dev/null +++ b/languages/zh-Hans/Help/commands.tid @@ -0,0 +1,18 @@ +title: $:/language/Help/commands +description: 运行从筛选器传回的命令 + +按顺序运行从筛选器传回的命令符记 + +``` +--commands +``` + +示例 + +``` +--commands "[enlist{$:/build-commands-as-text}]" +``` + +``` +--commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget]" +``` diff --git a/languages/zh-Hans/Help/fetch.tid b/languages/zh-Hans/Help/fetch.tid index 39c37bb6c..2fdd9efb6 100644 --- a/languages/zh-Hans/Help/fetch.tid +++ b/languages/zh-Hans/Help/fetch.tid @@ -1,7 +1,7 @@ title: $:/language/Help/fetch -description: 通过网址从维基撷取条目 +description: 通过网址从维基提取条目 -通过 HTTP/HTTPS 撷取一个或多个文件，并导入匹配筛选器的条目，可选的转换传入的名称。 +通过 HTTP/HTTPS 提取一个或多个文件，并导入匹配筛选器的条目，可选的转换传入的名称。 ``` --fetch file @@ -10,11 +10,11 @@ description: 通过网址从维基撷取条目 --fetch raw-files ``` - "file" 和 "files" 选项撷取指定的文件，并尝试导入其中的条目（与将文件拖动到浏览器视窗中的处理相同）。 "raw-file" 和 "raw-files" 变选项撷取指定的文件，并将原始文件资料存储于条目，而不套用导入逻辑。 + "file" 和 "files" 选项提取指定的文件，并尝试导入其中的条目（与将文件拖动到浏览器视窗中的处理相同）。 "raw-file" 和 "raw-files" 变选项提取指定的文件，并将原始文件资料存储于条目，而不套用导入逻辑。 -使用 "file" and "raw-file" 选项为仅撷取单个文件，且第一个参数为要读取文件的网址。 +使用 "file" and "raw-file" 选项为仅提取单个文件，且第一个参数为要读取文件的网址。 -使用 "files" 和 "raw-files" 选项为撷取多个文件，且第一个参数是一个产生要读取文件的网址清单的筛选器。例如，给定标签为 "remote-server" 的一组具有字段 "url" 的条目，筛选器 `[tag[remote-server]get[url]]` 将取回所有可用的网址。 +使用 "files" 和 "raw-files" 选项为提取多个文件，且第一个参数是一个产生要读取文件的网址清单的筛选器。例如，给定标签为 "remote-server" 的一组具有字段 "url" 的条目，筛选器 `[tag[remote-server]get[url]]` 将取回所有可用的网址。 对于 "file" 和 "files" 选项，the `` 参数指定一个筛选器，用于确定要导入哪些条目。如果未提供，则默认为 `[all[tiddlers]]`。 @@ -22,7 +22,7 @@ description: 通过网址从维基撷取条目 于 `--fetch` 之前使用 `--verbose` 命令，将在导入期间输出进度信息。 -请注意，TiddlyWiki 不会撷取一个已经加载插件的旧版本。 +请注意，TiddlyWiki 不会提取一个已经加载插件的旧版本。 以下示例从 https://tiddlywiki.com 取回所有非系统条目，并将其保存到一个 JSON 文件： diff --git a/languages/zh-Hans/Help/init.tid b/languages/zh-Hans/Help/init.tid index 6c5dcbcc8..915e99c15 100644 --- a/languages/zh-Hans/Help/init.tid +++ b/languages/zh-Hans/Help/init.tid @@ -19,5 +19,5 @@ tiddlywiki ./MyWikiFolder --init empty * 其中 "edition" 默认为 ''empty'' * 若 wiki 文件夹不是空的，则初始化命令将失败 * 初始化命令会删除 'tiddlywiki.info' 文件内所有 'includeWikis' 的定义。 -* 当指定多个版本时，这些版本于初始化后，将覆写早期版本共用的所有文件 (故此最终的 `tiddlywiki.info` 文件将是从最近的版本复制而得) +* 当指定多个版本时，这些版本于初始化后，将覆盖早期版本共用的所有文件 (故此最终的 `tiddlywiki.info` 文件将是从最近的版本复制而得) * `--editions` 传回所有可用版本的清单。 diff --git a/languages/zh-Hans/Help/listen.tid b/languages/zh-Hans/Help/listen.tid index a75323401..5dbf3be1a 100644 --- a/languages/zh-Hans/Help/listen.tid +++ b/languages/zh-Hans/Help/listen.tid @@ -16,16 +16,16 @@ listen 命令使用[[命名的命令参数|NamedCommandParameters]]： * ''port'' - 侦听的埠号；非数值会被解译为一个系统环境变数，从其中提取埠号 (默认为 "8080") * ''credentials'' - 凭证 CSV 文件的路径名（相对于维基文件夹） * ''anon-username'' - 匿名用户的编辑署名 -* ''username'' - 可选的基本验证用户名称 -* ''password'' - 可选的基本验证密码 +* ''username'' - 可选的基础验证用户名称 +* ''password'' - 可选的基础验证密码 * ''authenticated-user-header'' - 可选的标头名称，用于受信任身份验证 * ''readers'' - 允许读取此维基，以逗号分隔的用户名称的清单 * ''writers'' - 允许写入此维基，以逗号分隔的用户名称的清单 * ''csrf-disable'' - 设置为 "yes" 以禁用 CSRF 检查 (默认为 "no") * ''sse-enabled'' - 设置为 "yes" 以启用服务器传送的事件 (默认为 "no") -* ''root-tiddler'' - 服务的基本条目 (默认为 "$:/core/save/all") -* ''root-render-type'' - 呈现的基本条目的内容类型 (默认为 "text/plain") -* ''root-serve-type'' - 服务的基本条目的内容类型 (默认为 "text/html") +* ''root-tiddler'' - 服务的基础条目 (默认为 "$:/core/save/all") +* ''root-render-type'' - 呈现的基础条目的内容类型 (默认为 "text/plain") +* ''root-serve-type'' - 服务的基础条目的内容类型 (默认为 "text/html") * ''tls-cert'' - TLS 证书文件的路径名（相对于维基文件夹） * ''tls-key'' - TLS 密钥文件的路径名（相对于维基文件夹） * ''debug-level'' - 可选的调试级别；设置为 "debug" 来查看请求的详细信息；(默认为 "none") diff --git a/languages/zh-Hans/Help/makelibrary.tid b/languages/zh-Hans/Help/makelibrary.tid index 54d2df91e..1180af861 100644 --- a/languages/zh-Hans/Help/makelibrary.tid +++ b/languages/zh-Hans/Help/makelibrary.tid @@ -3,7 +3,7 @@ description: 构建升级处理所需的程式库插件 为升级处理构建 `$:/UpgradeLibrary` 条目。 -升级程式库被格式化为一个插件类型为 `library` 的一般插件条目。它包含 TiddlyWiki5 存储库中所有可用的插件、布景主题和语言包的副本。 +升级程式库被格式化为一个插件类型为 `library` 的一般插件条目。它包含 TiddlyWiki5 存储库中所有可用的插件、布局主题和语言包的副本。 此命令仅供内部使用；它只是与使用者构建一个自订的升级程序相关。 diff --git a/languages/zh-Hans/Help/savetiddlers.tid b/languages/zh-Hans/Help/savetiddlers.tid index 9cc5b4921..a47500a4f 100644 --- a/languages/zh-Hans/Help/savetiddlers.tid +++ b/languages/zh-Hans/Help/savetiddlers.tid @@ -11,6 +11,6 @@ description: 将一群条目的原始内容保存到一个文件夹 默认情况下，路径名被解析为相对于版本文件夹的 `output` 子文件夹。 `--output` 命令可以用于将输出指定到一个不同的文件夹。 -保存指定的文件之前，会先清除输出目录的现有文件。可藉由指定 ''noclean'' 旗标，禁用该删除动作。 +保存指定的文件之前，会先清除输出目录的现有文件。可藉由指定 ''noclean'' 旗标，禁用该删除操作。 自动创建在路径中任何缺少的文件夹。 diff --git a/languages/zh-Hans/Help/server.tid b/languages/zh-Hans/Help/server.tid index a26a954a5..af75d0766 100644 --- a/languages/zh-Hans/Help/server.tid +++ b/languages/zh-Hans/Help/server.tid @@ -1,9 +1,9 @@ title: $:/language/Help/server -description: 提供一个 HTTP 服务器介面到 TiddlyWiki (已弃用，支持新的 listen 命令) +description: 提供一个 HTTP 服务器界面到 TiddlyWiki (已弃用，支持新的 listen 命令) 在服务器中内置 TiddlyWiki5 是非常简单。虽与 TiddlyWeb 兼容，但不支持许多健全互联网面向的使用方式所需的功能。 -提供呈现一个指定条目，也可将个别条目编码成 JSON，且支持基本的 HTTP 操作 `GET`、`PUT` 及 `DELETE`. +提供呈现一个指定条目，也可将个别条目编码成 JSON，且支持基础的 HTTP 操作 `GET`、`PUT` 及 `DELETE`. ``` --server @@ -12,11 +12,11 @@ description: 提供一个 HTTP 服务器介面到 TiddlyWiki (已弃用，支持 参数说明： * ''port'' - 要侦听的埠号；非数值会被解译为一个系统环境变数，从其中提取埠号 (默认为 "8080") -* ''root-tiddler'' - 服务的基本条目 (默认为 "$:/core/save/all") -* ''root-render-type'' - 呈现的基本条目的内容类型 (默认为 "text/plain") -* ''root-serve-type'' - 服务的基本条目的内容类型 (默认为 "text/html") +* ''root-tiddler'' - 服务的基础条目 (默认为 "$:/core/save/all") +* ''root-render-type'' - 呈现的基础条目的内容类型 (默认为 "text/plain") +* ''root-serve-type'' - 服务的基础条目的内容类型 (默认为 "text/html") * ''username'' - 默认的编辑者署名 -* ''password'' - 可选的基本验证密码 +* ''password'' - 可选的基础验证密码 * ''host'' - 可选的主机名称， (默认为 "127.0.0.1" 或名为 "localhost") * ''path-prefix'' - 可选的路径前缀 * ''debug-level'' - 可选的调试级别；设置为 "debug" 来查看请求的详细信息；(默认为 "none") diff --git a/languages/zh-Hans/Help/setfield.tid b/languages/zh-Hans/Help/setfield.tid index dc10f8491..896889754 100644 --- a/languages/zh-Hans/Help/setfield.tid +++ b/languages/zh-Hans/Help/setfield.tid @@ -3,7 +3,7 @@ description: 准备用于外部条目 //请注意此命令是试验性的，且可能会更改或在最终定稿前被替换// -设置一群条目的指定栏位到 wikifying 范本条目的结果，其中的 `currentTiddler` 变数设置为各该条目。 +设置一群条目的指定字段到 wikifying 范本条目的结果，其中的 `currentTiddler` 变数设置为各该条目。 ``` --setfield @@ -12,6 +12,6 @@ description: 准备用于外部条目 参数说明： * ''filter'' - 受影响的辨识条目的筛选条件 -* ''fieldname'' - 要修改的栏位（默认为 "text"） -* ''templatetitle'' - 该条目 wikify 到指定栏位。若为空白或丢失，则删除指定的栏位 +* ''fieldname'' - 要修改的字段（默认为 "text"） +* ''templatetitle'' - 该条目 wikify 到指定字段。若为空白或丢失，则删除指定的字段 * ''rendertype'' - 要呈现的文本类型（默认为 "text/plain"; "text/html" 可以用于包含 HTML 标记)） diff --git a/languages/zh-Hans/Import.multids b/languages/zh-Hans/Import.multids index 6fc41d52f..b874dfed5 100644 --- a/languages/zh-Hans/Import.multids +++ b/languages/zh-Hans/Import.multids @@ -28,7 +28,7 @@ Upgrader/System/Disabled: 已禁用系統条目。 Upgrader/System/Suppressed: 封锁的系统条目。 Upgrader/System/Warning: 核心模块条目。 Upgrader/System/Alert: 您即将导入一个条目会覆盖一个核心模块条目。不建议这样做，因为可能会使系统不稳定。 -Upgrader/ThemeTweaks/Created: 从 <$text text=<>/> 迁移布景主题。 +Upgrader/ThemeTweaks/Created: 从 <$text text=<>/> 迁移布局主题。 Upgrader/Tiddler/Disabled: 已禁用系統条目。 Upgrader/Tiddler/Selected: 选定的条目。 Upgrader/Tiddler/Unselected: 未选定的条目。 \ No newline at end of file diff --git a/languages/zh-Hans/Misc.multids b/languages/zh-Hans/Misc.multids index 567ddfaee..3107626d2 100644 --- a/languages/zh-Hans/Misc.multids +++ b/languages/zh-Hans/Misc.multids @@ -1,16 +1,16 @@ title: $:/language/ -AboveStory/ClassicPlugin/Warning: 您貌似要加载为 ~TiddlyWiki 经典版设计的插件。请注意，[[这些插件无法运行于 TiddlyWiki 5.x.x 版|https://tiddlywiki.com/#TiddlyWikiClassic]]。检测到 ~TiddlyWiki 经典版插件： +AboveStory/ClassicPlugin/Warning: 您似乎要加载为 ~TiddlyWiki 经典版设计的插件。请注意，[[这些插件无法运行于 TiddlyWiki 5.x.x 版|https://tiddlywiki.com/#TiddlyWikiClassic]]。检测到 ~TiddlyWiki 经典版插件： BinaryWarning/Prompt: 此条目包含二进制数据 ClassicWarning/Hint: 此条目以经典版 TiddlyWiki 标记格式撰写，不完全兼容新版 TiddlyWiki 的格式，详细信息请参阅：https://tiddlywiki.com/static/Upgrading。 ClassicWarning/Upgrade/Caption: 升级 CloseAll/Button: 全部关闭 ColourPicker/Recent: 最近︰ -ConfirmCancelTiddler: 您确定要放弃对条目 "<$text text=<>/>" 的更改？ +ConfirmCancelTiddler: 您确定要取消对条目 "<$text text=<<title>>/>" 的更改？ ConfirmDeleteTiddler: 您确定要删除条目 "<$text text=<<title>>/>"？ ConfirmDeleteTiddlers: 您确定要删除 <<resultCount>> 个条目？ -ConfirmOverwriteTiddler: 您确定要复写条目 "<$text text=<<title>>/>"？ -ConfirmEditShadowTiddler: 您即将要编辑默认条目，任何更改将会复盖默认的系统，使未来的升级不寻常。您确定要编辑 "<$text text=<<title>>/>"? +ConfirmOverwriteTiddler: 您确定要覆盖条目 "<$text text=<<title>>/>"？ +ConfirmEditShadowTiddler: 您即将要编辑默认条目，任何更改将会覆盖默认的系统，使未来的升级不寻常。您确定要编辑 "<$text text=<<title>>/>"? ConfirmAction: 是否要继续？ Count: 计数 DefaultNewTiddlerTitle: 新条目 @@ -35,8 +35,8 @@ Error/NetworkErrorAlert: `<h2>''网络错误''</h2>与服务器的连缐似乎 Error/PutEditConflict: 服务器上的文件已更改 Error/PutForbidden: 没有权限 Error/PutUnauthorized: 需要身分验证 -Error/RecursiveTransclusion: 于 transclude 小部件中的递回嵌入错误 -Error/RetrievingSkinny: 简要条目清单撷取错误 +Error/RecursiveTransclusion: 于 transclude 小部件中的递归嵌入错误 +Error/RetrievingSkinny: 简要条目清单提取错误 Error/SavingToTWEdit: 保存到 TWEdit 时，发生错误 Error/WhileSaving: 保存时，发生错误 Error/XMLHttpRequest: XMLHttpRequest 错误代码 @@ -46,10 +46,10 @@ LayoutSwitcher/Description: 打开布局切换器 LazyLoadingWarning: <p>正在从 ''<$text text={{!!_canonical_uri}}/>'' 加载外部内容 ...</p><p>如果此信息未消失，可能是条目内容类型与外部内容的类型不匹配，或是您可能正在使用的浏览器，不支援单文件式维基的外部内容。请参阅 https://tiddlywiki.com/#ExternalText</p> LoginToTiddlySpace: 登录 TiddlySpace Manager/Controls/FilterByTag/None: (无) -Manager/Controls/FilterByTag/Prompt: 依标签筛选︰ +Manager/Controls/FilterByTag/Prompt: 按标签筛选︰ Manager/Controls/Order/Prompt: 反向顺序 -Manager/Controls/Search/Placeholder: 搜寻 -Manager/Controls/Search/Prompt: 搜寻︰ +Manager/Controls/Search/Placeholder: 搜索 +Manager/Controls/Search/Prompt: 搜索︰ Manager/Controls/Show/Option/Tags: 标签 Manager/Controls/Show/Option/Tiddlers: 条目 Manager/Controls/Show/Prompt: 显示︰ @@ -72,14 +72,14 @@ PluginReloadWarning: 请保存 {{$:/core/ui/Buttons/save-wiki}} 并刷新页面 RecentChanges/DateFormat: YYYY年0MM月0DD日 Shortcuts/Input/Accept/Hint: 接受选取的项目 Shortcuts/Input/AcceptVariant/Hint: 接受选取项目 (变种) -Shortcuts/Input/AdvancedSearch/Hint: 从侧边栏搜寻字段内打开[[进阶搜寻|$:/AdvancedSearch]]面板 +Shortcuts/Input/AdvancedSearch/Hint: 从侧边栏搜索字段内打开[[进阶搜索|$:/AdvancedSearch]]面板 Shortcuts/Input/Cancel/Hint: 清除输入字段 Shortcuts/Input/Down/Hint: 选择下一个项目 Shortcuts/Input/Tab-Left/Hint: 选择上一个页签 Shortcuts/Input/Tab-Right/Hint: 选择下一个页签 Shortcuts/Input/Up/Hint: 选择前一个项目 Shortcuts/SidebarLayout/Hint: 更改侧边栏布局 -Switcher/Subtitle/theme: 切换布景主题 +Switcher/Subtitle/theme: 切换布局主题 Switcher/Subtitle/layout: 切换布局 Switcher/Subtitle/language: 切换语言 Switcher/Subtitle/palette: 切换调色板 diff --git a/languages/zh-Hans/Search.multids b/languages/zh-Hans/Search.multids index 06bf94170..fca98a709 100644 --- a/languages/zh-Hans/Search.multids +++ b/languages/zh-Hans/Search.multids @@ -2,19 +2,19 @@ title: $:/language/Search/ DefaultResults/Caption: 列表 Filter/Caption: 筛选 -Filter/Hint: 以[[筛选表达式|https://tiddlywiki.com/static/Filters.html]]查找 +Filter/Hint: 以[[筛选表达式|https://tiddlywiki.com/static/Filters.html]]搜索 Filter/Matches: //<small><<resultCount>> 个条目符合条件</small>// Matches: //<small><<resultCount>> 个条目符合条件</small>// Matches/All: 所有匹配： Matches/Title: 条目名称匹配： -Search: 查找 -Search/TooShort: 查找文本太短 +Search: 搜索 +Search/TooShort: 搜索文本太短 Shadows/Caption: 默认 -Shadows/Hint: 查找默认条目 +Shadows/Hint: 搜索默认条目 Shadows/Matches: //<small><<resultCount>> 个条目符合条件</small>// Standard/Caption: 标准 -Standard/Hint: 查找一般条目 +Standard/Hint: 搜索一般条目 Standard/Matches: //<small><<resultCount>> 个条目符合条件</small>// System/Caption: 系统 -System/Hint: 查找系统条目 +System/Hint: 搜索系统条目 System/Matches: //<small><<resultCount>> 个条目符合条件</small>// diff --git a/languages/zh-Hans/SiteSubtitle.tid b/languages/zh-Hans/SiteSubtitle.tid index efde23ad6..f4fd5c0b2 100644 --- a/languages/zh-Hans/SiteSubtitle.tid +++ b/languages/zh-Hans/SiteSubtitle.tid @@ -1,3 +1,3 @@ title: $:/SiteSubtitle -一个非线性的网页式笔记 \ No newline at end of file +卡片式个人网页笔记 \ No newline at end of file diff --git a/languages/zh-Hans/Snippets/ListByTag.tid b/languages/zh-Hans/Snippets/ListByTag.tid index 5b65eb9b4..11108156c 100644 --- a/languages/zh-Hans/Snippets/ListByTag.tid +++ b/languages/zh-Hans/Snippets/ListByTag.tid @@ -1,5 +1,5 @@ title: $:/language/Snippets/ListByTag tags: $:/tags/TextEditor/Snippet -caption: 依标签筛选的条目列表 +caption: 按标签筛选的条目列表 <<list-links "[tag[task]sort[title]]">> diff --git a/languages/zh-Hans/ThemeTweaks.multids b/languages/zh-Hans/ThemeTweaks.multids index 02df2d7ec..b5c1c0c4a 100644 --- a/languages/zh-Hans/ThemeTweaks.multids +++ b/languages/zh-Hans/ThemeTweaks.multids @@ -1,21 +1,21 @@ title: $:/language/ThemeTweaks/ ThemeTweaks: 主题调整 -ThemeTweaks/Hint: 您可以调整 ''Vanilla'' 布景主题的某些样貌。 +ThemeTweaks/Hint: 您可以调整 ''Vanilla'' 布局主题的某些样貌。 Options: 选项 Options/SidebarLayout: 侧边栏布局 Options/SidebarLayout/Fixed-Fluid: 固定故事，浮动侧边栏 Options/SidebarLayout/Fluid-Fixed: 浮动故事，固定侧边栏 Options/StickyTitles: 置顶标题 -Options/StickyTitles/Hint: 使条目名称"黏着"于浏览器窗口的顶端 -Options/CodeWrapping: 在代码区块中折行 +Options/StickyTitles/Hint: 使条目名称吸顶 +Options/CodeWrapping: 在代码区块中换行 Settings: 设置 Settings/FontFamily: 字型 Settings/CodeFontFamily: 代码字型 Settings/EditorFontFamily: 编辑器字型 Settings/BackgroundImage: 页面背景图像 Settings/BackgroundImageAttachment: 页面背景图像附属 -Settings/BackgroundImageAttachment/Scroll: 随条目卷动 +Settings/BackgroundImageAttachment/Scroll: 随条目滚动 Settings/BackgroundImageAttachment/Fixed: 固定于窗口 Settings/BackgroundImageSize: 页面背景图像大小 Settings/BackgroundImageSize/Auto: 自动 @@ -28,8 +28,8 @@ Metrics/BodyFontSize: 条目本文的字体大小 Metrics/BodyLineHeight: 条目本文的行高 Metrics/StoryLeft: 故事左侧位置 Metrics/StoryLeft/Hint: 故事河（条目区）的左边缘与页面左端的间距 -Metrics/StoryTop: 故事顶端位置 -Metrics/StoryTop/Hint: 故事河（条目区）的上边缘与页面顶端的间距 +Metrics/StoryTop: 故事顶部位置 +Metrics/StoryTop/Hint: 故事河（条目区）的上边缘与页面顶部的间距 Metrics/StoryRight: 故事右侧位置 Metrics/StoryRight/Hint: 侧边栏的左边缘与页面左端的间距 Metrics/StoryWidth: 故事的宽度 @@ -39,4 +39,4 @@ Metrics/TiddlerWidth/Hint: 在故事河内 Metrics/SidebarBreakpoint: 侧边栏中断点 Metrics/SidebarBreakpoint/Hint: 故事河和侧边栏会并排显示的最小页面宽度 Metrics/SidebarWidth: 侧边栏宽度 -Metrics/SidebarWidth/Hint: 在浮动-固定布局中，侧边栏的宽度 +Metrics/SidebarWidth/Hint: 在 浮动故事，固定侧边栏 布局中，侧边栏的宽度 diff --git a/languages/zh-Hans/TiddlerInfo.multids b/languages/zh-Hans/TiddlerInfo.multids index b5580d1cf..6ea8f4b4a 100644 --- a/languages/zh-Hans/TiddlerInfo.multids +++ b/languages/zh-Hans/TiddlerInfo.multids @@ -8,8 +8,8 @@ Advanced/ShadowInfo/Heading: 默认条目状态 Advanced/ShadowInfo/NotShadow/Hint: <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> 不是一个默认条目 Advanced/ShadowInfo/Shadow/Hint: <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> 是一个默认条目 Advanced/ShadowInfo/Shadow/Source: 此条目定义于插件 <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link> -Advanced/ShadowInfo/OverriddenShadow/Hint: 已被一般条目覆写 -Fields/Caption: 栏位 +Advanced/ShadowInfo/OverriddenShadow/Hint: 已被一般条目覆盖 +Fields/Caption: 字段 List/Caption: 列表 List/Empty: 此条目无指定列表 Listed/Caption: 被列于 diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids index 2a170ed8e..7ffc15f50 100644 --- a/languages/zh-Hant/Buttons.multids +++ b/languages/zh-Hant/Buttons.multids @@ -59,6 +59,8 @@ Info/Caption: 資訊 Info/Hint: 顯示此條目的資訊 Language/Caption: 語言 Language/Hint: 選擇使用者介面語言 +LayoutSwitcher/Hint: 開啟版面切換器 +LayoutSwitcher/Caption: 版面 Manager/Caption: 條目管理器 Manager/Hint: 開啟條目管理器 More/Caption: 更多 diff --git a/languages/zh-Hant/Help/commands.tid b/languages/zh-Hant/Help/commands.tid new file mode 100644 index 000000000..afeaa1e49 --- /dev/null +++ b/languages/zh-Hant/Help/commands.tid @@ -0,0 +1,18 @@ +title: $:/language/Help/commands +description: 執行從篩選器傳回的命令 + +按順序執行從篩選器傳回的命令符記 + +``` +--commands <filter> +``` + +範例 + +``` +--commands "[enlist{$:/build-commands-as-text}]" +``` + +``` +--commands "[{$:/build-commands-as-json}jsonindexes[]] :map[{$:/build-commands-as-json}jsonget<currentTiddler>]" +``` diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 0ad84a378..b1af82fcc 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -499,3 +499,5 @@ Keiichi Shiga (🎈 BALLOON | FU-SEN), @fu-sen. 2022/07/07 Nathaniel Knight, @nathanielknight, 2022/07/26 HuanCheng Bai, @bestony, 2022/09/17 + +Carlo Colombo, @carlo-colombo, 2022/11/30 diff --git a/plugins/tiddlywiki/dynannotate/modules/dynannotate.js b/plugins/tiddlywiki/dynannotate/modules/dynannotate.js index 9a913384d..00314dab2 100644 --- a/plugins/tiddlywiki/dynannotate/modules/dynannotate.js +++ b/plugins/tiddlywiki/dynannotate/modules/dynannotate.js @@ -16,6 +16,8 @@ var TextMap = require("$:/plugins/tiddlywiki/dynannotate/textmap.js").TextMap; var Widget = require("$:/core/modules/widgets/widget.js").widget; +var Popup = require("$:/core/modules/utils/dom/popup.js"); + var DynannotateWidget = function(parseTreeNode,options) { this.initialise(parseTreeNode,options); }; @@ -191,7 +193,7 @@ DynannotateWidget.prototype.applyAnnotations = function() { "tv-selection-posy": (bounds.top).toString(), "tv-selection-width": (bounds.width).toString(), "tv-selection-height": (bounds.height).toString(), - "tv-selection-coords": "(" + bounds.left + "," + bounds.top + "," + bounds.width + "," + bounds.height + ")" + "tv-selection-coords": Popup.buildCoordinates(Popup.coordinatePrefix.csOffsetParent,bounds) }); if(self.hasAttribute("popup")) { $tw.popup.triggerPopup({ diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 026b8b9da..c1536d941 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -1525,6 +1525,10 @@ html body.tc-body.tc-single-tiddler-window { fill: <<colour toolbar-done-button>>; } +.tc-page-controls svg.tc-image-layout-button { + fill: <<colour toolbar-options-button>>; +} + /* ** Tiddler edit mode */