diff --git a/core/modules/server/routes/get-tiddler-html.js b/core/modules/server/routes/get-tiddler-html.js index 6bdfe7f2e..218dbae66 100644 --- a/core/modules/server/routes/get-tiddler-html.js +++ b/core/modules/server/routes/get-tiddler-html.js @@ -20,16 +20,18 @@ exports.handler = function(request,response,state) { var title = decodeURIComponent(state.params[0]), tiddler = state.wiki.getTiddler(title); if(tiddler) { - var serveType,template; + var outputType,serveType,template; // Render ordinary tiddlers as HTML, and system tiddlers in plain text if(state.wiki.isSystemTiddler(title)) { + outputType = "text/plain"; serveType = "text/plain"; template = "$:/core/templates/wikified-tiddler"; } else { + outputType = "text/html"; serveType = "text/html"; template = "$:/core/templates/server/static.tiddler.html"; } - var text = state.wiki.renderTiddler("text/plain",template,{variables: {currentTiddler: title}}); + var text = state.wiki.renderTiddler(outputType,template,{variables: {currentTiddler: title}}); // Naughty not to set a content-type, but it's the easiest way to ensure the browser will see HTML pages as HTML, and accept plain text tiddlers as CSS or JS response.writeHead(200); response.end(text,"utf8"); diff --git a/core/templates/server/static.sidebar.wikitext.tid b/core/templates/server/static.sidebar.wikitext.tid new file mode 100644 index 000000000..5ac53703e --- /dev/null +++ b/core/templates/server/static.sidebar.wikitext.tid @@ -0,0 +1,30 @@ +title: $:/core/templates/server/static.sidebar.wikitext + +\whitespace trim +
+
+

+<$transclude tiddler="$:/SiteTitle"/> +

+
+<$transclude tiddler="$:/SiteSubtitle"/> +
+

+

+
+<$list filter={{$:/DefaultTiddlers}}> +
+<$link><$text text=<>/> +
+ +
+ diff --git a/core/templates/server/static.tiddler.html.tid b/core/templates/server/static.tiddler.html.tid index f3b4512ea..935f88b7c 100644 --- a/core/templates/server/static.tiddler.html.tid +++ b/core/templates/server/static.tiddler.html.tid @@ -1,29 +1,29 @@ title: $:/core/templates/server/static.tiddler.html +\whitespace trim \define tv-wikilink-template() $uri_encoded$ -` +<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> - + - + -`<$view field="caption"><$view field="title"/></$view>: {{$:/core/wiki/title}}` +<$view field="caption"><$view field="title"/></$view>: {{$:/core/wiki/title}} +<$transclude tiddler="$:/core/templates/server/static.sidebar.wikitext" mode="inline"/>
-`<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> -<$view tiddler="$:/core/templates/server/static.tiddler.wikitext" format="htmlwikified"/> -` +<$transclude tiddler="$:/core/templates/server/static.tiddler.wikitext" mode="inline"/>
-` \ No newline at end of file + \ No newline at end of file diff --git a/core/templates/server/static.tiddler.wikitext.tid b/core/templates/server/static.tiddler.wikitext.tid index 74994be02..2d2bdaba6 100644 --- a/core/templates/server/static.tiddler.wikitext.tid +++ b/core/templates/server/static.tiddler.wikitext.tid @@ -1,5 +1,6 @@ title: $:/core/templates/server/static.tiddler.wikitext +\whitespace trim

<$text text=<>/>