diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-17 16:28:38 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-17 16:28:38 +0200 |
| commit | 79d00112bd5b787c72c36db34b02517ddc84f6b3 (patch) | |
| tree | 5af1779579017175e0a51826c583e0a52a4790e6 /templates | |
| parent | 660120c4c1f6f52a4138992e1b0f1dff40660b02 (diff) | |
| parent | 747d1ba5821b87aae3792c8304db0fa8597f2dc6 (diff) | |
Merge branch 'master-da' into master-nonedit-da
Conflicts (manually resolved: adjustments adopted, newly added files dropped):
ikiwiki.mdwn
ikiwiki/directive.mdwn
ikiwiki/formatting.mdwn
ikiwiki/markdown.mdwn
ikiwiki/openid.mdwn
ikiwiki/pagespec.mdwn
ikiwiki/pagespec/attachment.mdwn
ikiwiki/subpage.mdwn
ikiwiki/wikilink.mdwn
index.mdwn
templates.mdwn
wikiicons/openidlogin-bg.gif
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/note.mdwn | 2 | ||||
| -rw-r--r-- | templates/popup.mdwn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/note.mdwn b/templates/note.mdwn index 3a5b87a..2c6c9e0 100644 --- a/templates/note.mdwn +++ b/templates/note.mdwn @@ -1,7 +1,7 @@ <div class="notebox"> <TMPL_VAR text> </div> -<TMPL_UNLESS NAME="text"> +<TMPL_UNLESS text> Brug denne skabelon til at indsætte en note på en side. Noten vil blive udsmykket til at flyde til højre for den øvrige tekst på siden. Denne skabelon har et parameter: diff --git a/templates/popup.mdwn b/templates/popup.mdwn index f3358ac..6d56070 100644 --- a/templates/popup.mdwn +++ b/templates/popup.mdwn @@ -1,4 +1,4 @@ -<TMPL_UNLESS NAME="mouseover"> +<TMPL_UNLESS mouseover> Brug denne skabelon til at lave et popup-vindue som vises når musemarkøren er henover en del af siden. Denne skabelon har to parametre: <ul> |