mirrors
/
TiddlyWiki5
mirror of https://github.com/Jermolene/TiddlyWiki5
1
0
Fork 0
Code Issues Releases Wiki Activity

Make a distinction between templates and UI 

Templates are the low-level bits and pieces that allow TW5 to generate
HTML and CSS renderings of tiddlers. The UI folder contains the
user-visible UI of TW5
This commit is contained in:
Jeremy Ruston 2013-05-31 15:38:27 +01:00
parent 905945ee26
commit 28b0b58a11
18 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/startup.js
View File

@ -112,7 +112,7 @@ exports.startup = function() {
});
}
// Display the PageTemplate
var templateTitle = "$:/templates/PageTemplate",
var templateTitle = "$:/core/ui/PageTemplate",
parser = $tw.wiki.parseTiddler(templateTitle),
renderTree = new $tw.WikiRenderTree(parser,{wiki: $tw.wiki, context: {tiddlerTitle: templateTitle}, document: document});
renderTree.execute();

2
core/templates/StaticContent.tid → core/templates/static.content.tid
View File

@ -1,4 +1,4 @@
title: $:/templates/StaticContent
title: $:/templates/static.content
type: text/vnd.tiddlywiki
<!-- For Google, and people without JavaScript-->

2
core/templates/static.template.html.tid
View File

@ -18,6 +18,6 @@ type: text/vnd.tiddlywiki-html
</style>
</head>
<body>
{{$:/templates/PageTemplate||$:/core/templates/html-tiddler}}
{{$:/core/ui/PageTemplate||$:/core/templates/html-tiddler}}
</body>
</html>

2
core/templates/static.tiddler.html.tid
View File

@ -13,7 +13,7 @@ title: $:/core/templates/static.tiddler.html
<body>
<section class="story-river">
<div class="tw-tiddler-frame">
`<$view tiddler="$:/templates/ViewTemplate" format="htmlwikified"/>`
`<$view tiddler="$:/core/ui/ViewTemplate" format="htmlwikified"/>`
</div>
</section>
</body>

2
core/templates/tiddlywiki5.template.html.tid
View File

@ -26,7 +26,7 @@ title: $:/core/templates/tiddlywiki5.template.html
<!----------- Static content for Google and browsers without JavaScript ----------->
<noscript>
<div id="splashArea">
{{$:/templates/NewStaticContent||$:/core/templates/html-tiddler}}
{{$:/templates/static.content||$:/core/templates/html-tiddler}}
</div>
</noscript>
<!----------- Miscellaneous system tiddlers ----------->

2
core/ui/EditTemplate.tid
View File

@ -1,4 +1,4 @@
title: $:/templates/EditTemplate
title: $:/core/ui/EditTemplate
modifier: JeremyRuston
<span class="tw-tiddler-controls title"> <$button message="tw-delete-tiddler" class="btn-invisible">{{$:/core/images/delete-button}}</$button> <$button message="tw-cancel-tiddler" class="btn-invisible">{{$:/core/images/cancel-button}}</$button> <$button message="tw-save-tiddler" class="btn-invisible">{{$:/core/images/done-button}}</$button> </span>

2
core/ui/MissingTemplate.tid
View File

@ -1,4 +1,4 @@
title: $:/templates/MissingTemplate
title: $:/core/ui/MissingTemplate
<$button popup="$:/state/missingpopup" qualifyTiddlerTitles="yes" class="btn-invisible tw-missing-tiddler-label"><$view field="title" format="text" /></$button>
<$reveal state="$:/state/missingpopup" type="popup" position="below" qualifyTiddlerTitles="yes" ><div class="tw-drop-down">

6
core/ui/MoreSideBar.tid
View File

@ -1,4 +1,4 @@
title: $:/templates/MoreSideBar
title: $:/core/ui/MoreSideBar
<div class="tw-tab-set tw-more-sidebar"><div class="tw-tab-buttons">
@ -28,10 +28,10 @@ title: $:/templates/MoreSideBar
{{$:/snippets/recentchanges}}
</$reveal>
<$reveal type="match" state="$:/state/moreSideBarTabSet" text="tagsTab" qualifyTiddlerTitles="yes">
<$list filter="[tags[]sort[title]]" itemClass="tw-menu-list-item" template="$:/templates/TagTemplate"/>
<$list filter="[tags[]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/TagTemplate"/>
</$reveal>
<$reveal type="match" state="$:/state/moreSideBarTabSet" text="missingTab" qualifyTiddlerTitles="yes">
<$list filter="[is[missing]sort[title]]" itemClass="tw-menu-list-item" template="$:/templates/MissingTemplate"/>
<$list filter="[is[missing]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/MissingTemplate"/>
</$reveal>
<$reveal type="match" state="$:/state/moreSideBarTabSet" text="draftsTab" qualifyTiddlerTitles="yes">
<$list filter="[has[draft.of]sort[title]]" itemClass="tw-menu-list-item" />

6
core/ui/PageTemplate.tid
View File

@ -1,4 +1,4 @@
title: $:/templates/PageTemplate
title: $:/core/ui/PageTemplate
<!-- The navigator catches navigation events and updates the story and history tiddlers -->
<$navigator story="$:/StoryList" history="$:/HistoryList">
@ -10,7 +10,7 @@ title: $:/templates/PageTemplate
{{SiteTitle}}.title <br><small>{{SiteSubtitle}}</small>
{{$:/templates/SideBar}}
{{$:/core/ui/SideBar}}
</header>
@ -18,7 +18,7 @@ title: $:/templates/PageTemplate
<section class="story-river">
<!-- The main story -->
<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" template="$:/templates/ViewTemplate" editTemplate="$:/templates/EditTemplate" listview="classic" itemClass="tw-tiddler-frame"/>
<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" template="$:/core/ui/ViewTemplate" editTemplate="$:/core/ui/EditTemplate" listview="classic" itemClass="tw-tiddler-frame"/>
<!-- End of story river -->
</section>

