Merge remote-tracking branch 'upstream/master'

core/ui/TagManager.tid

@@ -2,18 +2,18 @@ title: $:/TagManager
 
 \define lingo-base() $:/language/TagManager/
 \define iconEditor(title)
+<div class="tw-drop-down-wrapper">
 <$edit-text field="icon" tag="input" size="20"/> <$button popup=<<qualify "$:/state/popup/icon/$title$">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button>
-<div class="tw-block-dropdown-wrapper">
-<$reveal state=<<qualify "$:/state/popup/icon/$title$">> type="nomatch" text="" default="">
+<$reveal state=<<qualify "$:/state/popup/icon/$title$">> type="popup" position="belowleft" text="" default="">
+<div class="tw-drop-down">
 <$linkcatcher to="$title$!!icon">
-<div class="tw-block-dropdown tw-edit-type-dropdown">
-<$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"/>
 </$link>
 </$list>
-</div>
 </$linkcatcher>
+</div>
 </$reveal>
 </div>
 \end

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 <<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 <<version-link>> 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 <<version>> of ~TiddlyWiki, a major reboot designed [[for the ne
 
 <a class="tw-message-icon" href="http://tiddlywiki.com/" target="_blank">{{TiddlyWiki Classic.png}}</a>
 
-!! 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.
 </div>

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]]).
+
+<style>
+.my-gallery svg {
+width: 6em;
+height: 6em;
+margin: 1em;
+}
+</style>
+<div class="my-gallery">
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/Image]]">
+<$transclude/>
+</$list>
+</div>

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=<<qualify "$:/state/toc/$caption$">> 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]]

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

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

themes/tiddlywiki/vanilla/base.tid

@@ -855,6 +855,10 @@ canvas.tw-edit-bitmapeditor  {
 	fill: <<colour muted-foreground>>;
 }
 
+.tw-drop-down-wrapper {
+	position: relative;
+}
+
 .tw-drop-down {
 	min-width: 280px;
 	border: 1px solid <<colour dropdown-border>>;
@@ -1241,20 +1245,37 @@ canvas.tw-edit-bitmapeditor  {
 .tw-plugin-info {
 	display: block;
 	border: 1px solid <<colour muted-foreground>>;
+	background-colour: <<colour background>>;
 	margin: 1em 0 1em 0;
 	padding: 8px;
 }
 
+a.tw-tiddlylink.tw-plugin-info:hover {
+	text-decoration: none;
+	background-color: <<colour primary>>;
+	color: <<colour background>>;
+}
+
 .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 <<colour muted-foreground>>;
+	padding: 1em;
+	margin-top: -1em;
+}
+
 /*
 ** Message boxes
 */