summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-08-04 12:05:31 +0200
committerJonas Smedegaard <dr@jones.dk>2012-08-04 12:05:31 +0200
commit81e01ecf5d97072f88a68748a741e9a810551030 (patch)
tree7915934fd58ad2b64c05311208562eba500eed2a
parent83b920b5bfb014a7ea14fce9d9757902f7771d28 (diff)
Sync with ikiwiki 3.20120419.
-rw-r--r--style.css5
-rw-r--r--templates.mdwn3
2 files changed, 8 insertions, 0 deletions
diff --git a/style.css b/style.css
index 35a1331..6e2afce 100644
--- a/style.css
+++ b/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.mdwn b/templates.mdwn
index 43bf9ee..d0f891c 100644
--- a/templates.mdwn
+++ b/templates.mdwn
@@ -82,10 +82,13 @@ Here is a full list of the template files used:
make calendar archive pages.
* `trails.tmpl` - Used by the trail plugin to generate links on each page
that is a member of a trail.
+* `notifyemail.tmpl` - Used by the notifymail plugin to generate mails about
+ changed pages.
* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
`editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
`editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
`passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user
interface; do not normally need to be customised.
+
[[!meta robots="noindex, follow"]]