6
core/ui/SideBar.tid
View File

@ -1,4 +1,4 @@
title: $:/templates/SideBar
title: $:/core/ui/SideBar
<!-- The implementation of tabs here is currently a bit unreadable -->
@ -41,10 +41,10 @@ title: $:/templates/SideBar
{{$:/snippets/recentchanges}}
</$reveal>
<$reveal type="match" state="$:/state/sideBarTabSet" text="toolsTab" qualifyTiddlerTitles="yes">
{{$:/templates/ToolsPanel}}
{{$:/core/ui/ToolsPanel}}
</$reveal>
<$reveal type="match" state="$:/state/sideBarTabSet" text="moreTab" qualifyTiddlerTitles="yes">
{{$:/templates/MoreSideBar}}
{{$:/core/ui/MoreSideBar}}
</$reveal>
</div>
</div>

2
core/ui/TagTemplate.tid
View File

@ -1,4 +1,4 @@
title: $:/templates/TagTemplate
title: $:/core/ui/TagTemplate
<$button popup="$:/state/tagpopup" qualifyTiddlerTitles="yes" class="btn-invisible"><$setstyle name="background-color" value={{!!color}} class="tw-tag-label"><$view field="title" format="text" /></$setstyle></$button>
<$reveal state="$:/state/tagpopup" type="popup" position="below" qualifyTiddlerTitles="yes" ><div class="tw-drop-down">

2
core/ui/TiddlerInfo.tid
View File

@ -1,4 +1,4 @@
title: $:/templates/TiddlerInfo
title: $:/core/ui/TiddlerInfo
<div class="tw-tab-set"><div class="tw-tab-buttons"><$button type="set" set="$:/state/tiddlerDropDownTabSet" setTo="refTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">References</$button><$button type="set" set="$:/state/tiddlerDropDownTabSet" setTo="taggingTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Tagging</$button><$button type="set" set="$:/state/tiddlerDropDownTabSet" setTo="fieldsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Fields</$button></div>
<div class="tw-tab-divider">

2
core/ui/ToolsPanel.tid
View File

@ -1,4 +1,4 @@
title: $:/templates/ToolsPanel
title: $:/core/ui/ToolsPanel
Import: <$import class="tw-drop-zone"/>

6
core/ui/ViewTemplate.tid
View File

@ -1,4 +1,4 @@
title: $:/templates/ViewTemplate
title: $:/core/ui/ViewTemplate
modifier: JeremyRuston
<span class="title"><span class="tw-tiddler-controls"><$button popup="$:/state/tiddlerInfo" qualifyTiddlerTitles="yes" class="btn-invisible">{{$:/core/images/info-button}}</$button><$button message="tw-edit-tiddler" class="btn-invisible">{{$:/core/images/edit-button}}</$button><$button message="tw-close-tiddler" class="btn-invisible">{{$:/core/images/close-button}}</$button>
@ -7,13 +7,13 @@ modifier: JeremyRuston
<$reveal type="nomatch" text="" default="" state="$:/state/tiddlerInfo" qualifyTiddlerTitles="yes" class="tw-tiddler-info" animate="yes">
<$transclude template="$:/templates/TiddlerInfo"/>
<$transclude template="$:/core/ui/TiddlerInfo"/>
</$reveal>
<div class="small"><$view field="modifier" format="link"/> <$view field="modified" format="relativedate"/></div>
<div class="tw-tags-wrapper"><$list filter="[is[current]tags[]]" template="$:/templates/TagTemplate" /></div>
<div class="tw-tags-wrapper"><$list filter="[is[current]tags[]]" template="$:/core/ui/TagTemplate" /></div>
<div class="body">
<$view field="text" format="wikified">

2
core/wiki/ControlPanel.tid
View File

@ -28,4 +28,4 @@ The tiddlers in TiddlyWiki documents can be securely encrypted by specifying a p
{{$:/snippets/themeswitcher}}
{{$:/templates/ServerControlPanel}}
{{$:/core/ui/ServerControlPanel}}

2
core/wiki/moreSideBarTabSet.tid
View File

@ -1,3 +1,3 @@
title: $:/state/moreSideBarTabSet-tiddlerTitle:$:/templates/MoreSideBar;templateTitle:$:/templates/MoreSideBar;-tiddlerTitle:$:/templates/SideBar;templateTitle:$:/templates/SideBar;-tiddlerTitle:$:/templates/PageTemplate;-
title: $:/state/moreSideBarTabSet-tiddlerTitle:$:/core/ui/MoreSideBar;templateTitle:$:/core/ui/MoreSideBar;-tiddlerTitle:$:/core/ui/SideBar;templateTitle:$:/core/ui/SideBar;-tiddlerTitle:$:/core/ui/PageTemplate;-
tagsTab

2
core/wiki/sideBarTabSet.tid
View File

@ -1,3 +1,3 @@
title: $:/state/sideBarTabSet-tiddlerTitle:$:/templates/SideBar;templateTitle:$:/templates/SideBar;-tiddlerTitle:$:/templates/PageTemplate;-
title: $:/state/sideBarTabSet-tiddlerTitle:$:/core/ui/SideBar;templateTitle:$:/core/ui/SideBar;-tiddlerTitle:$:/core/ui/PageTemplate;-
openTab

2
plugins/tiddlywiki/tiddlyweb/ServerControlPanel.tid
View File

@ -1,4 +1,4 @@
title: $:/templates/ServerControlPanel
title: $:/core/ui/ServerControlPanel
----