diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid index d6434c4d1..28457d0ab 100644 --- a/core/ui/TagManager.tid +++ b/core/ui/TagManager.tid @@ -2,18 +2,18 @@ title: $:/TagManager \define lingo-base() $:/language/TagManager/ \define iconEditor(title) +
<$edit-text field="icon" tag="input" size="20"/> <$button popup=<> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}} -
-<$reveal state=<> type="nomatch" text="" default=""> +<$reveal state=<> type="popup" position="belowleft" text="" default=""> +
<$linkcatcher to="$title$!!icon"> -
-<$list filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] +[sort[title]]"> +<$list filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[sort[title]]"> <$link to={{!!title}}> -<$view field="title"/> +<$transclude/> <$view field="title"/> -
+
\end diff --git a/editions/tw5.com/tiddlers/HelloThere.tid b/editions/tw5.com/tiddlers/HelloThere.tid index 4d210ef90..ade45068d 100644 --- a/editions/tw5.com/tiddlers/HelloThere.tid +++ b/editions/tw5.com/tiddlers/HelloThere.tid @@ -1,12 +1,12 @@ created: 20130822170200000 -modified: 20140624094134118 +modified: 20140809111938465 tags: introduction title: HelloThere type: text/vnd.tiddlywiki Welcome to TiddlyWiki, a complete interactive wiki in JavaScript. It can be used as a [[single HTML file in the browser|SingleFileApplication]] or as a powerful [[Node.js application|Node.js]]. It is highly customisable: the entire user interface is itself implemented in hackable WikiText. -This is version <> of ~TiddlyWiki, a major reboot designed [[for the next 25 years|Future of TiddlyWiki]]. It is currently in beta (see the detailed ReleaseHistory). There is a RoadMap for moving to the full release. It is a great time to [[get involved|Community]] and support the future development of ~TiddlyWiki. +This is version <> of ~TiddlyWiki, a major reboot designed [[for the next 25 years|Future of TiddlyWiki]]. It is currently in beta (see the detailed ReleaseHistory). There is a RoadMap for moving to the full release. It is a great time to [[get involved|Community]] and support the future development of ~TiddlyWiki. //~TiddlyWiki is a free, open source project that depends on [[your love and support|HelpingTiddlyWiki]] for its survival//. @@ -14,9 +14,7 @@ This is version <> of ~TiddlyWiki, a major reboot designed [[for the ne {{TiddlyWiki Classic.png}} -!! TiddlyWikiClassic - http://classic.tiddlywiki.com +!! TiddlyWikiClassic -On this site, unless noted otherwise, "~TiddlyWiki" refers to the new version 5, and "~TiddlyWikiClassic" is used to identify the older version. - -The deep internal improvements mean that the new version of ~TiddlyWiki is not fully compatible with ~TiddlyWikiClassic. Existing content will need massaging, while plugins and themes will have to be completely rewritten. The upgrade path will get smoother as the new version matures. +The original "Classic" version of TiddlyWiki is still available at http://classic.tiddlywiki.com. Note that it is not fully backwards compatible: existing content will need massaging, while plugins and themes will have to be completely rewritten. The upgrade path will get smoother as the new version matures.
diff --git a/editions/tw5.com/tiddlers/ImageGallery Example.tid b/editions/tw5.com/tiddlers/ImageGallery Example.tid new file mode 100644 index 000000000..61b94b605 --- /dev/null +++ b/editions/tw5.com/tiddlers/ImageGallery Example.tid @@ -0,0 +1,20 @@ +created: 20140809113603449 +modified: 20140809113849873 +tags: demo +title: ImageGallery Example +type: text/vnd.tiddlywiki + +Here is an example of using the ListWidget and the TranscludeWidget to show a grid of all system images (ie, tiddlers tagged [[$:/tags/Image]]). + + +
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/Image]]"> +<$transclude/> + +
diff --git a/editions/tw5.com/tiddlers/TableOfContents.tid b/editions/tw5.com/tiddlers/TableOfContents.tid index 155649251..9a432e17b 100644 --- a/editions/tw5.com/tiddlers/TableOfContents.tid +++ b/editions/tw5.com/tiddlers/TableOfContents.tid @@ -1,7 +1,10 @@ -title: TableOfContents -list-after: $:/core/ui/SideBar/Open -tags: $:/tags/SideBar caption: {{$:/language/SideBar/Contents/Caption}} +created: 20140809114010378 +list-after: $:/core/ui/SideBar/Open +modified: 20140809114018461 +tags: $:/tags/SideBar +title: TableOfContents +type: text/vnd.tiddlywiki \define toc-heading(caption,body) <$reveal type="nomatch" state=<> text="show"> @@ -106,6 +109,7 @@ $body$ ## [[Creating SubStories]] ## [[Editing Tiddlers with Emacs]] ## [[GoogleChromeTips]] +## [[ImageGallery Example]] ## [[Making curved text with SVG]] ## [[Preserving open tiddlers at startup]] ## [[Setting a favicon]] diff --git a/editions/tw5.com/tiddlers/roadmap/RoadMap.tid b/editions/tw5.com/tiddlers/roadmap/RoadMap.tid index d2d9a6e32..bd0e09293 100644 --- a/editions/tw5.com/tiddlers/roadmap/RoadMap.tid +++ b/editions/tw5.com/tiddlers/roadmap/RoadMap.tid @@ -1,5 +1,5 @@ created: 20130823203800000 -modified: 20140715081725471 +modified: 20140809112946299 tags: planning title: RoadMap type: text/vnd.tiddlywiki @@ -16,7 +16,7 @@ Some important features were deferred to be added after the beta: * Fixing hangovers from TiddlyWikiClassic * ~TiddlyWiki file format (to avoid illegal attribute names) * Tiddler object format (to provide true polymorphism of field values) -* Aliases +* Aliases (alternative titles for tiddlers) * Search and replace * Tiddler renaming * Rich link tooltips, incorporating a preview diff --git a/editions/tw5.com/tiddlers/system/version-link-macro.tid b/editions/tw5.com/tiddlers/system/version-link-macro.tid new file mode 100644 index 000000000..4acef82ac --- /dev/null +++ b/editions/tw5.com/tiddlers/system/version-link-macro.tid @@ -0,0 +1,6 @@ +title: $:/editions/tw5.com/version-link-macro +tags: $:/tags/Macro + +\define version-link() +[[$(version)$|Release $(version)$]] +\end diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 69c190736..6732b9162 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -855,6 +855,10 @@ canvas.tw-edit-bitmapeditor { fill: <>; } +.tw-drop-down-wrapper { + position: relative; +} + .tw-drop-down { min-width: 280px; border: 1px solid <>; @@ -1241,20 +1245,37 @@ canvas.tw-edit-bitmapeditor { .tw-plugin-info { display: block; border: 1px solid <>; + background-colour: <>; margin: 1em 0 1em 0; padding: 8px; } +a.tw-tiddlylink.tw-plugin-info:hover { + text-decoration: none; + background-color: <>; + color: <>; +} + .tw-plugin-info-chunk { display: inline-block; vertical-align: middle; } -.tw-plugin-info img, .tw-plugin-info svg { +.tw-plugin-info img { + width: 3em; +} + +.tw-plugin-info svg { width: 3em; height: 3em; } +.tw-plugin-info-dropdown { + border: 1px solid <>; + padding: 1em; + margin-top: -1em; +} + /* ** Message boxes */