From 4688190c965dd1464bf77f2db53e4ab16a915fce Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sun, 5 Jan 2014 16:33:01 +0000 Subject: [PATCH 1/4] Docs update --- editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid b/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid index 5ab82cb81..5035e26c9 100644 --- a/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid +++ b/editions/tw5.com/tiddlers/definitions/TiddlyWikiClassic.tid @@ -1,5 +1,5 @@ created: 20131222152210279 -modified: 20131222153004673 +modified: 20140105163248574 tags: definitions title: TiddlyWikiClassic type: text/vnd.tiddlywiki @@ -7,3 +7,7 @@ type: text/vnd.tiddlywiki "~TiddlyWiki Classic" refers to versions prior to 5.0, when TiddlyWiki was completely rewritten from the ground up. TiddlyWiki Classic is still being maintained at: http://classic.tiddlywiki.com/ + +MarioPietsch has started a site comparing the syntax and other changes between TiddlyWikiClassic and TiddlyWiki version 5: + +http://compare-tw2-tw5.tiddlyspace.com From 954901d78834be393f1ce53a9f42a079972b07fd Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sun, 5 Jan 2014 17:24:53 +0000 Subject: [PATCH 2/4] Start adding export options to the control panel --- core/ui/ControlPanel/Tools.tid | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/ui/ControlPanel/Tools.tid b/core/ui/ControlPanel/Tools.tid index 1fd1f2c6d..4a190e46e 100644 --- a/core/ui/ControlPanel/Tools.tid +++ b/core/ui/ControlPanel/Tools.tid @@ -8,6 +8,10 @@ caption: Tools Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). You can also drag and drop files directly to the browser window. +! Export + +<$button message="tw-download-file" param="$:/core/templates/alltiddlers.template.html" class="btn-big-green">Download all tiddlers as static HTML {{$:/core/images/save-button}} + ! Encryption {{$:/snippets/encryptionstatus}} From f2409d4245bbba0ccdf39186dca6a0cbf16d8759 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Tue, 7 Jan 2014 11:09:56 +0000 Subject: [PATCH 3/4] Fixed problem with positioning of the sidebar in the centralised theme --- themes/tiddlywiki/centralised/styles.tid | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/tiddlywiki/centralised/styles.tid b/themes/tiddlywiki/centralised/styles.tid index 4ef4ba7c7..dd8948448 100644 --- a/themes/tiddlywiki/centralised/styles.tid +++ b/themes/tiddlywiki/centralised/styles.tid @@ -5,11 +5,11 @@ tags: [[$:/tags/stylesheet]] @media (min-width: 770px) { - .tw-page-container { + html .tw-page-container { text-align: center; } - .story-river { + html .story-river { position: relative; width: 770px; padding: 42px; @@ -17,7 +17,7 @@ tags: [[$:/tags/stylesheet]] text-align: left; } - .sidebar-header { + html .sidebar-header { text-align: left; left: 50%; right: 0; From d57010d2fb3f18d485a5dfb394322da118068527 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Tue, 7 Jan 2014 11:57:42 +0000 Subject: [PATCH 4/4] Docs updates --- .../tiddlers/concepts/ContextTiddler.tid | 6 --- .../tiddlers/concepts/CurrentTiddler.tid | 7 ++++ .../tiddlers/concepts/TemplateTiddlers.tid | 40 +++++++++++++++++++ .../tiddlers/concepts/TiddlerFilters.tid | 4 +- .../tiddlers/widgets/TiddlerWidget.tid | 9 +++-- .../wikitext/Transclusion in WikiText.tid | 4 +- 6 files changed, 56 insertions(+), 14 deletions(-) delete mode 100644 editions/tw5.com/tiddlers/concepts/ContextTiddler.tid create mode 100644 editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid create mode 100644 editions/tw5.com/tiddlers/concepts/TemplateTiddlers.tid diff --git a/editions/tw5.com/tiddlers/concepts/ContextTiddler.tid b/editions/tw5.com/tiddlers/concepts/ContextTiddler.tid deleted file mode 100644 index 5132be1e3..000000000 --- a/editions/tw5.com/tiddlers/concepts/ContextTiddler.tid +++ /dev/null @@ -1,6 +0,0 @@ -created: 201308251449 -modified: 201308251449 -tags: concepts -title: ContextTiddler - -The ContextTiddler 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 TiddlerTemplates without explicitly specifying the tiddler that it applies to. diff --git a/editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid b/editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid new file mode 100644 index 000000000..8af3fab1e --- /dev/null +++ b/editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid @@ -0,0 +1,7 @@ +created: 20130825144900000 +modified: 20140107114307809 +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. diff --git a/editions/tw5.com/tiddlers/concepts/TemplateTiddlers.tid b/editions/tw5.com/tiddlers/concepts/TemplateTiddlers.tid new file mode 100644 index 000000000..fcc395685 --- /dev/null +++ b/editions/tw5.com/tiddlers/concepts/TemplateTiddlers.tid @@ -0,0 +1,40 @@ +created: 20140107114355828 +modified: 20140107114636001 +tags: concepts +title: TemplateTiddlers +type: text/vnd.tiddlywiki + +A template tiddler is not in fact a type of tiddler, it is a role in which a tiddler can be used. + +When text is wikified there is the concept of the CurrentTiddler. Certain widgets (like the ViewWidget) can use the current tiddler implicitly. For example: + +``` +<$view tiddler="HelloThere" field="myfield"/> - displays the field "myfield" of the tiddler HelloThere +<$view field="myfield"/> - displays the field "myfield" of the current tiddler +``` + +When the TranscludeWidget pulls in the content from another tiddler, by default it does not change the current tiddler, so the transcluded content behaves as if it were in the context of the transcluding tiddler. + +So, if we have a tiddler "A" that contains: + +``` +<$view field="myfield"/> +``` + +And then transclude it from a tiddler "B" like so: + +``` +My field value is: <$transclude tiddler="A"/> +``` + +The result will be that the field from the tiddler "B" is displayed; in other words, tiddler "A" is acting as a template for displaying information from tiddler "B". + +The TiddlerWidget is used to change the current tiddler. Consider a tiddler "C" containing: + +``` +<$tiddler tiddler="A"><$transclude tiddler="A"/> +``` + +It is still transcluding tiddler "A", but now it is also setting the current tiddler to "A". The result is therefore that the field "myfield" for tiddler "A" is displayed. + +The shorthand syntax for transcluding actually generates both a TiddlerWidget and a TranscludeWidget. diff --git a/editions/tw5.com/tiddlers/concepts/TiddlerFilters.tid b/editions/tw5.com/tiddlers/concepts/TiddlerFilters.tid index 9a07f27c8..1df0da137 100644 --- a/editions/tw5.com/tiddlers/concepts/TiddlerFilters.tid +++ b/editions/tw5.com/tiddlers/concepts/TiddlerFilters.tid @@ -1,5 +1,5 @@ created: 20130827080000000 -modified: 20140101183713761 +modified: 20140107114229585 tags: concepts title: TiddlerFilters type: text/vnd.tiddlywiki @@ -69,7 +69,7 @@ The operands available with the `is` operator are: * ''tiddler'': selects all tiddlers excluding shadows, whether or not they are SystemTiddlers * ''system'': selects all SystemTiddlers * ''shadow'': selects all ShadowTiddlers -* ''current'': selects the current ContextTiddler +* ''current'': selects the CurrentTiddler * ''missing'': selects all MissingTiddlers * ''orphan'': selects all OrphanTiddlers diff --git a/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid b/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid index 12b96c842..cc633426a 100644 --- a/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/TiddlerWidget.tid @@ -1,14 +1,15 @@ -created: 201308241543 -modified: 201310301351 +created: 20130824154300000 +modified: 20140107114152456 tags: widget title: TiddlerWidget +type: text/vnd.tiddlywiki ! Introduction -The TiddlerWidget sets the ContextTiddler that applies for processing its content. +The TiddlerWidget sets the CurrentTiddler that applies for processing its content. ! Content and Attributes |!Attribute |!Description | -|tiddler |The title of the tiddler to become the new ContextTiddler | +|tiddler |The title of the tiddler to become the new CurrentTiddler | |class |CSS classes to added to the generated elements | diff --git a/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid index 8e947c30a..6224df9ff 100644 --- a/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Transclusion in WikiText.tid @@ -1,5 +1,5 @@ created: 20131205160146648 -modified: 20131205160204570 +modified: 20140107114340951 tags: wikitext title: Transclusion in WikiText type: text/vnd.tiddlywiki @@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki You can incorporate the content of one tiddler within another using the transclusion notation: * `{{MyTiddler}}` transcludes a single tiddler -* `{{MyTiddler||TemplateTitle}}` displays the tiddler through a specified [[TiddlerTemplate|TiddlerTemplates]] +* `{{MyTiddler||TemplateTitle}}` displays the tiddler through a specified [[TemplateTiddler|TemplateTiddlers]] A similar syntax can be used to transclude a list of tiddlers matching a specified [[TiddlerFilter|TiddlerFilters]]: