diff --git a/bin/2bld.cmd b/bin/2bld.cmd index bf2a64ae4..9d18f6327 100644 --- a/bin/2bld.cmd +++ b/bin/2bld.cmd @@ -2,15 +2,6 @@ rem build TiddlyWiki 2.x -rem Prepare the readme file from the revelant content in the tw5.com wiki - -node .\tiddlywiki.js ^ - editions\tw5.com ^ - --verbose ^ - --output editions\tw2 ^ - --rendertiddler TiddlyWiki2ReadMe readme.md text/html ^ - || exit 1 - rem cook the TiddlyWiki 2.x.x index file node .\tiddlywiki.js ^ diff --git a/bin/2bld.sh b/bin/2bld.sh index e0b8d30c1..530466540 100755 --- a/bin/2bld.sh +++ b/bin/2bld.sh @@ -2,15 +2,6 @@ # build TiddlyWiki 2.x -# Prepare the readme file from the revelant content in the tw5.com wiki - -node ./tiddlywiki.js \ - editions/tw5.com \ - --verbose \ - --output editions/tw2 \ - --rendertiddler TiddlyWiki2ReadMe readme.md text/html \ - || exit 1 - # cook the TiddlyWiki 2.x.x index file node ./tiddlywiki.js \ diff --git a/bin/bld-languages.sh b/bin/bld-languages.sh deleted file mode 100755 index 19561c08e..000000000 --- a/bin/bld-languages.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -# Abbreviated version of bld.sh for quicker builds - -# Set up the build output directory - -if [ -z "$TW5_BUILD_OUTPUT" ]; then - TW5_BUILD_OUTPUT=../jermolene.github.com -fi - -if [ ! -d "$TW5_BUILD_OUTPUT" ]; then - echo 'A valid TW5_BUILD_OUTPUT environment variable must be set' - exit 1 -fi - -echo "Using TW5_BUILD_OUTPUT as [$TW5_BUILD_OUTPUT]" - -# /languages/de-AT/index.html Demo wiki with de-AT language -# /languages/de-AT/empty.html Empty wiki with de-AT language -node ./tiddlywiki.js \ - ./editions/de-AT \ - --verbose \ - --output $TW5_BUILD_OUTPUT/languages/de-AT \ - --build favicon empty static index \ - || exit 1 - -# /languages/de-DE/index.html Demo wiki with de-DE language -# /languages/de-DE/empty.html Empty wiki with de-DE language -node ./tiddlywiki.js \ - ./editions/de-DE \ - --verbose \ - --output $TW5_BUILD_OUTPUT/languages/de-DE \ - --build favicon empty static index \ - || exit 1 - -# /languages/fr-FR/index.html Demo wiki with fr-FR language -# /languages/fr-FR/empty.html Empty wiki with fr-FR language -node ./tiddlywiki.js \ - ./editions/fr-FR \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all languages/fr-FR/index.html text/plain \ - --rendertiddler $:/core/save/empty languages/fr-FR/empty.html text/plain \ - || exit 1 - -# /languages/zh-Hans/index.html Demo wiki with zh-Hans language -# /languages/zh-Hans/empty.html Empty wiki with zh-Hans language -node ./tiddlywiki.js \ - ./editions/zh-Hans \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all languages/zh-Hans/index.html text/plain \ - --rendertiddler $:/core/save/empty languages/zh-Hans/empty.html text/plain \ - || exit 1 - -# /languages/zh-Hant/index.html Demo wiki with zh-Hant language -# /languages/zh-Hant/empty.html Empty wiki with zh-Hant language -node ./tiddlywiki.js \ - ./editions/zh-Hant \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all languages/zh-Hant/index.html text/plain \ - --rendertiddler $:/core/save/empty languages/zh-Hant/empty.html text/plain \ - || exit 1 - diff --git a/bin/bld.cmd b/bin/bld.cmd deleted file mode 100644 index ef4be5b80..000000000 --- a/bin/bld.cmd +++ /dev/null @@ -1,130 +0,0 @@ -@echo off - -rem build TiddlyWiki5 for tiddlywiki.com - -rem Set up the build output directory - -if "x%TW5_BUILD_OUTPUT%" == "x" ( - set TW5_BUILD_OUTPUT=..\jermolene.github.com -) - -if not exist %TW5_BUILD_OUTPUT%\nul ( - echo A valid TW5_BUILD_OUTPUT environment variable must be set - exit 1 -) - -echo Using TW5_BUILD_OUTPUT as %TW5_BUILD_OUTPUT% -echo. - -rem Create the `static` directories if necessary - -setlocal enableextensions -mkdir %TW5_BUILD_OUTPUT%\static -setlocal disableextensions - -rem Delete any existing content - -del /q /s %TW5_BUILD_OUTPUT%\static - -rem The tw5.com wiki -rem index.html: the main file, including content -rem empty.html: the main file, excluding content -rem static.html: the static version of the default tiddlers - -node .\tiddlywiki.js ^ - .\editions\tw5.com ^ - --verbose ^ - --output . ^ - --build readmes ^ - --output %TW5_BUILD_OUTPUT% ^ - --build favicon empty static index ^ - || exit 1 - -rem dev/: developer material - -node .\tiddlywiki.js ^ - .\editions\dev ^ - --verbose ^ - --output %TW5_BUILD_OUTPUT%\dev ^ - --build index favicon static ^ - || exit 1 - -rem upgrade.html: custom edition for handling upgrades - -node .\tiddlywiki.js ^ - .\editions\upgrade ^ - --verbose ^ - --output %TW5_BUILD_OUTPUT% ^ - --build upgrade ^ - || exit 1 - -rem encrypted.html: a version of the main file encrypted with the password "password" - -node .\tiddlywiki.js ^ - .\editions\tw5.com ^ - --verbose ^ - --output %TW5_BUILD_OUTPUT% ^ - --build encrypted ^ - || exit 1 - -rem tahoelafs.html: empty wiki with plugin for Tahoe-LAFS - -node .\tiddlywiki.js ^ - .\editions\tahoelafs ^ - --verbose ^ - --output %TW5_BUILD_OUTPUT% ^ - --rendertiddler $:/core/save/all tahoelafs.html text/plain ^ - || exit 1 - -rem d3demo.html: wiki to demo d3 plugin - -node .\tiddlywiki.js ^ - .\editions\d3demo ^ - --verbose ^ - --output %TW5_BUILD_OUTPUT% ^ - --rendertiddler $:/core/save/all d3demo.html text/plain ^ - || exit 1 - -rem codemirrordemo.html: wiki to demo codemirror plugin - -node .\tiddlywiki.js ^ - .\editions\codemirrordemo ^ - --verbose ^ - --output %TW5_BUILD_OUTPUT% ^ - --rendertiddler $:/core/save/all codemirrordemo.html text/plain ^ - || exit 1 - -rem markdowndemo.html: wiki to demo markdown plugin - -node .\tiddlywiki.js ^ - .\editions\markdowndemo ^ - --verbose ^ - --output %TW5_BUILD_OUTPUT% ^ - --rendertiddler $:/core/save/all markdowndemo.html text/plain ^ - || exit 1 - -rem classicparserdemo.html: wiki to demo classicparser plugin - -node .\tiddlywiki.js ^ - .\editions\classicparserdemo ^ - --verbose ^ - --output %TW5_BUILD_OUTPUT% ^ - --rendertiddler $:/core/save/all classicparserdemo.html text/plain ^ - || exit 1 - -rem highlightdemo.html: wiki to demo highlight plugin - -node .\tiddlywiki.js ^ - .\editions\highlightdemo ^ - --verbose ^ - --output %TW5_BUILD_OUTPUT% ^ - --rendertiddler $:/core/save/all highlightdemo.html text/plain ^ - || exit 1 - -rem Make the CNAME file that GitHub Pages requires - -echo tiddlywiki.com > %TW5_BUILD_OUTPUT%\CNAME - -rem Run the test edition to run the Node.js tests and to generate test.html for tests in the browser - -.\bin\test.cmd diff --git a/bin/bld.sh b/bin/bld.sh deleted file mode 100755 index 5c2db5d1b..000000000 --- a/bin/bld.sh +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash - -# build TiddlyWiki5 for tiddlywiki.com - -# Set up the build output directory - -if [ -z "$TW5_BUILD_OUTPUT" ]; then - TW5_BUILD_OUTPUT=../jermolene.github.com -fi - -if [ ! -d "$TW5_BUILD_OUTPUT" ]; then - echo 'A valid TW5_BUILD_OUTPUT environment variable must be set' - exit 1 -fi - -echo "Using TW5_BUILD_OUTPUT as [$TW5_BUILD_OUTPUT]" - -# Make the CNAME file that GitHub Pages requires - -echo "tiddlywiki.com" > $TW5_BUILD_OUTPUT/CNAME - -# Create the `static` directories if necessary - -mkdir -p $TW5_BUILD_OUTPUT/static - -# Delete any existing content - -rm $TW5_BUILD_OUTPUT/static/* - -# The tw5.com wiki -# index.html: the main file, including content -# empty.html: the main file, excluding content -# static.html: the static version of the default tiddlers - -node ./tiddlywiki.js \ - ./editions/tw5.com \ - --verbose \ - --output . \ - --build readmes \ - --output $TW5_BUILD_OUTPUT \ - --build favicon empty static index \ - || exit 1 - -# dev/: developer material - -node ./tiddlywiki.js \ - ./editions/dev \ - --verbose \ - --output $TW5_BUILD_OUTPUT/dev \ - --build index favicon static \ - || exit 1 - -# upgrade.html: custom edition for handling upgrades - -node ./tiddlywiki.js \ - ./editions/upgrade \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --build upgrade \ - || exit 1 - -# encrypted.html: a version of the main file encrypted with the password "password" - -node ./tiddlywiki.js \ - ./editions/tw5.com \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --build encrypted \ - || exit 1 - -# tahoelafs.html: empty wiki with plugin for Tahoe-LAFS - -node ./tiddlywiki.js \ - ./editions/tahoelafs \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all tahoelafs.html text/plain \ - || exit 1 - -# d3demo.html: wiki to demo d3 plugin - -node ./tiddlywiki.js \ - ./editions/d3demo \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all d3demo.html text/plain \ - || exit 1 - -# codemirrordemo.html: wiki to demo codemirror plugin - -node ./tiddlywiki.js \ - ./editions/codemirrordemo \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all codemirrordemo.html text/plain \ - || exit 1 - -# markdowndemo.html: wiki to demo markdown plugin - -node ./tiddlywiki.js \ - ./editions/markdowndemo \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all markdowndemo.html text/plain \ - || exit 1 - -# classicparserdemo.html: wiki to demo classicparser plugin - -node ./tiddlywiki.js \ - ./editions/classicparserdemo \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all classicparserdemo.html text/plain \ - || exit 1 - -# highlightdemo.html: wiki to demo highlight plugin - -node ./tiddlywiki.js \ - ./editions/highlightdemo \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all highlightdemo.html text/plain \ - || exit 1 - -# Run the test edition to run the Node.js tests and to generate test.html for tests in the browser - -./bin/test.sh diff --git a/bin/deploy.cmd b/bin/deploy.cmd deleted file mode 100644 index d1bf0cf5c..000000000 --- a/bin/deploy.cmd +++ /dev/null @@ -1,17 +0,0 @@ -@echo off - -rem Publish to NPM - -npm publish || exit 1 - -rem Deploy latest build to github - -pushd ..\jermolene.github.com - -git add --all || exit 1 - -git commit -m "Updates" || exit 1 - -git push origin || exit 1 - -popd diff --git a/bin/deploy.sh b/bin/deploy.sh deleted file mode 100755 index 7c392005c..000000000 --- a/bin/deploy.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# Publish to NPM - -npm publish || exit 1 - -# Deploy latest build to github - -pushd ../jermolene.github.com - -git add --all || exit 1 - -git commit -m "Updates" || exit 1 - -git push origin || exit 1 - -popd diff --git a/bin/devbld.sh b/bin/devbld.sh deleted file mode 100755 index e3a50de5a..000000000 --- a/bin/devbld.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# Build the dev wiki - -# Set up the build output directory - -if [ -z "$TW5_BUILD_OUTPUT" ]; then - TW5_BUILD_OUTPUT=../jermolene.github.com -fi - -if [ ! -d "$TW5_BUILD_OUTPUT" ]; then - echo 'A valid TW5_BUILD_OUTPUT environment variable must be set' - exit 1 -fi - -echo "Using TW5_BUILD_OUTPUT as [$TW5_BUILD_OUTPUT]" - -# Make the CNAME file that GitHub Pages requires - -echo "tiddlywiki.com" > $TW5_BUILD_OUTPUT/CNAME - -# The tw5.com wiki -# index.html: the main file, including content - -node ./tiddlywiki.js \ - ./editions/dev \ - --verbose \ - --output $TW5_BUILD_OUTPUT/dev \ - --build index favicon \ - || exit 1 diff --git a/bin/fullbld.sh b/bin/fullbld.sh deleted file mode 100755 index c54ef8a9f..000000000 --- a/bin/fullbld.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/bash - -# Perform a full build for tiddlywiki.com - -# Set up the build output directory - -if [ -z "$TW5_BUILD_OUTPUT" ]; then - TW5_BUILD_OUTPUT=../jermolene.github.com -fi - -if [ ! -d "$TW5_BUILD_OUTPUT" ]; then - echo 'A valid TW5_BUILD_OUTPUT environment variable must be set' - exit 1 -fi - -echo "Using TW5_BUILD_OUTPUT as [$TW5_BUILD_OUTPUT]" - -# Make the CNAME file that GitHub Pages requires - -echo "tiddlywiki.com" > $TW5_BUILD_OUTPUT/CNAME - -# Delete any existing static content - -mkdir -p $TW5_BUILD_OUTPUT/static -mkdir -p $TW5_BUILD_OUTPUT/dev -mkdir -p $TW5_BUILD_OUTPUT/dev/static -rm $TW5_BUILD_OUTPUT/static/* -rm $TW5_BUILD_OUTPUT/dev/static/* - -rm $TW5_BUILD_OUTPUT/languages/de_AT/static/* -rm $TW5_BUILD_OUTPUT/languages/de_DE/static/* - -# Redirects - -echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/index.html" > $TW5_BUILD_OUTPUT/classicparserdemo.html -echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/codemirror/index.html" > $TW5_BUILD_OUTPUT/codemirrordemo.html -echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/d3/index.html" > $TW5_BUILD_OUTPUT/d3demo.html -echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/highlight/index.html" > $TW5_BUILD_OUTPUT/highlightdemo.html -echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/markdown/index.html" > $TW5_BUILD_OUTPUT/markdowndemo.html -echo "Moved to http://tiddlywiki.com/plugins/tiddlywiki/tahoelafs/index.html" > $TW5_BUILD_OUTPUT/tahoelafs.html - -###################################################### -# -# Core distribution -# -###################################################### - -# /index.html Main site -# /favicon.ico Favicon for main site -# /empty.html Empty -# /empty.hta For Internet Explorer -# /static.html Static rendering of default tiddlers -# /alltiddlers.html Static rendering of all tiddlers -# /static/* Static single tiddlers -# /static/static.css Static stylesheet -# /static/favicon.ico Favicon for static pages -node ./tiddlywiki.js \ - ./editions/tw5.com \ - --verbose \ - --output . \ - --build readmes \ - --output $TW5_BUILD_OUTPUT \ - --build favicon empty static index \ - || exit 1 - -# /dev/index.html Developer docs -# /dev/favicon.ico Favicon for dev site -# /dev/static.html Static rendering of default tiddlers -# /dev/alltiddlers.html Static rendering of all tiddlers -# /dev/static/* Static single tiddlers -# /dev/static/static.css Static stylesheet -node ./tiddlywiki.js \ - ./editions/dev \ - --verbose \ - --output $TW5_BUILD_OUTPUT/dev \ - --build index favicon static \ - || exit 1 - -# /upgrade.html Custom edition for performing upgrades -node ./tiddlywiki.js \ - ./editions/upgrade \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --build upgrade \ - || exit 1 - -# /encrypted.html Copy of the main file encrypted with the password "password" -node ./tiddlywiki.js \ - ./editions/tw5.com \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --build encrypted \ - || exit 1 - -###################################################### -# -# Plugin demos -# -###################################################### - -# /plugins/tiddlywiki/katex/index.html Demo wiki with KaTeX plugin -# /plugins/tiddlywiki/katex/empty.html Empty wiki with KaTeX plugin -node ./tiddlywiki.js \ - ./editions/katexdemo \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/katex/index.html text/plain \ - --rendertiddler $:/core/save/empty plugins/tiddlywiki/katex/empty.html text/plain \ - || exit 1 - -# /plugins/tiddlywiki/tahoelafs/index.html Demo wiki with Tahoe-LAFS plugin -# /plugins/tiddlywiki/tahoelafs/empty.html Empty wiki with Tahoe-LAFS plugin -node ./tiddlywiki.js \ - ./editions/tahoelafs \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/tahoelafs/index.html text/plain \ - --rendertiddler $:/core/save/empty plugins/tiddlywiki/tahoelafs/empty.html text/plain \ - || exit 1 - -# /plugins/tiddlywiki/d3/index.html Demo wiki with D3 plugin -# /plugins/tiddlywiki/d3/empty.html Empty wiki with D3 plugin -node ./tiddlywiki.js \ - ./editions/d3demo \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/d3/index.html text/plain \ - --rendertiddler $:/core/save/empty plugins/tiddlywiki/d3/empty.html text/plain \ - || exit 1 - -# /plugins/tiddlywiki/codemirror/index.html Demo wiki with codemirror plugin -# /plugins/tiddlywiki/codemirror/empty.html Empty wiki with codemirror plugin -node ./tiddlywiki.js \ - ./editions/codemirrordemo \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/codemirror/index.html text/plain \ - --rendertiddler $:/core/save/empty plugins/tiddlywiki/codemirror/empty.html text/plain \ - || exit 1 - -# /plugins/tiddlywiki/markdown/index.html Demo wiki with Markdown plugin -# /plugins/tiddlywiki/markdown/empty.html Empty wiki with Markdown plugin -node ./tiddlywiki.js \ - ./editions/markdowndemo \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/markdown/index.html text/plain \ - --rendertiddler $:/core/save/empty plugins/tiddlywiki/markdown/empty.html text/plain \ - || exit 1 - -# /plugins/tiddlywiki/tw2parser/index.html Demo wiki with tw2parser plugin -# /plugins/tiddlywiki/tw2parser/empty.html Empty wiki with tw2parser plugin -node ./tiddlywiki.js \ - ./editions/classicparserdemo \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/tw2parser/index.html text/plain \ - --rendertiddler $:/core/save/empty plugins/tiddlywiki/tw2parser/empty.html text/plain \ - || exit 1 - -# /plugins/tiddlywiki/highlight/index.html Demo wiki with highlight plugin -# /plugins/tiddlywiki/highlight/empty.html Empty wiki with highlight plugin -node ./tiddlywiki.js \ - ./editions/highlightdemo \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all plugins/tiddlywiki/highlight/index.html text/plain \ - --rendertiddler $:/core/save/empty plugins/tiddlywiki/highlight/empty.html text/plain \ - || exit 1 - -###################################################### -# -# Language editions -# -###################################################### - -# /languages/de-AT/index.html Demo wiki with de-AT language -# /languages/de-AT/empty.html Empty wiki with de-AT language -node ./tiddlywiki.js \ - ./editions/de-AT \ - --verbose \ - --output $TW5_BUILD_OUTPUT/languages/de-AT \ - --build favicon empty static index \ - || exit 1 - -# /languages/de-DE/index.html Demo wiki with de-DE language -# /languages/de-DE/empty.html Empty wiki with de-DE language -node ./tiddlywiki.js \ - ./editions/de-DE \ - --verbose \ - --output $TW5_BUILD_OUTPUT/languages/de-DE \ - --build favicon empty static index \ - || exit 1 - -# /languages/fr-FR/index.html Demo wiki with fr-FR language -# /languages/fr-FR/empty.html Empty wiki with fr-FR language -node ./tiddlywiki.js \ - ./editions/fr-FR \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all languages/fr-FR/index.html text/plain \ - --rendertiddler $:/core/save/empty languages/fr-FR/empty.html text/plain \ - || exit 1 - -# /languages/zh-Hans/index.html Demo wiki with zh-Hans language -# /languages/zh-Hans/empty.html Empty wiki with zh-Hans language -node ./tiddlywiki.js \ - ./editions/zh-Hans \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all languages/zh-Hans/index.html text/plain \ - --rendertiddler $:/core/save/empty languages/zh-Hans/empty.html text/plain \ - || exit 1 - -# /languages/zh-Hant/index.html Demo wiki with zh-Hant language -# /languages/zh-Hant/empty.html Empty wiki with zh-Hant language -node ./tiddlywiki.js \ - ./editions/zh-Hant \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all languages/zh-Hant/index.html text/plain \ - --rendertiddler $:/core/save/empty languages/zh-Hant/empty.html text/plain \ - || exit 1 - -###################################################### -# -# Tests -# -###################################################### - -# /test.html Wiki for running tests in browser -# Also runs the serverside tests -node ./tiddlywiki.js \ - ./editions/test \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all test.html text/plain \ - || exit 1 diff --git a/bin/qbld.cmd b/bin/qbld.cmd deleted file mode 100644 index 4eb772b3b..000000000 --- a/bin/qbld.cmd +++ /dev/null @@ -1,28 +0,0 @@ -@echo off - -rem Abbreviated version of bld.sh for quicker builds - -rem Set up the build output directory - -if "x%TW5_BUILD_OUTPUT%" == "x" ( - set TW5_BUILD_OUTPUT=..\jermolene.github.com -) - -if not exist %TW5_BUILD_OUTPUT%\nul ( - echo A valid TW5_BUILD_OUTPUT environment variable must be set - exit 1 -) - -echo Using TW5_BUILD_OUTPUT as %TW5_BUILD_OUTPUT% -echo. - -rem The tw5.com wiki -rem index.html: the main file, including content - -node .\tiddlywiki.js ^ - .\editions\tw5.com ^ - --verbose ^ - --output %TW5_BUILD_OUTPUT% ^ - --rendertiddler $:/core/save/all index.html text/plain ^ - --savetiddler $:/favicon.ico favicon.ico ^ - || exit 1 diff --git a/bin/qbld.sh b/bin/qbld.sh deleted file mode 100755 index a7a2d2534..000000000 --- a/bin/qbld.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# Abbreviated version of bld.sh for quicker builds - -# Set up the build output directory - -if [ -z "$TW5_BUILD_OUTPUT" ]; then - TW5_BUILD_OUTPUT=../jermolene.github.com -fi - -if [ ! -d "$TW5_BUILD_OUTPUT" ]; then - echo 'A valid TW5_BUILD_OUTPUT environment variable must be set' - exit 1 -fi - -echo "Using TW5_BUILD_OUTPUT as [$TW5_BUILD_OUTPUT]" - -# Make the CNAME file that GitHub Pages requires - -echo "tiddlywiki.com" > $TW5_BUILD_OUTPUT/CNAME - -# The tw5.com wiki -# index.html: the main file, including content - -node ./tiddlywiki.js \ - ./editions/tw5.com \ - --verbose \ - --output $TW5_BUILD_OUTPUT \ - --build index favicon \ - || exit 1 diff --git a/bin/readme.md b/bin/readme.md index 5b1443f95..d69837069 100644 --- a/bin/readme.md +++ b/bin/readme.md @@ -1,7 +1,3 @@ -

Script Files

The TiddlyWiki5 repository contains several scripts in the bin folder that are used to build and deploy TiddlyWiki (.sh for *nix and .cmd for Windows). They can serve as a useful starting point for your own scripts.

All the scripts expect to be run from the root folder of the repository.

fullbld: builds tw5.com

This script builds several variants of TiddlyWiki5 for deployment on tiddlywiki.com.

By default, files are output to a folder called jermolene.github.com, sibling to the TiddlyWiki5 repo directory. For example:

/TiddlyWork/ - Directory for working with TiddlyWiki5
-  |
-  +--+-- /TiddlyWiki5/ - Directory containing the TiddlyWiki5 repo from GitHub
-     |
-     +-- /jermolene.github.com/ - Directory for output files

You can override the build output directory by defining the environment variable TW5_BUILD_OUTPUT. The easiest way to do this is to create a personal batch file to invoke TiddlyWiki5 that first sets the environment variable and then invokes fullbld.

fullbld also runs the TiddlyWiki5 Node.js-based test suite (see TestingMechanism)

serve: serves tw5.com

./bin/serve.sh -h
+
Script Files
The TiddlyWiki5 repository contains several scripts in the bin folder that you can use to automate common tasks, or as a useful starting point for your own scripts. See Scripts for building tiddlywiki.com for details of the scripts used to build and release http://tiddlywiki.com/.
All the scripts expect to be run from the root folder of the repository.
serve: serves tw5.com
./bin/serve.sh -h
 ./bin/serve.sh [edition dir] [username] [password] [host] [port]
Or:
./bin/serve.cmd -h
-./bin/serve.cmd [edition dir] [username] [password] [host] [port]
This script starts TiddlyWiki5 running as an HTTP server, defaulting to the content from the tw5.com-server edition. By default, the Node.js serves on port 8080. If the optional username parameter is provided, it is used for signing edits. If the password is provided then HTTP basic authentication is used. Run the script with the -h parameter to see online help.
To experiment with this configuration, run the script and then visit http://127.0.0.1:8080 in a browser.
Changes made in the browser propagate to the server over HTTP (use the browser developer console to see these requests). The server then syncs changes to the file system (and logs each change to the screen).
test: build and run tests
This script runs the test edition of TiddlyWiki on the server to perform the server-side tests and to build test.html for running the tests in the browser.
lazy: serves tw5.com with lazily loaded images
./bin/lazy.sh <username> [<password>]
Or:
./bin/lazy.cmd <username> [<password>]
This script serves the tw5.com-server edition content with LazyLoading applied to images.
wbld: builds TiddlyWiki for TiddlyWeb
This script builds and deploys the code for TiddlyWiki in the Sky for TiddlyWeb. If you want to experiment with your own builds of TiddlyWiki5 for TiddlyWeb you could use this batch file as a base.
2bld: builds TiddlyWiki 2.6.5
This script builds TiddlyWiki 2.6.5 from the original source and then displays the differences between them (diff is used for *nix, fc for Windows).
deploy & verbump: deploy TiddlyWiki and bump the TiddlyWiki version number
These scripts are concerned with releasing a new version of TiddlyWiki. See Releasing a new version of TiddlyWiki5.

\ No newline at end of file
+./bin/serve.cmd [edition dir] [username] [password] [host] [port]

This script starts TiddlyWiki5 running as an HTTP server, defaulting to the content from the tw5.com-server edition. By default, the Node.js serves on port 8080. If the optional username parameter is provided, it is used for signing edits. If the password is provided then HTTP basic authentication is used. Run the script with the -h parameter to see online help.

To experiment with this configuration, run the script and then visit http://127.0.0.1:8080 in a browser.

Changes made in the browser propagate to the server over HTTP (use the browser developer console to see these requests). The server then syncs changes to the file system (and logs each change to the screen).

test: build and run tests

This script runs the test edition of TiddlyWiki on the server to perform the server-side tests and to build test.html for running the tests in the browser.

lazy: serves tw5.com with lazily loaded images

./bin/lazy.sh <username> [<password>]

Or:

./bin/lazy.cmd <username> [<password>]

This script serves the tw5.com-server edition content with LazyLoading applied to images.

2bld: builds TiddlyWiki 2.6.5

This script builds TiddlyWiki 2.6.5 from the original source and then displays the differences between them (diff is used for *nix, fc for Windows).

\ No newline at end of file diff --git a/bin/serve.cmd b/bin/serve.cmd index 898904cdc..3f0b69e1c 100644 --- a/bin/serve.cmd +++ b/bin/serve.cmd @@ -43,8 +43,8 @@ echo - %%3 .. password .. can be empty like this: '""' echo - %%4 .. IP address or HOST .. defaults to localhost echo - %%5 .. PORT .. defaults to 8080 echo. -echo Example 1 .\serve .\edition\tw5.com-server username -echo Example 2 .\serve .\edition\tw5.com-server '""' '""' localhost 9090 +echo Example 1 .\serve .\editions\tw5.com-server username +echo Example 2 .\serve .\editions\tw5.com-server '""' '""' localhost 9090 echo .. Example 2 defines: empty username, empty password echo. echo Help information diff --git a/bin/serve.sh b/bin/serve.sh index 3d28d5297..9b9d9da71 100755 --- a/bin/serve.sh +++ b/bin/serve.sh @@ -45,8 +45,8 @@ help() { echo $'\t'-v .. Version echo $'\t'-h .. Help echo - echo Example 1 ./serve ./edition/tw5.com-server username - echo Example 2 ./serve ./edition/tw5.com-server \"\" \"\" localhost 9090 + echo Example 1 ./serve ./editions/tw5.com-server username + echo Example 2 ./serve ./editions/tw5.com-server \"\" \"\" localhost 9090 echo .. Example 2 defines: empty username, empty password echo } diff --git a/bin/test.cmd b/bin/test.cmd index f5a3085eb..554277b57 100644 --- a/bin/test.cmd +++ b/bin/test.cmd @@ -2,24 +2,10 @@ rem test TiddlyWiki5 for tiddlywiki.com -rem Set up the build output directory - -if "x%TW5_BUILD_OUTPUT%" == "x" ( - set TW5_BUILD_OUTPUT=..\jermolene.github.com -) - -if not exist %TW5_BUILD_OUTPUT%\nul ( - echo A valid TW5_BUILD_OUTPUT environment variable must be set - exit 1 -) - -echo Using TW5_BUILD_OUTPUT as %TW5_BUILD_OUTPUT% - rem Run the test edition to run the node.js tests and to generate test.html for tests in the browser node .\tiddlywiki.js ^ .\editions\test ^ - --output %TW5_BUILD_OUTPUT% ^ --verbose ^ --rendertiddler $:/core/save/all test.html text/plain ^ || exit 1 diff --git a/bin/test.sh b/bin/test.sh index 00036cd7d..38bb7fbb8 100755 --- a/bin/test.sh +++ b/bin/test.sh @@ -2,24 +2,12 @@ # test TiddlyWiki5 for tiddlywiki.com -# Set up the build output directory - -if [ -z "$TW5_BUILD_OUTPUT" ]; then - TW5_BUILD_OUTPUT=../jermolene.github.com -fi - -if [ ! -d "$TW5_BUILD_OUTPUT" ]; then - echo 'A valid TW5_BUILD_OUTPUT environment variable must be set' - exit 1 -fi - -echo "Using TW5_BUILD_OUTPUT as [$TW5_BUILD_OUTPUT]" - # Run the test edition to run the node.js tests and to generate test.html for tests in the browser node ./tiddlywiki.js \ ./editions/test \ --verbose \ - --output $TW5_BUILD_OUTPUT \ --rendertiddler $:/core/save/all test.html text/plain \ || exit 1 + +echo To run the tests in a browser, open "editions/test/output/test.html" diff --git a/bin/verbump.cmd b/bin/verbump.cmd deleted file mode 100644 index 378a3e3e8..000000000 --- a/bin/verbump.cmd +++ /dev/null @@ -1,16 +0,0 @@ -@echo off - -rem Bump to a new version number - -if "x%1" == "x" ( - echo Missing version (eg '5.0.0-alpha'^) - exit 1 -) - -rem Set the new version number (will also commit and tag the release) - -npm version %1 -m "Version number update for %1" || exit 1 - -rem Make sure our tags are pushed to the origin server - -git push origin --tags || exit 1 diff --git a/bin/verbump.sh b/bin/verbump.sh deleted file mode 100755 index fe97908ef..000000000 --- a/bin/verbump.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# Bump to a new version number - -if [ -z "$1" ] - then - echo "Missing version (eg '5.0.0-alpha')" - exit 1 -fi - -# Set the new version number (will also commit and tag the release) - -npm version $1 -m "Version number update for $1" || exit 1 - -# Make sure our tags are pushed to the origin server - -git push origin --tags || exit 1 diff --git a/bin/wbld.cmd b/bin/wbld.cmd deleted file mode 100644 index 31c028d39..000000000 --- a/bin/wbld.cmd +++ /dev/null @@ -1,26 +0,0 @@ -@echo off - -rem build the TiddlyWeb edition of TiddlyWiki5 and upload it to TiddlySpace. Requires the TiddlySpace credentials -rem of a member of the tw5tiddlyweb space - -rem usage: -rem .\wbld.cmd - -rem Open the tw5tiddlyweb edition in TW5 and save the template for the main HTML file - -node .\tiddlywiki.js ^ - editions\tw5tiddlyweb ^ - --verbose ^ - --output tmp ^ - --rendertiddler $:/core/save/all tiddlyweb.html text/plain ^ - || exit 1 - -rem Prepend the type information that TiddlyWeb needs to turn the .html file into a .tid file - -echo "type: text/html" > tmp\tiddlerforupload.txt -echo "" >> tmp\tiddlerforupload.txt -type tmp\tiddlyweb.html >> tmp\tiddlerforupload.txt - -rem Upload the tiddler file - -curl -u %1:%2 -X PUT -H "content-type: text/plain" http://tw5tiddlyweb.tiddlyspace.com/bags/tw5tiddlyweb_public/tiddlers/tw5 --data-binary @tmp/tiddlerforupload.txt diff --git a/bin/wbld.sh b/bin/wbld.sh deleted file mode 100755 index a50ba3042..000000000 --- a/bin/wbld.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# build the TiddlyWeb edition of TiddlyWiki5 and upload it to TiddlySpace. Requires the TiddlySpace credentials -# of a member of the tw5tiddlyweb space - -# usage: -# ./wbld.sh - -# Create the tmp directory if needed - -mkdir -p tmp - -# Open the tw5tiddlyweb edition in TW5 and save the template for the main HTML file - -node ./tiddlywiki.js \ - editions/tw5tiddlyweb \ - --verbose \ - --output tmp \ - --rendertiddler $:/core/save/all tiddlyweb.html text/plain \ - || exit 1 - -# Prepend the type information that TiddlyWeb needs to turn the .html file into a .tid file - -echo "type: text/html" > tmp/tiddlerforupload.txt -echo "" >> tmp/tiddlerforupload.txt -cat tmp/tiddlyweb.html >> tmp/tiddlerforupload.txt - -# Upload the tiddler file - -curl -u $1:$2 -X PUT -H "content-type: text/plain" http://tw5tiddlyweb.tiddlyspace.com/bags/tw5tiddlyweb_public/tiddlers/tw5 --data-binary @tmp/tiddlerforupload.txt diff --git a/boot/boot.js b/boot/boot.js index 9d838a0d6..0748f5c86 100644 --- a/boot/boot.js +++ b/boot/boot.js @@ -477,6 +477,7 @@ submitText: text to use for submit button (defaults to "Login") serviceName: text of the human readable service name noUserName: set true to disable username prompt canCancel: set true to enable a cancel button (callback called with null) +repeatPassword: set true to prompt for the password twice callback: function to be called on submission with parameter of object {username:,password:}. Callback must return `true` to remove the password prompt */ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) { @@ -493,6 +494,11 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) { children.push(dm("input",{ attributes: {type: "password", name: "password", placeholder: "Password"} })); + if(options.repeatPassword) { + children.push(dm("input",{ + attributes: {type: "password", name: "password2", placeholder: "Repeat password"} + })); + } if(options.canCancel) { children.push(dm("button",{ text: "Cancel", @@ -527,18 +533,23 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) { data[element.name] = element.value; } }); - // Call the callback - if(options.callback(data)) { - // Remove the prompt if the callback returned true - self.removePrompt(promptInfo); + // Check that the passwords match + if(options.repeatPassword && data.password !== data.password2) { + alert("Passwords do not match"); } else { - // Clear the password if the callback returned false - $tw.utils.each(form.elements,function(element) { - if(element.name === "password") { - element.value = ""; - } - }); - } + // Call the callback + if(options.callback(data)) { + // Remove the prompt if the callback returned true + self.removePrompt(promptInfo); + } else { + // Clear the password if the callback returned false + $tw.utils.each(form.elements,function(element) { + if(element.name === "password" || element.name === "password2") { + element.value = ""; + } + }); + } + } event.preventDefault(); return false; },true); @@ -1244,10 +1255,14 @@ Decrypt any tiddlers stored within the element with the ID "encryptedArea". The $tw.boot.decryptEncryptedTiddlers = function(callback) { var encryptedArea = document.getElementById("encryptedStoreArea"); if(encryptedArea) { - var encryptedText = encryptedArea.innerHTML; + var encryptedText = encryptedArea.innerHTML, + prompt = "Enter a password to decrypt this TiddlyWiki"; // Prompt for the password + if($tw.utils.hop($tw.boot,"encryptionPrompts")) { + prompt = $tw.boot.encryptionPrompts.decrypt; + } $tw.passwordPrompt.createPrompt({ - serviceName: "Enter a password to decrypt this TiddlyWiki", + serviceName: prompt, noUserName: true, submitText: "Decrypt", callback: function(data) { @@ -1568,7 +1583,9 @@ $tw.loadWikiTiddlers = function(wikiPath,parentPaths) { $tw.utils.each(wikiInfo.includeWikis,function(includedWikiPath) { var resolvedIncludedWikiPath = path.resolve(wikiPath,includedWikiPath); if(parentPaths.indexOf(resolvedIncludedWikiPath) === -1) { - $tw.loadWikiTiddlers(resolvedIncludedWikiPath,parentPaths); + var subWikiInfo = $tw.loadWikiTiddlers(resolvedIncludedWikiPath,parentPaths); + // Merge the build targets + wikiInfo.build = $tw.utils.extend([],subWikiInfo.build,wikiInfo.build); } else { $tw.utils.error("Cannot recursively include wiki " + resolvedIncludedWikiPath); } diff --git a/boot/bootprefix.js b/boot/bootprefix.js index d22620858..bff9a2aa2 100644 --- a/boot/bootprefix.js +++ b/boot/bootprefix.js @@ -99,7 +99,7 @@ return $tw if(typeof(exports) === "undefined") { // Set up $tw global for the browser - window.$tw = _bootprefix(); + window.$tw = _bootprefix(window.$tw); } else { // Export functionality as a module exports.bootprefix = _bootprefix; diff --git a/contributing.md b/contributing.md index 832b9432f..58e64e879 100644 --- a/contributing.md +++ b/contributing.md @@ -1,3 +1,3 @@ -

Contributing to TiddlyWiki5

We welcome contributions to the code and documentation of TiddlyWiki in several ways:

There are other ways to help TiddlyWiki too.

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).

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

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". +

