aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-06-26 11:21:35 -0400
committerJoey Hess <joey@kitenet.net>2013-06-26 11:21:35 -0400
commit428d4065532f5c98aae362059c73d2cdec0ed541 (patch)
tree2319f15ae49722a43e8dd7f34a3e6a5f524457b1
parentd3a9cb4b126571f6342c3747df40ffd0b8f078b0 (diff)
parentfae59b07b02dbcaba892e96ff86f3f800e6ef54a (diff)
downloadikiwiki-428d4065532f5c98aae362059c73d2cdec0ed541.tar
ikiwiki-428d4065532f5c98aae362059c73d2cdec0ed541.tar.gz
Merge remote-tracking branch 'smcv/ready/no-trails-if-dynamic'
-rw-r--r--templates/page.tmpl10
1 files changed, 10 insertions, 0 deletions
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 89b4f3a06..6353c7596 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -21,6 +21,8 @@
<TMPL_ELSE>
<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
</TMPL_IF>
+
+<TMPL_UNLESS DYNAMIC>
<TMPL_IF EDITURL>
<link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
</TMPL_IF>
@@ -36,6 +38,8 @@
<link rel="next" href="<TMPL_VAR NEXTURL>" title="<TMPL_VAR NEXTTITLE>" />
</TMPL_IF>
</TMPL_LOOP>
+</TMPL_UNLESS>
+
</head>
<body>
@@ -56,9 +60,11 @@
</TMPL_IF>
</span>
</span>
+<TMPL_UNLESS DYNAMIC>
<TMPL_IF SEARCHFORM>
<TMPL_VAR SEARCHFORM>
</TMPL_IF>
+</TMPL_UNLESS>
<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
<TMPL_IF HAVE_ACTIONS>
@@ -112,15 +118,19 @@
<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
</TMPL_IF>
+<TMPL_UNLESS DYNAMIC>
<TMPL_VAR TRAILS>
+</TMPL_UNLESS>
<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+<TMPL_UNLESS DYNAMIC>
<TMPL_IF SIDEBAR>
<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
<TMPL_VAR SIDEBAR>
<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
</TMPL_IF>
+</TMPL_UNLESS>
<div id="pagebody">