aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/trail.pm2
-rw-r--r--doc/style.css5
-rw-r--r--templates/page.tmpl2
-rw-r--r--themes/actiontabs/style.css2
-rw-r--r--themes/blueview/style.css8
5 files changed, 11 insertions, 8 deletions
diff --git a/IkiWiki/Plugin/trail.pm b/IkiWiki/Plugin/trail.pm
index 34a2ca5b6..7d2338f9b 100644
--- a/IkiWiki/Plugin/trail.pm
+++ b/IkiWiki/Plugin/trail.pm
@@ -335,7 +335,7 @@ sub prerender {
if (exists $pagestate{$member}{trail}{item} &&
! exists $member_to_trails{$member}) {
$rebuild_trail_members{$member} = 1;
- delete $pagestate{$member}{trailitem};
+ delete $pagestate{$member}{trail}{item};
}
}
diff --git a/doc/style.css b/doc/style.css
index 35a133198..6e2afce66 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -275,6 +275,7 @@ div.progress-done {
@media print {
.actions { display: none; }
.tags { display: none; }
+ .trails { display: none; }
.feedbutton { display: none; }
#searchform { display: none; }
.blogform, #blogform { display: none; }
@@ -502,6 +503,10 @@ a.openid_large_btn:focus {
background: url(ikiwiki/images/pbar-ani.gif);
}
+.trails {
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
.trail {
display: block;
clear: both;
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 770ac2399..89b4f3a06 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -149,6 +149,8 @@
<TMPL_UNLESS DYNAMIC>
<TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
+<TMPL_VAR TRAILS>
+
<TMPL_IF TAGS>
<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
Tags:
diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css
index 26cdc1e86..f6cb5c04e 100644
--- a/themes/actiontabs/style.css
+++ b/themes/actiontabs/style.css
@@ -143,7 +143,7 @@ div.recentchanges {
border-color: #999;
}
-.trails {
+.pageheader .trails {
/* allow space for the action tabs */
margin-bottom: 2em;
}
diff --git a/themes/blueview/style.css b/themes/blueview/style.css
index 32f4b32ea..40a940f26 100644
--- a/themes/blueview/style.css
+++ b/themes/blueview/style.css
@@ -197,23 +197,19 @@ body {
font-weight: bold;
}
-.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span, .pageheader #otherlanguages ul li, .trailprev, .trailnext, .trailup {
+.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span, .pageheader #otherlanguages ul li, .pageheader .trailprev, .pageheader .trailnext, .pageheader .trailup {
padding: 0.25em 0.25em 0.25em 0.25em;
background-image: url('background_darkness.png');
background-repeat: repeat;
color: white;
}
-.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a, .pageheader #otherlanguages ul li a, .pageheader a {
+.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a, .pageheader #otherlanguages ul li a, .pageheader a, .pageheader .trail a {
font-weight: bold;
color: white;
text-decoration: none;
}
-.trailprev, .trailnext, .trailup {
- margin-top: 0.5em;
-}
-
.pageheader .actions {
text-align: right;
vertical-align: bottom;