From 9c57ebb05d14250e286e57b92801eba33b9dc8e8 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Fri, 9 Jun 2017 15:31:55 +0100 Subject: [PATCH] Minor tweaks to new tiddler Explorer --- core/language/en-GB/SideBar.multids | 1 + .../{System-Explorer.tid => Explorer.tid} | 8 +--- core/wiki/tags/MoreSideBar.tid | 2 +- editions/prerelease/tiddlers/Explore.tid | 41 ------------------- 4 files changed, 4 insertions(+), 48 deletions(-) rename core/ui/MoreSideBar/{System-Explorer.tid => Explorer.tid} (94%) delete mode 100644 editions/prerelease/tiddlers/Explore.tid diff --git a/core/language/en-GB/SideBar.multids b/core/language/en-GB/SideBar.multids index 1ae4439dd..b109f3a9b 100644 --- a/core/language/en-GB/SideBar.multids +++ b/core/language/en-GB/SideBar.multids @@ -3,6 +3,7 @@ title: $:/language/SideBar/ All/Caption: All Contents/Caption: Contents Drafts/Caption: Drafts +Explorer/Caption: Explorer Missing/Caption: Missing More/Caption: More Open/Caption: Open diff --git a/core/ui/MoreSideBar/System-Explorer.tid b/core/ui/MoreSideBar/Explorer.tid similarity index 94% rename from core/ui/MoreSideBar/System-Explorer.tid rename to core/ui/MoreSideBar/Explorer.tid index d2dbfcad7..d8bd00703 100644 --- a/core/ui/MoreSideBar/System-Explorer.tid +++ b/core/ui/MoreSideBar/Explorer.tid @@ -1,6 +1,6 @@ -title: $:/core/ui/MoreSideBar/System-Explorer +title: $:/core/ui/MoreSideBar/Explorer tags: $:/tags/MoreSideBar -caption: {{$:/language/SideBar/System-Explorer/Caption}} +caption: {{$:/language/SideBar/Explorer/Caption}} \define cleanChunk() <$list filter="[[$(chunk)$]] +[removesuffix[/]]" variable="cleanChunk"> @@ -30,15 +30,12 @@ emptyMessage="""<$text text="$prefix$$(chunk)$"/>"""> <$button set="""$:/state/tree/$prefix$$(chunk)$""" setTo="hide" class="tc-btn-invisible">{{$:/core/images/down-arrow}} - <> - <$list filter="""[all[shadows+tiddlers]prefix[$prefix$$(chunk)$]] -[[$prefix$$(chunk)$]] +[limit[1]]""">(<$count filter="""[all[shadows+tiddlers]prefix[$prefix$$(chunk)$]] -[[$prefix$$(chunk)$]]"""/>) <$reveal type="match" state="""$:/state/tree/$prefix$$(chunk)$""" text="show"> <$macrocall $name="tree" prefix="""$prefix$$(chunk)$"""/> - \end @@ -48,7 +45,6 @@ emptyMessage="""<$text text="$prefix$$(chunk)$"/>"""> <$list filter="[all[shadows+tiddlers]removeprefix[$prefix$]splitbefore[/]sort[title]] +[!suffix[/]]" variable="chunk"> <> - <$list filter="[all[shadows+tiddlers]removeprefix[$prefix$]splitbefore[/]sort[title]] +[suffix[/]]" variable="chunk"> <> diff --git a/core/wiki/tags/MoreSideBar.tid b/core/wiki/tags/MoreSideBar.tid index 2dc0adb53..f3371ef4b 100644 --- a/core/wiki/tags/MoreSideBar.tid +++ b/core/wiki/tags/MoreSideBar.tid @@ -1,3 +1,3 @@ title: $:/tags/MoreSideBar -list: [[$:/core/ui/MoreSideBar/All]] [[$:/core/ui/MoreSideBar/Recent]] [[$:/core/ui/MoreSideBar/Tags]] [[$:/core/ui/MoreSideBar/Missing]] [[$:/core/ui/MoreSideBar/Drafts]] [[$:/core/ui/MoreSideBar/Orphans]] [[$:/core/ui/MoreSideBar/Types]] [[$:/core/ui/MoreSideBar/System]] [[$:/core/ui/MoreSideBar/Shadows]] [[$:/core/ui/MoreSideBar/Plugins]] +list: [[$:/core/ui/MoreSideBar/All]] [[$:/core/ui/MoreSideBar/Recent]] [[$:/core/ui/MoreSideBar/Tags]] [[$:/core/ui/MoreSideBar/Missing]] [[$:/core/ui/MoreSideBar/Drafts]] [[$:/core/ui/MoreSideBar/Orphans]] [[$:/core/ui/MoreSideBar/Types]] [[$:/core/ui/MoreSideBar/System]] [[$:/core/ui/MoreSideBar/Shadows]] [[$:/core/ui/MoreSideBar/Explorer]] [[$:/core/ui/MoreSideBar/Plugins]] diff --git a/editions/prerelease/tiddlers/Explore.tid b/editions/prerelease/tiddlers/Explore.tid deleted file mode 100644 index f6e8d601f..000000000 --- a/editions/prerelease/tiddlers/Explore.tid +++ /dev/null @@ -1,41 +0,0 @@ -title: $:/core/ui/MoreSideBar/Explore -tags: $:/tags/MoreSideBar -caption: Explore - -\define treenode-inner(prefix) -<$reveal type="nomatch" text="" default="""$(chunk)$"""> -
  • -<$list filter="""[all[shadows+tiddlers]prefix[$prefix$$(chunk)$]] -[[$prefix$$(chunk)$]] +[limit[1]]""" emptyMessage=""""""> -<$reveal type="nomatch" state="""$:/state/tree/$prefix$$(chunk)$""" text="show"> -<$button set="""$:/state/tree/$prefix$$(chunk)$""" setTo="show" class="tc-btn-invisible">{{$:/core/images/right-arrow}} - -<$reveal type="match" state="""$:/state/tree/$prefix$$(chunk)$""" text="show"> -<$button set="""$:/state/tree/$prefix$$(chunk)$""" setTo="hide" class="tc-btn-invisible">{{$:/core/images/down-arrow}} - - -<$list filter="""[[$prefix$$(chunk)$]is[shadow]] [[$prefix$$(chunk)$]is[tiddler]] +[limit[1]]""" emptyMessage="""<$text text="$prefix$$(chunk)$"/>"""> -<$link> -<$view field="title"/> - - -<$list filter="""[all[shadows+tiddlers]prefix[$prefix$$(chunk)$]] -[[$prefix$$(chunk)$]] +[limit[1]]"""> -(<$count filter="""[all[shadows+tiddlers]prefix[$prefix$$(chunk)$]] -[[$prefix$$(chunk)$]]"""/>) -<$reveal type="match" state="""$:/state/tree/$prefix$$(chunk)$""" text="show"> -<$macrocall $name="treenode" prefix="""$prefix$$(chunk)$"""/> - - -
  • - -\end - -\define treenode(prefix) -
      -<$list filter="[all[shadows+tiddlers]removeprefix[$prefix$]splitbefore[/]sort[title]]" variable="chunk"> -<> - -
    -\end - -
    -<> -