From 4a1c530da721276e072cf1f21aa294e3147e2c2d Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 28 Aug 2014 18:13:46 +0100 Subject: [PATCH] Rename "tw-tiddlylink-*" classes to "tc-tiddlylink-*" Part of #764 --- contributing.md | 4 +-- .../parsers/wikiparser/rules/extlink.js | 2 +- .../parsers/wikiparser/rules/prettyextlink.js | 2 +- .../parsers/wikiparser/rules/prettylink.js | 2 +- core/modules/widgets/link.js | 12 +++---- editions/test/tiddlers/tests/test-wikitext.js | 2 +- .../tiddlers/system/EditTemplateSources.tid | 2 +- editions/tw5.com/tiddlers/system/Sources.tid | 2 +- .../tw5.com/tiddlers/widgets/LinkWidget.tid | 10 +++--- .../tiddlywiki/github-fork-ribbon/styles.tid | 4 +-- readme.md | 6 ++-- themes/tiddlywiki/vanilla/base.tid | 36 +++++++++---------- 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/contributing.md b/contributing.md index 9c4a9ca54..e2b294730 100644 --- a/contributing.md +++ b/contributing.md @@ -1,3 +1,3 @@ -

Contributing to TiddlyWiki5

TiddlyWiki5 welcomes contributions to its code and documentation via GitHub. Please take a moment to read these notes to help make the process as smooth as possible.

Coding Style

Code contributions should follow the TiddlyWiki Coding Style Guidelines.

GitHub Issues

See ReportingBugs for information about how TiddlyWiki handles bug reports.

Contributor License Agreement

Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).

This is a first pass at a CLA for TiddlyWiki. Please let us know if we missed something important. If we do have to make essential changes to the CLA, there is a possibility that all contributors will need to sign it again

How to sign the CLA

Create a GitHub pull request to add your name to cla-individual.md or cla-entity.md, with the date in the format (YYYY/MM/DD).

eg: Jeremy Ruston, @Jermolene, 2011/11/22

Thank you!

Attribution

The CLA documents used for this project were created using Harmony Project Templates. "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity" -

This file was automatically generated by TiddlyWiki5 +

Contributing to TiddlyWiki5

TiddlyWiki5 welcomes contributions to its code and documentation via GitHub. Please take a moment to read these notes to help make the process as smooth as possible.

Coding Style

Code contributions should follow the TiddlyWiki Coding Style Guidelines.

GitHub Issues

See ReportingBugs for information about how TiddlyWiki handles bug reports.

Contributor License Agreement

Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).

This is a first pass at a CLA for TiddlyWiki. Please let us know if we missed something important. If we do have to make essential changes to the CLA, there is a possibility that all contributors will need to sign it again

How to sign the CLA

Create a GitHub pull request to add your name to cla-individual.md or cla-entity.md, with the date in the format (YYYY/MM/DD).

eg: Jeremy Ruston, @Jermolene, 2011/11/22

Thank you!

Attribution

The CLA documents used for this project were created using Harmony Project Templates. "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity" +

This file was automatically generated by TiddlyWiki5

