summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-08-04 12:08:20 +0200
committerJonas Smedegaard <dr@jones.dk>2012-08-04 12:08:20 +0200
commit74b86178c787a683d175faf563e9e636c1ac9e0b (patch)
tree3477db3998c73cbf711119cfaa7280500a48cbe1
parent085eb1c5e279bbb9337e7088c8121fbad8914d6f (diff)
parent81e01ecf5d97072f88a68748a741e9a810551030 (diff)
Merge branch 'ikiwiki' into da
Conflicts: templates.mdwn
-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 61bcd17..37e44a6 100644
--- a/templates.mdwn
+++ b/templates.mdwn
@@ -84,10 +84,13 @@ Her er en komplet oversigt over anvendte skabelonfiler:
at oprette kalender-arkiv sider.
* `trails.tmpl` - Anvendt af udvidelsen trail til at danne henvisninger på hver side
der er et medlem af en sti.
+* `notifyemail.tmpl` - Anvendt af udvidelsen notifymail til at danne emails om
+ ændrede sider.
* `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` - Dele af ikiwiki's
brugerflade; kræver normalt ingen tilretning.
+
[[!meta robots="noindex, follow"]]