Contributing to TiddlyWiki5

We welcome contributions to the code and documentation of TiddlyWiki in several ways:

There are other ways to help TiddlyWiki too.

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).

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).

step by step

  1. click licenses/CLA-individual or licenses/CLA-entity
  2. in cla-individual.md or cla-entity.md click icon on the top-right corner (clicking this button will fork the project so you can edit the file)
  3. add your name at the bottom

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

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

This file was automatically generated by TiddlyWiki5

\ No newline at end of file diff --git a/core/images/new-here-button.tid b/core/images/new-here-button.tid new file mode 100644 index 000000000..e8f7f3e27 --- /dev/null +++ b/core/images/new-here-button.tid @@ -0,0 +1,8 @@ +title: $:/core/images/new-here-button +tags: $:/tags/Image + + + + + + diff --git a/core/images/new-journal-button.tid b/core/images/new-journal-button.tid new file mode 100644 index 000000000..7aaaca045 --- /dev/null +++ b/core/images/new-journal-button.tid @@ -0,0 +1,16 @@ +title: $:/core/images/new-journal-button +tags: $:/tags/Image + + + + + + + + + <> + + + + + diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids index dac85e315..2888f4768 100644 --- a/core/language/en-GB/Buttons.multids +++ b/core/language/en-GB/Buttons.multids @@ -34,10 +34,16 @@ Home/Caption: home Home/Hint: Open the default tiddlers Language/Caption: language Language/Hint: Choose the user interface language -NewTiddler/Caption: new tiddler -NewTiddler/Hint: Create a new tiddler More/Caption: more More/Hint: More actions +NewHere/Caption: new here +NewHere/Hint: Create a new tiddler tagged with this one +NewJournal/Caption: new journal +NewJournal/Hint: Create a new journal tiddler +NewJournalHere/Caption: new journal here +NewJournalHere/Hint: Create a new journal tiddler tagged with this one +NewTiddler/Caption: new tiddler +NewTiddler/Hint: Create a new tiddler Permalink/Caption: permalink Permalink/Hint: Set browser address bar to a direct link to this tiddler Permaview/Caption: permaview diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids index 7bb60a790..a9a9ab822 100644 --- a/core/language/en-GB/ControlPanel.multids +++ b/core/language/en-GB/ControlPanel.multids @@ -10,6 +10,8 @@ Basics/DefaultTiddlers/BottomHint: Use [[double square brackets]] Basics/DefaultTiddlers/Prompt: Default tiddlers: Basics/DefaultTiddlers/TopHint: Choose which tiddlers are displayed at startup: Basics/Language/Prompt: Hello! Current language: +Basics/NewJournal/Title/Prompt: Title of new journal tiddlers +Basics/NewJournal/Tags/Prompt: Tags for new journal tiddlers Basics/OverriddenShadowTiddlers/Prompt: Number of overridden shadow tiddlers: Basics/ShadowTiddlers/Prompt: Number of shadow tiddlers: Basics/Subtitle/Prompt: Subtitle: diff --git a/core/language/en-GB/Dates.multids b/core/language/en-GB/Dates.multids new file mode 100644 index 000000000..6859c0324 --- /dev/null +++ b/core/language/en-GB/Dates.multids @@ -0,0 +1,87 @@ +title: $:/language/ + +Date/DaySuffix/1: st +Date/DaySuffix/2: nd +Date/DaySuffix/3: rd +Date/DaySuffix/4: th +Date/DaySuffix/5: th +Date/DaySuffix/6: th +Date/DaySuffix/7: th +Date/DaySuffix/8: th +Date/DaySuffix/9: th +Date/DaySuffix/10: th +Date/DaySuffix/11: th +Date/DaySuffix/12: th +Date/DaySuffix/13: th +Date/DaySuffix/14: th +Date/DaySuffix/15: th +Date/DaySuffix/16: th +Date/DaySuffix/17: th +Date/DaySuffix/18: th +Date/DaySuffix/19: th +Date/DaySuffix/20: th +Date/DaySuffix/21: st +Date/DaySuffix/22: nd +Date/DaySuffix/23: rd +Date/DaySuffix/24: th +Date/DaySuffix/25: th +Date/DaySuffix/26: th +Date/DaySuffix/27: th +Date/DaySuffix/28: th +Date/DaySuffix/29: th +Date/DaySuffix/30: th +Date/DaySuffix/31: st +Date/Long/Day/0: Sunday +Date/Long/Day/1: Monday +Date/Long/Day/2: Tuesday +Date/Long/Day/3: Wednesday +Date/Long/Day/4: Thursday +Date/Long/Day/5: Friday +Date/Long/Day/6: Saturday +Date/Long/Month/1: January +Date/Long/Month/2: February +Date/Long/Month/3: March +Date/Long/Month/4: April +Date/Long/Month/5: May +Date/Long/Month/6: June +Date/Long/Month/7: July +Date/Long/Month/8: August +Date/Long/Month/9: September +Date/Long/Month/10: October +Date/Long/Month/11: November +Date/Long/Month/12: December +Date/Period/am: am +Date/Period/pm: pm +Date/Short/Day/0: Sun +Date/Short/Day/1: Mon +Date/Short/Day/2: Tue +Date/Short/Day/3: Wed +Date/Short/Day/4: Thu +Date/Short/Day/5: Fri +Date/Short/Day/6: Sat +Date/Short/Month/1: Jan +Date/Short/Month/2: Feb +Date/Short/Month/3: Mar +Date/Short/Month/4: Apr +Date/Short/Month/5: May +Date/Short/Month/6: Jun +Date/Short/Month/7: Jul +Date/Short/Month/8: Aug +Date/Short/Month/9: Sep +Date/Short/Month/10: Oct +Date/Short/Month/11: Nov +Date/Short/Month/12: Dec +RelativeDate/Future/Days: <> days from now +RelativeDate/Future/Hours: <> hours from now +RelativeDate/Future/Minutes: <> minutes from now +RelativeDate/Future/Months: <> months from now +RelativeDate/Future/Second: 1 second from now +RelativeDate/Future/Seconds: <> seconds from now +RelativeDate/Future/Years: <> years from now +RelativeDate/Past/Days: <> days ago +RelativeDate/Past/Hours: <> hours ago +RelativeDate/Past/Minutes: <> minutes ago +RelativeDate/Past/Months: <> months ago +RelativeDate/Past/Second: 1 second ago +RelativeDate/Past/Seconds: <> seconds ago +RelativeDate/Past/Years: <> years ago diff --git a/core/language/en-GB/Docs/ModuleTypes.multids b/core/language/en-GB/Docs/ModuleTypes.multids index 6f7f08d30..7d666e309 100644 --- a/core/language/en-GB/Docs/ModuleTypes.multids +++ b/core/language/en-GB/Docs/ModuleTypes.multids @@ -14,6 +14,7 @@ storyview: Story views customise the animation and behaviour of list widgets. tiddlerdeserializer: Converts different content types into tiddlers. tiddlerfield: Defines the behaviour of an individual tiddler field. tiddlermethod: Adds methods to the `$tw.Tiddler` prototype. +upgrader: Applies upgrade processing to tiddlers during an upgrade/import. utils: Adds methods to `$tw.utils`. utils-node: Adds Node.js-specific methods to `$tw.utils`. widget: Widgets encapsulate DOM rendering and refreshing. diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids index 0e9b91d2c..c1f46473a 100644 --- a/core/language/en-GB/Misc.multids +++ b/core/language/en-GB/Misc.multids @@ -8,24 +8,13 @@ ConfirmCancelTiddler: Do you wish to discard changes to the tiddler "<$text text ConfirmDeleteTiddler: Do you wish to delete the tiddler "<$text text=<>/>"? ConfirmOverwriteTiddler: Do you wish to overwrite the tiddler "<$text text=<<title>>/>"? ConfirmEditShadowTiddler: You are about to edit a ShadowTiddler. Any changes will override the default system making future upgrades non-trivial. Are you sure you want to edit "<$text text=<<title>>/>"? +DefaultNewTiddlerTitle: New Tiddler DropMessage: Drop here (or click escape to cancel) +Encryption/ConfirmClearPassword: Do you wish to clear the password? This will remove the encryption applied when saving this wiki +Encryption/PromptSetPassword: Set a new password for this TiddlyWiki InvalidFieldName: Illegal characters in field name "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`) MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" - click {{$:/core/images/edit-button}} to create RecentChanges/DateFormat: DDth MMM YYYY -RelativeDate/Future/Days: <<period>> days from now -RelativeDate/Future/Hours: <<period>> hours from now -RelativeDate/Future/Minutes: <<period>> minutes from now -RelativeDate/Future/Months: <<period>> months from now -RelativeDate/Future/Second: 1 second from now -RelativeDate/Future/Seconds: <<period>> seconds from now -RelativeDate/Future/Years: <<period>> years from now -RelativeDate/Past/Days: <<period>> days ago -RelativeDate/Past/Hours: <<period>> hours ago -RelativeDate/Past/Minutes: <<period>> minutes ago -RelativeDate/Past/Months: <<period>> months ago -RelativeDate/Past/Second: 1 second ago -RelativeDate/Past/Seconds: <<period>> seconds ago -RelativeDate/Past/Years: <<period>> years ago SystemTiddler/Tooltip: This is a system tiddler TagManager/Colour/Heading: Colour TagManager/Icon/Heading: Icon diff --git a/core/language/en-GB/NewJournal.multids b/core/language/en-GB/NewJournal.multids new file mode 100644 index 000000000..ff566fabe --- /dev/null +++ b/core/language/en-GB/NewJournal.multids @@ -0,0 +1,4 @@ +title: $:/config/NewJournal/ + +Title: DDth MMM YYYY +Tags: Journal diff --git a/core/modules/config.js b/core/modules/config.js index a7d90082b..c9996f62c 100644 --- a/core/modules/config.js +++ b/core/modules/config.js @@ -17,20 +17,6 @@ exports.preferences = {}; exports.preferences.notificationDuration = 3 * 1000; exports.preferences.jsonSpaces = 4; -exports.dateFormats = { - months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November","December"], - days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], - shortMonths: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], - shortDays: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], -// suffixes for dates, eg "1st","2nd","3rd"..."30th","31st" - daySuffixes: ["st","nd","rd","th","th","th","th","th","th","th", - "th","th","th","th","th","th","th","th","th","th", - "st","nd","rd","th","th","th","th","th","th","th", - "st"], - am: "am", - pm: "pm" -}; - exports.htmlEntities = {quot:34, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, euro:8364, image:8465, weierp:8472, real:8476, trade:8482, alefsym:8501, larr:8592, uarr:8593, rarr:8594, darr:8595, harr:8596, crarr:8629, lArr:8656, uArr:8657, rArr:8658, dArr:8659, hArr:8660, forall:8704, part:8706, exist:8707, empty:8709, nabla:8711, isin:8712, notin:8713, ni:8715, prod:8719, sum:8721, minus:8722, lowast:8727, radic:8730, prop:8733, infin:8734, ang:8736, and:8743, or:8744, cap:8745, cup:8746, int:8747, there4:8756, sim:8764, cong:8773, asymp:8776, ne:8800, equiv:8801, le:8804, ge:8805, sub:8834, sup:8835, nsub:8836, sube:8838, supe:8839, oplus:8853, otimes:8855, perp:8869, sdot:8901, lceil:8968, rceil:8969, lfloor:8970, rfloor:8971, lang:9001, rang:9002, loz:9674, spades:9824, clubs:9827, hearts:9829, diams:9830 }; exports.htmlVoidElements = "area,base,br,col,command,embed,hr,img,input,keygen,link,meta,param,source,track,wbr".split(","); diff --git a/core/modules/filters/addprefix.js b/core/modules/filters/addprefix.js new file mode 100644 index 000000000..d1f0a822b --- /dev/null +++ b/core/modules/filters/addprefix.js @@ -0,0 +1,28 @@ +/*\ +title: $:/core/modules/filters/addprefix.js +type: application/javascript +module-type: filteroperator + +Filter operator for adding a prefix to each title in the list. This is +especially useful in contexts where only a filter expression is allowed +and macro substitution isn't available. + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Export our filter function +*/ +exports.addprefix = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push(operator.operand + title); + }); + return results; +}; + +})(); diff --git a/core/modules/filters/addsuffix.js b/core/modules/filters/addsuffix.js new file mode 100644 index 000000000..fb80c2573 --- /dev/null +++ b/core/modules/filters/addsuffix.js @@ -0,0 +1,28 @@ +/*\ +title: $:/core/modules/filters/addsuffix.js +type: application/javascript +module-type: filteroperator + +Filter operator for adding a suffix to each title in the list. This is +especially useful in contexts where only a filter expression is allowed +and macro substitution isn't available. + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Export our filter function +*/ +exports.addsuffix = function(source,operator,options) { + var results = []; + source(function(tiddler,title) { + results.push(title + operator.operand); + }); + return results; +}; + +})(); diff --git a/core/modules/macros/now.js b/core/modules/macros/now.js new file mode 100644 index 000000000..d0a15dce2 --- /dev/null +++ b/core/modules/macros/now.js @@ -0,0 +1,32 @@ +/*\ +title: $:/core/modules/macros/now.js +type: application/javascript +module-type: macro + +Macro to return a formatted version of the current time + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Information about this macro +*/ + +exports.name = "now"; + +exports.params = [ + {name: "format"} +]; + +/* +Run the macro +*/ +exports.run = function(format) { + return $tw.utils.formatDateString(new Date(),format || "0hh:0mm, DDth MMM YYYY"); +}; + +})(); diff --git a/core/modules/startup/password.js b/core/modules/startup/password.js index 41902e9e9..6205b3e7d 100644 --- a/core/modules/startup/password.js +++ b/core/modules/startup/password.js @@ -21,10 +21,11 @@ exports.synchronous = true; exports.startup = function() { $tw.rootWidget.addEventListener("tm-set-password",function(event) { $tw.passwordPrompt.createPrompt({ - serviceName: "Set a new password for this TiddlyWiki", + serviceName: $tw.language.getString("Encryption/PromptSetPassword"), noUserName: true, submitText: "Set password", canCancel: true, + repeatPassword: true, callback: function(data) { if(data) { $tw.crypto.setPassword(data.password); @@ -34,6 +35,11 @@ exports.startup = function() { }); }); $tw.rootWidget.addEventListener("tm-clear-password",function(event) { + if($tw.browser) { + if(!confirm($tw.language.getString("Encryption/ConfirmClearPassword"))) { + return; + } + } $tw.crypto.setPassword(null); }); // Ensure that $:/isEncrypted is maintained properly diff --git a/core/modules/startup/story.js b/core/modules/startup/story.js index 6c7258485..460e48ba3 100644 --- a/core/modules/startup/story.js +++ b/core/modules/startup/story.js @@ -59,6 +59,9 @@ exports.startup = function() { var storyFilter = $tw.wiki.getTiddlerText(DEFAULT_TIDDLERS_TITLE), storyList = $tw.wiki.filterTiddlers(storyFilter); $tw.wiki.addTiddler({title: DEFAULT_STORY_TITLE, text: "", list: storyList},$tw.wiki.getModificationFields()); + if(storyList[0]) { + $tw.wiki.addToHistory(storyList[0]); + } }); // Listen for the tm-permalink message $tw.rootWidget.addEventListener("tm-permalink",function(event) { diff --git a/core/modules/storyviews/zoomin.js b/core/modules/storyviews/zoomin.js index 0ae8e8f46..1a66bdf33 100644 --- a/core/modules/storyviews/zoomin.js +++ b/core/modules/storyviews/zoomin.js @@ -35,7 +35,7 @@ var ZoominListView = function(listWidget) { } else { self.currentTiddlerDomNode = domNode; } - domNode.style.position = "absolute"; + $tw.utils.addClass(domNode,"tc-storyview-zoomin-tiddler"); }); }; @@ -52,8 +52,8 @@ ZoominListView.prototype.navigateTo = function(historyInfo) { return; } // Make the new tiddler be position absolute and visible so that we can measure it + $tw.utils.addClass(targetElement,"tc-storyview-zoomin-tiddler"); $tw.utils.setStyle(targetElement,[ - {position: "absolute"}, {display: "block"}, {transformOrigin: "0 0"}, {transform: "translateX(0px) translateY(0px) scale(1)"}, @@ -134,9 +134,9 @@ ZoominListView.prototype.insert = function(widget) { return; } // Make the newly inserted node position absolute and hidden + $tw.utils.addClass(targetElement,"tc-storyview-zoomin-tiddler"); $tw.utils.setStyle(targetElement,[ - {display: "none"}, - {position: "absolute"} + {display: "none"} ]); }; @@ -152,8 +152,8 @@ ZoominListView.prototype.remove = function(widget) { return; } // Set up the tiddler that is being closed + $tw.utils.addClass(targetElement,"tc-storyview-zoomin-tiddler"); $tw.utils.setStyle(targetElement,[ - {position: "absolute"}, {display: "block"}, {transformOrigin: "50% 50%"}, {transform: "translateX(0px) translateY(0px) scale(1)"}, @@ -168,8 +168,8 @@ ZoominListView.prototype.remove = function(widget) { var toWidgetDomNode = toWidget && toWidget.findFirstDomNode(); // Set up the tiddler we're moving back in if(toWidgetDomNode) { + $tw.utils.addClass(toWidgetDomNode,"tc-storyview-zoomin-tiddler"); $tw.utils.setStyle(toWidgetDomNode,[ - {position: "absolute"}, {display: "block"}, {transformOrigin: "50% 50%"}, {transform: "translateX(0px) translateY(0px) scale(10)"}, diff --git a/core/modules/utils/fakedom.js b/core/modules/utils/fakedom.js index dd36369a2..1c4bf2755 100755 --- a/core/modules/utils/fakedom.js +++ b/core/modules/utils/fakedom.js @@ -39,6 +39,7 @@ var TW_Element = function(tag,namespace) { this.attributes = {}; this.isRaw = false; this.children = []; + this.style = {}; this.namespaceURI = namespace || "http://www.w3.org/1999/xhtml"; }; @@ -137,6 +138,15 @@ Object.defineProperty(TW_Element.prototype, "outerHTML", { } } } + if(this.style) { + var style = []; + for(var s in this.style) { + style.push(s + ":" + this.style[s] + ";"); + } + if(style.length > 0) { + output.push(" style='",style.join(""),"'") + } + } output.push(">"); if($tw.config.htmlVoidElements.indexOf(this.tag) === -1) { output.push(this.innerHTML); @@ -179,6 +189,9 @@ Object.defineProperty(TW_Element.prototype, "textContent", { }); return b.join(""); } + }, + set: function(value) { + this.children = [new TW_TextNode(value)]; } }); diff --git a/core/modules/utils/utils.js b/core/modules/utils/utils.js index 0ed21f88c..b4242e1d0 100644 --- a/core/modules/utils/utils.js +++ b/core/modules/utils/utils.js @@ -87,6 +87,7 @@ exports.pushTop = function(array,value) { } array.push(value); } + return array; }; /* @@ -167,61 +168,118 @@ exports.slowInSlowOut = function(t) { return (1 - ((Math.cos(t * Math.PI) + 1) / 2)); }; -exports.formatDateString = function (date,template) { - var t = template.replace(/0hh12/g,$tw.utils.pad($tw.utils.getHours12(date))); - t = t.replace(/hh12/g,$tw.utils.getHours12(date)); - t = t.replace(/0hh/g,$tw.utils.pad(date.getHours())); - t = t.replace(/hh/g,date.getHours()); - t = t.replace(/mmm/g,$tw.config.dateFormats.shortMonths[date.getMonth()]); - t = t.replace(/0mm/g,$tw.utils.pad(date.getMinutes())); - t = t.replace(/mm/g,date.getMinutes()); - t = t.replace(/0ss/g,$tw.utils.pad(date.getSeconds())); - t = t.replace(/ss/g,date.getSeconds()); - t = t.replace(/[ap]m/g,$tw.utils.getAmPm(date).toLowerCase()); - t = t.replace(/[AP]M/g,$tw.utils.getAmPm(date).toUpperCase()); - t = t.replace(/wYYYY/g,$tw.utils.getYearForWeekNo(date)); - t = t.replace(/wYY/g,$tw.utils.pad($tw.utils.getYearForWeekNo(date)-2000)); - t = t.replace(/YYYY/g,date.getFullYear()); - t = t.replace(/YY/g,$tw.utils.pad(date.getFullYear()-2000)); - t = t.replace(/MMM/g,$tw.config.dateFormats.months[date.getMonth()]); - t = t.replace(/0MM/g,$tw.utils.pad(date.getMonth()+1)); - t = t.replace(/MM/g,date.getMonth()+1); - t = t.replace(/0WW/g,$tw.utils.pad($tw.utils.getWeek(date))); - t = t.replace(/WW/g,$tw.utils.getWeek(date)); - t = t.replace(/DDD/g,$tw.config.dateFormats.days[date.getDay()]); - t = t.replace(/ddd/g,$tw.config.dateFormats.shortDays[date.getDay()]); - t = t.replace(/0DD/g,$tw.utils.pad(date.getDate())); - t = t.replace(/DDth/g,date.getDate()+$tw.utils.getDaySuffix(date)); - t = t.replace(/DD/g,date.getDate()); - var tz = date.getTimezoneOffset(); - var atz = Math.abs(tz); - t = t.replace(/TZD/g,(tz < 0 ? '+' : '-') + $tw.utils.pad(Math.floor(atz / 60)) + ':' + $tw.utils.pad(atz % 60)); +exports.formatDateString = function(date,template) { + var t = template; + t = t.replace(/0hh12/g,function() { + return $tw.utils.pad($tw.utils.getHours12(date)); + }); + t = t.replace(/hh12/g,function() { + return $tw.utils.getHours12(date); + }); + t = t.replace(/0hh/g,function() { + return $tw.utils.pad(date.getHours()); + }); + t = t.replace(/hh/g,function() { + return date.getHours(); + }); + t = t.replace(/mmm/g,function() { + return $tw.language.getString("Date/Short/Month/" + (date.getMonth() + 1)); + }); + t = t.replace(/0mm/g,function() { + return $tw.utils.pad(date.getMinutes()); + }); + t = t.replace(/mm/g,function() { + return date.getMinutes(); + }); + t = t.replace(/0ss/g,function() { + return $tw.utils.pad(date.getSeconds()); + }); + t = t.replace(/ss/g,function() { + return date.getSeconds(); + }); + t = t.replace(/[ap]m/g,function() { + return $tw.utils.getAmPm(date).toLowerCase(); + }); + t = t.replace(/[AP]M/g,function() { + return $tw.utils.getAmPm(date).toUpperCase(); + }); + t = t.replace(/wYYYY/g,function() { + return $tw.utils.getYearForWeekNo(date); + }); + t = t.replace(/wYY/g,function() { + return $tw.utils.pad($tw.utils.getYearForWeekNo(date)-2000); + }); + t = t.replace(/YYYY/g,function() { + return date.getFullYear(); + }); + t = t.replace(/YY/g,function() { + return $tw.utils.pad(date.getFullYear()-2000); + }); + t = t.replace(/MMM/g,function() { + return $tw.language.getString("Date/Long/Month/" + (date.getMonth() + 1)); + }); + t = t.replace(/0MM/g,function() { + return $tw.utils.pad(date.getMonth()+1); + }); + t = t.replace(/MM/g,function() { + return date.getMonth() + 1; + }); + t = t.replace(/0WW/g,function() { + return $tw.utils.pad($tw.utils.getWeek(date)); + }); + t = t.replace(/WW/g,function() { + return $tw.utils.getWeek(date); + }); + t = t.replace(/DDD/g,function() { + return $tw.language.getString("Date/Long/Day/" + date.getDay()); + }); + t = t.replace(/ddd/g,function() { + return $tw.language.getString("Date/Short/Day/" + date.getDay()); + }); + t = t.replace(/0DD/g,function() { + return $tw.utils.pad(date.getDate()); + }); + t = t.replace(/DDth/g,function() { + return date.getDate() + $tw.utils.getDaySuffix(date); + }); + t = t.replace(/DD/g,function() { + return date.getDate(); + }); + t = t.replace(/TZD/g,function() { + var tz = date.getTimezoneOffset(), + atz = Math.abs(tz); + return (tz < 0 ? '+' : '-') + $tw.utils.pad(Math.floor(atz / 60)) + ':' + $tw.utils.pad(atz % 60); + }); t = t.replace(/\\(.)/g,"$1"); return t; }; exports.getAmPm = function(date) { - return date.getHours() >= 12 ? $tw.config.dateFormats.pm : $tw.config.dateFormats.am; + return $tw.language.getString("Date/Period/" + (date.getHours() >= 12 ? "pm" : "am")); }; exports.getDaySuffix = function(date) { - return $tw.config.dateFormats.daySuffixes[date.getDate()-1]; + return $tw.language.getString("Date/DaySuffix/" + date.getDate()); }; exports.getWeek = function(date) { var dt = new Date(date.getTime()); var d = dt.getDay(); - if(d === 0) d=7;// JavaScript Sun=0, ISO Sun=7 - dt.setTime(dt.getTime()+(4-d)*86400000);// shift day to Thurs of same week to calculate weekNo - var n = Math.floor((dt.getTime()-new Date(dt.getFullYear(),0,1)+3600000)/86400000); - return Math.floor(n/7)+1; + if(d === 0) { + d = 7; // JavaScript Sun=0, ISO Sun=7 + } + dt.setTime(dt.getTime() + (4 - d) * 86400000);// shift day to Thurs of same week to calculate weekNo + var n = Math.floor((dt.getTime()-new Date(dt.getFullYear(),0,1) + 3600000) / 86400000); + return Math.floor(n / 7) + 1; }; exports.getYearForWeekNo = function(date) { var dt = new Date(date.getTime()); var d = dt.getDay(); - if(d === 0) d=7;// JavaScript Sun=0, ISO Sun=7 - dt.setTime(dt.getTime()+(4-d)*86400000);// shift day to Thurs of same week + if(d === 0) { + d = 7; // JavaScript Sun=0, ISO Sun=7 + } + dt.setTime(dt.getTime() + (4 - d) * 86400000);// shift day to Thurs of same week return dt.getFullYear(); }; diff --git a/core/modules/widgets/action-navigate.js b/core/modules/widgets/action-navigate.js new file mode 100644 index 000000000..b6688df08 --- /dev/null +++ b/core/modules/widgets/action-navigate.js @@ -0,0 +1,79 @@ +/*\ +title: $:/core/modules/widgets/action-navigate.js +type: application/javascript +module-type: widget + +Action widget to navigate to a tiddler + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var Widget = require("$:/core/modules/widgets/widget.js").widget; + +var NavigateWidget = function(parseTreeNode,options) { + this.initialise(parseTreeNode,options); +}; + +/* +Inherit from the base widget class +*/ +NavigateWidget.prototype = new Widget(); + +/* +Render this widget into the DOM +*/ +NavigateWidget.prototype.render = function(parent,nextSibling) { + this.computeAttributes(); + this.execute(); +}; + +/* +Compute the internal state of the widget +*/ +NavigateWidget.prototype.execute = function() { + this.actionTo = this.getAttribute("$to"); + this.actionScroll = this.getAttribute("$scroll"); +}; + +/* +Refresh the widget by ensuring our attributes are up to date +*/ +NavigateWidget.prototype.refresh = function(changedTiddlers) { + var changedAttributes = this.computeAttributes(); + if(changedAttributes["$to"] || changedAttributes["$scroll"]) { + this.refreshSelf(); + return true; + } + return this.refreshChildren(changedTiddlers); +}; + +/* +Invoke the action associated with this widget +*/ +NavigateWidget.prototype.invokeAction = function(triggeringWidget,event) { + var bounds = triggeringWidget && triggeringWidget.getBoundingClientRect && triggeringWidget.getBoundingClientRect(), + suppressNavigation = event.metaKey || event.ctrlKey || (event.button === 1); + if(this.actionScroll === "yes") { + suppressNavigation = false; + } else if(this.actionScroll === "no") { + suppressNavigation = true; + } + this.dispatchEvent({ + type: "tm-navigate", + navigateTo: this.actionTo === undefined ? this.getVariable("currentTiddler") : this.actionTo, + navigateFromTitle: this.getVariable("storyTiddler"), + navigateFromNode: triggeringWidget, + navigateFromClientRect: bounds && { top: bounds.top, left: bounds.left, width: bounds.width, right: bounds.right, bottom: bounds.bottom, height: bounds.height + }, + navigateSuppressNavigation: suppressNavigation + }); + return true; // Action was invoked +}; + +exports["action-navigate"] = NavigateWidget; + +})(); diff --git a/core/modules/widgets/action-sendmessage.js b/core/modules/widgets/action-sendmessage.js new file mode 100644 index 000000000..fa788240a --- /dev/null +++ b/core/modules/widgets/action-sendmessage.js @@ -0,0 +1,82 @@ +/*\ +title: $:/core/modules/widgets/action-sendmessage.js +type: application/javascript +module-type: widget + +Action widget to send a message + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +var Widget = require("$:/core/modules/widgets/widget.js").widget; + +var SendMessageWidget = function(parseTreeNode,options) { + this.initialise(parseTreeNode,options); +}; + +/* +Inherit from the base widget class +*/ +SendMessageWidget.prototype = new Widget(); + +/* +Render this widget into the DOM +*/ +SendMessageWidget.prototype.render = function(parent,nextSibling) { + this.computeAttributes(); + this.execute(); +}; + +/* +Compute the internal state of the widget +*/ +SendMessageWidget.prototype.execute = function() { + this.actionMessage = this.getAttribute("$message"); + this.actionParam = this.getAttribute("$param"); +}; + +/* +Refresh the widget by ensuring our attributes are up to date +*/ +SendMessageWidget.prototype.refresh = function(changedTiddlers) { + var changedAttributes = this.computeAttributes(); + if(changedAttributes["$message"] || changedAttributes["$param"]) { + this.refreshSelf(); + return true; + } + return this.refreshChildren(changedTiddlers); +}; + +/* +Invoke the action associated with this widget +*/ +SendMessageWidget.prototype.invokeAction = function(triggeringWidget,event) { + // Get the parameter + var param = this.actionParam; + // If the parameter is missing then we'll assemble the attributes as a hashmap + if(!param) { + param = Object.create(null); + var count = 0; + $tw.utils.each(this.attributes,function(attribute,name) { + if(name.charAt(0) !== "$") { + param[name] = attribute; + count++; + } + }); + // Revert to an empty parameter if no values were found + if(!count) { + param = undefined; + } + } + // Dispatch the message + this.dispatchEvent({type: this.actionMessage, param: param, tiddlerTitle: this.getVariable("currentTiddler")}); + return true; // Action was invoked +}; + +exports["action-sendmessage"] = SendMessageWidget; + +})(); diff --git a/core/modules/widgets/button.js b/core/modules/widgets/button.js index 21268d7a5..142c13ada 100644 --- a/core/modules/widgets/button.js +++ b/core/modules/widgets/button.js @@ -59,6 +59,9 @@ ButtonWidget.prototype.render = function(parent,nextSibling) { // Add a click event handler domNode.addEventListener("click",function (event) { var handled = false; + if(self.invokeActions(event)) { + handled = true; + } if(self.to) { self.navigateTo(event); handled = true; @@ -87,6 +90,10 @@ ButtonWidget.prototype.render = function(parent,nextSibling) { this.domNodes.push(domNode); }; +ButtonWidget.prototype.getBoundingClientRect = function() { + return this.domNodes[0].getBoundingClientRect(); +} + ButtonWidget.prototype.isSelected = function() { var tiddler = this.wiki.getTiddler(this.set); return tiddler ? tiddler.fields.text === this.setTo : this.defaultSetValue === this.setTo; @@ -99,7 +106,7 @@ ButtonWidget.prototype.isPoppedUp = function() { }; ButtonWidget.prototype.navigateTo = function(event) { - var bounds = this.domNodes[0].getBoundingClientRect(); + var bounds = this.getBoundingClientRect(); this.dispatchEvent({ type: "tm-navigate", navigateTo: this.to, diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js index 2241180e4..f4a164c62 100755 --- a/core/modules/widgets/navigator.js +++ b/core/modules/widgets/navigator.js @@ -177,12 +177,7 @@ NavigatorWidget.prototype.handleCloseOtherTiddlersEvent = function(event) { NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) { var self = this; function isUnmodifiedShadow(title) { - // jshint eqnull:true - var tiddler = self.wiki.getTiddler(title); - return ( - self.wiki.isShadowTiddler(title) && - tiddler.fields.modified == null - ); + return self.wiki.isShadowTiddler(title) && !self.wiki.tiddlerExists(title); } function confirmEditShadow(title) { return confirm($tw.language.getString( @@ -253,19 +248,14 @@ Create/reuse the draft tiddler for a given title */ NavigatorWidget.prototype.makeDraftTiddler = function(targetTitle) { // See if there is already a draft tiddler for this tiddler - var drafts = []; - this.wiki.forEachTiddler({includeSystem: true},function(title,tiddler) { - if(tiddler.fields["draft.title"] && tiddler.fields["draft.of"] === targetTitle) { - drafts.push(tiddler); - } - }); - if(drafts.length > 0) { - return drafts[0]; + var draftTitle = this.wiki.findDraft(targetTitle); + if(draftTitle) { + return this.wiki.getTiddler(draftTitle); } // Get the current value of the tiddler we're editing - var tiddler = this.wiki.getTiddler(targetTitle), - draftTitle = this.generateDraftTitle(targetTitle); + var tiddler = this.wiki.getTiddler(targetTitle); // Save the initial value of the draft tiddler + draftTitle = this.generateDraftTitle(targetTitle); var draftTiddler = new $tw.Tiddler( tiddler, { @@ -372,29 +362,76 @@ NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) { }; // Create a new draft tiddler +// event.param can either be the title of a template tiddler, or a hashmap of fields. +// +// The title of the newly created tiddler follows these rules: +// * If a hashmap was used and a title field was specified, use that title +// * If a hashmap was used without a title field, use a default title, if necessary making it unique with a numeric suffix +// * If a template tiddler was used, use the title of the template, if necessary making it unique with a numeric suffix +// +// If a draft of the target tiddler already exists then it is reused NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) { // Get the story details - var storyList = this.getStoryList(); - // Get the template tiddler if there is one - var templateTiddler = this.wiki.getTiddler(event.param); - // Title the new tiddler - var title = this.wiki.generateNewTitle((templateTiddler && templateTiddler.fields.title) || "New Tiddler"); - // Create the draft tiddler - var draftTitle = this.generateDraftTitle(title), - draftTiddler = new $tw.Tiddler({ - text: "" - },templateTiddler, + var storyList = this.getStoryList(), + templateTiddler, title, draftTitle, existingTiddler, mergedTags; + // Work out the title of the target tiddler + if(typeof event.param === "object") { + // If we got a hashmap use it as the template + templateTiddler = event.param; + if(templateTiddler.title) { + // Use the provided title + title = templateTiddler.title + } else { + // Generate a new unique title + title = this.wiki.generateNewTitle($tw.language.getString("DefaultNewTiddlerTitle")); + } + } else { + // If we got a string, use it as the template and generate a new title + templateTiddler = this.wiki.getTiddler(event.param); + title = this.wiki.generateNewTitle(event.param || $tw.language.getString("DefaultNewTiddlerTitle")); + } + // Find any existing draft for this tiddler + draftTitle = this.wiki.findDraft(title); + // Pull in any existing tiddler + if(draftTitle) { + existingTiddler = this.wiki.getTiddler(draftTitle); + } else { + draftTitle = this.generateDraftTitle(title); + existingTiddler = this.wiki.getTiddler(title); + } + // Merge the tags + if(existingTiddler && existingTiddler.fields.tags && templateTiddler && templateTiddler.tags) { + // Merge tags + mergedTags = $tw.utils.pushTop($tw.utils.parseStringArray(templateTiddler.tags),existingTiddler.fields.tags); + } else if(existingTiddler && existingTiddler.fields.tags) { + mergedTags = existingTiddler.fields.tags; + } else if(templateTiddler && templateTiddler.tags) { + mergedTags = templateTiddler.tags; + } else if(templateTiddler && templateTiddler.fields && templateTiddler.fields.tags) { + mergedTags = templateTiddler.fields.tags; + } + // Save the draft tiddler + var draftTiddler = new $tw.Tiddler({ + text: "", + "draft.title": title + }, + templateTiddler, + existingTiddler, this.wiki.getCreationFields(), { title: draftTitle, - "draft.title": title, - "draft.of": title + "draft.of": title, + tags: mergedTags },this.wiki.getModificationFields()); this.wiki.addTiddler(draftTiddler); - // Update the story to insert the new draft at the top - var slot = storyList.indexOf(event.navigateFromTitle); - storyList.splice(slot + 1,0,draftTitle); - // Save the updated story + // Update the story to insert the new draft at the top and remove any existing tiddler + if(storyList.indexOf(draftTitle) === -1) { + var slot = storyList.indexOf(event.navigateFromTitle); + storyList.splice(slot + 1,0,draftTitle); + } + if(storyList.indexOf(title) !== -1) { + storyList.splice(storyList.indexOf(title),1); + } this.saveStoryList(storyList); // Add a new record to the top of the history stack this.addToHistory(draftTitle); diff --git a/core/modules/widgets/widget.js b/core/modules/widgets/widget.js index df434973c..a4942a86f 100755 --- a/core/modules/widgets/widget.js +++ b/core/modules/widgets/widget.js @@ -475,6 +475,20 @@ Widget.prototype.removeChildDomNodes = function() { } }; +/* +Invoke any action widgets that are immediate children of this widget +*/ +Widget.prototype.invokeActions = function(event) { + var handled = false; + for(var t=0; t<this.children.length; t++) { + var child = this.children[t]; + if(child.invokeAction && child.invokeAction(this,event)) { + handled = true; + } + } + return handled; +}; + exports.widget = Widget; })(); diff --git a/core/modules/wiki.js b/core/modules/wiki.js index e9df6b68c..10ec56f21 100755 --- a/core/modules/wiki.js +++ b/core/modules/wiki.js @@ -177,7 +177,7 @@ exports.generateNewTitle = function(baseTitle,options) { options = options || {}; var c = 0, title = baseTitle; - while(this.tiddlerExists(title) || this.isShadowTiddler(title)) { + while(this.tiddlerExists(title) || this.isShadowTiddler(title) || this.findDraft(title)) { title = baseTitle + (options.prefix || " ") + (++c); @@ -1132,6 +1132,19 @@ exports.readFile = function(file,callback) { } }; +/* +Find any existing draft of a specified tiddler +*/ +exports.findDraft = function(targetTitle) { + var draftTitle = undefined; + this.forEachTiddler({includeSystem: true},function(title,tiddler) { + if(tiddler.fields["draft.title"] && tiddler.fields["draft.of"] === targetTitle) { + draftTitle = title; + } + }); + return draftTitle; +} + /* Check whether the specified draft tiddler has been modified */ diff --git a/core/ui/AdvancedSearch/Shadows.tid b/core/ui/AdvancedSearch/Shadows.tid index b9fb02726..53cb90372 100644 --- a/core/ui/AdvancedSearch/Shadows.tid +++ b/core/ui/AdvancedSearch/Shadows.tid @@ -17,7 +17,7 @@ caption: {{$:/language/Search/Shadows/Caption}} <<lingo Shadows/Matches>> -<$list filter="[all[shadows]search{$:/temp/advancedsearch}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/> +<$list filter="[all[shadows]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]]" template="$:/core/ui/ListItemTemplate"/> </div> diff --git a/core/ui/AdvancedSearch/Standard.tid b/core/ui/AdvancedSearch/Standard.tid index ddc99be78..3f125f68e 100644 --- a/core/ui/AdvancedSearch/Standard.tid +++ b/core/ui/AdvancedSearch/Standard.tid @@ -17,7 +17,7 @@ caption: {{$:/language/Search/Standard/Caption}} <<lingo Standard/Matches>> -<$list filter="[!is[system]search{$:/temp/advancedsearch}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/> +<$list filter="[!is[system]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]]" template="$:/core/ui/ListItemTemplate"/> </div> diff --git a/core/ui/AdvancedSearch/System.tid b/core/ui/AdvancedSearch/System.tid index dd51f323e..801f7d4cc 100644 --- a/core/ui/AdvancedSearch/System.tid +++ b/core/ui/AdvancedSearch/System.tid @@ -17,7 +17,7 @@ caption: {{$:/language/Search/System/Caption}} <<lingo System/Matches>> -<$list filter="[is[system]search{$:/temp/advancedsearch}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/> +<$list filter="[is[system]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]]" template="$:/core/ui/ListItemTemplate"/> </div> diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid index 81cbaa76e..604326cdd 100644 --- a/core/ui/ControlPanel/Basics.tid +++ b/core/ui/ControlPanel/Basics.tid @@ -9,6 +9,8 @@ caption: {{$:/language/ControlPanel/Basics/Caption}} |<$link to="$:/status/UserName"><<lingo Username/Prompt>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> | |<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> | |<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// | +|<$link to="$:/config/NewJournal/Title"><<lingo NewJournal/Title/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> | +|<$link to="$:/config/NewJournal/Tags"><<lingo NewJournal/Tags/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Tags" default="" tag="input"/> | |<<lingo Language/Prompt>> |{{$:/snippets/minilanguageswitcher}} | |<<lingo Tiddlers/Prompt>> |''<$count filter="[!is[system]]"/>'' | |<<lingo Tags/Prompt>> |''<$count filter="[tags[]]"/>'' | diff --git a/core/ui/ControlPanel/Toolbars/EditToolbar.tid b/core/ui/ControlPanel/Toolbars/EditToolbar.tid index c8f51b137..68d78f854 100644 --- a/core/ui/ControlPanel/Toolbars/EditToolbar.tid +++ b/core/ui/ControlPanel/Toolbars/EditToolbar.tid @@ -15,7 +15,7 @@ $:/config/EditToolbarButtons/Visibility/$(listItem)$ <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"> -<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox> +<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i> </$list> diff --git a/core/ui/ControlPanel/Toolbars/PageControls.tid b/core/ui/ControlPanel/Toolbars/PageControls.tid index 9acb3dc24..981b6be27 100644 --- a/core/ui/ControlPanel/Toolbars/PageControls.tid +++ b/core/ui/ControlPanel/Toolbars/PageControls.tid @@ -15,7 +15,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"> -<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox> +<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i> </$list> diff --git a/core/ui/ControlPanel/Toolbars/ViewToolbar.tid b/core/ui/ControlPanel/Toolbars/ViewToolbar.tid index c151ef0c8..071fb206c 100644 --- a/core/ui/ControlPanel/Toolbars/ViewToolbar.tid +++ b/core/ui/ControlPanel/Toolbars/ViewToolbar.tid @@ -15,7 +15,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"> -<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox> +<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i> </$list> diff --git a/core/ui/EditTemplate/controls.tid b/core/ui/EditTemplate/controls.tid index 4369d34ef..e2dcab626 100644 --- a/core/ui/EditTemplate/controls.tid +++ b/core/ui/EditTemplate/controls.tid @@ -4,7 +4,7 @@ tags: $:/tags/EditTemplate \define config-title() $:/config/EditToolbarButtons/Visibility/$(listItem)$ \end -<div class="tc-tiddler-title"> +<div class="tc-tiddler-title tc-tiddler-edit-title"> <$view field="title"/> <span class="tc-tiddler-controls tc-titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list></span> <div style="clear: both;"></div> diff --git a/core/ui/EditToolbar/cancel.tid b/core/ui/EditToolbar/cancel.tid index 03a533f53..f5e01e3c8 100644 --- a/core/ui/EditToolbar/cancel.tid +++ b/core/ui/EditToolbar/cancel.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/Cancel/Hint}} {{$:/core/images/cancel-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Cancel/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Cancel/Caption}}/></span> </$list> </$button> diff --git a/core/ui/EditToolbar/delete.tid b/core/ui/EditToolbar/delete.tid index bab951295..add232c63 100644 --- a/core/ui/EditToolbar/delete.tid +++ b/core/ui/EditToolbar/delete.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/Delete/Hint}} {{$:/core/images/delete-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Delete/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Delete/Caption}}/></span> </$list> </$button> \ No newline at end of file diff --git a/core/ui/EditToolbar/save.tid b/core/ui/EditToolbar/save.tid index 1d642c08a..e5282c528 100644 --- a/core/ui/EditToolbar/save.tid +++ b/core/ui/EditToolbar/save.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/Save/Hint}} {{$:/core/images/done-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Save/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Save/Caption}}/></span> </$list> </$button> \ No newline at end of file diff --git a/core/ui/PageControls/closeall.tid b/core/ui/PageControls/closeall.tid index 95bdcb3a6..a34eff5df 100644 --- a/core/ui/PageControls/closeall.tid +++ b/core/ui/PageControls/closeall.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/CloseAll/Hint}} {{$:/core/images/close-all-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/CloseAll/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/CloseAll/Caption}}/></span> </$list> </$button> diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid index 2d4f7d27c..8157c42cc 100644 --- a/core/ui/PageControls/controlpanel.tid +++ b/core/ui/PageControls/controlpanel.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/ControlPanel/Hint}} {{$:/core/images/options-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/ControlPanel/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/ControlPanel/Caption}}/></span> </$list> </$button> diff --git a/core/ui/PageControls/encryption.tid b/core/ui/PageControls/encryption.tid index dffc4efa7..cc06c82cd 100644 --- a/core/ui/PageControls/encryption.tid +++ b/core/ui/PageControls/encryption.tid @@ -9,7 +9,7 @@ description: {{$:/language/Buttons/Encryption/Hint}} {{$:/core/images/locked-padlock}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Encryption/ClearPassword/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Encryption/ClearPassword/Caption}}/></span> </$list> </$button> </$reveal> @@ -19,7 +19,7 @@ description: {{$:/language/Buttons/Encryption/Hint}} {{$:/core/images/unlocked-padlock}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Encryption/SetPassword/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Encryption/SetPassword/Caption}}/></span> </$list> </$button> </$reveal> diff --git a/core/ui/PageControls/full-screen.tid b/core/ui/PageControls/full-screen.tid index 1fb6edf59..d2ca1cbd3 100644 --- a/core/ui/PageControls/full-screen.tid +++ b/core/ui/PageControls/full-screen.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/FullScreen/Hint}} {{$:/core/images/full-screen-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/FullScreen/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/FullScreen/Caption}}/></span> </$list> </$button> diff --git a/core/ui/PageControls/home.tid b/core/ui/PageControls/home.tid index 7b48f2a21..8a06f6055 100644 --- a/core/ui/PageControls/home.tid +++ b/core/ui/PageControls/home.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/Home/Hint}} {{$:/core/images/home-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Home/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Home/Caption}}/></span> </$list> </$button> diff --git a/core/ui/PageControls/import.tid b/core/ui/PageControls/import.tid index f7b6350bc..654a77ccd 100644 --- a/core/ui/PageControls/import.tid +++ b/core/ui/PageControls/import.tid @@ -9,7 +9,7 @@ description: {{$:/language/Buttons/Import/Hint}} {{$:/core/images/import-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Import/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Import/Caption}}/></span> </$list> </$button> <$browse/> diff --git a/core/ui/PageControls/language.tid b/core/ui/PageControls/language.tid index 1d07da32c..8abc7b126 100644 --- a/core/ui/PageControls/language.tid +++ b/core/ui/PageControls/language.tid @@ -15,7 +15,7 @@ $(languagePluginTitle)$/icon </span> </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Language/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Language/Caption}}/></span> </$list> </$button> <$reveal state=<<qualify "$:/state/popup/language">> type="popup" position="below" animate="yes"> diff --git a/core/ui/PageControls/more-page-actions.tid b/core/ui/PageControls/more-page-actions.tid index 4fe8e2dbd..00b1c58b1 100644 --- a/core/ui/PageControls/more-page-actions.tid +++ b/core/ui/PageControls/more-page-actions.tid @@ -11,7 +11,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ {{$:/core/images/down-arrow}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/More/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/More/Caption}}/></span> </$list> </$button> <$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes"> diff --git a/core/ui/PageControls/new-journal.tid b/core/ui/PageControls/new-journal.tid new file mode 100644 index 000000000..d1b5cae30 --- /dev/null +++ b/core/ui/PageControls/new-journal.tid @@ -0,0 +1,20 @@ +title: $:/core/ui/Buttons/new-journal +tags: $:/tags/PageControls +caption: {{$:/core/images/new-journal-button}} {{$:/language/Buttons/NewJournal/Caption}} +description: {{$:/language/Buttons/NewJournal/Hint}} + +\define journalButton() +<$button tooltip={{$:/language/Buttons/NewJournal/Hint}} aria-label={{$:/language/Buttons/NewJournal/Caption}} class=<<tv-config-toolbar-class>>> +<$action-sendmessage $message="tm-new-tiddler" title=<<now "$(journalTitleTemplate)$">> tags="$(journalTags)$"/> +<$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> +{{$:/core/images/new-journal-button}} +</$list> +<$list filter="[<tv-config-toolbar-text>prefix[yes]]"> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewJournal/Caption}}/></span> +</$list> +</$button> +\end +<$set name="journalTitleTemplate" value={{$:/config/NewJournal/Title}}> +<$set name="journalTags" value={{$:/config/NewJournal/Tags}}> +<<journalButton>> +</$set></$set> diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid index 1995e5f00..9af1d49ee 100644 --- a/core/ui/PageControls/newtiddler.tid +++ b/core/ui/PageControls/newtiddler.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/NewTiddler/Hint}} {{$:/core/images/new-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/NewTiddler/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewTiddler/Caption}}/></span> </$list> </$button> diff --git a/core/ui/PageControls/refresh.tid b/core/ui/PageControls/refresh.tid index dc2c5467d..18ef57b09 100644 --- a/core/ui/PageControls/refresh.tid +++ b/core/ui/PageControls/refresh.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/Refresh/Hint}} {{$:/core/images/refresh-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Refresh/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Refresh/Caption}}/></span> </$list> </$button> diff --git a/core/ui/PageControls/savewiki.tid b/core/ui/PageControls/savewiki.tid index c196c2ecf..16a4312c4 100644 --- a/core/ui/PageControls/savewiki.tid +++ b/core/ui/PageControls/savewiki.tid @@ -9,7 +9,7 @@ description: {{$:/language/Buttons/SaveWiki/Hint}} {{$:/core/images/save-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/SaveWiki/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/SaveWiki/Caption}}/></span> </$list> </span> </$button> \ No newline at end of file diff --git a/core/ui/PageControls/storyview.tid b/core/ui/PageControls/storyview.tid index 1d921ec2f..0b8c43c52 100644 --- a/core/ui/PageControls/storyview.tid +++ b/core/ui/PageControls/storyview.tid @@ -13,7 +13,7 @@ $:/core/images/storyview-$(storyview)$ </$set> </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/StoryView/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/StoryView/Caption}}/></span> </$list> </$button> <$reveal state=<<qualify "$:/state/popup/storyview">> type="popup" position="below" animate="yes"> diff --git a/core/ui/PageControls/tag-button.tid b/core/ui/PageControls/tag-button.tid index e49e611e5..ac1c3524c 100644 --- a/core/ui/PageControls/tag-button.tid +++ b/core/ui/PageControls/tag-button.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/TagManager/Hint}} {{$:/core/images/tag-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/TagManager/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/TagManager/Caption}}/></span> </$list> </$button> diff --git a/core/ui/PageControls/theme.tid b/core/ui/PageControls/theme.tid index 3af7510f3..c14ffba77 100644 --- a/core/ui/PageControls/theme.tid +++ b/core/ui/PageControls/theme.tid @@ -8,7 +8,7 @@ description: {{$:/language/Buttons/Theme/Hint}} {{$:/core/images/theme-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Theme/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Theme/Caption}}/></span> </$list> </$button> <$reveal state=<<qualify "$:/state/popup/theme">> type="popup" position="below" animate="yes"> diff --git a/core/ui/SideBar/Tools.tid b/core/ui/SideBar/Tools.tid index 908426911..f5c62c96f 100644 --- a/core/ui/SideBar/Tools.tid +++ b/core/ui/SideBar/Tools.tid @@ -17,7 +17,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$ <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"> -<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox> +<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>>/> <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i> </$list> diff --git a/core/ui/TiddlerInfo/Tools.tid b/core/ui/TiddlerInfo/Tools.tid index 7c23a4d64..a7cc433d1 100644 --- a/core/ui/TiddlerInfo/Tools.tid +++ b/core/ui/TiddlerInfo/Tools.tid @@ -14,7 +14,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"> -<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox> +<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>>/> <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i> </$list> diff --git a/core/ui/ViewToolbar/clone.tid b/core/ui/ViewToolbar/clone.tid index 9c3f26a9a..a1f97e6d6 100644 --- a/core/ui/ViewToolbar/clone.tid +++ b/core/ui/ViewToolbar/clone.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/Clone/Hint}} {{$:/core/images/clone-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Clone/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Clone/Caption}}/></span> </$list> </$button> diff --git a/core/ui/ViewToolbar/close-others.tid b/core/ui/ViewToolbar/close-others.tid index 2be44940b..63bc4da80 100644 --- a/core/ui/ViewToolbar/close-others.tid +++ b/core/ui/ViewToolbar/close-others.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/CloseOthers/Hint}} {{$:/core/images/close-others-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/CloseOthers/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/CloseOthers/Caption}}/></span> </$list> </$button> diff --git a/core/ui/ViewToolbar/close.tid b/core/ui/ViewToolbar/close.tid index 6a6ae1ff1..3f90b68f1 100644 --- a/core/ui/ViewToolbar/close.tid +++ b/core/ui/ViewToolbar/close.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/Close/Hint}} {{$:/core/images/close-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Close/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Close/Caption}}/></span> </$list> </$button> \ No newline at end of file diff --git a/core/ui/ViewToolbar/edit.tid b/core/ui/ViewToolbar/edit.tid index 16b3bf185..20e0aa79f 100644 --- a/core/ui/ViewToolbar/edit.tid +++ b/core/ui/ViewToolbar/edit.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/Edit/Hint}} {{$:/core/images/edit-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Edit/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Edit/Caption}}/></span> </$list> </$button> diff --git a/core/ui/ViewToolbar/info.tid b/core/ui/ViewToolbar/info.tid index 0dc861638..22ef4f0b6 100644 --- a/core/ui/ViewToolbar/info.tid +++ b/core/ui/ViewToolbar/info.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/Info/Hint}} {{$:/core/images/info-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Info/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Info/Caption}}/></span> </$list> </$button> diff --git a/core/ui/ViewToolbar/more-tiddler-actions.tid b/core/ui/ViewToolbar/more-tiddler-actions.tid index b5c1ebc62..ff852f617 100644 --- a/core/ui/ViewToolbar/more-tiddler-actions.tid +++ b/core/ui/ViewToolbar/more-tiddler-actions.tid @@ -11,7 +11,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$ {{$:/core/images/down-arrow}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/More/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/More/Caption}}/></span> </$list> </$button> <$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes"> diff --git a/core/ui/ViewToolbar/new-here.tid b/core/ui/ViewToolbar/new-here.tid new file mode 100644 index 000000000..94a81b07f --- /dev/null +++ b/core/ui/ViewToolbar/new-here.tid @@ -0,0 +1,20 @@ +title: $:/core/ui/Buttons/new-here +tags: $:/tags/ViewToolbar +caption: {{$:/core/images/new-here-button}} {{$:/language/Buttons/NewHere/Caption}} +description: {{$:/language/Buttons/NewHere/Hint}} + +\define newHereButtonTags() +[[$(currentTiddler)$]] +\end +\define newHereButton() +<$button tooltip={{$:/language/Buttons/NewHere/Hint}} aria-label={{$:/language/Buttons/NewHere/Caption}} class=<<tv-config-toolbar-class>>> +<$action-sendmessage $message="tm-new-tiddler" tags=<<newHereButtonTags>>/> +<$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> +{{$:/core/images/new-here-button}} +</$list> +<$list filter="[<tv-config-toolbar-text>prefix[yes]]"> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewHere/Caption}}/></span> +</$list> +</$button> +\end +<<newHereButton>> \ No newline at end of file diff --git a/core/ui/ViewToolbar/new-journal-here.tid b/core/ui/ViewToolbar/new-journal-here.tid new file mode 100644 index 000000000..f93a10a1a --- /dev/null +++ b/core/ui/ViewToolbar/new-journal-here.tid @@ -0,0 +1,24 @@ +title: $:/core/ui/Buttons/new-journal-here +tags: $:/tags/ViewToolbar +caption: {{$:/core/images/new-journal-button}} {{$:/language/Buttons/NewJournalHere/Caption}} +description: {{$:/language/Buttons/NewJournalHere/Hint}} + +\define journalButtonTags() +[[$(currentTiddlerTag)$]] $(journalTags)$ +\end +\define journalButton() +<$button tooltip={{$:/language/Buttons/NewJournalHere/Hint}} aria-label={{$:/language/Buttons/NewJournalHere/Caption}} class=<<tv-config-toolbar-class>>> +<$action-sendmessage $message="tm-new-tiddler" title=<<now "$(journalTitleTemplate)$">> tags=<<journalButtonTags>>/> +<$list filter="[<tv-config-toolbar-icons>prefix[yes]]"> +{{$:/core/images/new-journal-button}} +</$list> +<$list filter="[<tv-config-toolbar-text>prefix[yes]]"> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewJournalHere/Caption}}/></span> +</$list> +</$button> +\end +<$set name="journalTitleTemplate" value={{$:/config/NewJournal/Title}}> +<$set name="journalTags" value={{$:/config/NewJournal/Tags}}> +<$set name="currentTiddlerTag" value=<<currentTiddler>>> +<<journalButton>> +</$set></$set></$set> diff --git a/core/ui/ViewToolbar/permalink.tid b/core/ui/ViewToolbar/permalink.tid index 0d13052f8..d19c1db1b 100644 --- a/core/ui/ViewToolbar/permalink.tid +++ b/core/ui/ViewToolbar/permalink.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/Permalink/Hint}} {{$:/core/images/permalink-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Permalink/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Permalink/Caption}}/></span> </$list> </$button> diff --git a/core/ui/ViewToolbar/permaview.tid b/core/ui/ViewToolbar/permaview.tid index a2b93de4d..699fce949 100644 --- a/core/ui/ViewToolbar/permaview.tid +++ b/core/ui/ViewToolbar/permaview.tid @@ -8,6 +8,6 @@ description: {{$:/language/Buttons/Permaview/Hint}} {{$:/core/images/permaview-button}} </$list> <$list filter="[<tv-config-toolbar-text>prefix[yes]]"> -<$text text={{$:/language/Buttons/Permaview/Caption}}/> +<span class="tc-btn-text"><$text text={{$:/language/Buttons/Permaview/Caption}}/></span> </$list> </$button> diff --git a/core/wiki/config/PageControlButtons.multids b/core/wiki/config/PageControlButtons.multids index 164c454e3..5029bc1ca 100644 --- a/core/wiki/config/PageControlButtons.multids +++ b/core/wiki/config/PageControlButtons.multids @@ -9,6 +9,7 @@ core/ui/Buttons/import: hide core/ui/Buttons/language: hide core/ui/Buttons/tag-manager: hide core/ui/Buttons/more-page-actions: hide +core/ui/Buttons/new-journal: hide core/ui/Buttons/permaview: hide core/ui/Buttons/storyview: hide core/ui/Buttons/theme: hide diff --git a/core/wiki/config/ViewToolbarButtons.multids b/core/wiki/config/ViewToolbarButtons.multids index 998e49032..84d8028e3 100644 --- a/core/wiki/config/ViewToolbarButtons.multids +++ b/core/wiki/config/ViewToolbarButtons.multids @@ -3,5 +3,7 @@ title: $:/config/ViewToolbarButtons/Visibility/$:/ core/ui/Buttons/clone: hide core/ui/Buttons/close-others: hide core/ui/Buttons/more-tiddler-actions: hide +core/ui/Buttons/new-here: hide +core/ui/Buttons/new-journal-here: hide core/ui/Buttons/permalink: hide core/ui/Buttons/permaview: hide diff --git a/core/wiki/macros/timeline.tid b/core/wiki/macros/timeline.tid index 62f8782cf..c385c9500 100644 --- a/core/wiki/macros/timeline.tid +++ b/core/wiki/macros/timeline.tid @@ -6,7 +6,7 @@ tags: $:/tags/Macro <$list filter="[!is[system]$subfilter$has[modified]!sort[modified]limit[$limit$]eachday[modified]]"> <div class="tc-menu-list-item"> <$view field="modified" format="date" template="$format$"/> -<$list filter="[sameday{!!modified}!is[system]!sort[modified]]"> +<$list filter="[sameday{!!modified}!is[system]$subfilter$!sort[modified]]"> <div class="tc-menu-list-subitem"> <$link to={{!!title}}> <$view field="title"/> diff --git a/core/wiki/tags/PageControls.tid b/core/wiki/tags/PageControls.tid index 233ef5443..81d1e46a7 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/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/full-screen]] [[$:/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/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/new-journal]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/refresh]] [[$:/core/ui/Buttons/more-page-actions]] diff --git a/core/wiki/tags/ViewToolbar.tid b/core/wiki/tags/ViewToolbar.tid index 230a2d680..aebed7cdd 100644 --- a/core/wiki/tags/ViewToolbar.tid +++ b/core/wiki/tags/ViewToolbar.tid @@ -1,2 +1,2 @@ title: $:/tags/ViewToolbar -list: [[$:/core/ui/Buttons/more-tiddler-actions]] [[$:/core/ui/Buttons/info]] [[$:/core/ui/Buttons/clone]] [[$:/core/ui/Buttons/edit]] [[$:/core/ui/Buttons/permalink]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/close-others]] [[$:/core/ui/Buttons/close]] +list: [[$:/core/ui/Buttons/more-tiddler-actions]] [[$:/core/ui/Buttons/info]] [[$:/core/ui/Buttons/new-here]] [[$:/core/ui/Buttons/new-journal-here]] [[$:/core/ui/Buttons/clone]] [[$:/core/ui/Buttons/edit]] [[$:/core/ui/Buttons/permalink]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/close-others]] [[$:/core/ui/Buttons/close]] diff --git a/editions/classicparserdemo/tiddlers/Classic Parser Plugin Demo.tid b/editions/classicparserdemo/tiddlers/Classic Parser Plugin Demo.tid index a35f261d4..6258f1e9c 100644 --- a/editions/classicparserdemo/tiddlers/Classic Parser Plugin Demo.tid +++ b/editions/classicparserdemo/tiddlers/Classic Parser Plugin Demo.tid @@ -12,3 +12,8 @@ At present there is limited support for Classic macros. See below for examples o !!Status See here for <<slider $:/temp/1 Issues "Issues»" "more" >> !!See also [[Developers Notes]] +! Installation +To add this plugin to your own TiddlyWiki5, just drag this link to your tiddlywiki's browser window: + +[[$:/plugins/tiddlywiki/tw2parser]] + diff --git a/editions/de-AT/tiddlers/Willkommen.tid b/editions/de-AT/tiddlers/Willkommen.tid index c586614ce..fce990a38 100644 --- a/editions/de-AT/tiddlers/Willkommen.tid +++ b/editions/de-AT/tiddlers/Willkommen.tid @@ -6,22 +6,22 @@ tags: InhaltsVerzeichnis Intro title: Willkommen! type: text/vnd.tiddlywiki -~TiddlyWiki ist eine Web-Applikation, die sie frei herunterladen können. Sie können sie speichern, wo sie wollen: +~TiddlyWiki ist eine Web-Applikation, die Sie frei herunterladen können. Sie können sie speichern, wo Sie wollen: -* Auf ihrem Laufwerk, +* Auf Ihrem Laufwerk, * USB-Wechselspeicher -* oder ihrem "Cloud Speicher" +* oder Ihrem "Cloud Speicher" -Sie sind der Herr über ihre Daten! +Sie sind der Herr über Ihre Daten! -Sie können ~TiddlyWiki verwenden um Ihre Notizen zu erstellen / organisieren / oder mit Freunden zu teilen, in einer Weise, die kein anderes Textverarbeitungsprogramm vermag. ~TiddlyWiki speichert ihre Texte in einer "nicht-linearen" Form, mit Hilfe von [[Tags]], [[Hyperlinks]] und vielen weiteren Möglichkeiten. So können sie Ihre Notizen strukturieren, in einer +Sie können ~TiddlyWiki verwenden um Ihre Notizen zu erstellen / organisieren / oder mit Freunden zu teilen, in einer Weise, die kein anderes Textverarbeitungsprogramm vermag. ~TiddlyWiki speichert Ihre Texte in einer "nicht-linearen" Form, mit Hilfe von [[Tags]], [[Hyperlinks]] und vielen weiteren Möglichkeiten. So können Sie Ihre Notizen strukturieren, in einer Weise, die mehr dem entspricht, "wie wir denken", nicht in einem vom Entwickler vorgegebenen starren Korsett. -Sie können TiddlyWiki als eine einzige Datei speichern, die sie mit dem Web-Browser, online oder offline, verwenden können. Für geübte Benutzer kann ~TiddlyWiki als [[Node.js Applikation|Node.js]] verwendet werden, die jeden [[Tiddler]] als einzelne Datei behandelt und dabei als zentrales Archiv fungiert. +Sie können TiddlyWiki als eine einzige Datei speichern, die Sie mit dem Web-Browser, online oder offline, verwenden können. Für geübte Benutzer kann ~TiddlyWiki als [[Node.js Applikation|Node.js]] verwendet werden, die jeden [[Tiddler]] als einzelne Datei behandelt und dabei als zentrales Archiv fungiert. -!!! Wie können sie ~TiddlyWiki nun für sich nutzen? +!!! Wie können Sie ~TiddlyWiki nun für sich nutzen? -* Im Anschluss sind einige Links aufgeführt, mit denen sie starten sollten, oder sie können jederzeit das InhaltsVerzeichnis verwenden. +* Im Anschluss sind einige Links aufgeführt, mit denen Sie starten sollten, oder Sie können jederzeit das InhaltsVerzeichnis verwenden. * Das ~InhaltsVerzeichnis kann auch über den Reiter "Inhalt" auf der rechten Seite aufgerufen werden. diff --git a/editions/de-AT/tiddlers/howto/Speichern auf TiddlySpot.tid b/editions/de-AT/tiddlers/howto/Speichern auf TiddlySpot.tid index f1bf57ee5..0d220b37a 100644 --- a/editions/de-AT/tiddlers/howto/Speichern auf TiddlySpot.tid +++ b/editions/de-AT/tiddlers/howto/Speichern auf TiddlySpot.tid @@ -11,13 +11,13 @@ TiddlySpot ist ein freier Hosting Service von Simon und Daniel Baird. Er ist bei ~TiddlyWiki5 wird momentan noch nicht als Standard Wiki angeboten, Sie können aber folgende Schritte verwenden um ~TiddlyWiki auf ~TiddlySpot zu speichern. # Erstellen Sie ein Wiki auf http://tiddlyspot.com/ und merken Sie sich den Namen und Ihr Passwort! -# Für Österreich: öffnen Sie http://tiddlywiki.com/languages/de-AT/empty.html in ihrem Browser. +# Für Österreich: öffnen Sie http://tiddlywiki.com/languages/de-AT/empty.html in Ihrem Browser. #* Für Deutschland: http://tiddlywiki.com/languages/de-DE/empty.html # Wählen Sie im [[Control Panel|$:/ControlPanel]], den "Speichern" Tab und tragen Sie im "~TiddlySpot" Bereich, den Wiki Namen und das Passwort ein. # Klicken Sie den "Speichern" Button. Nach einiger Zeit, bekommen Sie rechts oben die Mitteilung "Wiki gespeichert". Das Speichern kann je nach Internetverbindung und Wiki Größe einige Sekunden dauern. #* //Das Erstellen eines neuen Wikis funktioniert nicht mit Firefox, da die Sicherheitseinstellungen diese Vorgehensweise nicht erlauben. Google Chrome kann verwendet werden. Ein späteres Editieren von tiddlyspot.com ist auch mit Firefox möglich!// -# Gehen Sie nun zu ihrem Wiki: ~http://{wikiname}.tiddlyspot.com/ +# Gehen Sie nun zu Ihrem Wiki: ~http://{wikiname}.tiddlyspot.com/ # Beim ersten Besuch müssen Sie eventuell den Wiki-Namen und das Passwort neu eingeben. -# Sie sollten jetzt eine Kopie ihres Wikis sehen. Sie können nun Änderungen vornehmen und mit "Speichern" direkt in "die Cloud" speichern. +# Sie sollten jetzt eine Kopie Ihres Wikis sehen. Sie können nun Änderungen vornehmen und mit "Speichern" direkt in "die Cloud" speichern. # Die ~TiddlySpot Verwaltungs-Seite ist unter: ~http://{wikiname}.tiddlyspot.com/controlpanel zu finden. diff --git a/editions/de-AT/tiddlers/howto/Speichern mit Chrome.tid b/editions/de-AT/tiddlers/howto/Speichern mit Chrome.tid index ebe0bbd0a..8463b75ec 100644 --- a/editions/de-AT/tiddlers/howto/Speichern mit Chrome.tid +++ b/editions/de-AT/tiddlers/howto/Speichern mit Chrome.tid @@ -1,20 +1,26 @@ created: 20131129092604900 creator: pmario -modified: 20140922125135926 -modifier: ChrisK +modified: 20141012120259664 +modifier: pmario tags: howto title: Speichern mit Chrome type: text/vnd.tiddlywiki Diese Methode ist etwas umständlich, da man Einstellungen immer wieder manuell vornehmen muss. Der Vorteil ist, dass diese Methode jedoch mit fast allen Desktop- und vielen mobilen Browsern funktioniert. +!! Video + +<iframe width="560" height="315" src="http://www.youtube.com/embed/LcoZ7hQCuFI" frameborder="0" allowfullscreen></iframe> + +!! Speichern mit Chrome + # Speichern Sie eine leere Datei der deutschen Version. #> {{$:/editions/de-AT-DE/snippets/download-empty-button}} #> Wenn der Button nicht funktioniert, dann klicken Sie den Link mit der rechten Maustaste und wählen: "Ziel Speichern unter ..." http://tiddlywiki.com/languages/de-AT/empty.html oder http://tiddlywiki.com/languages/de-DE/empty.html #> Je nach Browser folgen Sie den Dialogen! # Suchen Sie die eben geladene Datei im Datei Manager. #* Geben Sie der Datei einen vernünftigen Namen und stellen Sie sicher, dass die Endung `.html` oder `.htm` ist. -# Öffnen Sie die Datei mit ihrem Browser. +# Öffnen Sie die Datei mit Ihrem Browser. # Erstellen Sie einen neuen Tiddler mit dem {{$:/core/images/new-button}} ''plus'' im rechten Menü. # Geben Sie den Text ein und bestätigen die Eingabe mit dem {{$:/core/images/done-button}} ''OK''. # Speichern Sie die Änderungen mit: {{$:/core/images/save-button}} ''speichern'' im rechten Menü @@ -22,4 +28,4 @@ Diese Methode ist etwas umständlich, da man Einstellungen immer wieder manuell # Suchen Sie die eben geladene Datei im Datei Manager. # Überprüfen sie, ob die Änderungen richtig gespeichert wurden. -''Tip'': Die meisten Browser haben eine Einstellung, dass der "Datei Speichern" Dialog immer angezeigt wird. Das ermöglicht ihnen, die bestehende Datei auszuwählen und zu überschreiben. +''Tip'': Die meisten Browser haben eine Einstellung, dass der "Datei Speichern" Dialog immer angezeigt wird. Das ermöglicht Ihnen, die bestehende Datei auszuwählen und zu überschreiben. diff --git a/editions/de-AT/tiddlers/howto/Speichern mit Safari.tid b/editions/de-AT/tiddlers/howto/Speichern mit Safari.tid index 508bd75c2..2b2e77b56 100644 --- a/editions/de-AT/tiddlers/howto/Speichern mit Safari.tid +++ b/editions/de-AT/tiddlers/howto/Speichern mit Safari.tid @@ -13,7 +13,7 @@ Diese Methode ist etwas umständlich, da jeder Schritt manuell gemacht werden mu #> Ihr Browser kann eventuell nachfragen, ob die Datei gespeichert werden soll. # Suchen Sie die eben geladene Datei im Datei Manager. #* Geben Sie der Datei einen vernünftigen Namen und stellen Sie sicher, dass die Endung `.html` oder `.htm` ist. -# Öffnen Sie die Datei mit ihrem Browser. +# Öffnen Sie die Datei mit Ihrem Browser. # Erstellen Sie einen neuen Tiddler mit dem {{$:/core/images/new-button}} ''plus'' im rechten Menü. # Geben Sie den Text ein und bestätigen die Eingabe mit dem {{$:/core/images/done-button}} ''OK''. # Speichern Sie die Änderungen mit: {{$:/core/images/save-button}} ''speichern'' im rechten Menü diff --git a/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox.tid b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox.tid index abb19a97e..1b7e5a52a 100644 --- a/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox.tid +++ b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyFox.tid @@ -1,13 +1,20 @@ created: 20131221085742684 creator: pmario -modified: 20140922125640163 -modifier: ChrisK +modified: 20141012083445443 +modifier: pmario tags: howto TiddlyFox title: Speichern mit TiddlyFox type: text/vnd.tiddlywiki +!! Android + Wenn Sie "Firefox for Android" verwenden, dann beachten sie: [[Speichern mit TiddlyFox - Android]]. +!! Video (de) + +<iframe width="560" height="315" src="http://www.youtube.com/embed/bsWE7jXPbb0" frameborder="0" allowfullscreen></iframe> + +!! Speichern mit TiddlyFox # Stellen Sie sicher, dass Sie die [[aktuelle Version von Firefox|http://getfirefox.com]] verwenden. # Installieren Sie die aktuelle TiddlyFox Erweiterung von: https://addons.mozilla.org/en-US/firefox/addon/tiddlyfox/ # Firefox neu starten! diff --git a/editions/de-AT/tiddlers/howto/Speichern mit TiddlyIE.tid b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyIE.tid index 461f2f944..c34906521 100644 --- a/editions/de-AT/tiddlers/howto/Speichern mit TiddlyIE.tid +++ b/editions/de-AT/tiddlers/howto/Speichern mit TiddlyIE.tid @@ -1,11 +1,17 @@ created: 20131211220000000 creator: pmario -modified: 20140918102257399 +modified: 20141012141931383 modifier: pmario tags: howto title: Speichern mit TiddlyIE type: text/vnd.tiddlywiki +!! Video + +<iframe width="560" height="315" src="http://www.youtube.com/embed/OrWuvjs3Ly0" frameborder="0" allowfullscreen></iframe> + +!! Speichern mit TiddlyIE + # Installieren Sie TiddlyIE AddOn von: #* https://github.com/davidjade/TiddlyIE/releases # Starten Sie Internet Explorer neu. IE wird beim Start einen Dialog anzeigen, mit dem Sie das AddOn freischalten können. @@ -14,7 +20,7 @@ type: text/vnd.tiddlywiki #> http://tiddlywiki.com/languages/de-AT/empty.html oder #> http://tiddlywiki.com/languages/de-DE/empty.html # Suchen Sie die eben geladene Datei im Datei Manager. -#* Geben Sie der Datei einen vernünftigen Namen und stellen Sie sicher, dass die Endung `.html` oder `.htm` ist. +#* Geben Sie der Datei einen vernünftigen Namen und stellen Sie sicher, dass die Endung `.html` ist. # Öffnen Sie die Datei mit dem Internet Explorer # Erstellen Sie einen neuen Tiddler mit dem {{$:/core/images/new-button}} ''plus'' im rechten Menü. # Geben Sie den Text ein und bestätigen die Eingabe mit dem {{$:/core/images/done-button}} ''OK''. diff --git a/editions/de-AT/tiddlers/howto/Windows HTA Hack.tid b/editions/de-AT/tiddlers/howto/Windows HTA Hack.tid index 00abaeee0..40f91b062 100644 --- a/editions/de-AT/tiddlers/howto/Windows HTA Hack.tid +++ b/editions/de-AT/tiddlers/howto/Windows HTA Hack.tid @@ -1,7 +1,7 @@ created: 20131212223146250 creator: pmario -modified: 20140922132924816 -modifier: ChrisK +modified: 20141012142437720 +modifier: pmario tags: howto title: Windows HTA Hack type: text/vnd.tiddlywiki @@ -12,4 +12,8 @@ Achtung! Der Nachteil dieser Änderung ist, dass die Datei im UTF-16 format gespeichert wird, was sie ungefähr doppelt so groß macht. TW wird standardmäßig im UTF-8 Format gespeichert. Wird die Datei wieder mit einer TW spezifischen Methode gespeichert, dann wird sie wieder kleiner. +Hier ist ein Video von Mario Pietsch, dass den Umgang IE, HTA und TiddlyWiki zeigt. + +<iframe width="560" height="315" src="http://www.youtube.com/embed/OrWuvjs3Ly0" frameborder="0" allowfullscreen></iframe> + Siehe Wikipedia (englisch): http://en.wikipedia.org/wiki/HTML_Application diff --git a/editions/de-AT/tiddlers/lexikon/Status Tiddler.tid b/editions/de-AT/tiddlers/lexikon/Status Tiddler.tid index 58704f3ac..d40e6d907 100644 --- a/editions/de-AT/tiddlers/lexikon/Status Tiddler.tid +++ b/editions/de-AT/tiddlers/lexikon/Status Tiddler.tid @@ -12,7 +12,7 @@ Diese Status Tiddler werden meist mit einem System Prefix versehen, damit sie in Wenn Sie im rechten Menü den Reiter: "Mehr: System" wählen, dann können Sie Status Tiddler mit den Namen: `$:/state/xxxxxx` sehen. -''Wichtig'': `$:/state/*` Tiddler werden nicht gespeichert. Wenn Sie also den Status ihres `<<tabs>>` Makros speichern wollen, dann verwenden Sie einen anderen Namen. zB: `$:/_state/tabx` +''Wichtig'': `$:/state/*` Tiddler werden nicht gespeichert. Wenn Sie also den Status Ihres `<<tabs>>` Makros speichern wollen, dann verwenden Sie einen anderen Namen. zB: `$:/_state/tabx` Siehe auch: diff --git a/editions/de-AT/tiddlers/wikitext/Makros in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Makros in WikiText.tid index 51f149d68..dd336588e 100644 --- a/editions/de-AT/tiddlers/wikitext/Makros in WikiText.tid +++ b/editions/de-AT/tiddlers/wikitext/Makros in WikiText.tid @@ -112,7 +112,7 @@ Rodentville, Ratland.">> ``` -Wenn sie 3 doppelte Anführungszeichen verwenden, dann können die Parameter einfache Anführungszeichen enthalten: +Wenn Sie 3 doppelte Anführungszeichen verwenden, dann können die Parameter einfache Anführungszeichen enthalten: ``` <<meinErstesMakro "Mickey Mouse" """Mouse House, diff --git a/editions/de-AT/tiddlers/wikitext/Tabellen in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Tabellen in WikiText.tid index dfc060812..d18d4b7c4 100644 --- a/editions/de-AT/tiddlers/wikitext/Tabellen in WikiText.tid +++ b/editions/de-AT/tiddlers/wikitext/Tabellen in WikiText.tid @@ -65,7 +65,7 @@ Dargestellt als (der "Rahmen" ist nötig, um die Ausrichtung mit wenig Text sich | ::<br>:: |,unten links |, unten mitte |, unten rechts| ::<br>:: | | :: | ::::::::::::::::::::::::::: | ::::::::::::::::::::::::::: | ::::::::::::::::::::::::::: | :: | -Wenn sie die Zeichen `^` und `,` als erste Zeichen benötigen, dann können sie "HTML escaping" verwenden. +Wenn Sie die Zeichen `^` und `,` als erste Zeichen benötigen, dann können Sie "HTML escaping" verwenden. | `^` | &#94; | | `,` | &#44; | diff --git a/editions/de-AT/tiddlers/wikitext/Typisierte Blocke in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Typisierte Blocke in WikiText.tid index 0599fe9b5..4e4c6b842 100644 --- a/editions/de-AT/tiddlers/wikitext/Typisierte Blocke in WikiText.tid +++ b/editions/de-AT/tiddlers/wikitext/Typisierte Blocke in WikiText.tid @@ -7,7 +7,7 @@ tags: WikiText title: Typisierte Blöcke in WikiText type: text/vnd.tiddlywiki -WikiText kann Textblöcke direkt darstellen, wenn Ihr Inhalts-Typ ([[MIME-Type]]) bekannt ist: +WikiText kann Textblöcke direkt darstellen, wenn ihr Inhalts-Typ ([[MIME-Type]]) bekannt ist: ``` $$$image/svg+xml diff --git a/editions/de-AT/tiddlers/wikitext/WikiText.tid b/editions/de-AT/tiddlers/wikitext/WikiText.tid index 1796d1d81..8ff026af4 100644 --- a/editions/de-AT/tiddlers/wikitext/WikiText.tid +++ b/editions/de-AT/tiddlers/wikitext/WikiText.tid @@ -7,7 +7,7 @@ tags: Konzept Referenz InhaltsVerzeichnis title: WikiText type: text/vnd.tiddlywiki -~WikiText ist eine Auszeichnungssprache, die es erlaubt, auf einfache Weise Texte und ihre Formatierung in Textform einzugeben. Das erlaubt es ihnen, sich auf das Schreiben zu konzentrieren und nicht auf eine komplexe Oberfläche, die vom Wesentlichen ablenkt. Für Anwender, die bereits MarkDown kennen, sollte es relativ leicht sein, sich in ~WikiText einzuarbeiten. WikiText bietet mehr Möglichkeiten zum Verlinken und zur Erstellung von interaktiven Inhalten. +~WikiText ist eine Auszeichnungssprache, die es erlaubt, auf einfache Weise Texte und ihre Formatierung in Textform einzugeben. Das erlaubt es Ihnen, sich auf das Schreiben zu konzentrieren und nicht auf eine komplexe Oberfläche, die vom Wesentlichen ablenkt. Für Anwender, die bereits MarkDown kennen, sollte es relativ leicht sein, sich in ~WikiText einzuarbeiten. WikiText bietet mehr Möglichkeiten zum Verlinken und zur Erstellung von interaktiven Inhalten. Die folgenden Elemente sind im TW Kern enthalten: diff --git a/editions/de-AT/tiddlers/wikitext/Zitate in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Zitate in WikiText.tid index c0bfcef63..49752d691 100644 --- a/editions/de-AT/tiddlers/wikitext/Zitate in WikiText.tid +++ b/editions/de-AT/tiddlers/wikitext/Zitate in WikiText.tid @@ -23,7 +23,7 @@ Das Ergebnis wird zusammenhängend dargestellt. !! Zitat mit Autor -Wenn sie den Autor anführen möchten, dann schreiben sie wie folgt: +Wenn Sie den Autor anführen möchten, dann schreiben Sie wie folgt: <<wikitext-example src:"<<< Computers are like a bicycle for our minds diff --git a/editions/dev/tiddlers/HelloThere.tid b/editions/dev/tiddlers/HelloThere.tid index 87d262af2..be8687104 100644 --- a/editions/dev/tiddlers/HelloThere.tid +++ b/editions/dev/tiddlers/HelloThere.tid @@ -16,6 +16,9 @@ Welcome to the developer documentation for TiddlyWiki (http://tiddlywiki.com/). ** [[TiddlyWiki on node-webkit]] ** [[package.json for node-webkit]] ** [[How to create plugins in the browser]] +** [[Contributing to the TiddlyWiki Core]] +** [[Contributing to the TiddlyWiki Plugin Library]] +** [[Scripts for building tiddlywiki.com]] ** SyncAdaptorModules ** WidgetModules ** WikiRuleModules diff --git a/editions/dev/tiddlers/build/ReadMe for build.jermolene.github.io.tid b/editions/dev/tiddlers/build/ReadMe for build.jermolene.github.io.tid new file mode 100644 index 000000000..f0e24855e --- /dev/null +++ b/editions/dev/tiddlers/build/ReadMe for build.jermolene.github.io.tid @@ -0,0 +1,3 @@ +title: ReadMe for build.jermolene.github.io + +{{Scripts for building tiddlywiki.com}} diff --git a/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid b/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid new file mode 100644 index 000000000..073c32cbb --- /dev/null +++ b/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid @@ -0,0 +1,22 @@ +title: Releasing a new version of TiddlyWiki + +# Move the latest release note from the prerelease edition into the tw5.com edition +# Adjust the release date of the latest release tiddler (eg, [[Release 5.1.3]]) +# Ensure [[Releases]] has the new version as the default tab +# Adjust the modified time of HelloThere +# Make sure ''Jermolene/TiddlyWiki5'' is fully committed +# Edit `package.json` to the new version number +# Run `../build.jermolene.github.io/readme-bld.sh` to build the readme files +# Commit the new readme files in `TiddlyWiki5` and `build.jermolene.github.io` +# Restore `package.json` to the previous version number +# Run `../build.jermolene.github.io/verbump "5.1.3"` (substituting the correct version number) to update the version number, assign it a tag +# Run `../build.jermolene.github.io/npm-publish.sh` to publish the release to npm +# Verify that the new release of TiddlyWiki is available at https://www.npmjs.org/package/tiddlywiki +# Check the version number of TiddlyWiki specified in `build.jermolene.github.io/package.json` is the latest version +# Change current directory to the `build.jermolene.github.io` directory +# Run `npm install` to install the correct version of TiddlyWiki +# Change current directory to the `TiddlyWiki5` directory +# Run `../build.jermolene.github.io/bld.sh` to build the content files +# Verify that the files in the `jermolene.github.io` directory are correct +# Run `../build.jermolene.github.io/github-push.sh` to push the new files to GitHub +# Run `../build.jermolene.github.io/tiddlyspace-upload.sh <username> <password>` to upload the release to TiddlySpace diff --git a/editions/dev/tiddlers/build/Releasing new content for TiddlyWiki.tid b/editions/dev/tiddlers/build/Releasing new content for TiddlyWiki.tid new file mode 100644 index 000000000..662fbdf41 --- /dev/null +++ b/editions/dev/tiddlers/build/Releasing new content for TiddlyWiki.tid @@ -0,0 +1,8 @@ +title: Releasing new content for TiddlyWiki + +# Change current directory to the `TiddlyWiki5` directory +# Run `../build.jermolene.github.io/bld.sh` to build the content files +# Run `../build.jermolene.github.io/readme-bld.sh` to build the readmes +# Commit the readmes to `TiddlyWiki5` and `build.jermolene.github.io` if necessary +# Verify that the files in the `jermolene.github.io` directory are correct +# Run `../build.jermolene.github.io/github-push.sh` to push the new files to GitHub diff --git a/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid b/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid new file mode 100644 index 000000000..c78b80d26 --- /dev/null +++ b/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid @@ -0,0 +1,94 @@ +title: Scripts for building tiddlywiki.com + +These scripts are used to build and release the content for tiddlywiki.com. They are not designed for general purpose use -- they resolve problems that are specific to the task of building tiddlywiki.com: pushing to GitHub Pages, handling the prerelease builds and bumping version numbers. + +Nonetheless, you may find techniques that are useful for your own scripts. + +! Hosting + +http://tiddlywiki.com is served by [[GitHub Pages|https://pages.github.com]] from the repository https://github.com/Jermolene/jermolene.github.io + +The scripts live in the repository https://github.com/Jermolene/build.jermolene.github.io + +! Directory structure + +These scripts require the following directories to be siblings: + +* `build.jermolene.github.io` - a local copy of https://github.com/Jermolene/build.jermolene.github.io +* `jermolene.github.io` - a local copy of the repo https://github.com/Jermolene/jermolene.github.io +* `TiddlyWiki5` - a local copy of the repo https://github.com/Jermolene/TiddlyWiki5 + +The scripts are designed to be executed with the current directory being the `TiddlyWiki5` directory. + +! Configuration + +!! package.json + +The `package.json` in the root of the `build.jermolene.github.io` repository contains a dependency declaration that specifies the latest official released version of TiddlyWiki to be used when building the release targets: + +``` + + "dependencies": { + "tiddlywiki": "5.1.2" + } +``` + +!! Environment variables + +Some of the scripts use the following environment variables: + +* ''TW5_BUILD_MAIN_EDITION'' - the path to the wiki folder to be used as the main edition, generating `index.html` and `encrypted.html` +* ''TW5_BUILD_OUTPUT'' - the path to the output folder (defaults to `../jermolene.github.io`) +* ''TW5_BUILD_TIDDLYWIKI'' - the pathname of the `tiddlywiki.js` to be used (defaults to `../build.jermolene.github.io/node_modules/tiddlywiki/tiddlywiki.js`) + +! Scripts + +!! `bld.sh` + +Builds the `tiddlywiki.com` target files. By default, it uses the version of tiddlywiki specified in the `package.json` file. This can be overridden with the ''TW5_BUILD_TIDDLYWIKI'' environment variable. The following command would select the latest prerelease version of tiddlywiki from the `TiddlyWiki5` directory: + +``` + TW5_BUILD_TIDDLYWIKI=./tiddlywiki.js +``` + +!! `readme-bld.sh` + +Builds the readme files for the `TiddlyWiki5` and `build.jermolene.github.io` repos using the released version of TiddlyWiki specified in `package.json`. + +!! `prerelease-bld.sh` + +Builds the `tiddlywiki.com/prerelease` target files using the latest TiddlyWiki prerelease code and special ''prerelease'' edition for the content. + +!! `github-push.sh` + +Pushes the latest changes to the `jermolene.github.io` directory to GitHub. + +!! `dev-bld.sh` + +Builds the ''dev'' prerelease edition. + +!! `quick-bld.sh` + +Builds the ''prerelease'' prerelease edition. + +!! `tiddlyspace-upload.sh` + +Builds the ''tw5tiddlyweb'' edition and uploads it to TiddlySpace. + +!! `verbump.sh` + +Bumps the version number of the `package.json` in the `TiddlyWiki5` repo and applies the correct version tag to the repo. + +!! `npm-publish.sh` + +Publishes the `TiddlyWiki5` repo to npm. + +! Procedures + +!! Releasing a new version of TiddlyWiki + +{{Releasing a new version of TiddlyWiki}} + +!! Releasing new content for TiddlyWiki + +{{Releasing new content for TiddlyWiki}} diff --git a/editions/dev/tiddlers/from tw5.com/Contributing to the TiddlyWiki Core.tid b/editions/dev/tiddlers/from tw5.com/Contributing to the TiddlyWiki Core.tid new file mode 100644 index 000000000..9e1e08c5c --- /dev/null +++ b/editions/dev/tiddlers/from tw5.com/Contributing to the TiddlyWiki Core.tid @@ -0,0 +1,22 @@ +created: 20141016083308219 +modified: 20141016083333808 +title: Contributing to the TiddlyWiki Core +type: text/vnd.tiddlywiki + +The TiddlyWiki core is the container for all the generic features of TiddlyWiki that are of universal utility. Concretely, it comprises the tiddlers in the `$:/core` plugin. + +! Core Contribution Requirements + +There are requirements that must be met for any contribution that is to be accepted into the core: + +* If appropriate, the new functionality must support both standalone and Node.js configurations. For example, any new widgets must be capable of being rendered on the server +* The contribution must not compromise the backwards compatibility of the existing code +* Code contributions must comply with the [[TiddlyWiki Coding Style Guidelines]] +* Generic components are preferred over point solutions for specific problems (which belong in plugins) + +! The Core and Innovation + +If you've created something new and innovative, don't try to rush to get it included into the core. Once new stuff is in the core it is subject to the core policies of strict backwards compatibility, making it frozen as far as radical innovation is concerned. It's usually better to release the new thing as a plugin so that it can be shared with the rest of the community for feedback. + +The expected model of innovation is that the core development will move relatively slowly as more and more of the initial planned functionality is implemented. Innovation can take place in the much more unconstrained environment of plugins. Over time, as these third party plugins gain popularity and become more polished, some or all of their functionality will be migrated into the core. + diff --git a/editions/dev/tiddlers/from tw5.com/Contributing to the TiddlyWiki Plugin Library.tid b/editions/dev/tiddlers/from tw5.com/Contributing to the TiddlyWiki Plugin Library.tid new file mode 100644 index 000000000..cc3bec88e --- /dev/null +++ b/editions/dev/tiddlers/from tw5.com/Contributing to the TiddlyWiki Plugin Library.tid @@ -0,0 +1,14 @@ +created: 20141016083308219 +modified: 20141016083333808 +title: Contributing to the TiddlyWiki Plugin Library +type: text/vnd.tiddlywiki + +The TiddlyWiki Plugin library is the set of plugins, themes and languages that are distributed via http://tiddlywiki.com. + +The plugin library is intended to help end users of TiddlyWiki in the following ways: + +* By being a reliable, official source of community assets +* Permitting automatic upgrading of plugins during the upgrade process +* Providing a guarantee of backwards compatibility + +Plugins in the library need a maintainer who is prepared to make a commitment to keep them tested and fully operational with successive releases of the core code. Many plugins are maintained by the core team. diff --git a/editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid b/editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid index 97fbeb635..9d271de77 100644 --- a/editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid +++ b/editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid @@ -87,7 +87,7 @@ For example files see the plugins in the tiddlywiki5 repository i.e. those locat Modify editions/tw5.com/tiddlywiki.info to include a reference to your plugin directory, i.e. find `"plugins": [ ` and add `"yourname/pluginname"`. -From the TW5 directory issue command +From the TW5 directory issue the command ``` ./bin/qbld.sh diff --git a/editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid b/editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid index 36a66e84b..c8ad7300a 100644 --- a/editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid +++ b/editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid @@ -21,7 +21,7 @@ type: text/vnd.tiddlywiki # Copy the contents of `<repo>/core/language/en-GB` into your translation folder # Create a `plugin.info` file (see below) in your translation folder # Edit `<repo>/editions/tw5.com/tiddlywiki.info` to add your language to the list -# Run `./bin/qbld.sh` to build TiddlyWiki +# Run `../build.jermolene.github.io/quick-bld.sh` to build TiddlyWiki # Open the TiddlyWiki file at `/MyTranslation/jermolene.github.com/index.html` # You should see your translation listed in the control panel, but the text of the translation will still be in British English # Edit the `.tid` and `.multids` files in your language folder to translate the English text diff --git a/editions/dev/tiddlers/from tw5.com/How to customise the password prompt.tid b/editions/dev/tiddlers/from tw5.com/How to customise the password prompt.tid new file mode 100644 index 000000000..53eb35433 --- /dev/null +++ b/editions/dev/tiddlers/from tw5.com/How to customise the password prompt.tid @@ -0,0 +1,15 @@ +title: How to customise the password prompt +tags: howto +created: 20141006085526118 +modified: 20141006085526118 + +You can customise the text and appearance of the password prompt that is displayed when encrypted TiddlyWiki files are first opened. + +To do so, create a tiddler tagged {{$:/core/wiki/rawmarkup|$:/core/ui/TagTemplate}} containing: + +# A JavaScript `<script>` tag containing code to override the configuration variable `$tw.boot.encryptionPrompts.decrypt` +# CSS `<style>` definitions targeting the `tc-password-wrapper` class to apply styles to the form + +Raw markup tiddlers are spliced into the top of the standalone HTML file, and are executed before the boot prefix and boot kernel. + +See $:/PathEncryptionPrompt for an example. diff --git a/editions/dev/tiddlers/from tw5.com/Procedure for releasing a new version of TiddlyWiki5.tid b/editions/dev/tiddlers/from tw5.com/Procedure for releasing a new version of TiddlyWiki5.tid deleted file mode 100644 index 39d711b9c..000000000 --- a/editions/dev/tiddlers/from tw5.com/Procedure for releasing a new version of TiddlyWiki5.tid +++ /dev/null @@ -1,16 +0,0 @@ -created: 20131130132123707 -modified: 20140908153054348 -tags: dev -title: Releasing a new version of TiddlyWiki5 -type: text/vnd.tiddlywiki - -# Adjust the release date of the latest release tiddler (eg, [[Release 5.0.7-beta]]) -# Ensure [[Releases]] has the new version as the default tab -# Adjust the modified time of HelloThere -# Make sure ''Jermolene/TiddlyWiki5'' is fully committed -# Edit `package.json` to the new version number -# Run `bin/bld.sh` to build the deployment files -# Restore `package.json` to the previous version number -# Run `bin/verbump "5.0.8-beta"`, substituting the new version number -# Run `bin/deploy.sh` -# Run `bin/wbld.sh <username> <password>` diff --git a/editions/dev/tiddlers/from tw5.com/TiddlyWiki Coding Style Guidelines.tid b/editions/dev/tiddlers/from tw5.com/TiddlyWiki Coding Style Guidelines.tid index f50c7c2b8..9fded81a7 100644 --- a/editions/dev/tiddlers/from tw5.com/TiddlyWiki Coding Style Guidelines.tid +++ b/editions/dev/tiddlers/from tw5.com/TiddlyWiki Coding Style Guidelines.tid @@ -1,3 +1,4 @@ +modified: 20141016083333808 title: TiddlyWiki Coding Style Guidelines tags: dev @@ -7,6 +8,8 @@ TiddlyWiki is a large project with many interested parties. It benefits everyone ! Guidelines +This list of guidelines isn't exhaustive but captures some of the common problems. The ultimate guide is the existing TiddlyWiki code-base. There are still some places where the coding guidelines aren't used consistently within the core; pull requests are welcome to help resolve those issues. + !! Tabs and whitespace TiddlyWiki uses 4-character tabs for indenting. diff --git a/editions/dev/tiddlers/system/PatchEncryptionPrompt.tid b/editions/dev/tiddlers/system/PatchEncryptionPrompt.tid new file mode 100644 index 000000000..d9fb28344 --- /dev/null +++ b/editions/dev/tiddlers/system/PatchEncryptionPrompt.tid @@ -0,0 +1,33 @@ +title: $:/PatchEncryptionPrompt +tags: $:/core/wiki/rawmarkup + +<script> + +window.$tw = window.$tw || Object.create(null); +$tw.boot = $tw.boot || Object.create(null); + +$tw.boot.encryptionPrompts = { + decrypt: "Decrypt this TiddlyWiki by entering the password" +}; + +</script> +<style> + +body .tc-password-wrapper { + background-color: rgb(183, 197, 235); + border: 8px solid rgb(152, 164, 197); +} + +body .tc-password-wrapper form { + text-align: center; +} + +body .tc-password-wrapper h1 { + padding-bottom: 8px; +} + +body .tc-password-wrapper input { + width: auto; +} + +</style> diff --git a/editions/dev/tiddlywiki.info b/editions/dev/tiddlywiki.info index 5d4be5dfb..d737e127b 100644 --- a/editions/dev/tiddlywiki.info +++ b/editions/dev/tiddlywiki.info @@ -32,6 +32,8 @@ "--setfield","[tag[external-image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain", "--setfield","[tag[external-image]]","text","","text/plain", "--rendertiddler","$:/core/save/all","index.html","text/plain"], + "build-readme": [ + "--rendertiddler","ReadMe for build.jermolene.github.io","readme.md","text/html"], "favicon": [ "--savetiddler","$:/favicon.ico","favicon.ico"], "static": [ diff --git a/editions/katexdemo/tiddlers/HelloThere.tid b/editions/katexdemo/tiddlers/HelloThere.tid index 719121c1e..c3ecef5bb 100644 --- a/editions/katexdemo/tiddlers/HelloThere.tid +++ b/editions/katexdemo/tiddlers/HelloThere.tid @@ -2,9 +2,7 @@ title: HelloThere This is a TiddlyWiki plugin for mathematical typesetting based on KaTeX from Khan Academy. -It is completely self-contained, and doesn't need an Internet connection in order to work. - -//This first version of the plugin cannot be used to generate static content under Node.js, but that capability will come in a future update. (Note that you can still use it when running the client-server configuration under Node.js).// +It is completely self-contained, and doesn't need an Internet connection in order to work. It works both in the browser and under Node.js. ! Installation diff --git a/editions/katexdemo/tiddlywiki.info b/editions/katexdemo/tiddlywiki.info index 8f24a036e..b45c7b950 100644 --- a/editions/katexdemo/tiddlywiki.info +++ b/editions/katexdemo/tiddlywiki.info @@ -10,6 +10,11 @@ ], "build": { "index": [ - "--rendertiddler","$:/core/save/all","katexdemo.html","text/plain"] + "--rendertiddler","$:/core/save/all","katexdemo.html","text/plain"], + "static": [ + "--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain", + "--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", + "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain", + "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"] } } diff --git a/editions/prerelease/tiddlers/Release 5.1.3.tid b/editions/prerelease/tiddlers/Release 5.1.3.tid new file mode 100644 index 000000000..a05f31f35 --- /dev/null +++ b/editions/prerelease/tiddlers/Release 5.1.3.tid @@ -0,0 +1,62 @@ +caption: 5.1.3 +created: 20140928085506951 +modified: 20140928085506951 +tags: ReleaseNotes +title: Release 5.1.3 +type: text/vnd.tiddlywiki + +//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.2...v5.1.3]]// + +!! Usability Improvements + +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/e872f17842809e33eae177980e9ea0650b6a4c03]] "new journal" button; see [[Creating journal tiddlers]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/70984aa39f8a4061162d4e404bfd158e515c7e6e]] "new here" button; see [[Creating and editing tiddlers]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/00cdd04edd49c2bf0e461071c0c7c50f8aab4e42]] "new journal here" button; see [[Creating journal tiddlers]] +* [[Made|https://github.com/Jermolene/TiddlyWiki5/commit/c6951ee912d1f2717a8c208cbb920e54edf9e5d9]] date format strings be translateable +* [[Added|https://github.com/Jermolene/TiddlyWiki5/tree/master/languages/ru-RU]] Russian translation +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/ef1d5310918dae088ce9361c1682ce0f99cf568a]] confirmation when clearing password +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b7bbcfa05659808c1e51a4f2f5f1d6afbc2ed3a1]] additional prompt when setting password +* [[Increased|https://github.com/Jermolene/TiddlyWiki5/commit/dc9981322aeb508d5ebac0b691b0d703f8c1995e]] size of the clear search button + + +!! Hackability Improvements + +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/0dcf54c3b59ed04645928f0ec4ced647e5a0da7f]] support for ActionWidgets +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/65504d5d41e45326ab1b1b6c0c21eea4c9772797]] new [[FilterOperator: addprefix]] and [[FilterOperator: addsuffix]] +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/0c8e5380778303cdd3308bed4a15290214841f8b]] support for custom password prompts +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/c26bd4c5a872f56c47e9f5cfc3fada468c53ddde]] the ListMacro to display ''caption'' field if present + +!! Bug Fixes + +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/cc576b052e2b05fd93fcb4f3eb8d9ee5278abf3e]] [[FilterOperator: each]] to work with missing tiddlers +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/5dd6ebff05a3380db2901294b2cfc89c1a0e71bf]] problem with tiddler width in zoomin storyview with the sidebar hidden +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/09b6540998fec6bf1fb14842be8e8c53dbd5c46a]] bug whereby the `tm-home` message wasn't navigating to a tiddler, causing problems in zoomin storyview +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/3ca8d7b6cca46ffa424bcf9bdc134da464fc84f4]] problem with jumping toolbar icons under Firefox +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/f85b07e70b71d0622a9459e4b04e2027540abda8]] problem with untagged label being incorrectly coloured +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/b3dcd7d625ec83701ef3a77f3fb8101af57c154f]] problem with title background colours with the "Sticky Titles" theme +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/5211f9c40c874a167174e8c0d439db34189d3329]] problem with subfilter parameter of TimelineMacro +* [[Exclude|https://groups.google.com/d/topic/tiddlywiki/YPACpXhH9PY/discussion]] search string tiddler from search results + +!! Node.js Changes + +//These changes are only relevant to people using TiddlyWiki under Node.js// + +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/63c174d7ed56284e80ad6cd6ae966b81f9181cc9]] ~KaTeX plugin to be able to work under Node.js to generate static HTML +* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/49dc5694a391a391264a4473e4f4422e2472a3b3]] "includeWikis" to merge build targets +* [[Refactored|https://github.com/Jermolene/TiddlyWiki5/issues/969]] the build scripts for tiddlywiki.com into a separate repository at https://github.com/Jermolene/build.jermolene.github.io + +!! Contributors + +[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki: + +* [[@andrey013|https://github.com/andrey013]] +* [[@BramChen|https://github.com/BramChen]] +* [[@buggyj|https://github.com/buggyj]] +* [[@Eucaly|https://github.com/Eucaly]] +* [[@fghhfg|https://github.com/fghhfg]] +* [[@gernert|https://github.com/gernert]] +* [[@pmario|https://github.com/pmario]] +* [[@simonbaird|https://github.com/simonbaird]] +* [[@TheDiveO|https://github.com/TheDiveO]] +* [[@xcazin|https://github.com/xcazin]] + diff --git a/editions/prerelease/tiddlers/system/DefaultTiddlers.tid b/editions/prerelease/tiddlers/system/DefaultTiddlers.tid new file mode 100644 index 000000000..19dd8b2fd --- /dev/null +++ b/editions/prerelease/tiddlers/system/DefaultTiddlers.tid @@ -0,0 +1,10 @@ +created: 20131127215321439 +modified: 20140912135951542 +title: $:/DefaultTiddlers +type: text/vnd.tiddlywiki + +[[TiddlyWiki Pre-release]] +[tag[ReleaseNotes]!has[released]] +HelloThere +GettingStarted +Community diff --git a/editions/prerelease/tiddlers/system/GoogleAnalyticsAccount.tid b/editions/prerelease/tiddlers/system/GoogleAnalyticsAccount.tid new file mode 100644 index 000000000..1e0f77e7c --- /dev/null +++ b/editions/prerelease/tiddlers/system/GoogleAnalyticsAccount.tid @@ -0,0 +1,3 @@ +title: $:/GoogleAnalyticsAccount + +UA-32839735-1 \ No newline at end of file diff --git a/editions/prerelease/tiddlers/system/GoogleAnalyticsDomain.tid b/editions/prerelease/tiddlers/system/GoogleAnalyticsDomain.tid new file mode 100644 index 000000000..ee2e3f723 --- /dev/null +++ b/editions/prerelease/tiddlers/system/GoogleAnalyticsDomain.tid @@ -0,0 +1,3 @@ +title: $:/GoogleAnalyticsDomain + +tiddlywiki.com \ No newline at end of file diff --git a/editions/prerelease/tiddlers/system/SiteSubtitle.tid b/editions/prerelease/tiddlers/system/SiteSubtitle.tid new file mode 100644 index 000000000..07d2ed13d --- /dev/null +++ b/editions/prerelease/tiddlers/system/SiteSubtitle.tid @@ -0,0 +1,3 @@ +title: $:/SiteSubtitle + +<<version>> \ No newline at end of file diff --git a/editions/prerelease/tiddlers/system/SiteTitle.tid b/editions/prerelease/tiddlers/system/SiteTitle.tid new file mode 100644 index 000000000..eb3d1d643 --- /dev/null +++ b/editions/prerelease/tiddlers/system/SiteTitle.tid @@ -0,0 +1,6 @@ +created: 20131211131022562 +modified: 20131211131023829 +title: $:/SiteTitle +type: text/vnd.tiddlywiki + +TiddlyWiki Pre-release \ No newline at end of file diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid new file mode 100644 index 000000000..68a5f431f --- /dev/null +++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid @@ -0,0 +1,6 @@ +title: TiddlyWiki Pre-release +modified: 20141013204930183 + +This is a pre-release build of TiddlyWiki. + +It is provided for testing purposes. Please don't try to use it for anything important -- you should use the latest official release from http://tiddlywiki.com. diff --git a/editions/prerelease/tiddlywiki.info b/editions/prerelease/tiddlywiki.info new file mode 100644 index 000000000..85e38ccce --- /dev/null +++ b/editions/prerelease/tiddlywiki.info @@ -0,0 +1,34 @@ +{ + "plugins": [ + "tiddlywiki/cecily", + "tiddlywiki/googleanalytics", + "tiddlywiki/nodewebkitsaver", + "tiddlywiki/github-fork-ribbon", + "tiddlywiki/browser-sniff" + ], + "themes": [ + "tiddlywiki/vanilla", + "tiddlywiki/snowwhite", + "tiddlywiki/nighttime", + "tiddlywiki/starlight", + "tiddlywiki/seamless", + "tiddlywiki/stickytitles", + "tiddlywiki/centralised", + "tiddlywiki/readonly" + ], + "languages": [ + "en-US", + "en-GB", + "de-AT", + "de-DE", + "fr-FR", + "zh-Hans", + "zh-Hant", + "it-IT", + "ja-JP", + "ru-RU" + ], + "includeWikis": [ + "../tw5.com" + ] +} diff --git a/editions/tw2/readme.md b/editions/tw2/readme.md deleted file mode 100644 index 5eaadaea2..000000000 --- a/editions/tw2/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -<h1 class=''>Building <span>TiddlyWikiClassic</span></h1><p><span>TiddlyWiki5</span> can be used to build older 2.x.x versions of <span>TiddlyWikiClassic</span> from their constituent components. Doing so involves these features:</p><ul><li>The <code>tiddlywiki/classictools</code> plugin, containing a deserializer module which allows tiddlers to be loaded from <span>TiddlyWiki</span> 2.x.x <code>.recipe</code> files</li><li>The <code>stripcomments</code> format for the <span>ViewWidget</span>, which strips single line <span>JavaScript</span> comments starting <code>//#</code></li><li>The <code>stripTitlePrefix='yes'</code> attribute of the <span>FieldsWidget</span>, which removes prefixes wrapped in curly braces from the <code>title</code> attribute<ul><li>For example, <code>{tiddler}HelloThere</code> would be transformed to <code>HelloThere</code></li></ul></li></ul><h1 class=''>Usage</h1><p><span>TiddlyWikiClassic</span> is built from the command line by running <span>TiddlyWiki on Node.js</span>. A typical usage would be:</p><pre><code>node ../../tiddlywiki.js \ - --verbose \ - --load <path_to_recipe_file> \ - --rendertiddler $:/core/templates/tiddlywiki2.template.html <path_to_write_index_file> text/plain \ - || exit 1</code></pre> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/TableOfContentsInProcess b/editions/tw5.com/tiddlers/TableOfContentsInProcess deleted file mode 100644 index dfdd99e07..000000000 --- a/editions/tw5.com/tiddlers/TableOfContentsInProcess +++ /dev/null @@ -1,8 +0,0 @@ -title: TableOfContentsInProcess -tags: -created: 201409041006 -modified: 201409041006 - -<div class='tc-toc'> -<<toc-selective-expandable 'TableOfContents'>> -</div> diff --git a/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid b/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid index 30afe03ed..25456498c 100644 --- a/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid +++ b/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid @@ -62,4 +62,7 @@ I worked on new release of TiddlyWiki from November 2011. As a programmer, worki ! The Future -Now that TiddlyWiki5 has finally left "beta" status behind, my hope is that it will have a long life. Because it only uses standard features of HTML5 and Node.js, there is no reason why it cannot be fully operational for many years to come. My goal is for it last for at least 25 years. +Now that TiddlyWiki5 has finally left "beta" status behind, my hope is that it will have a long life. Because it only uses standard features of HTML5 and Node.js, there is no reason why it cannot be fully operational for many years to come. My goal is for it to last for at least 25 years. + +//Jeremy Ruston, 20th September 2014// + diff --git a/editions/tw5.com/tiddlers/community/Contributing.tid b/editions/tw5.com/tiddlers/community/Contributing.tid index bca4442f0..e07553141 100644 --- a/editions/tw5.com/tiddlers/community/Contributing.tid +++ b/editions/tw5.com/tiddlers/community/Contributing.tid @@ -24,6 +24,12 @@ Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license a 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). +''step by step'' + +# click [[licenses/CLA-individual|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md]] or [[licenses/CLA-entity|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md]] +# in `cla-individual.md` or `cla-entity.md` click icon on the top-right corner (clicking this button will fork the project so you can edit the file) +# add your name at the bottom + eg: `Jeremy Ruston, @Jermolene, 2011/11/22` --- diff --git a/editions/tw5.com/tiddlers/community/Examples.tid b/editions/tw5.com/tiddlers/community/Examples.tid index 450897730..e4dd64d3e 100644 --- a/editions/tw5.com/tiddlers/community/Examples.tid +++ b/editions/tw5.com/tiddlers/community/Examples.tid @@ -2,7 +2,6 @@ created: 20140320230543190 modified: 20140916121854696 tags: HelloThere Community title: Examples -caption: Examples of ~TiddlyWiki being used in the wild type: text/vnd.tiddlywiki This collection showcases inspiring and interesting examples of TiddlyWiki being used in the wild. diff --git a/editions/tw5.com/tiddlers/community/TiddlyWiki Hangouts.tid b/editions/tw5.com/tiddlers/community/TiddlyWiki Hangouts.tid index e9dce6324..fb9fda85b 100644 --- a/editions/tw5.com/tiddlers/community/TiddlyWiki Hangouts.tid +++ b/editions/tw5.com/tiddlers/community/TiddlyWiki Hangouts.tid @@ -8,4 +8,4 @@ The TiddlyWiki community holds regular Google Hangouts, usually every Tuesday fr Past Hangouts are archived in this YouTube playlist: -<iframe width="560" height="315" src="//www.youtube.com/embed/videoseries?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u" frameborder="0" allowfullscreen></iframe> +<iframe width="560" height="315" src="http://www.youtube.com/embed/videoseries?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u" frameborder="0" allowfullscreen></iframe> diff --git a/editions/tw5.com/tiddlers/community/resources/TiddlyWiki5 Squared by Iannis Zannos.tid b/editions/tw5.com/tiddlers/community/resources/TiddlyWiki5 Squared by Iannis Zannos.tid new file mode 100644 index 000000000..0c695547f --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/TiddlyWiki5 Squared by Iannis Zannos.tid @@ -0,0 +1,16 @@ +created: 20141009170239174 +modified: 20141009170711343 +tags: Resources +title: "TiddlyWiki5^2 documenting while learning TiddlyWiki5" by Iannis Zannos +type: text/vnd.tiddlywiki +url: http://larigot.avarts.ionio.gr/users/iani/wikis/tw5square.html + +A wealth of hints, tips and notes about using [[TiddlyWiki on Node.js]]: + +<<< +TiddlyWiki is different from other wikis because of its principle of dynamically customizeable "storyline" based on tiddlers as basic units of information. That is, the user "composes" their own version of the webpage by clicking on tiddler links, which add tiddlers to the page in order to compose a storyline. + +The Node.js implementation in TiddlyWiki5 adds all the advantages of flat-file markup language based type of site. This makes TiddlyWiki an excellent alternative to flat-file based CMS/webpage/blog authoring systems for the web. + +Also very cool is the treatment of tags as menus everywhere. +<<< diff --git a/editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid b/editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid index 59d35f1dd..bc673c507 100644 --- a/editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid +++ b/editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid @@ -1,9 +1,9 @@ created: 20130825144900000 -modified: 20140107114307809 +modified: 20141012154500719 tags: Concepts title: CurrentTiddler type: text/vnd.tiddlywiki -The CurrentTiddler is the current tiddler during WikiText processing. A context tiddler is set by the TiddlerWidget. It allows you to write references like `<$view field="title" format="link"/>` in TemplateTiddlers without explicitly specifying the tiddler that it applies to. +The CurrentTiddler is the current tiddler during WikiText rendering. It is usually set by the TiddlerWidget. It allows you to write references like `<$view field="title"/>` in TemplateTiddlers without explicitly specifying the tiddler that it applies to. -The title of the current tiddler is contained in the widget variable ''currentTiddler''. +The title of the current tiddler is contained in the [[WidgetVariable: currentTiddler]]. diff --git a/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid b/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid index 30baeef3d..d0e14d8ce 100644 --- a/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid +++ b/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid @@ -1,5 +1,5 @@ created: 20130825214200000 -modified: 20140912141727308 +modified: 20141013204930183 tags: [[TiddlyWiki on Node.js]] title: TiddlyWikiFolders type: text/vnd.tiddlywiki @@ -27,6 +27,8 @@ The `tiddlywiki.info` file in a wiki folder contains a JSON object comprising th * ''build'' - a hashmap of named build targets, each defined by an array of command tokens (see BuildCommand) * ''config'' - an optional hashmap of configuration options (see below) +Note that the build targets of included wikis are merged if a target of that name isn't defined in the current `tiddlywiki.info` file. + Configuration options include: * ''default-tiddler-location'' - a string path to the default location for the filesystem adaptor to save new tiddlers (resolved relative to the wiki folder) diff --git a/editions/tw5.com/tiddlers/features/Searching.tid b/editions/tw5.com/tiddlers/features/Searching.tid index ff85bec79..1d01b9481 100644 --- a/editions/tw5.com/tiddlers/features/Searching.tid +++ b/editions/tw5.com/tiddlers/features/Searching.tid @@ -22,4 +22,4 @@ To the right of the search box, when there are no search results displayed below * The ''shadows'' tab allows you to limit your search to shadow tiddlers. -* The ''filter'' tab is not a search box, per se, but a way to obtain a list of all tiddlers that meet the specific criteria described by that filter, for example, "All tags except system tags". +* The ''filter'' tab is not a search box, per se, but a way to obtain a list of all tiddlers that meet the specific criteria described by that filter, for example, "All tags except system tags". More information in [[Introduction to Filters]]. diff --git a/editions/tw5.com/tiddlers/filters/FilterOperator addprefix.tid b/editions/tw5.com/tiddlers/filters/FilterOperator addprefix.tid new file mode 100644 index 000000000..48ac8129d --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/FilterOperator addprefix.tid @@ -0,0 +1,15 @@ +created: 20140410103123179 +modified: 20140410103123179 +tags: Filters +caption: addprefix +title: FilterOperator: addprefix +type: text/vnd.tiddlywiki + +The ''addprefix'' filter operator add a prefix to all titles in the current list. + +For example: + +|!Filter String |!Description | +|`one two three +[addprefix[tid-]]` |Returns `tid-one`, `tid-two`, `tid-three` | + +See also [[FilterOperator: prefix]], [[FilterOperator: suffix]], [[FilterOperator: addsuffix]], [[FilterOperator: removeprefix]] and [[FilterOperator: removesuffix]]. diff --git a/editions/tw5.com/tiddlers/filters/FilterOperator addsuffix.tid b/editions/tw5.com/tiddlers/filters/FilterOperator addsuffix.tid new file mode 100644 index 000000000..ecd3748b7 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/FilterOperator addsuffix.tid @@ -0,0 +1,15 @@ +created: 20140828133830424 +modified: 20140902145613329 +tags: Filters +caption: addsuffix +title: FilterOperator: addsuffix +type: text/vnd.tiddlywiki + +The ''addsuffix'' filter operator adds a suffix to all titles in the current list. + +For example: + +|!Filter String |!Description | +|`one two three +[addsuffix[-tid]]` |Returns `one-tid`, `two-tid`, `three-tid` | + +See also [[FilterOperator: suffix]], [[FilterOperator: prefix]], [[FilterOperator: addprefix]], [[FilterOperator: removesuffix]], and [[FilterOperator: removeprefix]]. diff --git a/editions/tw5.com/tiddlers/filters/FilterOperator list.tid b/editions/tw5.com/tiddlers/filters/FilterOperator list.tid index d5870a281..c546a3e40 100644 --- a/editions/tw5.com/tiddlers/filters/FilterOperator list.tid +++ b/editions/tw5.com/tiddlers/filters/FilterOperator list.tid @@ -5,7 +5,7 @@ caption: list title: FilterOperator: list type: text/vnd.tiddlywiki -The ''list'' filter operator replaces the current list with the list contained in the [[TextReference|TextReferences]] specified in the operand. The default field for the text reference is `list`. +The ''list'' filter operator replaces the current list with the list contained in the TextReference specified in the operand. The default field for the text reference is `list`. Preceding the operator name with `!` inverts the logic so that the filter only returns the tiddlers in the current list that are not listed in the specified list. diff --git a/editions/tw5.com/tiddlers/filters/FilterOperator prefix.tid b/editions/tw5.com/tiddlers/filters/FilterOperator prefix.tid index 41139bbb4..af965c7c6 100644 --- a/editions/tw5.com/tiddlers/filters/FilterOperator prefix.tid +++ b/editions/tw5.com/tiddlers/filters/FilterOperator prefix.tid @@ -13,4 +13,4 @@ For example: |`[tag[task]!prefix[hidden]]` |Returns tiddlers tagged `task` whose titles do not start with `hidden` | |`[prefix[$:/]]` |Equivalent to `[is[system]]` | -See also [[FilterOperator: removeprefix]], [[FilterOperator: removesuffix]] and [[FilterOperator: removesuffix]]. +See also [[FilterOperator: removeprefix]], [[FilterOperator: removesuffix]], [[FilterOperator: removesuffix]], [[FilterOperator: addprefix]], and [[FilterOperator: addsuffix]]. diff --git a/editions/tw5.com/tiddlers/filters/FilterOperator removeprefix.tid b/editions/tw5.com/tiddlers/filters/FilterOperator removeprefix.tid index a3aebd3bd..c9ab7b69a 100644 --- a/editions/tw5.com/tiddlers/filters/FilterOperator removeprefix.tid +++ b/editions/tw5.com/tiddlers/filters/FilterOperator removeprefix.tid @@ -12,4 +12,4 @@ For example: |!Filter String |!Description | |`tid-one tid-two three +[removeprefix[tid-]]` |Returns `one`, `two` | -See also [[FilterOperator: prefix]], [[FilterOperator: suffix]] and [[FilterOperator: removesuffix]]. +See also [[FilterOperator: prefix]], [[FilterOperator: suffix]], [[FilterOperator: removesuffix]], [[FilterOperator: addprefix]], and [[FilterOperator: addsuffix]]. diff --git a/editions/tw5.com/tiddlers/filters/FilterOperator removesuffix.tid b/editions/tw5.com/tiddlers/filters/FilterOperator removesuffix.tid index b07a4e3d2..9b55a9383 100644 --- a/editions/tw5.com/tiddlers/filters/FilterOperator removesuffix.tid +++ b/editions/tw5.com/tiddlers/filters/FilterOperator removesuffix.tid @@ -12,4 +12,4 @@ For example: |!Filter String |!Description | |`one-tid two-tid three +[removesuffix[-tid]]` |Returns `one`, `two` | -See also [[FilterOperator: suffix]], [[FilterOperator: prefix]] and [[FilterOperator: removeprefix]]. +See also [[FilterOperator: suffix]], [[FilterOperator: prefix]], [[FilterOperator: removeprefix]], [[FilterOperator: addprefix]], and [[FilterOperator: addsuffix]]. diff --git a/editions/tw5.com/tiddlers/filters/FilterOperator suffix.tid b/editions/tw5.com/tiddlers/filters/FilterOperator suffix.tid index a82c9fca5..0c12a01a2 100644 --- a/editions/tw5.com/tiddlers/filters/FilterOperator suffix.tid +++ b/editions/tw5.com/tiddlers/filters/FilterOperator suffix.tid @@ -13,4 +13,4 @@ For example: |`[tag[task]!suffix[hidden]]` |Returns tiddlers tagged `task` whose titles do not end with `hidden` | |`[suffix[.jpg]]` |Returns tiddlers whose titles end with `.jpg` | -See also [[FilterOperator: removesuffix]], [[FilterOperator: prefix]] and [[FilterOperator: removeprefix]]. +See also [[FilterOperator: removesuffix]], [[FilterOperator: prefix]], [[FilterOperator: removeprefix]], [[FilterOperator: addprefix]], and [[FilterOperator: addsuffix]]. diff --git a/editions/tw5.com/tiddlers/filters/FilterOperators.tid b/editions/tw5.com/tiddlers/filters/FilterOperators.tid index 23d5be995..478f33888 100644 --- a/editions/tw5.com/tiddlers/filters/FilterOperators.tid +++ b/editions/tw5.com/tiddlers/filters/FilterOperators.tid @@ -1,14 +1,11 @@ created: 20140410103123179 -modified: 20140410103123179 +modified: 20141007213204936 tags: Concepts title: FilterOperators type: text/vnd.tiddlywiki -\define bulletList(filter) -<ul><$list filter="$filter$"><li><$link to={{!!title}}><$view field="title"/></$link></li></$list></ul> -\end Filter operators are the individual elements of [[filters|Filters]]. See [[Introduction to Filters]] for details. The full list of available filter operators is: -<<bulletList "[tag[Filters]]">> +<<list-links "[tag[Filters]]">> diff --git a/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid b/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid index 257cb7a5e..2b42e738a 100644 --- a/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid +++ b/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid @@ -1,12 +1,24 @@ created: 20140410101941871 -modified: 20140919160749349 +modified: 20141009180223576 tags: Learning title: Introduction to Filters type: text/vnd.tiddlywiki A step by step introduction to how [[Filters]] are used. -You can experiment with tiddler filters by typing them into the "Filter" tab of the [[advanced search panel|$:/AdvancedSearch]]. +! Using Filters + +Filters are a special language within WikiText for expressing lists of tiddlers. + +Filters are used in the ListMacro, TabsMacro, ListWidget, CountWidget, and many other areas of TiddlyWiki. + +For example, this is how the ListMacro would be used to display the first example below: + +``` +<<list-links "HelloThere Introduction [[Title with Spaces]]">> +``` + +The easiest way to experiment with tiddler filters is by typing them into the "Filter" tab of the [[advanced search panel|$:/AdvancedSearch]]. ! Simple Filters @@ -87,6 +99,12 @@ You can use multiple filter operations at once. This example selects all tiddler Each separate operator is processed in turn, accumulating the tiddlers that they select. +Here's an example that returns tiddlers tagged ''alpha'' or ''beta'' that are also tagged ''task'' and not tagged ''done'': + +``` +[tag[alpha]] [tag[beta]] +[tag[task]!tag[done]] +``` + ! ANDing Multiple Filter Operators A sequence of operators can be logically ANDed together by bashing them together and merging the outer square brackets. This is called a "run" of operations. For example, here we select tiddlers that are tagged "introduction" and also tagged "demo": diff --git a/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid b/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid index 328221864..ca738891e 100644 --- a/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid +++ b/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid @@ -1,5 +1,5 @@ created: 20130828190200000 -modified: 20140912141647843 +modified: 20141013085608911 tags: [[TiddlyWiki on Node.js]] title: Generating Static Sites with TiddlyWiki type: text/vnd.tiddlywiki @@ -12,14 +12,15 @@ There is much flexibility in how the static HTML is generated. The following sce You can explore a static representation of this TiddlyWiki at <a href="static.html">static.html</a>. That file is a static snapshot of the current DefaultTiddlers. Any tiddlers that it links to are referred to via URLs of the form `/static/HelloThere.html` that point to static snapshots of individual tiddlers. The tiddler HTML files reference a `static.css` stylesheet file. -The included `bin/bld.sh` script includes these commands that are involved in generating the sample static version of the TiddlyWiki5 site: +The following commands are used to generate the sample static version of the TiddlyWiki5 site: ``` ---rendertiddler $:/core/templates/static.template.html $TW5_BUILD_OUTPUT/static.html text/plain \ ---rendertiddler $:/core/templates/static.template.css $TW5_BUILD_OUTPUT/static/static.css text/plain \ ---rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html $TW5_BUILD_OUTPUT/static text/plain \ +--rendertiddler $:/core/templates/static.template.html static.html text/plain +--rendertiddler $:/core/templates/static.template.css static/static.css text/plain +--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html static text/plain ``` -The first RenderTiddlerCommand saves the static version of the DefaultTiddlers, the second saves the stylesheet, and the final RenderTiddlersCommand generates the HTML representations of individual tiddlers. + +The first RenderTiddlerCommand saves the static version of the DefaultTiddlers, the second saves the stylesheet, and the final RenderTiddlersCommand generates the HTML representations of individual tiddlers. (All the files are placed in the `output` folder of the wiki folder). ! Wiki Snapshot with Internal Links @@ -27,8 +28,8 @@ It is also possible to produce a single HTML file that contains static represent For example: <a href="alltiddlers.html">alltiddlers.html</a> -The example is built by the following line in `bin/bld.sh`: +The example is built by the following commands: ``` ---rendertiddler $:/core/templates/alltiddlers.template.html $TW5_BUILD_OUTPUT/alltiddlers.html text/plain \ +--rendertiddler $:/core/templates/alltiddlers.template.html alltiddlers.html text/plain ``` diff --git a/editions/tw5.com/tiddlers/howtos/Upgrading.tid b/editions/tw5.com/tiddlers/howtos/Upgrading.tid index db04fd0b2..8d0117687 100644 --- a/editions/tw5.com/tiddlers/howtos/Upgrading.tid +++ b/editions/tw5.com/tiddlers/howtos/Upgrading.tid @@ -13,18 +13,16 @@ The process described here is for upgrading standalone TiddlyWiki files. There i <<< When upgrading, please remember the [[The First Rule of Using TiddlyWiki]]: -//You are responsible for looking after your own data; take care to make backups, especially when upgrading the ~TiddlyWiki core// +//Backup your data!// <<< ! Online upgrading This process will work on most desktop browsers. Note that none of your personal data leaves your browser with this process. -# Locate your TiddlyWiki file in the file system (ie using Windows Explorer, the Finder on Mac OS X, or your file manager on Linux) -# Visit http://tiddlywiki.com/upgrade.html in your browser +# Visit the new version tiddywiki in http://tiddlywiki.com/upgrade.html in your browser # Drag your old TiddlyWiki HTML file into the browser window #* If the file is encrypted you will be prompted for the password -# Review the list of tiddlers that will be upgraded # Click ''Upgrade'' # Save changes to save the new version diff --git a/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid b/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid index 2227b55d1..3dccedebc 100644 --- a/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid +++ b/editions/tw5.com/tiddlers/howtos/Using TiddlyWiki for GitHub Pages project documentation.tid @@ -1,16 +1,16 @@ created: 20130825150100000 modified: 20140912141559011 tags: [[TiddlyWiki on Node.js]] -title: Using TiddlyWiki for GitHub Pages project documentation +title: Using TiddlyWiki for GitHub project documentation type: text/vnd.tiddlywiki -TiddlyWiki5 can be used to produce documentation for GitHub projects. It lets you maintain a single set of documentation as a [[TiddlyWikiFolder|TiddlyWikiFolders]] containing separate tiddler files under source code control, and then use it to produce `readme.md` files for inclusion in project folders, or HTML files for storage in [[GitHub Pages|http://pages.github.com/]]. Both features are demonstrated by TiddlyWiki5 itself. +TiddlyWiki5 can be used to produce documentation for GitHub projects. It lets you maintain a single set of documentation as a [[TiddlyWikiFolder|TiddlyWikiFolders]] containing separate tiddler files under source code control, and then use it to produce `readme.md` files for inclusion in project folders, or HTML files for storage in [[GitHub Pages|http://pages.github.com/]]. Both features are demonstrated by TiddlyWiki5 itself. ! Generating `readme.md` files When displaying the contents of a folder GitHub will look for a `readme.md` file and display it. Note that it will not display full HTML files in this way, just static MarkDown files (this is a security measure). Happily MarkDown permits a safe subset of HTML, and thus to generate a `readme.md` file that is suitable for GitHub it is just necessary for TiddlyWiki5 to generate the content of the `<body>` element of an HTML document, and give it the appropriate filename. -This is done in `bin/bld.sh` by this command: +This is done with this command: ``` --rendertiddler ReadMe ./readme.md text/html @@ -27,10 +27,3 @@ By default, tiddler links will be rendered as `<a>` links to a relative URI cons See the LinkWidget for more details. In this example, tiddler links are rendered as links to the static rendering of tw5.com. - -! Publishing to GitHub Pages - -Publishing to GitHub Pages is very straightforward. In the case of TiddlyWiki5, several different build products are published. - -The `bld.sh` script deposits the build products directly into the local clone of the repo associated with the GitHub Pages account. There is then a manual step to review changes and push them up to github.com. - diff --git a/editions/tw5.com/tiddlers/learning/Learning.tid b/editions/tw5.com/tiddlers/learning/Learning.tid index 0318a2f3b..07f4a2b64 100644 --- a/editions/tw5.com/tiddlers/learning/Learning.tid +++ b/editions/tw5.com/tiddlers/learning/Learning.tid @@ -10,3 +10,4 @@ Learn more about using TiddlyWiki: <<list-links "[tag[Learning]]">> +Also see the complete [[Reference]], including advanced WikiText, macros, widgets, filters etc. diff --git a/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid b/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid index 4f6c50c94..ff14a4076 100644 --- a/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid +++ b/editions/tw5.com/tiddlers/macros/ChangeCountMacro.tid @@ -5,7 +5,7 @@ title: ChangeCountMacro type: text/vnd.tiddlywiki caption: changecount -The changecount macro returns a counter maintained by the TiddlyWiki core that tracks the number of modifications made to each tiddler. The changecount macro always applies to the tiddler named in the [[currentTiddler|WidgetVariable: currentTiddler]] variable. +The changecount macro returns a counter maintained by the TiddlyWiki core that tracks the number of modifications made to each tiddler. The changecount macro always applies to the tiddler named in the CurrentTiddler variable. For example: diff --git a/editions/tw5.com/tiddlers/macros/NowMacro.tid b/editions/tw5.com/tiddlers/macros/NowMacro.tid new file mode 100644 index 000000000..6945ddf7a --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/NowMacro.tid @@ -0,0 +1,28 @@ +caption: now +created: 20141008141616791 +modified: 20141013180540337 +tags: Macros +title: NowMacro +type: text/vnd.tiddlywiki + +The 'now' macro returns the current date and time, formatted with an optional format string. + +! Parameters + +|!Position |!Name |!Description |!Default | +|1st |format |DateFormat string specifying the format for the date/time |`0hh:0mm, DDth MMM YYYY` | + +! Examples + +For example: + +``` +* <<now>> +* <<now "DDth MMM YYYY">> +``` + +Returns: + +* <<now>> +* <<now "DDth MMM YYYY">> + diff --git a/editions/tw5.com/tiddlers/macros/TimelineMacro.tid b/editions/tw5.com/tiddlers/macros/TimelineMacro.tid index 1f9396518..4a3ec9b0e 100644 --- a/editions/tw5.com/tiddlers/macros/TimelineMacro.tid +++ b/editions/tw5.com/tiddlers/macros/TimelineMacro.tid @@ -1,6 +1,6 @@ title: TimelineMacro tags: Macros -modified: 20140913100126081 +modified: 20141015165343893 caption: timeline The timeline macro produces a list of tiddlers in reverse chronological order of modification date that is grouped by the date of the day of modification. @@ -8,7 +8,7 @@ The timeline macro produces a list of tiddlers in reverse chronological order of ! Parameters |!Position |!Name |!Description |!Default | -|1st |limit |The maximum number of tiddlers to list |100 | +|1st |limit |The maximum number of tiddlers to list (see below) |100 | |2nd |format |A DateFormat string for formatting the date |DDth MMM YYYY | |3rd |subfilter |A subfilter to include in the timeline filter (see below) | | @@ -24,6 +24,8 @@ To restrict the timeline to a particular tag, the subfilter can be set to someth <<timeline limit:10 subfilter:"tag[mytag]">> ``` +Note that the timeline macro does not truncate the entries for a particular day, instead always displaying all the tiddlers under each displayed day heading. This means that the limit parameter works in an unexpected way because it is possible for more than the specified number of tiddlers to be displayed. + ! Examples <$macrocall $name="wikitext-example-without-html" diff --git a/editions/tw5.com/tiddlers/mechanisms/TestingMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/TestingMechanism.tid index f3c330d52..90694073d 100644 --- a/editions/tw5.com/tiddlers/mechanisms/TestingMechanism.tid +++ b/editions/tw5.com/tiddlers/mechanisms/TestingMechanism.tid @@ -1,4 +1,4 @@ -modified: 201311222159 +modified: 20141013085608911 tags: Mechanisms title: TestingMechanism @@ -28,9 +28,9 @@ To generate a wiki containing the browser tests load up the `test` wiki and save node ./tiddlywiki.js \ ./editions/test \ --verbose \ - --rendertiddler $:/core/save/all $TW5_BUILD_OUTPUT/test.html text/plain \ + --rendertiddler $:/core/save/all test.html text/plain \ ``` -Then, open the `test.html` file in the browser to see the test results. There is a prebuilt version of `test.html` at: +The `test.html` file will be placed in the `output` folder within the wiki folder. Open it in the browser to see the test results. There is a prebuilt version of `test.html` at: http://tiddlywiki.com/test.html diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid index 6cad0c4ae..2c3dfa41f 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid @@ -1,17 +1,23 @@ +caption: tm-new-tiddler created: 20140226194405353 -modified: 20140724194729158 +modified: 20141008142952355 tags: Messages navigator-message title: WidgetMessage: tm-new-tiddler type: text/vnd.tiddlywiki -caption: tm-new-tiddler The new tiddler message creates a new draft tiddler and adds it to the current story. It requires the following properties on the `event` object: |!Name |!Description | -|param |Optional title of a tiddler to use as a template for the new tiddler | +|param |Either the title of a tiddler to use as a template for the new tiddler or a hashmap of tiddler fields | |navigateFromTitle |Title of the tiddler from which the navigation to the new tiddler was initiated | -The new tiddler message is usually generated with the LinkWidget or the ButtonWidget and is handled by the NavigatorWidget. +The title for the draft tiddler is chosen according to these rules: + +* If a hashmap was used and a title field was specified, use that title +* If a hashmap was used without a title field, use a default title, if necessary making it unique with a numeric suffix +* If a template tiddler was used, use the title of the template tiddler, if necessary making it unique with a numeric suffix + +The new tiddler message is usually generated with the LinkWidget, ButtonWidget or ActionSendMessageWidget and is handled by the NavigatorWidget. ! Example diff --git a/editions/tw5.com/tiddlers/nodejs/Scripts for TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Scripts for TiddlyWiki on Node.js.tid index e0b33bd25..8c0c250e1 100644 --- a/editions/tw5.com/tiddlers/nodejs/Scripts for TiddlyWiki on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/Scripts for TiddlyWiki on Node.js.tid @@ -1,33 +1,15 @@ created: 20131219100637788 -modified: 20140917190022854 +modified: 20141015165343893 tags: [[TiddlyWiki on Node.js]] title: Scripts for TiddlyWiki on Node.js type: text/vnd.tiddlywiki ! Script Files -The TiddlyWiki5 repository contains several scripts in the `bin` folder that are used to build and deploy TiddlyWiki (`.sh` for *nix and `.cmd` for Windows). They can serve as a useful starting point for your own scripts. +The TiddlyWiki5 repository contains several scripts in the `bin` folder that you can use to automate common tasks, or as a useful starting point for your own scripts. See [[Scripts for building tiddlywiki.com]] for details of the scripts used to build and release http://tiddlywiki.com/. All the scripts expect to be run from the root folder of the repository. -!! `fullbld`: builds tw5.com - -This script builds several variants of TiddlyWiki5 for deployment on tiddlywiki.com. - -By default, files are output to a folder called `jermolene.github.com`, sibling to the TiddlyWiki5 repo directory. For example: - -``` -/TiddlyWork/ - Directory for working with TiddlyWiki5 - | - +--+-- /TiddlyWiki5/ - Directory containing the TiddlyWiki5 repo from GitHub - | - +-- /jermolene.github.com/ - Directory for output files -``` - -You can override the build output directory by defining the environment variable `TW5_BUILD_OUTPUT`. The easiest way to do this is to create a personal batch file to invoke TiddlyWiki5 that first sets the environment variable and then invokes `fullbld`. - -`fullbld` also runs the TiddlyWiki5 Node.js-based test suite (see TestingMechanism) - !! `serve`: serves tw5.com ``` @@ -66,15 +48,7 @@ Or: This script serves the `tw5.com-server` edition content with LazyLoading applied to images. -!! `wbld`: builds TiddlyWiki for TiddlyWeb - -This script builds and deploys the code for [[TiddlyWiki in the Sky for TiddlyWeb]]. If you want to experiment with your own builds of TiddlyWiki5 for TiddlyWeb you could use this batch file as a base. - !! `2bld`: builds TiddlyWiki 2.6.5 This script builds TiddlyWiki 2.6.5 from the original source and then displays the differences between them (`diff` is used for *nix, `fc` for Windows). -!! `deploy` & `verbump`: deploy TiddlyWiki and bump the TiddlyWiki version number - -These scripts are concerned with releasing a new version of TiddlyWiki. See [[Releasing a new version of TiddlyWiki5]]. - diff --git a/editions/tw5.com/tiddlers/plugins/Plugins.tid b/editions/tw5.com/tiddlers/plugins/Plugins.tid index 00b6ae653..702070bfa 100644 --- a/editions/tw5.com/tiddlers/plugins/Plugins.tid +++ b/editions/tw5.com/tiddlers/plugins/Plugins.tid @@ -19,3 +19,13 @@ The tiddlers within a plugin appear as ShadowTiddlers. Plugins can contain JavaScript modules, style sheets, and templates to extend the functionality of TiddlyWiki itself. Plugins can also be used to distribute ordinary text, images or other content. Plugins can be updated from their source as a unit. See the PluginMechanism discussion for more details about how plugins are implemented internally. + +! How to install a plugin + +# Create a backup of your current TiddlyWiki HTML file ([[just in case|The First Rule of Using TiddlyWiki]]) +# Open your TiddlyWiki in a browser +# In another browser window, find a link to the plugin, e.g. [[$:/plugins/tiddlywiki/example]]. You will typically find links to plugins on the home page of the plugin (for example, http://tiddlywiki.com/plugins/tiddlywiki/katex/) +# Drag the link [[$:/plugins/tiddlywiki/example]] to the browser window containing your TiddlyWiki +# Save your TiddlyWiki +# Refresh the window +# The plugin should now be available for use diff --git a/editions/tw5.com/tiddlers/reference/Reference.tid b/editions/tw5.com/tiddlers/reference/Reference.tid index 2ead9fc0a..e51738e76 100644 --- a/editions/tw5.com/tiddlers/reference/Reference.tid +++ b/editions/tw5.com/tiddlers/reference/Reference.tid @@ -7,4 +7,8 @@ list: Concepts Definitions WikiText Macros Widgets Filters Messages Commands Mec The following topics provide the canonical reference documentation for TiddlyWiki: -<<list-links "[tag[Reference]]">> +<div class="tc-table-of-contents"> + +<<toc-selective-expandable 'Reference'>> + +</div> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/releasenotes/BetaReleases.tid b/editions/tw5.com/tiddlers/releasenotes/BetaReleases.tid index d9113239d..e2087e94e 100644 --- a/editions/tw5.com/tiddlers/releasenotes/BetaReleases.tid +++ b/editions/tw5.com/tiddlers/releasenotes/BetaReleases.tid @@ -1,9 +1,9 @@ created: 20131109105400007 -modified: 20140701201607494 +modified: 20141010092837891 tags: Releases title: BetaReleases type: text/vnd.tiddlywiki Here are the details of the beta releases of TiddlyWiki5. See [[TiddlyWiki5 Versioning]] for details of how releases are named. -<<tabs "[tag[BetaReleaseNotes]!sort[created]]" "Release 5.0.19-beta" "$:/state/tab2" "tc-vertical" "ReleaseTemplate">> +<<tabs "[tag[BetaReleaseNotes]!sort[created]]" "Release 5.0.18-beta" "$:/state/tab2" "tc-vertical" "ReleaseTemplate">> diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.3.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.3.tid deleted file mode 100644 index 0edc92ab3..000000000 --- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.3.tid +++ /dev/null @@ -1,27 +0,0 @@ -caption: 5.1.3 -created: 20140928085506951 -modified: 20140928085506951 -tags: ReleaseNotes -title: Release 5.1.3 -type: text/vnd.tiddlywiki - -//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.2...v5.1.3]]// - - -!! Usability Improvements - -* - -!! Hackability Improvements - -* - -!! Bug Fixes - -* - -!! Contributors - -[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki: - -* [[@pmario|https://github.com/pmario]] diff --git a/editions/tw5.com/tiddlers/variables/WidgetVariable_ currentTiddler.tid b/editions/tw5.com/tiddlers/variables/WidgetVariable_ currentTiddler.tid index e66fb5131..b2fbfa83c 100644 --- a/editions/tw5.com/tiddlers/variables/WidgetVariable_ currentTiddler.tid +++ b/editions/tw5.com/tiddlers/variables/WidgetVariable_ currentTiddler.tid @@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki ! Mechanism -The ''currentTiddler'' variable containes the title of the current tiddler. +The ''currentTiddler'' variable contains the title of the current tiddler. The ListWidget assigns the list result to the ''currentTiddler'' variable, unless the `variable` attribute is specified. @@ -19,4 +19,4 @@ The TranscludeWidget (or WikiText `{{||TemplateTitle}}`) transcludes a tiddler w These mechanisms together allow you to write references like `<$view field="title" format="link"/>` in TemplateTiddlers or inside the ListWidget hierarchy without explicitly specifying the tiddler that it applies to. -See also [[WidgetVariable: storyTiddler]] \ No newline at end of file +See also [[WidgetVariable: storyTiddler]] and [[WidgetVariable: currentTiddler]] diff --git a/editions/tw5.com/tiddlers/Working with the TiddlyWiki5 repository video.tid b/editions/tw5.com/tiddlers/videos/Working with the TiddlyWiki5 repository video.tid similarity index 100% rename from editions/tw5.com/tiddlers/Working with the TiddlyWiki5 repository video.tid rename to editions/tw5.com/tiddlers/videos/Working with the TiddlyWiki5 repository video.tid diff --git a/editions/tw5.com/tiddlers/widgets/ActionNavigateWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionNavigateWidget.tid new file mode 100644 index 000000000..5160502ff --- /dev/null +++ b/editions/tw5.com/tiddlers/widgets/ActionNavigateWidget.tid @@ -0,0 +1,38 @@ +caption: action-navigate +created: 20141008163514491 +modified: 20141008164303144 +tags: Widgets ActionWidgets +title: ActionNavigateWidget +type: text/vnd.tiddlywiki + +! Introduction + +The ''action-navigate'' widget is an [[action widget|ActionWidgets]] that sends a [[tm-navigate|WidgetMessage: tm-navigate]] message back up the widget tree. ActionWidgets are used within triggering widgets such as the ButtonWidget. + +! Content and Attributes + +The ''action-navigate'' widget is invisible. Any content within it is ignored. + +|!Attribute |!Description | +|$to |The title of the target tiddler for the navigation (if not provided defaults to the [[WidgetVariable: currentTiddler]] | +|$scroll |Optional parameter determining whether the navigation will also cause a scroll to the target tiddler (see below) | + +!! Scroll handling + +The optional `$scroll` attribute can be set to "yes" to force scrolling to occur to bring the target tiddler into view. If set to "no" then scrolling does not occur. If the `$scroll` attribute is omitted then scrolling occurs unless either: + +* the control key is pressed +* the action was initiated with the middle mouse button (if available) + +Note that if navigating to multiple tiddlers at once you should use the same `$scroll` setting for all of them. + +! Examples + +Here is an example of button that navigates to two different tiddlers at once: + +<$macrocall $name='wikitext-example-without-html' +src='<$button> +<$action-navigate $to="ButtonWidget"/> +<$action-navigate $to="ActionWidgets"/> +Click me! +</$button>'/> diff --git a/editions/tw5.com/tiddlers/widgets/ActionSendMessageWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionSendMessageWidget.tid new file mode 100644 index 000000000..6b621df67 --- /dev/null +++ b/editions/tw5.com/tiddlers/widgets/ActionSendMessageWidget.tid @@ -0,0 +1,31 @@ +caption: action-sendmessage +created: 20141008134309742 +modified: 20141008162952455 +tags: Widgets ActionWidgets +title: ActionSendMessageWidget +type: text/vnd.tiddlywiki + +! Introduction + +The ''action-sendmessage'' widget is an [[action widget|ActionWidgets]] that sends a [[message|WidgetMessages]] back up the widget tree. ActionWidgets are used within triggering widgets such as the ButtonWidget. + +! Content and Attributes + +The ''action-sendmessage'' widget is invisible. Any content within it is ignored. + +|!Attribute |!Description | +|$message |The message to send (eg, [[WidgetMessage: tm-new-tiddler]]) | +|$param |Optional parameter string whose meaning is dependent on the message being sent | +|//{any attributes not starting with $}// |Multiple parameters that are attached to the message if the `$param$` attribute is not provided | + +! Examples + +Here is an example of button that displays both a notification and a wizard, and creates a new tiddler with tags and text: + +<$macrocall $name='wikitext-example-without-html' +src='<$button> +<$action-sendmessage $message="tm-modal" $param="SampleWizard"/> +<$action-sendmessage $message="tm-notify" $param="SampleNotification"/> +<$action-sendmessage $message="tm-new-tiddler" title="This is newly created tiddler" tags="OneTag [[Another Tag]]" text=<<now "Today is DDth, MMM YYYY">>/> +Click me! +</$button>'/> diff --git a/editions/tw5.com/tiddlers/widgets/ActionWidgets.tid b/editions/tw5.com/tiddlers/widgets/ActionWidgets.tid new file mode 100644 index 000000000..f1f9de2ca --- /dev/null +++ b/editions/tw5.com/tiddlers/widgets/ActionWidgets.tid @@ -0,0 +1,23 @@ +created: 20141008134425548 +modified: 20141008144957192 +tags: Widgets +title: ActionWidgets +type: text/vnd.tiddlywiki + +Action widgets are a special type of widget that perform an action such as sending a message, navigating to a tiddler, or changing the value of a tiddler. They are used in association with other widgets that trigger those actions (for example, the ButtonWidget). + +Action widgets are invisible. They must be the immediate children of their parent triggering widget. The actions are performed in sequence. For example, here is a button that triggers two actions of sending different messages: + +``` +<$button> +<$action-sendmessage $message="tm-home"/> +<$action-sendmessage $message="tm-full-screen"/> +Click me! +</$button> +``` + +Take care not to accidentally introduce an extra line break after the opening tag of the button widget. Doing so will trigger the WikiText parser to wrap the action widgets in a paragraph element. This means that the action widgets will not be triggered as they are no longer immediate children of the triggering widget. + +The following action widgets are provided: + +<<list-links "[tag[ActionWidgets]]">> diff --git a/editions/tw5.com/tiddlers/widgets/BrowseWidget.tid b/editions/tw5.com/tiddlers/widgets/BrowseWidget.tid index cc997f8df..e29a556e4 100644 --- a/editions/tw5.com/tiddlers/widgets/BrowseWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/BrowseWidget.tid @@ -16,3 +16,13 @@ The content of the `<$browse>` widget is ignored. |multiple |Set to "multiple" to select multiple file upload | On iPhone/iPad choosing the multiple option will remove the ability to take photographs/videos directly into TiddlyWiki. + +''e.g.'' + +``` +<$browse> +``` + +renders as: + +<$browse> diff --git a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid index cd96a91cf..f3f52412a 100644 --- a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid @@ -1,17 +1,22 @@ -title: ButtonWidget -created: 201310241419 -modified: 201406170837 -tags: Widgets caption: button +created: 20131024141900000 +modified: 20141008145311298 +tags: Widgets +title: ButtonWidget +type: text/vnd.tiddlywiki ! Introduction The button widget displays an HTML `<button>` element that can perform a combination of optional actions when clicked: -* Navigate to a specified tiddler -* Dispatch a user defined [[widget message|Messages]] -* Trigger a user defined [[popup|PopupMechanism]] -* Assign new text to a specified tiddler +* Executing any ActionWidgets that are immediate children of the button widget +* Execute any integrated actions: +** Navigate to a specified tiddler +** Dispatch a user defined [[widget message|Messages]] +** Trigger a user defined [[popup|PopupMechanism]] +** Assign new text to a specified tiddler + +The integrated actions are provided as a shortcut for invoking common actions. The same functionality is available via ActionWidgets, with the exception of the support for highlighting selected popups. ! Content and Attributes diff --git a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid index e6f1e198d..21b13e236 100644 --- a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid @@ -16,7 +16,7 @@ The checkbox widget displays an HTML `<input type="checkbox">` element that is d The content of the `<$checkbox>` widget is displayed within an HTML `<label>` element immediately after the checkbox itself. This means that clicking on the content will toggle the checkbox. |!Attribute |!Description | -|tiddler |Title of the tiddler to manipulate (defaults to the [[WidgetVariable: currentTiddler]]) | +|tiddler |Title of the tiddler to manipulate (defaults to the CurrentTiddler) | |tag |The name of the tag to which the checkbox should be bound | |field |The name of the field to which the checkbox should be bound | |checked |The value of the field corresponding to the checkbox being checked | diff --git a/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid b/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid index cbd7b69d7..69080e395 100644 --- a/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid @@ -14,7 +14,7 @@ The edit bitmap widget provides a user interface in the browser for editing bitm The content of the `<$edit-bitmap>` widget is ignored. |!Attribute |!Description | -|tiddler |The tiddler to edit (defaults to the [[WidgetVariable: currentTiddler]]) | +|tiddler |The tiddler to edit (defaults to the CurrentTiddler) | ! Configuration diff --git a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid index db07d1e68..6ff14fba1 100644 --- a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid @@ -15,7 +15,7 @@ By default, the edit text widget generates a `<textarea>` as the HTML editing el The content of the `<$edit-text>` widget is ignored. |!Attribute |!Description | -|tiddler |The tiddler to edit (defaults to the [[WidgetVariable: currentTiddler]]) | +|tiddler |The tiddler to edit (defaults to the CurrentTiddler) | |field |The field to edit (defaults to `text`). Takes precedence over the `index` attribute | |index |The index to edit | |default |The default text to be provided when the target tiddler doesn't exist | @@ -30,7 +30,7 @@ The content of the `<$edit-text>` widget is ignored. One trap to be aware of is that the edit text widget cannot be used to edit a field of the tiddler that contains it. Each keypress results in the tiddler being re-rendered, which loses the cursor position within the text field. -Instead, place the edit text widget in a [[template|TiddlerTemplates]] that references the tiddler you want to modify. +Instead, place the edit text widget in a [[template|TemplateTiddlers]] that references the tiddler you want to modify. For example, if you wanted to edit the value of the "myconfig" field of the tiddler "AppSettings", you might do so by creating a separate tiddler "ChangeAppSettings" that contains the following: diff --git a/editions/tw5.com/tiddlers/widgets/EditWidget.tid b/editions/tw5.com/tiddlers/widgets/EditWidget.tid index 83b648d4e..fa7422371 100644 --- a/editions/tw5.com/tiddlers/widgets/EditWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/EditWidget.tid @@ -13,7 +13,7 @@ The edit widget provides a general purpose interface for editing a tiddler. It d The content of the `<$edit>` widget is ignored. |!Attribute |!Description | -|tiddler |The tiddler to edit (defaults to the [[WidgetVariable: currentTiddler]]) | +|tiddler |The tiddler to edit (defaults to the CurrentTiddler) | |field |The field to edit (defaults to `text`). Takes precedence over the `index` attribute | |index |The index to edit | |class |A CSS class to be added the generated editing widget | diff --git a/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid b/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid index 326b29ff6..a4933af80 100644 --- a/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/FieldManglerWidget.tid @@ -20,4 +20,4 @@ The field mangler widget manipulates the fields and tags of a tiddler. It does s The field mangler widget displays any contained content, and responds to [[Messages]] dispatched within it. |!Attribute |!Description | -|tiddler |Title of the tiddler to manipulate (defaults to the [[WidgetVariable: currentTiddler]]) | +|tiddler |Title of the tiddler to manipulate (defaults to the CurrentTiddler) | diff --git a/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid b/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid index 9d068ce61..9e81ba094 100644 --- a/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/FieldsWidget.tid @@ -22,7 +22,7 @@ The provided template is rendered with the following special substitutions: The content of the `<$fields>` widget is ignored. |!Attribute |!Description | -|tiddler |Title of the tiddler from which the fields are to be displayed (defaults to the [[WidgetVariable: currentTiddler]]) | +|tiddler |Title of the tiddler from which the fields are to be displayed (defaults to the CurrentTiddler) | |template |Text of the template (see above) | |exclude |Lists of fields to be excluded (defaults to "text") | |stripTitlePrefix |If set to "yes" then curly bracketed prefixes are removed from titles (for example `{prefix}HelloThere` converts to `HelloThere`) | diff --git a/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid b/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid index f18eea3c1..950153eb9 100644 --- a/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid @@ -14,8 +14,8 @@ The keyboard widget allows [[Messages]] to be generated in response to key press The content of the `<$keyboard>` widget is rendered normally. The keyboard shortcut only takes effect within the contained content. |!Attribute |!Description | -|message |The title of the WidgetMessage to generate | -|param |The parameter to be passed with the WidgetMessage | +|message |The title of the [[WidgetMessage|Messages]] to generate | +|param |The parameter to be passed with the [[WidgetMessage|Messages]] | |key |Key string identifying the key to be trapped (see below) | |class |A CSS class to be assigned to the generated HTML DIV element | diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid index 29d163acb..db885e11e 100644 --- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid @@ -9,7 +9,7 @@ The `link` widget generates links to tiddlers. (Use the HTML `<a>` element to ge ! Content and Attributes |!Attribute |!Description | -|to |The title of the target tiddler for the link (defaults to the [[WidgetVariable: currentTiddler]]) | +|to |The title of the target tiddler for the link (defaults to the CurrentTiddler) | |aria-label |Optional [[Accessibility]] label | |tooltip |Optional tooltip WikiText | diff --git a/editions/tw5.com/tiddlers/widgets/ListWidget.tid b/editions/tw5.com/tiddlers/widgets/ListWidget.tid index 6bc9aaf1d..3efd64b82 100644 --- a/editions/tw5.com/tiddlers/widgets/ListWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ListWidget.tid @@ -20,7 +20,7 @@ The tiddlers can either be displayed by transcluding each in turn through an opt The content of the `<$list>` widget is an optional template to use for rendering each tiddler in the list (alternatively, the template can be specified as a tiddler title in the ``template`` attribute). |!Attribute |!Description | -|filter |The TiddlerFilter to display | +|filter |The [[tiddler filter|Filters]] to display | |template |The title of a template tiddler for rendering each tiddler in the list | |editTemplate |An alternative template to use for DraftTiddlers in edit mode | |variable |The [[widget variable|WidgetVariables]] name to be assigned the title of each tiddler in the list. Defaults to ''currentTiddler'' | diff --git a/editions/tw5.com/tiddlers/widgets/RadioWidget.tid b/editions/tw5.com/tiddlers/widgets/RadioWidget.tid index 2b520fbf8..a0aa5f496 100644 --- a/editions/tw5.com/tiddlers/widgets/RadioWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/RadioWidget.tid @@ -14,7 +14,7 @@ The radio widget displays an HTML `<input type="radio">` that reflects whether The content of the `<$radio>` widget is displayed within an HTML `<label>` element also containing the radio button. This means that clicking on the content will have the same effect as clicking on the button itself. |!Attribute |!Description | -|tiddler |Title of the tiddler to manipulate (defaults to the [[WidgetVariable: currentTiddler]]) | +|tiddler |Title of the tiddler to manipulate (defaults to the CurrentTiddler) | |field |The name of the field to which the radio button will be bound | |value |The value for the tiddler field | |class |CSS classes to be assigned to the label around the radio button | diff --git a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid index 0bafa0241..54799aca1 100644 --- a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid @@ -34,10 +34,10 @@ Retaining the content when hidden can give poor performance since the hidden con Here's a simple example of showing and hiding content with buttons: -<<wikitext-example-without-html '<$button set="$:/SampleRevealState" setTo="show">Show me</$button> -<$button set="$:/SampleRevealState" setTo="hide">Hide me</$button> +<<wikitext-example-without-html '<$button set="$:/SampleRevealState1" setTo="show">Show me</$button> +<$button set="$:/SampleRevealState1" setTo="hide">Hide me</$button> -<$reveal type="match" state="$:/SampleRevealState" text="show"> +<$reveal type="match" state="$:/SampleRevealState1" text="show"> ! This is the revealed content And this is some text @@ -48,14 +48,14 @@ And this is some text A slider appears as a single button that can be used to toggle the display of the contained content. -<<wikitext-example-without-html '<$reveal type="nomatch" state="$:/SampleRevealState" text="show"> +<<wikitext-example-without-html '<$reveal type="nomatch" state="$:/SampleRevealState2" text="show"> -<$button set="$:/SampleRevealState" setTo="show">Show me</$button> +<$button set="$:/SampleRevealState2" setTo="show">Show me</$button> </$reveal> -<$reveal type="match" state="$:/SampleRevealState" text="show"> +<$reveal type="match" state="$:/SampleRevealState2" text="show"> -<$button set="$:/SampleRevealState" setTo="hide">Hide me</$button> +<$button set="$:/SampleRevealState2" setTo="hide">Hide me</$button> ! This is the revealed content And this is some text diff --git a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid index 963d0826e..e7d11bf55 100644 --- a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid @@ -13,7 +13,7 @@ The view widget displays the contents of a tiddler field in a specified format. The content of the `<$view>` widget is displayed if the field or property is missing or empty. |!Attribute |!Description | -|tiddler |The title of the tiddler (defaults to the [[WidgetVariable: currentTiddler]]) | +|tiddler |The title of the tiddler (defaults to the CurrentTiddler) | |field |The name of the field to view (defaults to "text") | |index |The name of the index to view | |format |The format for displaying the field (see below) | diff --git a/editions/tw5.com/tiddlers/wikitext/Macros in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Macros in WikiText.tid index aa242e4c1..0872f26b8 100644 --- a/editions/tw5.com/tiddlers/wikitext/Macros in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Macros in WikiText.tid @@ -71,3 +71,20 @@ By using triple-double quotes you can specify parameter values that include sing Rodentville, Ratland.""">> ``` + +! Invoked + +There are many different ways to invoke macro.A macro called `italicise` that takes a single parameter called `text` can be invoked in any of these ways: + +``` +<<italicise "Text to be made into italics">> +<<italicise text:"Text to be made into italics">> +<$macrocall $name="italicise" text="Text to be made into italics"/> +<$macrocall $name="italicise" text={{Title of tiddler containing text to be italicised}}/> +<$macrocall $name="italicise" text=<<textMaker "Another macro to generate the text to be italicised">>/> +``` + +''also see'' + +* [[Macros]] +* [[MacroCallWidget]] diff --git a/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid index fe0df8844..9e1978996 100644 --- a/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid @@ -9,7 +9,7 @@ You can incorporate the content of one tiddler within another using the transclu * `{{MyTiddler}}` transcludes a single tiddler * `{{MyTiddler||TemplateTitle}}` displays the tiddler through a specified [[TemplateTiddler|TemplateTiddlers]] -* `{{||TemplateTitle}}` displays the specified template tiddler without altering the [[current tiddler|WidgetVariable: currentTiddler]] +* `{{||TemplateTitle}}` displays the specified template tiddler without altering the CurrentTiddler You can also use a TextReference instead of a tiddler title: diff --git a/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid index cdbf85ec4..0374fd081 100644 --- a/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid +++ b/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid @@ -1,5 +1,5 @@ created: 20140904140300000 -modified: 20140916130530304 +modified: 20141010093319359 tags: [[Working with TiddlyWiki]] title: Creating and editing tiddlers type: text/vnd.tiddlywiki @@ -8,6 +8,10 @@ type: text/vnd.tiddlywiki You create a tiddler either by clicking the {{$:/core/images/new-button}} button in the sidebar, or by clicking on a link to a missing tiddler (links to missing tiddlers will appear in [[blue italic text]]). +See also: + +* [[Creating journal tiddlers]] + ! Editing tiddlers You can edit an existing tiddler by clicking the {{$:/core/images/edit-button}} button at the top right of the tiddler. diff --git a/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid new file mode 100644 index 000000000..62f7efe94 --- /dev/null +++ b/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid @@ -0,0 +1,36 @@ +created: 20141010093214683 +modified: 20141010093214683 +tags: [[Working with TiddlyWiki]] +title: Creating journal tiddlers +type: text/vnd.tiddlywiki + +! Introduction + +Journal tiddlers are tiddlers that use a date and/or time as their title. They are typically used as a quick way to record time-stamped information. + +Additional tags on a journal tiddler can be used to link it to other tiddlers, helping to establish the relationships between items of information. + +For example, a journal tiddler called "11th October 2014" might be used to record thoughts and information captured on that particular day. The tags "Shopping" and "New York" might be used to indicate that the entry concerns shopping in New York. + +! Creating a journal tiddler + +The easiest way to create a journal tiddler is to use the ''new journal'' button in the tools tab of the sidebar. If you find yourself often using the button then click the checkbox to display the button in the page control toolbar where it is more easily accessible. + +The new journal button creates the journal tiddler as a blank tiddler with the tag "Journal" and a title derived from todays date. If there is already an existing journal tiddler then it is opened for editing. + +! Creating a tagged journal tiddler + +A common sequence of actions is creating (or re-opening) todays journal and adding a tag for the current tiddler. This can be done with the ''new journal here'' button in the tiddler toolbar (you can find this button in the tools tab of the tiddler info panel). + +For example, one might be reviewing a tiddler called "Times Square" and realise that it is relevant for planning the shopping trip. Clicking the ''new journal here'' button on the "Times Square" tiddler will bring up a journal tagged with "Times Square". + +! Customising journal tiddlers + +Visit the control panel Info/Basics tab to configure new journal creation: + +* "Title of new journal tiddlers" specifies the naming of journal tiddlers as a [[date format string|DateFormat]]. The default setting of "DDth MMM YYYY" causes new journals to have titles of the form "11th October 2014" +* "Tags for new journal tiddlers" specifies one or more optional tags that are automatically applied to new journal tiddlers. Multiple tags should be separated with spaces. Tags containing spaces should be surrounded by double square brackes. For example: `Journal [[Multi-word tag]]` + +One useful hint is to use a title format such as `YYYY-0MM-0DD at 0hhh0mm'0ss''` which causes the time (including seconds) to be included in the journal title. This means that a new, separate journal tiddler will be created each time the button is clicked. + + diff --git a/editions/tw5.com/tiddlers/workingwithtw/Navigating between open tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Navigating between open tiddlers.tid index e9b02099b..aab29639b 100644 --- a/editions/tw5.com/tiddlers/workingwithtw/Navigating between open tiddlers.tid +++ b/editions/tw5.com/tiddlers/workingwithtw/Navigating between open tiddlers.tid @@ -1,10 +1,10 @@ created: 20140908092600000 -modified: 20140919154732676 +modified: 20141010184954582 tags: [[Working with TiddlyWiki]] title: Navigating between open tiddlers type: text/vnd.tiddlywiki -In the default 'classic' storyview mode, open tiddlers are displayed in a vertical column called the 'story river.' There are a number of ways you can 'navigate the story river' - that is, how you can jump back and forth between the open tiddlers. +In the default 'classic' storyview mode, open tiddlers are displayed in a vertical column called the 'story river.' There are a number of ways you can navigate the story river - that is, how you can jump back and forth between the open tiddlers. * One obvious way is to ''scroll the page up and down'' using the story river scrollbar to the right. diff --git a/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid b/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid index 390ab1b35..3b30e2e6e 100644 --- a/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid +++ b/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid @@ -1,12 +1,12 @@ created: 20140908093600000 -modified: 20140919155030759 +modified: 20141010184816361 tags: [[Working with TiddlyWiki]] title: Using links to navigate between tiddlers type: text/vnd.tiddlywiki You can use internal hyperlinks (links between tiddlers, normally displayed in blue text) to navigate between your tiddlers. Clicking on a link to any tiddler will take you to that tiddler. If the tiddler is closed, it will be opened. The wonderful thing about ~Tiddlywiki is that it has made links to tiddlers as accessible as possible. There are links everywhere! Here are the key places where you can find links to tiddlers in ~TiddlyWiki: -* You can ''create a link'' to a tiddler, whether it exists yet or not, in the body of any tiddler. See [[Linking in Wikitext]] to see the various, easy ways to create links between tiddlers. +* You can ''create a link'' to a tiddler, whether it exists yet or not, in the body of any tiddler. See [[Linking in WikiText]] to see the various, easy ways to create links between tiddlers. * Each ''tag pill'' found in your tiddler (such as the 'Working with ~TiddlyWiki' tag pill under the title of this tiddler) contains a link to that tag tiddler, as well a lists of all the tiddlers tagged with that tag. This allows you to go to any of those tiddlers. @@ -48,6 +48,6 @@ You can use internal hyperlinks (links between tiddlers, normally displayed in b * Finally, you can create your own custom lists of tiddlers by various methods: -** You can transclude a TiddlerFilter (see [[Transclusion in WikiText]]). For example, adding `{{ [tag[mountain]] }}` to a tiddler will insert a list of all tiddlers tagged with 'mountain'. +** You can transclude a [[filter|Filters]] (see [[Transclusion in WikiText]]). For example, adding `{{{ [tag[mountain]] }}}` to a tiddler will insert a list of all tiddlers tagged with 'mountain'. -** You can use the ListWidget. This is more complicated than transcluding a ~TiddlerFilter, but in return allows you more flexibility in designing and displaying the list exactly as you want it to appear. +** You can use the ListWidget. This is more complicated than transcluding a [[filter|Filters]], but in return allows you more flexibility in designing and displaying the list exactly as you want it to appear. diff --git a/editions/tw5.com/tiddlers/workingwithtw/Working with TiddlyWiki.tid b/editions/tw5.com/tiddlers/workingwithtw/Working with TiddlyWiki.tid index ebf627860..fb4d217ca 100644 --- a/editions/tw5.com/tiddlers/workingwithtw/Working with TiddlyWiki.tid +++ b/editions/tw5.com/tiddlers/workingwithtw/Working with TiddlyWiki.tid @@ -1,5 +1,5 @@ created: 20140904101100000 -list: [[The First Rule of Using TiddlyWiki]] GettingStarted [[Getting Started Video]] Upgrading [[Navigating between open tiddlers]] [[Using links to navigate between tiddlers]] [[Searching in TiddlyWiki]] [[Creating and editing tiddlers]] Saving [[Formatting text in TiddlyWiki]] [[Structuring TiddlyWiki]] Tagging [[Images in WikiText]] KeyboardShortcuts Encryption +list: [[The First Rule of Using TiddlyWiki]] GettingStarted [[Getting Started Video]] Upgrading [[Navigating between open tiddlers]] [[Using links to navigate between tiddlers]] [[Searching in TiddlyWiki]] [[Creating and editing tiddlers]] [[Creating journal tiddlers]] Saving [[Formatting text in TiddlyWiki]] [[Structuring TiddlyWiki]] Tagging [[Images in WikiText]] KeyboardShortcuts Encryption modified: 20140919191122898 tags: TableOfContents title: Working with TiddlyWiki diff --git a/languages/de-AT/Dates.multids b/languages/de-AT/Dates.multids new file mode 100644 index 000000000..cf4610a4b --- /dev/null +++ b/languages/de-AT/Dates.multids @@ -0,0 +1,5 @@ +title: $:/language/ + +# The rest of the elements is part of languages/de-DE/Dates.multids +Date/Long/Month/1: Jänner +Date/Short/Month/1: Jän diff --git a/languages/de-DE/Buttons.multids b/languages/de-DE/Buttons.multids index aa5d8c645..408efa01c 100644 --- a/languages/de-DE/Buttons.multids +++ b/languages/de-DE/Buttons.multids @@ -31,17 +31,23 @@ Import/Hint: Importiere Dateien Info/Caption: info Info/Hint: Informationen zu diesem Tiddler anzeigen Home/Caption: home -Home/Hint: Öffnen der standard (default) Tiddler +Home/Hint: Öffnen der Standard-Tiddler Language/Caption: Sprache -Language/Hint: Auswahl Dialog für die System Sprache -NewTiddler/Caption: neuer Tiddler -NewTiddler/Hint: Erstelle einen neuen Tiddler +Language/Hint: Auswahldialog für die Systemsprache More/Caption: mehr More/Hint: Weitere Aktionen +NewHere/Caption: neu hier +NewHere/Hint: Erstelle einen neuen Tiddler der mit diesem getaggt ist +NewJournal/Caption: neues Journal +NewJournal/Hint: Erstelle einen neuen Journal-Tiddler +NewJournalHere/Caption: neues Journal hier +NewJournalHere/Hint: Erstelle ein neues Journal der mit diesem getaggt ist +NewTiddler/Caption: neuer Tiddler +NewTiddler/Hint: Erstelle einen neuen Tiddler Permalink/Caption: permalink -Permalink/Hint: Die Browser Adressleiste enthält einen Link zu diesem Tiddler +Permalink/Hint: Die Adressleiste des Browsers enthält einen Link zu diesem Tiddler Permaview/Caption: permaview -Permaview/Hint: Die Browser Adressleiste enthält einen Link zu allen offenen Tiddlern in dieser "Story" +Permaview/Hint: Die Adressleiste des Browsers enthält einen Link zu allen offenen Tiddlern in dieser [[Story]] Refresh/Caption: aktualisieren Refresh/Hint: Die Seite wird neu in den Browser geladen Save/Caption: speichern @@ -49,7 +55,7 @@ Save/Hint: Speichere diesen Tiddler SaveWiki/Caption: Speichern SaveWiki/Hint: Das Wiki speichern StoryView/Caption: Story Modus -StoryView/Hint: Auswahl des Anzeige Modus für die "Story" +StoryView/Hint: Auswahl des Anzeigemodus für die [[Story]] HideSideBar/Caption: Sidebar ausblenden HideSideBar/Hint: Sidebar ausblenden ShowSideBar/Caption: Sidebar einblenden diff --git a/languages/de-DE/ControlPanel.multids b/languages/de-DE/ControlPanel.multids index 22d63c535..a81a0437b 100755 --- a/languages/de-DE/ControlPanel.multids +++ b/languages/de-DE/ControlPanel.multids @@ -3,13 +3,15 @@ title: $:/language/ControlPanel/ Advanced/Caption: Erweitert Advanced/Hint: Interne Informationen über dieses ~TiddlyWiki. Appearance/Caption: Design -Appearance/Hint: Möglichkeiten um das Aussehen ihres ~TiddlyWiki's anzupassen. +Appearance/Hint: Möglichkeiten um das Aussehen Ihres ~TiddlyWiki's anzupassen. Basics/AnimDuration/Prompt: Animation Dauer: Basics/Caption: Basis -Basics/DefaultTiddlers/BottomHint: Verwenden sie [[doppelte eckige Klammern]] für Titel mit Leerzeichen oder wählen sie <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">Offene Tiddler beim Laden wiederherstellen.</$button> -Basics/DefaultTiddlers/Prompt: Standard Tiddler: +Basics/DefaultTiddlers/BottomHint: Verwenden Sie [[doppelte eckige Klammern]] für Titel mit Leerzeichen oder wählen Sie <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">Offene Tiddler beim Laden wiederherstellen.</$button> +Basics/DefaultTiddlers/Prompt: Standard-Tiddler: Basics/DefaultTiddlers/TopHint: Tiddler, die beim Start geladen werden: Basics/Language/Prompt: Hallo! Aktuelle Sprache: +Basics/NewJournal/Title/Prompt: Titel des neuen Journal-Tiddlers +Basics/NewJournal/Tags/Prompt: Tags des neuen Journal-Tiddlers Basics/OverriddenShadowTiddlers/Prompt: Anzahl überschriebener Schatten-Tiddler: Basics/ShadowTiddlers/Prompt: Anzahl Schatten-Tiddler: Basics/Subtitle/Prompt: Untertitel: @@ -17,7 +19,7 @@ Basics/SystemTiddlers/Prompt: Anzahl System-Tiddler: Basics/Tags/Prompt: Anzahl Tags: Basics/Tiddlers/Prompt: Anzahl Tiddler: Basics/Title/Prompt: Titel dieses ~TiddlyWikis: -Basics/Username/Prompt: Benutzer Signatur zum editieren: +Basics/Username/Prompt: Benutzersignatur zum editieren: Basics/Version/Prompt: ~TiddlyWiki Version: EditorTypes/Caption: Editor Typen EditorTypes/Editor/Caption: Editor @@ -26,10 +28,10 @@ EditorTypes/Type/Caption: MIME-Type Info/Caption: Info Info/Hint: Informationen über dieses TiddlyWiki LoadedModules/Caption: Geladene Module -LoadedModules/Hint: Hier werden die geladenen Module und ihre Quelltext Komponenten angezeigt. Mit "italic" hervorgehobene Tiddler wurden während des Boot-Prozesses erstellt. Diese Tiddler haben keinen Quelltext. +LoadedModules/Hint: Hier werden die geladenen Module und ihre Quelltext-Komponenten angezeigt. Kursiv hervorgehobene Tiddler haben keinen Quelltext. Sie werden während des Boot-Prozesses (Aufrufen des Tiddlywikis) erstellt. Palette/Caption: Palette Palette/Editor/Clone/Caption: Palette klonen -Palette/Editor/Clone/Prompt: Es wird empfohlen, dass sie diese Schatten-Palette klonen, bevor sie sie bearbeiten. Der Name der Palette wird im Tiddler Feld "description" eingestellt. +Palette/Editor/Clone/Prompt: Es wird empfohlen, dass Sie diese Schatten-Palette klonen, bevor Sie sie bearbeiten. Der Name der Palette wird im Tiddler-Feld "description" eingestellt. Palette/Editor/Prompt/Modified: Diese Schatten-Palette wurde bearbeitet. Palette/Editor/Prompt: Bearbeiten Palette/Editor/Reset/Caption: Palette zurücksetzen @@ -38,11 +40,11 @@ Palette/Prompt: Ausgewählte Farbpalette: Palette/ShowEditor/Caption: Editor zeigen Plugins/Caption: Plugins Plugins/Disable/Caption: deaktivieren -Plugins/Disable/Hint: Deaktivieren sie dieses Plugin beim nächsten Laden der Seite. +Plugins/Disable/Hint: Deaktivieren Sie dieses Plugin beim nächsten Laden der Seite. Plugins/Disabled/Status: (deaktiviert) Plugins/Empty/Hint: keine Plugins/Enable/Caption: aktivieren -Plugins/Enable/Hint: Aktivieren sie dieses Plugin beim nächsten Laden der Seite. +Plugins/Enable/Hint: Aktivieren Sie dieses Plugin beim nächsten Laden der Seite. Plugins/Language/Prompt: Sprachen Plugins/Plugin/Prompt: Plugins Plugins/Theme/Prompt: Themen @@ -51,11 +53,12 @@ Saving/Heading: Speichern Saving/TiddlySpot/Advanced/Heading: Erweiterte Einstellungen Saving/TiddlySpot/BackupDir: "Backup" Verzeichnis Saving/TiddlySpot/Backups: "Backups" +Saving/TiddlySpot/Description: Diese Einstellungen sind nur für http://tiddlyspot.com und kompatible Server aktiv! Saving/TiddlySpot/Filename: "Upload" Dateiname Saving/TiddlySpot/Heading: ~TiddlySpot -Saving/TiddlySpot/Hint: //Die standard Server URL ist `http://<wikiname>.tiddlyspot.com/store.cgi` und kann im Feld 'Server URL' verändert werden.// +Saving/TiddlySpot/Hint: //Die standard Server-URL ist `http://<wikiname>.tiddlyspot.com/store.cgi` und kann im Feld 'Server-URL' verändert werden.// Saving/TiddlySpot/Password: Passwort -Saving/TiddlySpot/ServerURL: Server URL +Saving/TiddlySpot/ServerURL: Server-URL Saving/TiddlySpot/UploadDir: "Upload" Verzeichnis Saving/TiddlySpot/UserName: Wiki Name Settings/AutoSave/Caption: Automatisch speichern @@ -63,10 +66,10 @@ Settings/AutoSave/Disabled/Description: Änderungen NICHT automatisch speichern Settings/AutoSave/Enabled/Description: Änderungen automatisch speichern Settings/AutoSave/Hint: Änderungen des Wikis automatisch speichern Settings/Caption: Einstellungen -Settings/Hint: Diese erweiterten Einstellungen ermöglichen ihnen, das Verhalten von TiddlyWiki zu ändern. +Settings/Hint: Diese erweiterten Einstellungen ermöglichen Ihnen, das Verhalten von TiddlyWiki zu ändern. Settings/NavigationAddressBar/Caption: Navigation Adresszeile -Settings/NavigationAddressBar/Hint: Verhalten der Browser Adresszeile, wenn ein Tiddler geöffnet wird: -Settings/NavigationAddressBar/No/Description: Die Browser Adresszeile wird nicht verändert. +Settings/NavigationAddressBar/Hint: Verhalten der Adresszeile des Browsers, wenn ein Tiddler geöffnet wird: +Settings/NavigationAddressBar/No/Description: Die Adresszeile des Browsers wird nicht verändert. Settings/NavigationAddressBar/Permalink/Description: Den aktuellen Tiddler einbinden. Settings/NavigationAddressBar/Permaview/Description: Alle geöffneten Tiddler einbinden. Settings/NavigationHistory/Caption: Browser Chronik @@ -82,7 +85,7 @@ StoryView/Prompt: Ausgewählte Anzeige: Theme/Caption: Thema Theme/Prompt: Ausgewähltes Thema: TiddlerFields/Caption: Tiddler Felder -TiddlerFields/Hint: Hier finden sie alle [[Felder|TiddlerFields]], die in diesem Wiki verwendet werden. Inklusive der Felder aus System-, exklusive Schatten-Tiddler. +TiddlerFields/Hint: Hier finden Sie alle [[Felder|TiddlerFields]], die in diesem Wiki verwendet werden. Inklusive der Felder aus System-, exklusive Schatten-Tiddler. Toolbars/Caption: Toolbar Toolbars/EditToolbar/Caption: Edit Toolbar Toolbars/EditToolbar/Hint: Auswählen, welche Buttons im "Edit Modus" angezeigt werden: diff --git a/languages/de-DE/Dates.multids b/languages/de-DE/Dates.multids new file mode 100644 index 000000000..ff028f0f6 --- /dev/null +++ b/languages/de-DE/Dates.multids @@ -0,0 +1,87 @@ +title: $:/language/ + +Date/DaySuffix/1: . +Date/DaySuffix/2: . +Date/DaySuffix/3: . +Date/DaySuffix/4: . +Date/DaySuffix/5: . +Date/DaySuffix/6: . +Date/DaySuffix/7: . +Date/DaySuffix/8: . +Date/DaySuffix/9: . +Date/DaySuffix/10: . +Date/DaySuffix/11: . +Date/DaySuffix/12: . +Date/DaySuffix/13: . +Date/DaySuffix/14: . +Date/DaySuffix/15: . +Date/DaySuffix/16: . +Date/DaySuffix/17: . +Date/DaySuffix/18: . +Date/DaySuffix/19: . +Date/DaySuffix/20: . +Date/DaySuffix/21: . +Date/DaySuffix/22: . +Date/DaySuffix/23: . +Date/DaySuffix/24: . +Date/DaySuffix/25: . +Date/DaySuffix/26: . +Date/DaySuffix/27: . +Date/DaySuffix/28: . +Date/DaySuffix/29: . +Date/DaySuffix/30: . +Date/DaySuffix/31: . +Date/Long/Day/0: Sonntag +Date/Long/Day/1: Montag +Date/Long/Day/2: Dienstag +Date/Long/Day/3: Mittwoch +Date/Long/Day/4: Donnerstag +Date/Long/Day/5: Freitag +Date/Long/Day/6: Samstag +Date/Long/Month/1: Januar +Date/Long/Month/2: Februar +Date/Long/Month/3: März +Date/Long/Month/4: April +Date/Long/Month/5: Mai +Date/Long/Month/6: Juni +Date/Long/Month/7: Juli +Date/Long/Month/8: August +Date/Long/Month/9: September +Date/Long/Month/10: Oktober +Date/Long/Month/11: November +Date/Long/Month/12: Dezember +Date/Period/am: am +Date/Period/pm: pm +Date/Short/Day/0: So +Date/Short/Day/1: Mo +Date/Short/Day/2: Di +Date/Short/Day/3: Mi +Date/Short/Day/4: Do +Date/Short/Day/5: Fr +Date/Short/Day/6: Sa +Date/Short/Month/1: Jan +Date/Short/Month/2: Feb +Date/Short/Month/3: Mär +Date/Short/Month/4: Apr +Date/Short/Month/5: Mai +Date/Short/Month/6: Jun +Date/Short/Month/7: Jul +Date/Short/Month/8: Aug +Date/Short/Month/9: Sep +Date/Short/Month/10: Okt +Date/Short/Month/11: Nov +Date/Short/Month/12: Dez +RelativeDate/Future/Days: in <<period>> Tagen +RelativeDate/Future/Hours: in <<period>> Stunden +RelativeDate/Future/Minutes: in <<period>> Minuten +RelativeDate/Future/Months: in <<period>> Monaten +RelativeDate/Future/Second: in einer Sekunde +RelativeDate/Future/Seconds: in <<period>> Sekunden +RelativeDate/Future/Years: in <<period>> Jahren +RelativeDate/Past/Days: vor <<period>> Tagen +RelativeDate/Past/Hours: vor <<period>> Stunden +RelativeDate/Past/Minutes: vor <<period>> Minuten +RelativeDate/Past/Months: vor <<period>> Monaten +RelativeDate/Past/Second: vor einer Sekunde +RelativeDate/Past/Seconds: vor <<period>> Sekunden +RelativeDate/Past/Years: vor <<period>> Jahren diff --git a/languages/de-DE/Docs/ModuleTypes.multids b/languages/de-DE/Docs/ModuleTypes.multids index 582644717..1a001df29 100644 --- a/languages/de-DE/Docs/ModuleTypes.multids +++ b/languages/de-DE/Docs/ModuleTypes.multids @@ -1,21 +1,21 @@ title: $:/language/Docs/ModuleTypes/ animation: Animationen, die vom RevealWidget verwendet werden. -command: Kommandozeilen Parameter, die mit node.js ausgeführt werden können. +command: Kommandozeilen-Parameter, die mit node.js ausgeführt werden können. config: Daten, die in `$tw.config` eingefügt werden. -filteroperator: Individuelle Filter Operator Funktionen. +filteroperator: Individuelle Funktionen für den Filter-Operator. global: Globale Daten, die in `$tw` eingefügt werden. -isfilteroperator: Operanden, für den ''is'' Filter Operator. -macro: Globale JavaScript Macro Definitionen. +isfilteroperator: Operanden für den Filter-Operator: ''is'' +macro: Globale Macro-Definitionen in JavaScript. parser: Parser für verschiedene Tiddler Typen. saver: "Savers" stellen verschiedene Methoden zum Speichern mit dem Browser zur Verfügung. -startup: Initialisierungs Funktionen. -storyview: "Story View" ist für das Verhalten des "ListWidget's" zuständig, das die Tiddler "Hauptanzeige" verwaltet. -tiddlerdeserializer: Konvertiert unterschiedliche "Inhalts Typen" in das Tiddler Format. -tiddlerfield: Definiert das Verhalten, der unterschiedlichen Tiddler Felder. +startup: Funktionen zur Initialisierung. +storyview: "[[Story View|Story]]" ist für das Verhalten des "ListWidgets" zuständig, das die Tiddler "Hauptanzeige" verwaltet. Mit dem Toolbutton "Story Modus" wird einer dieser Modi ausgewählt. +tiddlerdeserializer: Konvertiert verschiedene textbasierte Inhaltstypen in das Tiddler-Format. +tiddlerfield: Definiert das Verhalten, der unterschiedlichen Tiddler-Felder. tiddlermethod: Methoden werden dem `$tw.Tiddler` Prototypen hinzugefügt. utils: Methoden werden `$tw.utils` hinzugefügt. -utils-node: Erweitert `$tw.utils` mit node.js spezifischen Methoden. -widget: Widgets verarbeiten das "Rendern" und "Aktualisieren" der Anzeige in der DOM. +utils-node: Erweitert `$tw.utils` mit Methoden aus node.js. +widget: Widgets verarbeiten das Rendern und Aktualisieren der Anzeige in der DOM. wikimethod: Methoden werden zu `$tw.Wiki` hinzugefügt. -wikirule: Enthält die individuellen "Parser Regeln" für den WikiText Parser. +wikirule: Enthält die individuellen Parser Regeln für den WikiText-Parser. diff --git a/languages/de-DE/EditTemplate.multids b/languages/de-DE/EditTemplate.multids index b05f1118a..d65cda1d6 100644 --- a/languages/de-DE/EditTemplate.multids +++ b/languages/de-DE/EditTemplate.multids @@ -1,7 +1,7 @@ title: $:/language/EditTemplate/ Body/External/Hint: Diese ist ein externer Tiddler, der nicht im TW file gespeichert ist. Sie können die "Tags" und "Feld" Texte ändern, jedoch nicht den Inhalt des Tiddlers! -Body/Hint: Verwenden sie [[WikiText|http://tiddlywiki.com/static/WikiText.html]] zum Formatieren. +Body/Hint: Verwenden Sie zum Formatieren [[WikiText|http://tiddlywiki.com/static/WikiText.html]]. Body/Placeholder: Geben Sie den Text für diesen Tiddler ein. Body/Preview/Button/Hide: Vorschau aus Body/Preview/Button/Show: Vorschau @@ -10,8 +10,8 @@ Fields/Add/Name/Placeholder: Feld Name Fields/Add/Prompt: Feld einfügen: Fields/Add/Value/Placeholder: Feld Text / Wert Shadow/Warning: Dies ist ein Schatten-Tiddler. Jede Änderung überschreibt die Standardversion. -Shadow/OverriddenWarning: Dies ist ein veränderter Tiddler. Um zur Standardversion zurück zu kehren, löschen sie diesen Tiddler. +Shadow/OverriddenWarning: Dies ist ein veränderter Tiddler. Um zur Standardversion zurückzukehren, löschen Sie diesen Tiddler. Tags/Add/Button: ok Tags/Add/Placeholder: neuer Tag Type/Placeholder: Tiddler Format -Type/Prompt: Type: +Type/Prompt: Typ: diff --git a/languages/de-DE/GettingStarted.tid b/languages/de-DE/GettingStarted.tid index 5e3ebd6db..4a714cc70 100755 --- a/languages/de-DE/GettingStarted.tid +++ b/languages/de-DE/GettingStarted.tid @@ -2,7 +2,7 @@ title: GettingStarted Willkommen bei TiddlyWiki, einem persönlichen nicht-linearen Web-Notizbuch. -Vor dem Start, vergewissern sie sich, dass sie dieses Wiki auch wirklich speichern können. Weitere Informationen finden sie für: +Vor dem Start, vergewissern Sie sich, dass Sie dieses Wiki auch wirklich speichern können. Weitere Informationen finden Sie für: * Österreich: http://tiddlywiki.com/languages/de-AT * Deutschland: http://tiddlywiki.com/languages/de-DE @@ -10,9 +10,9 @@ Vor dem Start, vergewissern sie sich, dass sie dieses Wiki auch wirklich speiche Erste Schritte: -* Erstellen sie einen neuen Tiddler mit dem "Plus-Button" in der rechten Navigationsleiste. +* Erstellen Sie einen neuen Tiddler mit dem "Plus-Button" in der rechten Navigationsleiste. * Einstellungen können im [[Kontrollpanel|$:/ControlPanel]] vorgenommen werden. Siehe: "Zahnrad-Button" -** Das Anzeigen dieses Tiddlers können sie verhindern, indem sie die "~DefaultTiddlers" im ''Basis-Tab'' verändern. +** Das Anzeigen dieses Tiddlers können Sie verhindern, indem Sie die "~DefaultTiddlers" im ''Basis-Tab'' verändern. * Speichern wird mit dem "Speichern-Button" in der Navigationsleiste ausgelöst. * Österreich: [[Weitere Informationen zu WikiText|http://tiddlywiki.com/languages/de-AT/index.html#WikiText]] * Deutschland: [[Weitere Informationen zu WikiText|http://tiddlywiki.com/languages/de-DE/index.html#WikiText]] diff --git a/languages/de-DE/Misc.multids b/languages/de-DE/Misc.multids index 0a369b278..3139e8e84 100644 --- a/languages/de-DE/Misc.multids +++ b/languages/de-DE/Misc.multids @@ -1,33 +1,22 @@ title: $:/language/ BinaryWarning/Prompt: Dieser Tiddler enthält binäre Daten. -ClassicWarning/Hint: Dieser Tiddler wurde im TiddlyWiki Classic Format erstellt. Dieses Format ist nur teilweise kompatibel mit TiddlyWiki Version 5. Mehr Info finden sie unter: http://tiddlywiki.com/static/Upgrading.html +ClassicWarning/Hint: Dieser Tiddler wurde im TiddlyWiki Classic Format erstellt. Dieses Format ist nur teilweise kompatibel mit TiddlyWiki Version 5. Mehr Info finden Sie unter: http://tiddlywiki.com/static/Upgrading.html ClassicWarning/Upgrade/Caption: upgrade CloseAll/Button: alle schließen -ConfirmCancelTiddler: Wollen sie die Änderungen im Tiddler: "<$text text=<<title>>/>" verwerfen? -ConfirmDeleteTiddler: Wollen sie den Tiddler: "<$text text=<<title>>/>" löschen? +ConfirmCancelTiddler: Wollen Sie die Änderungen im Tiddler: "<$text text=<<title>>/>" verwerfen? +ConfirmDeleteTiddler: Wollen Sie den Tiddler: "<$text text=<<title>>/>" löschen? ConfirmOverwriteTiddler: Tiddler: "<$text text=<<title>>/>" existiert! OK überschreibt den tiddler! -ConfirmEditShadowTiddler: Sie sind dabei, einen Schatten-Tiddler zu verändern. Zukünftige, automatische Anpassungen werden dadurch unterdrückt. Sie können ihre Änderungen rückgängig machen, indem sie diesen Tiddler wieder löschen. Wollen sie den Tiddler: "<$text text=<<title>>/>" ändern? +ConfirmEditShadowTiddler: Sie sind dabei, einen Schatten-Tiddler zu verändern. Zukünftige, automatische Anpassungen werden dadurch unterdrückt. Sie können Ihre Änderungen rückgängig machen, indem Sie diesen Tiddler wieder löschen. Wollen Sie den Tiddler: "<$text text=<<title>>/>" ändern? +DefaultNewTiddlerTitle: Neuer Tiddler DropMessage: Hierher ziehen (oder Escape um abzubrechen) +Encryption/ConfirmClearPassword: Wollen Sie das Passwort löschen? Damit wird die Verschlüsselung beim nächsten Speichervorgang abgeschalten! +Encryption/PromptSetPassword: Der TiddlyWiki Inhalt wird mit dem nächsten Speichern verschlüsselt! InvalidFieldName: Das Feld: "<$text text=<<fieldName>>/>" enthält illegale Zeichen. Felder müssen klein geschrieben werden. Erlaubte Sonderzeichen sind: Zahlen, Unterstrich (`_`), Minus (`-`) und Punkt (`.`). -MissingTiddler/Hint: Fehlender Tiddler "<$text text=<<currentTiddler>>/>" - klicken sie {{$:/core/images/edit-button}} um ihn zu erzeugen. -RecentChanges/DateFormat: DDth MMM YYYY -RelativeDate/Future/Days: in <<period>> Tagen -RelativeDate/Future/Hours: in <<period>> Stunden -RelativeDate/Future/Minutes: in <<period>> Minuten -RelativeDate/Future/Months: in <<period>> Monaten -RelativeDate/Future/Second: in einer Sekunde -RelativeDate/Future/Seconds: in <<period>> Sekunden -RelativeDate/Future/Years: in <<period>> Jahren -RelativeDate/Past/Days: vor <<period>> Tagen -RelativeDate/Past/Hours: vor <<period>> Stunden -RelativeDate/Past/Minutes: vor <<period>> Minuten -RelativeDate/Past/Months: vor <<period>> Monaten -RelativeDate/Past/Second: vor einer Sekunde -RelativeDate/Past/Seconds: vor <<period>> Sekunden -RelativeDate/Past/Years: vor <<period>> Jahren +MissingTiddler/Hint: Fehlender Tiddler "<$text text=<<currentTiddler>>/>" - klicken Sie {{$:/core/images/edit-button}} um ihn zu erzeugen. +RecentChanges/DateFormat: YYYY MMM DD SystemTiddler/Tooltip: Das ist ein System-Tiddler TagManager/Colour/Heading: Farbe TagManager/Icon/Heading: Symbol TagManager/Tag/Heading: Tag -UnsavedChangesWarning: TiddlyWiki wurde geändert, aber noch nicht gespeichert! \ No newline at end of file +UnsavedChangesWarning: TiddlyWiki wurde geändert, aber noch nicht gespeichert! diff --git a/languages/de-DE/Modals/Download.tid b/languages/de-DE/Modals/Download.tid index ae7cd7946..4c816d029 100644 --- a/languages/de-DE/Modals/Download.tid +++ b/languages/de-DE/Modals/Download.tid @@ -6,8 +6,8 @@ help: http://tiddlywiki.com/static/DownloadingChanges.html Ihr Browser unterstützt nur manuelles Speichern. -Um das geänderte Wiki zu speichern, machen sie einen "rechts klick" auf den folgenden Link. Wählen sie "Datei herunterladen" oder "Datei speichern" und wählen sie Name und Verzeichnis. +Um das geänderte Wiki zu speichern, machen Sie einen "rechts klick" auf den folgenden Link. Wählen Sie "Datei herunterladen" oder "Datei speichern" und wählen Sie Name und Verzeichnis. -//Sie können den Vorgang etwas beschleunigen, indem sie die "Control-Taste" (Windows) oder die "Options/Alt-Taste" (Max OS X) drücken. Es wird kein "Speichern Dialog" erscheinen. Jedoch wird bei einigen Browsern die Datei einen zufälligen Namen bekommen. Sie müssen die Datei eventuell umbenennen, um sie öffnen zu können.// +//Sie können den Vorgang etwas beschleunigen, indem Sie die "Control-Taste" (Windows) oder die "Options/Alt-Taste" (Max OS X) drücken. Es wird kein "Speichern Dialog" erscheinen. Jedoch wird bei einigen Browsern die Datei einen zufälligen Namen bekommen. Sie müssen die Datei eventuell umbenennen, um sie öffnen zu können.// -Bei "Smartphones", die das Speichern von Dateien nicht erlauben, können sie ein Lesezeichen erstellen, dass mit ihrem PC synchronisiert wird. Dort können sie die Dateien dann wie gewohnt speichern. +Bei "Smartphones", die das Speichern von Dateien nicht erlauben, können Sie ein Lesezeichen erstellen, dass mit Ihrem PC synchronisiert wird. Dort können Sie die Dateien dann wie gewohnt speichern. diff --git a/languages/de-DE/Modals/SaveInstructions.tid b/languages/de-DE/Modals/SaveInstructions.tid index caf65e688..f34cf0f63 100644 --- a/languages/de-DE/Modals/SaveInstructions.tid +++ b/languages/de-DE/Modals/SaveInstructions.tid @@ -8,16 +8,16 @@ Ihre Änderungen sollen als ~TiddlyWiki HTML Datei gespeichert werden. !!! Desktop Browser -# Verwenden sie ''Speichern unter'' aus dem ''Datei'' Menü. -# Wählen sie den Dateinamen und das Verzeichnis. +# Verwenden Sie ''Speichern unter'' aus dem ''Datei'' Menü. +# Wählen Sie den Dateinamen und das Verzeichnis. -#* Bei einigen Browsern müssen sie das Format explizit angeben. Zb: ''Webseite, nur HTML'' oder ähnliches. +#* Bei einigen Browsern müssen Sie das Format explizit angeben. Zb: ''Webseite, nur HTML'' oder ähnliches. # Den Browser-Tab schließen. !!! Smartphone Browser -# Erstellen sie ein "Lesezeichen" -#* Wenn sie "iCloud" oder "Google Sync" verwenden, dann werden ihre Daten automatisch mit dem Desktop PC synchronisiert. Dort können sie wie oben beschrieben fortfahren. +# Erstellen Sie ein "Lesezeichen" +#* Wenn Sie "iCloud" oder "Google Sync" verwenden, dann werden Ihre Daten automatisch mit dem Desktop PC synchronisiert. Dort können Sie wie oben beschrieben fortfahren. # Den Browser-Tab schließen. -//Wenn sie das Lesezeichen mit "Mobile Safari" öffnen, dann wird diese Meldung erneut angezeigt. Klicken sie ''Schließen'' um fort zu fahren.// +//Wenn Sie das Lesezeichen mit "Mobile Safari" öffnen, dann wird diese Meldung erneut angezeigt. Klicken Sie ''Schließen'' um fort zu fahren.// diff --git a/languages/de-DE/NewJournal.multids b/languages/de-DE/NewJournal.multids new file mode 100644 index 000000000..1a3cb24c3 --- /dev/null +++ b/languages/de-DE/NewJournal.multids @@ -0,0 +1,4 @@ +title: $:/config/NewJournal/ + +Title: YYYY MMM 0DD +Tags: Journal diff --git a/languages/de-DE/TiddlerInfo.multids b/languages/de-DE/TiddlerInfo.multids index 19049a811..122890677 100755 --- a/languages/de-DE/TiddlerInfo.multids +++ b/languages/de-DE/TiddlerInfo.multids @@ -8,7 +8,7 @@ Advanced/ShadowInfo/Heading: Shatten Status Advanced/ShadowInfo/NotShadow/Hint: Der Tiddler: <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> ist kein Schatten-Tiddler. Advanced/ShadowInfo/Shadow/Hint: Der Tiddler: <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> ist ein Schatten-Tiddler. Advanced/ShadowInfo/Shadow/Source: Er ist definiert im Plugin: <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link>. -Advanced/ShadowInfo/OverriddenShadow/Hint: Der originale Schatten-Tiddler wurde durch diesen Tiddler überschrieben. Wenn sie diesen Tiddler löschen, wird der originale Schatten-Tiddler wieder aktiv. Vorher eventuell eine Sicherungskopie erstellen! +Advanced/ShadowInfo/OverriddenShadow/Hint: Der originale Schatten-Tiddler wurde durch diesen Tiddler überschrieben. Wenn Sie diesen Tiddler löschen, wird der originale Schatten-Tiddler wieder aktiv. Vorher eventuell eine Sicherungskopie erstellen! Fields/Caption: Felder List/Caption: Liste List/Empty: Dieser Tiddler hat kein "list" Feld. diff --git a/languages/fr-FR/Buttons.multids b/languages/fr-FR/Buttons.multids index 4b0a59ca7..ed2cf0398 100644 --- a/languages/fr-FR/Buttons.multids +++ b/languages/fr-FR/Buttons.multids @@ -34,10 +34,16 @@ Home/Caption: accueil Home/Hint: Ouvre les tiddlers par défaut Language/Caption: langue Language/Hint: Choix de la langue pour l'interface utilisateur +NewJournal/Caption: nouveau journal +NewJournal/Hint: Crée un nouveau tiddler journal +NewJournalHere/Caption: nouveau journal, ici +NewJournalHere/Hint: Crée un nouveau tiddler journal avec pour tag le tiddler courant NewTiddler/Caption: nouveau tiddler NewTiddler/Hint: Créer un nouveau tiddler More/Caption: plus More/Hint: Autres actions +NewHere/Caption: nouveau, ici +NewHere/Hint: Crée un nouveau tiddler avec pour tag le tiddler courant Permalink/Caption: permalink Permalink/Hint: Remplacer l'URL dans la barre d'adresse du navigateur par un lien direct vers ce tiddler Permaview/Caption: permaview diff --git a/languages/fr-FR/ControlPanel.multids b/languages/fr-FR/ControlPanel.multids index 5a0e05e5a..06606c60e 100644 --- a/languages/fr-FR/ControlPanel.multids +++ b/languages/fr-FR/ControlPanel.multids @@ -10,6 +10,8 @@ Basics/DefaultTiddlers/BottomHint: Utilisez les [[crochets doubles]& Basics/DefaultTiddlers/Prompt: Tiddlers par défaut Basics/DefaultTiddlers/TopHint: Liste des tiddlers qui seront affichés au démarrage : Basics/Language/Prompt: Bonjour ! Langue active : +Basics/NewJournal/Title/Prompt: Modèle pour les titres des tiddlers journaux +Basics/NewJournal/Tags/Prompt: Tags pour les nouveaux tiddlers journaux Basics/OverriddenShadowTiddlers/Prompt: Nombre de tiddlers //shadow// remplacés Basics/ShadowTiddlers/Prompt: Nombre de tiddlers //shadow// Basics/Subtitle/Prompt: Sous-titre diff --git a/languages/fr-FR/Dates.multids b/languages/fr-FR/Dates.multids new file mode 100644 index 000000000..5de36a34a --- /dev/null +++ b/languages/fr-FR/Dates.multids @@ -0,0 +1,87 @@ +title: $:/language/ + +Date/DaySuffix/1: er +Date/DaySuffix/2: +Date/DaySuffix/3: +Date/DaySuffix/4: +Date/DaySuffix/5: +Date/DaySuffix/6: +Date/DaySuffix/7: +Date/DaySuffix/8: +Date/DaySuffix/9: +Date/DaySuffix/10: +Date/DaySuffix/11: +Date/DaySuffix/12: +Date/DaySuffix/13: +Date/DaySuffix/14: +Date/DaySuffix/15: +Date/DaySuffix/16: +Date/DaySuffix/17: +Date/DaySuffix/18: +Date/DaySuffix/19: +Date/DaySuffix/20: +Date/DaySuffix/21: +Date/DaySuffix/22: +Date/DaySuffix/23: +Date/DaySuffix/24: +Date/DaySuffix/25: +Date/DaySuffix/26: +Date/DaySuffix/27: +Date/DaySuffix/28: +Date/DaySuffix/29: +Date/DaySuffix/30: +Date/DaySuffix/31: +Date/Long/Day/0: Dimanche +Date/Long/Day/1: Lundi +Date/Long/Day/2: Mardi +Date/Long/Day/3: Mercredi +Date/Long/Day/4: Jeudi +Date/Long/Day/5: Vendredi +Date/Long/Day/6: Samedi +Date/Long/Month/1: Janvier +Date/Long/Month/2: Février +Date/Long/Month/3: Mars +Date/Long/Month/4: Avril +Date/Long/Month/5: Mai +Date/Long/Month/6: Juin +Date/Long/Month/7: Juillet +Date/Long/Month/8: Août +Date/Long/Month/9: Septembre +Date/Long/Month/10: Octobre +Date/Long/Month/11: Novembre +Date/Long/Month/12: Décembre +Date/Period/am: am +Date/Period/pm: pm +Date/Short/Day/0: Di +Date/Short/Day/1: Lu +Date/Short/Day/2: Ma +Date/Short/Day/3: Me +Date/Short/Day/4: Je +Date/Short/Day/5: Ve +Date/Short/Day/6: Sa +Date/Short/Month/1: Jan +Date/Short/Month/2: Fév +Date/Short/Month/3: Mar +Date/Short/Month/4: Avr +Date/Short/Month/5: Mai +Date/Short/Month/6: Jun +Date/Short/Month/7: Jul +Date/Short/Month/8: Aoû +Date/Short/Month/9: Sep +Date/Short/Month/10: Oct +Date/Short/Month/11: Nov +Date/Short/Month/12: Déc +RelativeDate/Future/Days: dans <<period>> jours +RelativeDate/Future/Hours: dans <<period>> heures +RelativeDate/Future/Minutes: dans <<period>> minutes +RelativeDate/Future/Months: dans <<period>> mois +RelativeDate/Future/Second: dans 1 seconde +RelativeDate/Future/Seconds: dans <<period>> secondes +RelativeDate/Future/Years: dans <<period>> ans +RelativeDate/Past/Days: il y a <<period>> jours +RelativeDate/Past/Hours: il y a <<period>> heures +RelativeDate/Past/Minutes: il y a <<period>> minutes +RelativeDate/Past/Months: il y a <<period>> mois +RelativeDate/Past/Second: il y a 1 seconde +RelativeDate/Past/Seconds: il y a <<period>> secondes +RelativeDate/Past/Years: il y a <<period>> ans diff --git a/languages/fr-FR/Misc.multids b/languages/fr-FR/Misc.multids index 952405799..b57f2ce7a 100644 --- a/languages/fr-FR/Misc.multids +++ b/languages/fr-FR/Misc.multids @@ -8,24 +8,13 @@ ConfirmCancelTiddler: Souhaitez-vous annuler les modifications apportées au tid ConfirmDeleteTiddler: Souhaitez-vous supprimer le tiddler « <$text text=<<title>>/> » ? ConfirmOverwriteTiddler: Souhaitez-vous supplanter le tiddler « <$text text=<<title>>/> » ? ConfirmEditShadowTiddler: Vous êtes sur le point d'éditer un ShadowTiddler. Toute modification supplantera la version par défaut du système, rendant les prochaines mises à jour non-triviales. Êtes-vous sûr(e) de vouloir éditer "<$text text=<<title>>/>"? +DefaultNewTiddlerTitle: Nouveau tiddler DropMessage: Lâcher ici (ou appuyer sur « escape » pour annuler) +Encryption/ConfirmClearPassword: Souhaitez-vous supprimer ce mot de passe ? Si oui, ce wiki ne sera plus chiffré au moment de la sauvegarde +Encryption/PromptSetPassword: Indiquer un nouveau mot de passe pour ce TiddlyWiki InvalidFieldName: Caractères illicites dans le nom du champ « <$text text=<<fieldName>>/> ». Les champs ne peuvent contenir que des lettres minuscules non accentuées et les caractères souligné (`_`), tiret (`-`) et point (`.`) MissingTiddler/Hint: Le tiddler « <$text text=<<currentTiddler>>/> » est manquant - cliquez sur {{$:/core/images/edit-button}} pour le créer RecentChanges/DateFormat: DD MMM YYYY -RelativeDate/Future/Days: dans <<period>> jours -RelativeDate/Future/Hours: dans <<period>> heures -RelativeDate/Future/Minutes: dans <<period>> minutes -RelativeDate/Future/Months: dans <<period>> mois -RelativeDate/Future/Second: dans 1 seconde -RelativeDate/Future/Seconds: dans <<period>> secondes -RelativeDate/Future/Years: dans <<period>> ans -RelativeDate/Past/Days: il y a <<period>> jours -RelativeDate/Past/Hours: il y a <<period>> heures -RelativeDate/Past/Minutes: il y a <<period>> minutes -RelativeDate/Past/Months: il y a <<period>> mois -RelativeDate/Past/Second: il y a 1 seconde -RelativeDate/Past/Seconds: il y a <<period>> secondes -RelativeDate/Past/Years: il y a <<period>> ans SystemTiddler/Tooltip: Ceci est un tiddler système TagManager/Colour/Heading: Couleur TagManager/Icon/Heading: Icone diff --git a/languages/fr-FR/NewJournal.multids b/languages/fr-FR/NewJournal.multids new file mode 100644 index 000000000..bb517bab4 --- /dev/null +++ b/languages/fr-FR/NewJournal.multids @@ -0,0 +1,4 @@ +title: $:/config/NewJournal/ + +Title: DD MMM YYYY +Tags: Journal diff --git a/languages/ja-JP/Dates.multids b/languages/ja-JP/Dates.multids new file mode 100644 index 000000000..3ca817b8a --- /dev/null +++ b/languages/ja-JP/Dates.multids @@ -0,0 +1,16 @@ +title: $:/language/ + +RelativeDate/Future/Days: <<period>> 日後 +RelativeDate/Future/Hours: <<period>> 時間後 +RelativeDate/Future/Minutes: <<period>> 分後 +RelativeDate/Future/Months: <<period>> か月後 +RelativeDate/Future/Second: 1 秒後 +RelativeDate/Future/Seconds: <<period>> 秒後 +RelativeDate/Future/Years: <<period>> 年後 +RelativeDate/Past/Days: <<period>> 日前 +RelativeDate/Past/Hours: <<period>> 時間前 +RelativeDate/Past/Minutes: <<period>> 分前 +RelativeDate/Past/Months: <<period>> か月前 +RelativeDate/Past/Second: 1 秒前 +RelativeDate/Past/Seconds: <<period>> 秒前 +RelativeDate/Past/Years: <<period>> 年前 diff --git a/languages/ja-JP/Misc.multids b/languages/ja-JP/Misc.multids index 4e6fba3cd..f8bbdfc02 100644 --- a/languages/ja-JP/Misc.multids +++ b/languages/ja-JP/Misc.multids @@ -8,20 +8,6 @@ ConfirmOverwriteTiddler: 本当にこの tiddler "<$text text=<<title>>/>" を InvalidFieldName: フィールド名に不正な文字が使われています "<$text text=<<fieldName>>/>". フィールド名に使用できるのは英小文字かアンダースコア(`_`)、ハイフン(`-`)、ピリオド(`.`)のみです。 MissingTiddler/Hint: 未作成の tiddler "<$text text=<<currentTiddler>>/>" - クリック {{$:/core/images/edit-button}} して作成 RecentChanges/DateFormat: YYYY-MM-DD -RelativeDate/Future/Days: <<period>> 日後 -RelativeDate/Future/Hours: <<period>> 時間後 -RelativeDate/Future/Minutes: <<period>> 分後 -RelativeDate/Future/Months: <<period>> か月後 -RelativeDate/Future/Second: 1 秒後 -RelativeDate/Future/Seconds: <<period>> 秒後 -RelativeDate/Future/Years: <<period>> 年後 -RelativeDate/Past/Days: <<period>> 日前 -RelativeDate/Past/Hours: <<period>> 時間前 -RelativeDate/Past/Minutes: <<period>> 分前 -RelativeDate/Past/Months: <<period>> か月前 -RelativeDate/Past/Second: 1 秒前 -RelativeDate/Past/Seconds: <<period>> 秒前 -RelativeDate/Past/Years: <<period>> 年前 SystemTiddler/Tooltip: これはシステム tiddler です TagManager/Colour/Heading: 色 TagManager/Icon/Heading: アイコン diff --git a/languages/ru-RU/Dates.multids b/languages/ru-RU/Dates.multids new file mode 100644 index 000000000..ed1fb207b --- /dev/null +++ b/languages/ru-RU/Dates.multids @@ -0,0 +1,16 @@ +title: $:/language/ + +RelativeDate/Future/Days: через <<period>> дней +RelativeDate/Future/Hours: через <<period>> часов +RelativeDate/Future/Minutes: через <<period>> минут +RelativeDate/Future/Months: через <<period>> месяцев +RelativeDate/Future/Second: через 1 секунду +RelativeDate/Future/Seconds: через <<period>> секунд +RelativeDate/Future/Years: через <<period>> лет +RelativeDate/Past/Days: <<period>> дней назад +RelativeDate/Past/Hours: <<period>> часов назад +RelativeDate/Past/Minutes: <<period>> минут назад +RelativeDate/Past/Months: <<period>> месяцев назад +RelativeDate/Past/Second: 1 секунду назад +RelativeDate/Past/Seconds: <<period>> секунд назад +RelativeDate/Past/Years: <<period>> лет назад diff --git a/languages/ru-RU/Misc.multids b/languages/ru-RU/Misc.multids index eb47864b8..b61fbcf4c 100644 --- a/languages/ru-RU/Misc.multids +++ b/languages/ru-RU/Misc.multids @@ -12,20 +12,6 @@ DropMessage: Перетащите сюда (или нажмите escape для InvalidFieldName: Недопустимые символы в названии поля "<$text text=<<fieldName>>/>". Поля могут содержать только латинские буквы нижнего регистра, цифры и символы: подчеркивание (`_`), дефис (`-`) и точку (`.`) MissingTiddler/Hint: Заметка "<$text text=<<currentTiddler>>/>" отсутствует - нажмите {{$:/core/images/edit-button}} чтобы её создать RecentChanges/DateFormat: DD MMM YYYY -RelativeDate/Future/Days: через <<period>> дней -RelativeDate/Future/Hours: через <<period>> часов -RelativeDate/Future/Minutes: через <<period>> минут -RelativeDate/Future/Months: через <<period>> месяцев -RelativeDate/Future/Second: через 1 секунду -RelativeDate/Future/Seconds: через <<period>> секунд -RelativeDate/Future/Years: через <<period>> лет -RelativeDate/Past/Days: <<period>> дней назад -RelativeDate/Past/Hours: <<period>> часов назад -RelativeDate/Past/Minutes: <<period>> минут назад -RelativeDate/Past/Months: <<period>> месяцев назад -RelativeDate/Past/Second: 1 секунду назад -RelativeDate/Past/Seconds: <<period>> секунд назад -RelativeDate/Past/Years: <<period>> лет назад SystemTiddler/Tooltip: Это системная заметка TagManager/Colour/Heading: Цвет TagManager/Icon/Heading: Значок diff --git a/languages/zh-Hans/Buttons.multids b/languages/zh-Hans/Buttons.multids index 68d2a750f..add90e9b2 100644 --- a/languages/zh-Hans/Buttons.multids +++ b/languages/zh-Hans/Buttons.multids @@ -36,8 +36,14 @@ Language/Caption: 语言 Language/Hint: 选择用户介面语言 More/Caption: 更多 More/Hint: 更多动作 +NewHere/Caption: 添加子条目 +NewHere/Hint: 创建一个标签为此条目名称的新条目 +NewJournal/Caption: 添加日志 +NewJournal/Hint: 创建一个新的日志条目 +NewJournalHere/Caption: 添加子日志 +NewJournalHere/Hint: 创建一个标签含此条目名称的新日志条目 NewTiddler/Caption: 添加条目 -NewTiddler/Hint: 创建一新条目 +NewTiddler/Hint: 创建一个新的条目 Permalink/Caption: 引用连结 Permalink/Hint: 设置浏览器网址栏为直接连结到此条目 Permaview/Caption: 永久连结 diff --git a/languages/zh-Hans/ControlPanel.multids b/languages/zh-Hans/ControlPanel.multids index eb8575bcb..6bb58317c 100644 --- a/languages/zh-Hans/ControlPanel.multids +++ b/languages/zh-Hans/ControlPanel.multids @@ -10,6 +10,8 @@ Basics/DefaultTiddlers/BottomHint: 标题含空白时请使用 [[双中 Basics/DefaultTiddlers/Prompt: 首页： Basics/DefaultTiddlers/TopHint: 默认开启的条目： Basics/Language/Prompt: 您好！当前的语言： +Basics/NewJournal/Title/Prompt: 新日志条目的名称 +Basics/NewJournal/Tags/Prompt: 新日志条目的标签 Basics/OverriddenShadowTiddlers/Prompt: 被覆写的默认条目数量： Basics/ShadowTiddlers/Prompt: 默认条目数量： Basics/Subtitle/Prompt: 副标题： diff --git a/languages/zh-Hans/Dates.multids b/languages/zh-Hans/Dates.multids new file mode 100644 index 000000000..1cbf41b53 --- /dev/null +++ b/languages/zh-Hans/Dates.multids @@ -0,0 +1,56 @@ +title: $:/language/ + +Date/Long/Day/0: 周日 +Date/Long/Day/1: 周一 +Date/Long/Day/2: 周二 +Date/Long/Day/3: 周三 +Date/Long/Day/4: 周四 +Date/Long/Day/5: 周五 +Date/Long/Day/6: 周六 +Date/Long/Month/1: 一月 +Date/Long/Month/2: 二月 +Date/Long/Month/3: 三月 +Date/Long/Month/4: 四月 +Date/Long/Month/5: 五月 +Date/Long/Month/6: 六月 +Date/Long/Month/7: 七月 +Date/Long/Month/8: 八月 +Date/Long/Month/9: 九月 +Date/Long/Month/10: 十月 +Date/Long/Month/11: 十一月 +Date/Long/Month/12: 十二月 +Date/Period/am: 上午 +Date/Period/pm: 下午 +Date/Short/Day/0: 日 +Date/Short/Day/1: 一 +Date/Short/Day/2: 二 +Date/Short/Day/3: 三 +Date/Short/Day/4: 四 +Date/Short/Day/5: 五 +Date/Short/Day/6: 六 +Date/Short/Month/1: 01月 +Date/Short/Month/2: 02月 +Date/Short/Month/3: 03月 +Date/Short/Month/4: 04月 +Date/Short/Month/5: 05月 +Date/Short/Month/6: 06月 +Date/Short/Month/7: 07月 +Date/Short/Month/8: 08月 +Date/Short/Month/9: 09月 +Date/Short/Month/10: 10月 +Date/Short/Month/11: 11月 +Date/Short/Month/12: 12月 +RelativeDate/Future/Days: <<period>> 天后 +RelativeDate/Future/Hours: <<period>> 小时后 +RelativeDate/Future/Minutes: <<period>> 分钟后 +RelativeDate/Future/Months: <<period>> 个月后 +RelativeDate/Future/Second: 1 秒后 +RelativeDate/Future/Seconds: <<period>> 秒后 +RelativeDate/Future/Years: <<period>> 年后 +RelativeDate/Past/Days: <<period>> 天前 +RelativeDate/Past/Hours: <<period>> 小时前 +RelativeDate/Past/Minutes: <<period>> 分钟前 +RelativeDate/Past/Months: <<period>> 个月前 +RelativeDate/Past/Second: 1 秒前 +RelativeDate/Past/Seconds: <<period>> 秒前 +RelativeDate/Past/Years: <<period>> 年前 diff --git a/languages/zh-Hans/Docs/ModuleTypes.multids b/languages/zh-Hans/Docs/ModuleTypes.multids index 015d5c652..010c8725c 100644 --- a/languages/zh-Hans/Docs/ModuleTypes.multids +++ b/languages/zh-Hans/Docs/ModuleTypes.multids @@ -14,6 +14,7 @@ storyview: 查看模式用以自订 list 小工具的动画与行为。 tiddlerdeserializer: 转换不同内容类型至条目。 tiddlerfield: 定义个别条目栏位的行为。 tiddlermethod: 添加方法至 `$tw.Tiddler` 原型。 +upgrader: 于升级/导入过程中，套用升级处理至条目。 utils: 添加方法至 `$tw.utils`。 utils-node: 将特定于 Node.js 的方法添加到 '$tw.utils'。 widget: 封装 DOM 渲染和刷新的小工具。 diff --git a/languages/zh-Hans/Misc.multids b/languages/zh-Hans/Misc.multids index 326e00522..85b6e50e3 100644 --- a/languages/zh-Hans/Misc.multids +++ b/languages/zh-Hans/Misc.multids @@ -8,24 +8,13 @@ ConfirmCancelTiddler: 您确定要放弃对条目 "<$text text=<<title>>/>" 的 ConfirmDeleteTiddler: 您确定要删除条目 "<$text text=<<title>>/>"？ ConfirmOverwriteTiddler: 您确定要覆写条目 "<$text text=<<title>>/>"？ ConfirmEditShadowTiddler: 您即将要编辑默认条目，任何更改将会覆盖默认的系统，使未来的升级不寻常。您确定要编辑 "<$text text=<<title>>/>"? +DefaultNewTiddlerTitle: 新条目 DropMessage: 拖放到此处 （或按 ESC 键取消） +Encryption/ConfirmClearPassword: 您要清除密码？这将移除保存此维基时套用的加密 +Encryption/PromptSetPassword: 为此 TiddlyWiki 设置一个新密码 InvalidFieldName: 栏位名称 "<$text text=<<fieldName>>/>" 包含无效字符，栏位名称只能包含小写字母、数字、底线 (`_`)、 连字号 (`-`) 和小数点 (`.`) MissingTiddler/Hint: 佚失条目 "<$text text=<<currentTiddler>>/>" - 点击 {{$:/core/images/edit-button}} 可创建此条目 RecentChanges/DateFormat: YYYY年0MM月0DD日 -RelativeDate/Future/Days: <<period>> 天后 -RelativeDate/Future/Hours: <<period>> 小时后 -RelativeDate/Future/Minutes: <<period>> 分钟后 -RelativeDate/Future/Months: <<period>> 个月后 -RelativeDate/Future/Second: 1 秒后 -RelativeDate/Future/Seconds: <<period>> 秒后 -RelativeDate/Future/Years: <<period>> 年后 -RelativeDate/Past/Days: <<period>> 天前 -RelativeDate/Past/Hours: <<period>> 小时前 -RelativeDate/Past/Minutes: <<period>> 分钟前 -RelativeDate/Past/Months: <<period>> 个月前 -RelativeDate/Past/Second: 1 秒前 -RelativeDate/Past/Seconds: <<period>> 秒前 -RelativeDate/Past/Years: <<period>> 年前 SystemTiddler/Tooltip: 此为系统条目 TagManager/Colour/Heading: 颜色 TagManager/Icon/Heading: 图标 diff --git a/languages/zh-Hans/NewJournal.multids b/languages/zh-Hans/NewJournal.multids new file mode 100644 index 000000000..5401f74a8 --- /dev/null +++ b/languages/zh-Hans/NewJournal.multids @@ -0,0 +1,4 @@ +title: $:/config/NewJournal/ + +Title: YYYY年0MM月0DD日 +Tags: 日志 diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids index 471c46ad0..7591526de 100644 --- a/languages/zh-Hant/Buttons.multids +++ b/languages/zh-Hant/Buttons.multids @@ -36,8 +36,14 @@ Language/Caption: 語言 Language/Hint: 選擇使用者介面語言 More/Caption: 更多 More/Hint: 更多動作 +NewHere/Caption: 新增子條目 +NewHere/Hint: 建立一個標籤為此條目名稱的新條目 +NewJournal/Caption: 新增日誌 +NewJournal/Hint: 建立一個新的日誌條目 +NewJournalHere/Caption: 新增子日誌 +NewJournalHere/Hint: 建立一個標籤含此條目名稱的新日誌條目 NewTiddler/Caption: 新增條目 -NewTiddler/Hint: 建立一新條目 +NewTiddler/Hint: 建立一個新的條目 Permalink/Caption: 引用連結 Permalink/Hint: 設定瀏覽器網址列為直接連結到此條目 Permaview/Caption: 固定連結 diff --git a/languages/zh-Hant/ControlPanel.multids b/languages/zh-Hant/ControlPanel.multids index e10dca7e8..83f47d4dc 100644 --- a/languages/zh-Hant/ControlPanel.multids +++ b/languages/zh-Hant/ControlPanel.multids @@ -10,6 +10,8 @@ Basics/DefaultTiddlers/BottomHint: 標題含空白時請使用 [[雙中 Basics/DefaultTiddlers/Prompt: 首頁： Basics/DefaultTiddlers/TopHint: 預設開啟的條目： Basics/Language/Prompt: 您好！當前的語言： +Basics/NewJournal/Title/Prompt: 新日誌條目的名稱 +Basics/NewJournal/Tags/Prompt: 新日誌條目的標籤 Basics/OverriddenShadowTiddlers/Prompt: 被覆寫的預設條目數量： Basics/ShadowTiddlers/Prompt: 預設條目數量： Basics/Subtitle/Prompt: 副標題： diff --git a/languages/zh-Hant/Dates.multids b/languages/zh-Hant/Dates.multids new file mode 100644 index 000000000..c9442b612 --- /dev/null +++ b/languages/zh-Hant/Dates.multids @@ -0,0 +1,56 @@ +title: $:/language/ + +Date/Long/Day/0: 星期日 +Date/Long/Day/1: 星期一 +Date/Long/Day/2: 星期二 +Date/Long/Day/3: 星期三 +Date/Long/Day/4: 星期四 +Date/Long/Day/5: 星期五 +Date/Long/Day/6: 星期六 +Date/Long/Month/1: 一月 +Date/Long/Month/2: 二月 +Date/Long/Month/3: 三月 +Date/Long/Month/4: 四月 +Date/Long/Month/5: 五月 +Date/Long/Month/6: 六月 +Date/Long/Month/7: 七月 +Date/Long/Month/8: 八月 +Date/Long/Month/9: 九月 +Date/Long/Month/10: 十月 +Date/Long/Month/11: 十一月 +Date/Long/Month/12: 十二月 +Date/Period/am: 上午 +Date/Period/pm: 下午 +Date/Short/Day/0: 日 +Date/Short/Day/1: 一 +Date/Short/Day/2: 二 +Date/Short/Day/3: 三 +Date/Short/Day/4: 四 +Date/Short/Day/5: 五 +Date/Short/Day/6: 六 +Date/Short/Month/1: 01月 +Date/Short/Month/2: 02月 +Date/Short/Month/3: 03月 +Date/Short/Month/4: 04月 +Date/Short/Month/5: 05月 +Date/Short/Month/6: 06月 +Date/Short/Month/7: 07月 +Date/Short/Month/8: 08月 +Date/Short/Month/9: 09月 +Date/Short/Month/10: 10月 +Date/Short/Month/11: 11月 +Date/Short/Month/12: 12月 +RelativeDate/Future/Days: <<period>> 天後 +RelativeDate/Future/Hours: <<period>> 小時後 +RelativeDate/Future/Minutes: <<period>> 分鐘後 +RelativeDate/Future/Months: <<period>> 個月後 +RelativeDate/Future/Second: 1 秒後 +RelativeDate/Future/Seconds: <<period>> 秒後 +RelativeDate/Future/Years: <<period>> 年後 +RelativeDate/Past/Days: <<period>> 天前 +RelativeDate/Past/Hours: <<period>> 小時前 +RelativeDate/Past/Minutes: <<period>> 分鐘前 +RelativeDate/Past/Months: <<period>> 個月前 +RelativeDate/Past/Second: 1 秒前 +RelativeDate/Past/Seconds: <<period>> 秒前 +RelativeDate/Past/Years: <<period>> 年前 diff --git a/languages/zh-Hant/Docs/ModuleTypes.multids b/languages/zh-Hant/Docs/ModuleTypes.multids index 0111f41e2..461652ce6 100644 --- a/languages/zh-Hant/Docs/ModuleTypes.multids +++ b/languages/zh-Hant/Docs/ModuleTypes.multids @@ -14,6 +14,7 @@ storyview: 檢視模式用以自訂 list 小工具的動畫與行為。 tiddlerdeserializer: 轉換不同內容類型至條目。 tiddlerfield: 定義個別條目欄位的行為。 tiddlermethod: 新增方法至 `$tw.Tiddler` 原型。 +upgrader: 於升級/導入過程中，套用升級處理至條目。 utils: 新增方法至 `$tw.utils`。 utils-node: 將特定於 Node.js 的方法新增到 '$tw.utils'。. widget: 封裝 DOM 渲染和刷新的小工具。 diff --git a/languages/zh-Hant/Misc.multids b/languages/zh-Hant/Misc.multids index e39a20c77..5f8338ea9 100644 --- a/languages/zh-Hant/Misc.multids +++ b/languages/zh-Hant/Misc.multids @@ -8,24 +8,13 @@ ConfirmCancelTiddler: 您確定要放棄對條目 "<$text text=<<title>>/>" 的 ConfirmDeleteTiddler: 您確定要刪除條目 "<$text text=<<title>>/>"？ ConfirmOverwriteTiddler: 您確定要覆寫條目 "<$text text=<<title>>/>"？ ConfirmEditShadowTiddler: 您即將要編輯預設條目，任何更改將會覆蓋預設的系統，使未來的升級不尋常。您確定要編輯 "<$text text=<<title>>/>"? +DefaultNewTiddlerTitle: 新條目 DropMessage: 拖放到此處 （或按 ESC 鍵取消） +Encryption/ConfirmClearPassword: 您要清除密碼？這將移除儲存此維基時套用的加密 +Encryption/PromptSetPassword: 為此 TiddlyWiki 設置一個新密碼 InvalidFieldName: 欄位名稱 "<$text text=<<fieldName>>/>" 包含無效字元，欄位名稱只能包含小寫字母、數字、底線 (`_`)、 連接號 (`-`) 和小數點 (`.`) MissingTiddler/Hint: 佚失條目 "<$text text=<<currentTiddler>>/>" - 點擊 {{$:/core/images/edit-button}} 可建立此條目 RecentChanges/DateFormat: YYYY年0MM月0DD日 -RelativeDate/Future/Days: <<period>> 天後 -RelativeDate/Future/Hours: <<period>> 小時後 -RelativeDate/Future/Minutes: <<period>> 分鐘後 -RelativeDate/Future/Months: <<period>> 個月後 -RelativeDate/Future/Second: 1 秒後 -RelativeDate/Future/Seconds: <<period>> 秒後 -RelativeDate/Future/Years: <<period>> 年後 -RelativeDate/Past/Days: <<period>> 天前 -RelativeDate/Past/Hours: <<period>> 小時前 -RelativeDate/Past/Minutes: <<period>> 分鐘前 -RelativeDate/Past/Months: <<period>> 個月前 -RelativeDate/Past/Second: 1 秒前 -RelativeDate/Past/Seconds: <<period>> 秒前 -RelativeDate/Past/Years: <<period>> 年前 SystemTiddler/Tooltip: 此為系統條目 TagManager/Colour/Heading: 顏色 TagManager/Icon/Heading: 圖示 diff --git a/languages/zh-Hant/NewJournal.multids b/languages/zh-Hant/NewJournal.multids new file mode 100644 index 000000000..1e06c7421 --- /dev/null +++ b/languages/zh-Hant/NewJournal.multids @@ -0,0 +1,4 @@ +title: $:/config/NewJournal/ + +Title: YYYY年0MM月0DD日 +Tags: 日誌 diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 6c3ab1f26..aaa073497 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -174,3 +174,5 @@ Ton Gerner, @gernert, 2014/09/19 Julie Bertrand, @Evolena, 2014/09/22 Andrey Yankin, @andrey013, 2014/09/30 + +David john, @fghhfg, 2014/10/06 diff --git a/plugins/tiddlywiki/katex/files/tiddlywiki.files b/plugins/tiddlywiki/katex/files/tiddlywiki.files index 1c290da42..522f9e7fe 100644 --- a/plugins/tiddlywiki/katex/files/tiddlywiki.files +++ b/plugins/tiddlywiki/katex/files/tiddlywiki.files @@ -78,7 +78,9 @@ "type": "application/javascript", "title": "$:/plugins/tiddlywiki/katex/katex.min.js", "module-type": "library" - } + }, + "prefix": "(function(document) {\n", + "suffix": "\n})($tw.node ? $tw.fakeDocument : window.document)\n" } ] } diff --git a/plugins/tiddlywiki/katex/wrapper.js b/plugins/tiddlywiki/katex/wrapper.js index 517ff5950..1e91d5223 100644 --- a/plugins/tiddlywiki/katex/wrapper.js +++ b/plugins/tiddlywiki/katex/wrapper.js @@ -37,7 +37,11 @@ KaTeXWidget.prototype.render = function(parent,nextSibling) { // Render it into a span var span = this.document.createElement("span"); try { - katex.render(text,span); + if($tw.browser) { + katex.render(text,span); + } else { + span.innerHTML = katex.renderToString(text); + } } catch(ex) { span.className = "tc-error"; span.textContent = ex; diff --git a/themes/tiddlywiki/stickytitles/styles.tid b/themes/tiddlywiki/stickytitles/styles.tid index 3276d5cfe..179a7084d 100644 --- a/themes/tiddlywiki/stickytitles/styles.tid +++ b/themes/tiddlywiki/stickytitles/styles.tid @@ -10,5 +10,5 @@ tags: [[$:/tags/Stylesheet]] position: -ms-sticky; position: sticky; top: 0px; - background: #fff; + background: <<colour tiddler-background>>; } diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 31c1da4da..618273a0c 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -260,6 +260,11 @@ button svg, button img { fill: <<colour muted-foreground>>; } +.tc-btn-text { + padding: 0; + margin: 0; +} + .tc-btn-big-green { padding: 8px; margin: 4px 8px 4px 8px; @@ -403,7 +408,9 @@ button.tc-untagged-label { } .tc-search a svg { - height: 0.75em; + width: 1.2em; + height: 1.2em; + vertical-align: middle; } .tc-search-results { @@ -706,7 +713,7 @@ canvas.tc-edit-bitmapeditor { line-height: 22px; } -.tc-tiddler-title, .tc-titlebar { +.tc-titlebar, .tc-tiddler-edit-title { overflow: hidden; /* https://github.com/Jermolene/TiddlyWiki5/issues/282 */ } @@ -850,6 +857,17 @@ canvas.tc-edit-bitmapeditor { width: 10%; } +/* +** Storyview Classes +*/ + +.tc-storyview-zoomin-tiddler { + position: absolute; + display: block; + width: 100%; + width: calc(100% - 84px); +} + /* ** Dropdowns */