\ No newline at end of file diff --git a/core/modules/parsers/wikiparser/rules/extlink.js b/core/modules/parsers/wikiparser/rules/extlink.js index abc4debd4..539d0f11b 100644 --- a/core/modules/parsers/wikiparser/rules/extlink.js +++ b/core/modules/parsers/wikiparser/rules/extlink.js @@ -41,7 +41,7 @@ exports.parse = function() { tag: "a", attributes: { href: {type: "string", value: this.match[0]}, - "class": {type: "string", value: "tw-tiddlylink-external"}, + "class": {type: "string", value: "tc-tiddlylink-external"}, target: {type: "string", value: "_blank"} }, children: [{ diff --git a/core/modules/parsers/wikiparser/rules/prettyextlink.js b/core/modules/parsers/wikiparser/rules/prettyextlink.js index 960c410c0..45bcbbf43 100644 --- a/core/modules/parsers/wikiparser/rules/prettyextlink.js +++ b/core/modules/parsers/wikiparser/rules/prettyextlink.js @@ -73,7 +73,7 @@ exports.parseLink = function(source,pos) { tag: "a", start: pos, attributes: { - "class": {type: "string", value: "tw-tiddlylink-external"}, + "class": {type: "string", value: "tc-tiddlylink-external"}, }, children: [textNode] }; diff --git a/core/modules/parsers/wikiparser/rules/prettylink.js b/core/modules/parsers/wikiparser/rules/prettylink.js index 2b6cfeb22..12683b3eb 100644 --- a/core/modules/parsers/wikiparser/rules/prettylink.js +++ b/core/modules/parsers/wikiparser/rules/prettylink.js @@ -44,7 +44,7 @@ exports.parse = function() { tag: "a", attributes: { href: {type: "string", value: link}, - "class": {type: "string", value: "tw-tiddlylink-external"}, + "class": {type: "string", value: "tc-tiddlylink-external"}, target: {type: "string", value: "_blank"} }, children: [{ diff --git a/core/modules/widgets/link.js b/core/modules/widgets/link.js index b5cd89fd8..c1bda8a91 100755 --- a/core/modules/widgets/link.js +++ b/core/modules/widgets/link.js @@ -60,15 +60,15 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) { if(this.linkClasses) { classes.push(this.linkClasses); } - classes.push("tw-tiddlylink"); + classes.push("tc-tiddlylink"); if(this.isShadow) { - classes.push("tw-tiddlylink-shadow"); + classes.push("tc-tiddlylink-shadow"); } if(this.isMissing && !this.isShadow) { - classes.push("tw-tiddlylink-missing"); + classes.push("tc-tiddlylink-missing"); } else { if(!this.isMissing) { - classes.push("tw-tiddlylink-resolves"); + classes.push("tc-tiddlylink-resolves"); } } domNode.setAttribute("class",classes.join(" ")); @@ -126,7 +126,7 @@ LinkWidget.prototype.handleClickEvent = function (event) { LinkWidget.prototype.handleDragStartEvent = function(event) { if(this.to) { // Set the dragging class on the element being dragged - $tw.utils.addClass(event.target,"tw-tiddlylink-dragging"); + $tw.utils.addClass(event.target,"tc-tiddlylink-dragging"); // Create the drag image elements this.dragImage = this.document.createElement("div"); this.dragImage.className = "tw-tiddler-dragger"; @@ -170,7 +170,7 @@ LinkWidget.prototype.handleDragStartEvent = function(event) { LinkWidget.prototype.handleDragEndEvent = function(event) { // Remove the dragging class on the element being dragged - $tw.utils.removeClass(event.target,"tw-tiddlylink-dragging"); + $tw.utils.removeClass(event.target,"tc-tiddlylink-dragging"); // Delete the drag image element if(this.dragImage) { this.dragImage.parentNode.removeChild(this.dragImage); diff --git a/editions/test/tiddlers/tests/test-wikitext.js b/editions/test/tiddlers/tests/test-wikitext.js index 271688cee..9773ebd59 100644 --- a/editions/test/tiddlers/tests/test-wikitext.js +++ b/editions/test/tiddlers/tests/test-wikitext.js @@ -43,7 +43,7 @@ describe("WikiText tests", function() { expect(wiki.renderTiddler("text/html","TiddlerThree")).toBe("

The speed of sound

The light of speed

"); }); it("should support attributes specified as macro invocations", function() { - expect(wiki.renderTiddler("text/html","TiddlerFour")).toBe("

This is a link

"); + expect(wiki.renderTiddler("text/html","TiddlerFour")).toBe("

This is a link

"); }); it("should identify wikiwords to automatically link", function() { expect(wiki.renderText("text/html","text/vnd-tiddlywiki","No wikilinks here").indexOf(" -> class="tw-tiddlylink-external" target="_blank">$linkText$ +> class="tc-tiddlylink-external" target="_blank">$linkText$ \end \define outerMakeGitHubLink(linkText) diff --git a/editions/tw5.com/tiddlers/system/Sources.tid b/editions/tw5.com/tiddlers/system/Sources.tid index e41212064..dd03eeb0f 100644 --- a/editions/tw5.com/tiddlers/system/Sources.tid +++ b/editions/tw5.com/tiddlers/system/Sources.tid @@ -13,7 +13,7 @@ https://github.com/Jermolene/TiddlyWiki5/blob/master/editions/tw5.com/tiddlers/$ \end \define outerMakeGitHubLink() <$set name="githubLink" value={{$:/config/OriginalTiddlerPaths##$(currentTiddler)$}}> -> class="tw-tiddlylink-external" target="_blank"><$text text=<>/> +> class="tc-tiddlylink-external" target="_blank"><$text text=<>/> \end A static HTML representation of this tiddler is available at the URL: diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid index f23fbade6..9c81ff1a9 100644 --- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid @@ -50,11 +50,11 @@ This causes the tooltip to be the ''tooltip'' field of the target tiddler. If th ! CSS Classes -* `tw-tiddlylink` - applied to all links -* `tw-tiddlylink-external` - applied to external, non-tiddler links -* `tw-tiddlylink-internal` - applied to tiddler links -* `tw-tiddlylink-missing` - applied to tiddler links where the target tiddler doesn't exist -* `tw-tiddlylink-resolves` - applied to tiddler links when the target tiddler does exist +* `tc-tiddlylink` - applied to all links +* `tc-tiddlylink-external` - applied to external, non-tiddler links +* `tc-tiddlylink-internal` - applied to tiddler links +* `tc-tiddlylink-missing` - applied to tiddler links where the target tiddler doesn't exist +* `tc-tiddlylink-resolves` - applied to tiddler links when the target tiddler does exist ! Configuration macros diff --git a/plugins/tiddlywiki/github-fork-ribbon/styles.tid b/plugins/tiddlywiki/github-fork-ribbon/styles.tid index dadb76416..bd695c1b0 100644 --- a/plugins/tiddlywiki/github-fork-ribbon/styles.tid +++ b/plugins/tiddlywiki/github-fork-ribbon/styles.tid @@ -29,8 +29,8 @@ tags: [[$:/tags/stylesheet]] pointer-events: auto; } -.github-fork-ribbon a, .github-fork-ribbon a.tw-tiddlylink, -.github-fork-ribbon a:hover, .github-fork-ribbon a.tw-tiddlylink:hover { +.github-fork-ribbon a, .github-fork-ribbon a.tc-tiddlylink, +.github-fork-ribbon a:hover, .github-fork-ribbon a.tc-tiddlylink:hover { /* Set the font */ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; diff --git a/readme.md b/readme.md index 56a2544a6..e0a4db2b0 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -

Welcome to TiddlyWiki

Welcome to TiddlyWiki, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.

TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.

This is version of TiddlyWiki, a major reboot designed for the next 25 years. It is currently in beta (see the detailed ReleaseHistory) with a RoadMap for moving to the full release. It is a great time to get involved and support the future development of TiddlyWiki.

TiddlyWiki is a free, open source project that depends on your love and support for its survival.

TiddlyWikiClassic

The original "Classic" version of TiddlyWiki is still available at http://classic.tiddlywiki.com. Note that it is not fully backwards compatible: existing content will need massaging, while plugins and themes will have to be completely rewritten. The upgrade path will get smoother as the new version matures. -

Getting started with TiddlyWiki under Node.js

Running TiddlyWiki on Node.js brings several important benefits over and above the single file version:

Installation

  1. Install Node.js from http://nodejs.org
  2. Open a command line terminal and type:

    npm install -g tiddlywiki

    If it fails with an error you may need to re-run the command as an administrator:

    npm install -g tiddlywiki (Windows)

    sudo npm install -g tiddlywiki (Mac/Linux)

  3. Check TiddlyWiki is installed by typing:

    tiddlywiki --version

  4. In response, you should see TiddlyWiki report its current version (eg 5.0.8-beta; you may also see other debugging information reported)
  5. Try it out:
    1. tiddlywiki mynewwiki --init server to create a folder for a new wiki that includes server-related components
    2. tiddlywiki mynewwiki --server to start TiddlyWiki
    3. Visit http://127.0.0.1:8080/ in your browser
    4. Try editing and creating tiddlers

The -g flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it.

A slightly different method for installation is recommended if you plan on forking the source code in order to study it or contribute to it. See Working with the TiddlyWiki5 repository. -

Usage

TiddlyWiki5 can be used on the command line to perform an extensive set of operations based on TiddlyWikiFolders, TiddlerFiles and TiddlyWikiFiles.

For example, the following command loads the tiddlers from a TiddlyWiki HTML file and then saves one of them in static HTML:

tiddlywiki --verbose --load mywiki.html --rendertiddler ReadMe ./readme.html

Running tiddlywiki from the command line boots the TiddlyWiki kernel, loads the core plugins and establishes an empty wiki store. It then sequentially processes the command line arguments from left to right. The arguments are separated with spaces.

The first argument is the optional path to the TiddlyWikiFolder to be loaded. If not present, then the current directory is used.

The commands and their individual arguments follow, each command being identified by the prefix --.

tiddlywiki [<wikipath>] [--<command> [<arg>[,<arg>]]]

The available commands are:

See also:

Upgrading

If you've installed TiddlyWiki on Node.js on the usual way, when a new version is released you can upgrade it with this command:

npm update -g tiddlywiki

On Mac or Linux you'll need to add sudo like this:

sudo npm update -g tiddlywiki

Working with the TiddlyWiki5 repository

Setting Up

If you plan on working with the TiddlyWiki5 source code then follow these steps:

  1. Fork the TiddlyWiki5 GitHub repository from https://github.com/Jermolene/TiddlyWiki5
  2. Clone a local copy of your fork
  3. Open a command line terminal and change the current working directory to the root of the repo
  4. Type npm link (Windows) or sudo npm link (Mac/Linux) to tell npm to use this copy of the repo as the globally installed one

After this procedure you can work with TiddlyWiki5 via npm as though it were installed in the usual way with npm install -g tiddlywiki.

See also Scripts for TiddlyWiki on Node.js.

This readme file was automatically generated by TiddlyWiki +

Welcome to TiddlyWiki

Welcome to TiddlyWiki, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.

TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.

This is version of TiddlyWiki, a major reboot designed for the next 25 years. It is currently in beta (see the detailed ReleaseHistory) with a RoadMap for moving to the full release. It is a great time to get involved and support the future development of TiddlyWiki.

TiddlyWiki is a free, open source project that depends on your love and support for its survival.

TiddlyWikiClassic

The original "Classic" version of TiddlyWiki is still available at http://classic.tiddlywiki.com. Note that it is not fully backwards compatible: existing content will need massaging, while plugins and themes will have to be completely rewritten. The upgrade path will get smoother as the new version matures. +

Getting started with TiddlyWiki under Node.js

Running TiddlyWiki on Node.js brings several important benefits over and above the single file version:

Installation

  1. Install Node.js from http://nodejs.org
  2. Open a command line terminal and type:

    npm install -g tiddlywiki

    If it fails with an error you may need to re-run the command as an administrator:

    npm install -g tiddlywiki (Windows)

    sudo npm install -g tiddlywiki (Mac/Linux)

  3. Check TiddlyWiki is installed by typing:

    tiddlywiki --version

  4. In response, you should see TiddlyWiki report its current version (eg 5.0.8-beta; you may also see other debugging information reported)
  5. Try it out:
    1. tiddlywiki mynewwiki --init server to create a folder for a new wiki that includes server-related components
    2. tiddlywiki mynewwiki --server to start TiddlyWiki
    3. Visit http://127.0.0.1:8080/ in your browser
    4. Try editing and creating tiddlers

The -g flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it.

A slightly different method for installation is recommended if you plan on forking the source code in order to study it or contribute to it. See Working with the TiddlyWiki5 repository. +

Usage

TiddlyWiki5 can be used on the command line to perform an extensive set of operations based on TiddlyWikiFolders, TiddlerFiles and TiddlyWikiFiles.

For example, the following command loads the tiddlers from a TiddlyWiki HTML file and then saves one of them in static HTML:

tiddlywiki --verbose --load mywiki.html --rendertiddler ReadMe ./readme.html

Running tiddlywiki from the command line boots the TiddlyWiki kernel, loads the core plugins and establishes an empty wiki store. It then sequentially processes the command line arguments from left to right. The arguments are separated with spaces.

The first argument is the optional path to the TiddlyWikiFolder to be loaded. If not present, then the current directory is used.

The commands and their individual arguments follow, each command being identified by the prefix --.

tiddlywiki [<wikipath>] [--<command> [<arg>[,<arg>]]]

The available commands are:

See also:

Upgrading

If you've installed TiddlyWiki on Node.js on the usual way, when a new version is released you can upgrade it with this command:

npm update -g tiddlywiki

On Mac or Linux you'll need to add sudo like this:

sudo npm update -g tiddlywiki

Working with the TiddlyWiki5 repository

Setting Up

If you plan on working with the TiddlyWiki5 source code then follow these steps:

  1. Fork the TiddlyWiki5 GitHub repository from https://github.com/Jermolene/TiddlyWiki5
  2. Clone a local copy of your fork
  3. Open a command line terminal and change the current working directory to the root of the repo
  4. Type npm link (Windows) or sudo npm link (Mac/Linux) to tell npm to use this copy of the repo as the globally installed one

After this procedure you can work with TiddlyWiki5 via npm as though it were installed in the usual way with npm install -g tiddlywiki.

See also Scripts for TiddlyWiki on Node.js.

This readme file was automatically generated by TiddlyWiki

\ No newline at end of file diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index e2309eacc..f1f81e233 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -139,52 +139,52 @@ table tfoot tr td { ** Links */ -a.tw-tiddlylink { +a.tc-tiddlylink { text-decoration: none; font-weight: normal; color: <>; -webkit-user-select: inherit; /* Otherwise the draggable attribute makes links impossible to select */ } -.tw-sidebar-lists a.tw-tiddlylink { +.tw-sidebar-lists a.tc-tiddlylink { color: <>; } -.tw-sidebar-lists a.tw-tiddlylink:hover { +.tw-sidebar-lists a.tc-tiddlylink:hover { color: <>; } -a.tw-tiddlylink:hover { +a.tc-tiddlylink:hover { text-decoration: underline; } -a.tw-tiddlylink-resolves { +a.tc-tiddlylink-resolves { } -a.tw-tiddlylink-shadow { +a.tc-tiddlylink-shadow { font-weight: bold; } -a.tw-tiddlylink-shadow.tw-tiddlylink-resolves { +a.tc-tiddlylink-shadow.tc-tiddlylink-resolves { font-weight: normal; } -a.tw-tiddlylink-missing { +a.tc-tiddlylink-missing { font-style: italic; } -a.tw-tiddlylink-external { +a.tc-tiddlylink-external { text-decoration: underline; color: <>; background-color: <>; } -a.tw-tiddlylink-external:visited { +a.tc-tiddlylink-external:visited { color: <>; background-color: <>; } -a.tw-tiddlylink-external:hover { +a.tc-tiddlylink-external:hover { color: <>; background-color: <>; } @@ -376,7 +376,7 @@ button.tw-tag-label, span.tw-tag-label { fill: <>; } -.tc-sidebar-header .tc-title a.tw-tiddlylink-resolves { +.tc-sidebar-header .tc-title a.tc-tiddlylink-resolves { font-weight: 300; } @@ -410,7 +410,7 @@ button.tw-tag-label, span.tw-tag-label { margin-right: 0.5em; } -.tw-page-controls a.tw-tiddlylink:hover { +.tw-page-controls a.tc-tiddlylink:hover { text-decoration: none; } @@ -657,7 +657,7 @@ button.tw-tag-label, span.tw-tag-label { margin-top: 14px; } -.tw-tiddler-help a.tw-tiddlylink { +.tw-tiddler-help a.tc-tiddlylink { color: <>; } @@ -750,7 +750,7 @@ canvas.tw-edit-bitmapeditor { font-style: normal; } -.tw-edit-type-dropdown a.tw-tiddlylink-missing { +.tw-edit-type-dropdown a.tc-tiddlylink-missing { font-style: normal; } @@ -1266,7 +1266,7 @@ canvas.tw-edit-bitmapeditor { background: repeating-linear-gradient(45deg, #aa0, #aa0 10px, #888 10px, #888 20px); } -a.tw-tiddlylink.tw-plugin-info:hover { +a.tc-tiddlylink.tw-plugin-info:hover { text-decoration: none; background-color: <>; color: <>; @@ -1323,7 +1323,7 @@ a.tw-tiddlylink.tw-plugin-info:hover { border: 8px; } -.tw-chooser-item a.tw-tiddlylink { +.tw-chooser-item a.tc-tiddlylink { display: block; text-decoration: none; color: <>; @@ -1331,7 +1331,7 @@ a.tw-tiddlylink.tw-plugin-info:hover { margin: 4px; } -.tw-chooser-item a.tw-tiddlylink:hover { +.tw-chooser-item a.tc-tiddlylink:hover { text-decoration: none; color: <>; background-color: <>;