diff options
| -rw-r--r-- | atomitem.tmpl | 6 | ||||
| -rw-r--r-- | atompage.tmpl | 8 | ||||
| -rw-r--r-- | editconflict.tmpl | 7 | ||||
| -rw-r--r-- | editcreationconflict.tmpl | 9 | ||||
| -rw-r--r-- | editfailedsave.tmpl | 10 | ||||
| -rw-r--r-- | editpage.tmpl | 58 | ||||
| -rw-r--r-- | editpagegone.tmpl | 7 | ||||
| -rw-r--r-- | inlinepage.tmpl | 16 | ||||
| -rw-r--r-- | page.tmpl | 17 | ||||
| -rw-r--r-- | renamesummary.tmpl | 19 | ||||
| -rw-r--r-- | rssitem.tmpl | 6 | ||||
| -rw-r--r-- | searchquery.tmpl | 2 |
12 files changed, 113 insertions, 52 deletions
diff --git a/atomitem.tmpl b/atomitem.tmpl index 1b1d686..19c557f 100644 --- a/atomitem.tmpl +++ b/atomitem.tmpl @@ -1,6 +1,10 @@ <entry> <title><TMPL_VAR TITLE></title> - <id><TMPL_VAR URL></id> + <TMPL_IF NAME="GUID"> + <id><TMPL_VAR GUID></id> + <TMPL_ELSE> + <id><TMPL_VAR URL></id> + </TMPL_IF> <link href="<TMPL_VAR PERMALINK>"/> <TMPL_IF NAME="AUTHOR"> <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author> diff --git a/atompage.tmpl b/atompage.tmpl index acc4737..e834d76 100644 --- a/atompage.tmpl +++ b/atompage.tmpl @@ -3,7 +3,7 @@ <feed xmlns="http://www.w3.org/2005/Atom"> <title><TMPL_VAR TITLE></title> <link href="<TMPL_VAR PAGEURL>"/> -<link href="<TMPL_VAR FEEDURL>" rel="self"/> +<link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/> <author> <TMPL_IF NAME="AUTHOR"> <name><TMPL_VAR AUTHOR></name> @@ -31,7 +31,11 @@ </rights> </TMPL_IF> </TMPL_IF> -<id><TMPL_VAR PAGEURL></id> +<TMPL_IF NAME="GUID"> + <id><TMPL_VAR GUID></id> +<TMPL_ELSE> + <id><TMPL_VAR PAGEURL></id> +</TMPL_IF> <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle> <generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator> <updated><TMPL_VAR FEEDDATE></updated> diff --git a/editconflict.tmpl b/editconflict.tmpl new file mode 100644 index 0000000..1252033 --- /dev/null +++ b/editconflict.tmpl @@ -0,0 +1,7 @@ +<p class="error"> +<b>Your changes conflict with other changes made to the page.</b> +</p> +<p> +Conflict markers have been inserted into the page content. Reconcile the +conflict and commit again to save your changes. +</p> diff --git a/editcreationconflict.tmpl b/editcreationconflict.tmpl new file mode 100644 index 0000000..c99102f --- /dev/null +++ b/editcreationconflict.tmpl @@ -0,0 +1,9 @@ +<p class="error"> +<b>While you were creating this page, someone else independently created a page +with the same name.</b> +</p> +<p> +The edit box below contains the page's current content, followed by the +content you entered previously, to allow you to merge the two +together before saving. +</p> diff --git a/editfailedsave.tmpl b/editfailedsave.tmpl new file mode 100644 index 0000000..5184f7d --- /dev/null +++ b/editfailedsave.tmpl @@ -0,0 +1,10 @@ +<p class="error"> +<b>Failed to save your changes.</b> +</p> +<p> +Your changes were not able to be saved to disk. The system gave the error: +<blockquote> +<TMPL_VAR ERROR_MESSAGE> +</blockquote> +Your changes are preserved below, and you can try again to save them. +</p> diff --git a/editpage.tmpl b/editpage.tmpl index b0bb0ec..4b54db2 100644 --- a/editpage.tmpl +++ b/editpage.tmpl @@ -1,44 +1,6 @@ -<TMPL_IF NAME="PAGE_CONFLICT"> -<p> -<b>Your changes conflict with other changes made to the page.</b> -</p> -<p> -Conflict markers have been inserted into the page content. Reconcile the -conflict and commit again to save your changes. -</p> -</TMPL_IF> -<TMPL_IF NAME="FAILED_SAVE"> -<p> -<b>Failed to save your changes.</b> -</p> -<p> -Your changes were not able to be saved to disk. The system gave the error: -<blockquote> -<TMPL_VAR ERROR_MESSAGE> -</blockquote> -Your changes are preserved below, and you can try again to save them. -</p> -</TMPL_IF> -<TMPL_IF NAME="PAGE_GONE"> -<p> -<b>The page you were editing has disappeared.</b> -</p> -<p> -Perhaps someone else has deleted it or moved it. If you want to recreate -this page with your text, click "Save Page" again. -</p> -</TMPL_IF> -<TMPL_IF NAME="CREATION_CONFLICT"> -<p> -<b>While you were creating this page, someone else independently created a page -with the same name.</b> -</p> -<p> -The edit box below contains the page's current content, followed by the -content you entered previously, to allow you to merge the two -together before saving. -</p> -</TMPL_IF> +<br /> +<TMPL_VAR JAVASCRIPT> +<TMPL_VAR MESSAGE> <TMPL_VAR FORM-START> <TMPL_VAR FIELD-DO> <TMPL_VAR FIELD-SID> @@ -60,6 +22,20 @@ Optional comment about this change:<br /> </TMPL_IF> <TMPL_VAR FORM-SUBMIT> <TMPL_VAR HELPONFORMATTINGLINK> +<TMPL_IF NAME="FIELD-ATTACHMENT"> +<a class="toggle" href="#attachments">Attachments</a> +<div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments"> +<table> +<tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr> +<TMPL_LOOP NAME="ATTACHMENT_LIST"> +<tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr> +</TMPL_LOOP> +<TMPL_IF NAME="ATTACHMENT_LIST"> +<tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr> +</TMPL_IF> +</table> +</div> +</TMPL_IF> <TMPL_VAR FORM-END> <TMPL_IF NAME="PAGE_PREVIEW"> diff --git a/editpagegone.tmpl b/editpagegone.tmpl new file mode 100644 index 0000000..2eed03a --- /dev/null +++ b/editpagegone.tmpl @@ -0,0 +1,7 @@ +<p class="error"> +<b>The page you were editing has disappeared.</b> +</p> +<p> +Perhaps someone else has deleted it or moved it. If you want to recreate +this page with your text, click "Save Page" again. +</p> diff --git a/inlinepage.tmpl b/inlinepage.tmpl index 71d57b0..ffcb897 100644 --- a/inlinepage.tmpl +++ b/inlinepage.tmpl @@ -1,4 +1,7 @@ <div class="inlinepage"> + +<div class="inlineheader"> + <TMPL_IF NAME="AUTHOR"> <span class="author"> <TMPL_IF NAME="AUTHORURL"> @@ -15,7 +18,14 @@ <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a> </TMPL_IF> </span> + +</div><!--.inlineheader--> + +<div class="inlinecontent"> <TMPL_VAR CONTENT> +</div><!--.inlinecontent--> + +<div class="inlinefooter"> <span class="pagedate"> Posted <TMPL_VAR CTIME> @@ -52,7 +62,9 @@ License: <TMPL_VAR LICENSE> <li><TMPL_VAR DISCUSSIONLINK></li> </TMPL_IF> </ul> -</div> +</div><!--.actions--> </TMPL_IF> -</div> +</div><!--.inlinefooter--> + +</div><!--.inlinepage--> @@ -9,18 +9,26 @@ </TMPL_IF> <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" /> <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" /> +<TMPL_IF NAME="EDITURL"> +<link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" /> +</TMPL_IF> <TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF> <TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF> </head> <body> +<div class="pageheader"> <div class="header"> <span> +<span class="parentlinks"> <TMPL_LOOP NAME="PARENTLINKS"> <a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/ </TMPL_LOOP> +</span> +<span class="title"> <TMPL_VAR TITLE> </span> +</span><!--.header--> <TMPL_IF NAME="SEARCHFORM"> <TMPL_VAR SEARCHFORM> </TMPL_IF> @@ -47,6 +55,7 @@ </ul> </div> </TMPL_IF> +</div> <!-- .pageheader --> <TMPL_IF SIDEBAR> <div id="sidebar"> @@ -58,7 +67,7 @@ <TMPL_VAR CONTENT> </div> -<div id="footer"> +<div id="footer" class="pagefooter"> <div id="pageinfo"> <TMPL_IF NAME="TAGS"> @@ -85,7 +94,7 @@ Links: </span> </span> </TMPL_IF> -</div> +</div><!-- #backlinks --> </TMPL_IF> <TMPL_IF COPYRIGHT> @@ -107,10 +116,10 @@ Last edited <TMPL_VAR NAME=MTIME> <!-- Created <TMPL_VAR NAME=CTIME> --> </div> -</div> +</div><!-- #pageinfo --> <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF> <!-- from <TMPL_VAR NAME=WIKINAME> --> -</div> +</div><!-- .pagefooter #footer --> </body> </html> diff --git a/renamesummary.tmpl b/renamesummary.tmpl new file mode 100644 index 0000000..2676082 --- /dev/null +++ b/renamesummary.tmpl @@ -0,0 +1,19 @@ +<p> +<b>Successfully renamed <TMPL_VAR SRC> to <TMPL_VAR DEST>.</b> +</p> +<p> +<TMPL_IF FIXEDLINKS> +The following pages have been automatically modified to update their links to <TMPL_VAR DEST>: +<ul> +<TMPL_LOOP NAME=FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP> +</ul> +</TMPL_IF> +<TMPL_IF BROKENLINKS> +The following pages still link to <TMPL_VAR SRC>: +<ul> +<TMPL_LOOP NAME=BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP> +</ul> +<TMPL_ELSE> +No pages have broken links to <TMPL_VAR SRC>. +</TMPL_IF> +</p> diff --git a/rssitem.tmpl b/rssitem.tmpl index f22e5e3..1144cd5 100644 --- a/rssitem.tmpl +++ b/rssitem.tmpl @@ -5,7 +5,11 @@ <TMPL_ELSE> <title><TMPL_VAR TITLE></title> </TMPL_IF> - <guid><TMPL_VAR URL></guid> + <TMPL_IF NAME="GUID"> + <guid isPermaLink="no"><TMPL_VAR GUID></guid> + <TMPL_ELSE> + <guid><TMPL_VAR URL></guid> + </TMPL_IF> <link><TMPL_VAR PERMALINK></link> <TMPL_IF NAME="CATEGORIES"> <TMPL_LOOP NAME="CATEGORIES"> diff --git a/searchquery.tmpl b/searchquery.tmpl index 0d6eb63..782b12c 100644 --- a/searchquery.tmpl +++ b/searchquery.tmpl @@ -1,5 +1,5 @@ $setmap{prefix,title,S} -$setmap{prefix,link,LINK} +$setmap{prefix,link,XLINK} $set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France} ${ $def{PREV, |