diff options
| -rw-r--r-- | doc/examples/blog/posts.mdwn | 2 | ||||
| -rw-r--r-- | doc/style.css | 7 | ||||
| -rw-r--r-- | doc/templates.mdwn | 4 | ||||
| -rw-r--r-- | templates/editcomment.tmpl | 16 | ||||
| -rw-r--r-- | templates/editpage.tmpl | 9 |
5 files changed, 8 insertions, 30 deletions
diff --git a/doc/examples/blog/posts.mdwn b/doc/examples/blog/posts.mdwn index 4b2939120..fa2dbef0e 100644 --- a/doc/examples/blog/posts.mdwn +++ b/doc/examples/blog/posts.mdwn @@ -1,3 +1,3 @@ -Here is a full list of posts to my [[blog|index]]. +Here is a full list of posts to the [[blog|index]]. [[!inline pages="./posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]] diff --git a/doc/style.css b/doc/style.css index 22c68bd7a..7c97a518c 100644 --- a/doc/style.css +++ b/doc/style.css @@ -338,13 +338,6 @@ label.block { label.inline { display: inline; } -ol.form { - list-style: none; - padding: 0; -} -li.form { - padding-bottom: 1em; -} input#openid_identifier { background: url(wikiicons/openidlogin-bg.gif) no-repeat; background-color: #fff; diff --git a/doc/templates.mdwn b/doc/templates.mdwn index 056e24c50..861d0bcbe 100644 --- a/doc/templates.mdwn +++ b/doc/templates.mdwn @@ -3,7 +3,7 @@ you can fully customise this site. Templates are located in `/usr/share/ikiwiki/templates` by default; the `templatedir` setting can be used to make another directory be -searched first. Customized templates can also be placed inside the +searched first. Customised templates can also be placed inside the "templates/" directory in your wiki's source. Ikiwiki uses the HTML::Template module as its template engine. This @@ -44,7 +44,7 @@ These templates are used to build the wiki. The aim is to keep almost all html out of ikiwiki and in the templates. * `page.tmpl` - Used for displaying all regular wiki pages. This is the - key template to customize. [[!if test="enabled(pagetemplate)" then=""" + key template to customise. [[!if test="enabled(pagetemplate)" then=""" (The pagetemplate directive can be used to make a page use a different template than `page.tmpl`.)"""]] * `rsspage.tmpl` - Used for generating rss feeds for blogs. diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl index f3a8e7395..a2edc691e 100644 --- a/templates/editcomment.tmpl +++ b/templates/editcomment.tmpl @@ -1,35 +1,27 @@ <div class="editcomment"> <TMPL_VAR MESSAGE> +<br /> <TMPL_VAR FORM-START> <TMPL_VAR FIELD-DO> <TMPL_VAR FIELD-SID> <TMPL_VAR FIELD-PAGE> -<ol class="form"> <TMPL_UNLESS NAME=USERNAME> <TMPL_IF NAME=ALLOWAUTHOR> -<li> <label for="author" class="block">Name:</label> <TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a href="<TMPL_VAR SIGNINURL>">signin</a>) -</li> -<li> +<br/> <label for="url" class="block">Website:</label> <TMPL_VAR NAME=FIELD-URL> (optional) -</li> +<br /> <TMPL_ELSE> -<li> (You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?) -</li> +<br /> </TMPL_IF> </TMPL_UNLESS> -<li> <label for="subject" class="block">Subject:</label> <TMPL_VAR FIELD-SUBJECT><br /> -</li> -<li> <label for="editcontent" class="block">Comment:</label> <TMPL_VAR FIELD-EDITCONTENT><br /> -</li> -</ol> <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br /> <TMPL_VAR NAME="FORM-END"> <TMPL_VAR WMD_PREVIEW> diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index b4b0d05df..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,33 +1,26 @@ <TMPL_VAR JAVASCRIPT> <TMPL_VAR MESSAGE> +<br /> <TMPL_VAR FORM-START> <TMPL_VAR FIELD-DO> <TMPL_VAR FIELD-SID> <TMPL_VAR FIELD-FROM> <TMPL_VAR FIELD-RCSINFO> <TMPL_VAR FIELD-NEWFILE> -<ol class="form"> <TMPL_IF NAME="PAGE_SELECT"> -<li> <label for="page" class="inline">Page location:</label><TMPL_VAR FIELD-PAGE> <label for="type" class="inline">Page type:</label><TMPL_VAR FIELD-TYPE> -</li> <TMPL_ELSE> <TMPL_VAR FIELD-PAGE> <TMPL_VAR FIELD-TYPE> </TMPL_IF> -<li> <div class="editcontentdiv"> <TMPL_VAR FIELD-EDITCONTENT><br /> </div> -</li> <TMPL_IF NAME="CAN_COMMIT"> -<li> <label for="editmessage" class="block">Optional comment about this change:</label> <TMPL_VAR FIELD-EDITMESSAGE><br /> -</li> </TMPL_IF> -</ol> <TMPL_VAR FORM-SUBMIT> <TMPL_VAR HELPONFORMATTINGLINK> <TMPL_IF NAME="FIELD-ATTACHMENT"> |