diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/atomitem.tmpl | 80 | ||||
| -rw-r--r-- | templates/atompage.tmpl | 34 | ||||
| -rw-r--r-- | templates/calendarmonth.tmpl | 2 | ||||
| -rw-r--r-- | templates/change.tmpl | 2 | ||||
| -rw-r--r-- | templates/page.tmpl | 3 | ||||
| -rw-r--r-- | templates/rssitem.tmpl | 34 |
6 files changed, 79 insertions, 76 deletions
diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl index 768695a2c..87cbee9e0 100644 --- a/templates/atomitem.tmpl +++ b/templates/atomitem.tmpl @@ -1,48 +1,48 @@ <entry> <title><TMPL_VAR TITLE></title> - <TMPL_IF NAME="GUID"> - <id><TMPL_VAR GUID></id> - <TMPL_ELSE> - <id><TMPL_VAR URL></id> - </TMPL_IF> +<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> - </TMPL_IF> - <TMPL_IF NAME="COPYRIGHT"> - <rights type="html" xml:lang="en"> - <TMPL_IF NAME="LICENSE"> - <TMPL_VAR LICENSE ESCAPE=HTML> - <TMPL_VAR COPYRIGHT ESCAPE=HTML> - <TMPL_ELSE> - <TMPL_VAR COPYRIGHT ESCAPE=HTML> - </TMPL_IF> - </rights> - <TMPL_ELSE> - <TMPL_IF NAME="LICENSE"> - <rights type="html" xml:lang="en"> - <TMPL_VAR LICENSE ESCAPE=HTML> - </rights> - </TMPL_IF> - </TMPL_IF> - <TMPL_IF NAME="CATEGORIES"> - <TMPL_LOOP NAME="CATEGORIES"> - <category term="<TMPL_VAR CATEGORY>" /> - </TMPL_LOOP> - </TMPL_IF> +<TMPL_IF NAME="AUTHOR"> + <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author> +</TMPL_IF> +<TMPL_IF NAME="COPYRIGHT"> + <rights type="html" xml:lang="en"> +<TMPL_IF NAME="LICENSE"> + <TMPL_VAR LICENSE ESCAPE=HTML> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> +<TMPL_ELSE> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> +</TMPL_IF> + </rights> +<TMPL_ELSE> +<TMPL_IF NAME="LICENSE"> + <rights type="html" xml:lang="en"> + <TMPL_VAR LICENSE ESCAPE=HTML> + </rights> +</TMPL_IF> +</TMPL_IF> +<TMPL_IF NAME="CATEGORIES"> +<TMPL_LOOP NAME="CATEGORIES"> + <category term="<TMPL_VAR CATEGORY>" /> +</TMPL_LOOP> +</TMPL_IF> <updated><TMPL_VAR MDATE_3339></updated> <published><TMPL_VAR CDATE_3339></published> - <TMPL_IF NAME="ENCLOSURE"> - <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" /> - <TMPL_ELSE> - <content type="html" xml:lang="en"> - <TMPL_VAR CONTENT ESCAPE=HTML> - </content> - </TMPL_IF> - <TMPL_IF NAME="COMMENTSURL"> +<TMPL_IF NAME="ENCLOSURE"> + <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" /> +<TMPL_ELSE> + <content type="html" xml:lang="en"> + <TMPL_VAR CONTENT ESCAPE=HTML> + </content> +</TMPL_IF> +<TMPL_IF NAME="COMMENTSURL"> <link rel="comments" href="<TMPL_VAR NAME="COMMENTSURL">" type="text/html" /> - </TMPL_IF> - <TMPL_IF NAME="ATOMCOMMENTSURL"> +</TMPL_IF> +<TMPL_IF NAME="ATOMCOMMENTSURL"> <link rel="comments" href="<TMPL_VAR NAME="ATOMCOMMENTSURL">" type="application/atom+xml" /> - </TMPL_IF> +</TMPL_IF> </entry> diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl index dcb89ab5c..fc0088ae8 100644 --- a/templates/atompage.tmpl +++ b/templates/atompage.tmpl @@ -6,31 +6,31 @@ <link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/> <author> <TMPL_IF NAME="AUTHOR"> - <name><TMPL_VAR AUTHOR></name> +<name><TMPL_VAR AUTHOR></name> <TMPL_ELSE> - <name><TMPL_VAR WIKINAME></name> +<name><TMPL_VAR WIKINAME></name> </TMPL_IF> </author> <TMPL_IF NAME="COPYRIGHT"> - <rights type="html" xml:lang="en"> - <TMPL_IF NAME="LICENSE"> - <TMPL_VAR LICENSE> - <TMPL_VAR COPYRIGHT ESCAPE=HTML> - <TMPL_ELSE> - <TMPL_VAR COPYRIGHT ESCAPE=HTML> - </TMPL_IF> - </rights> +<rights type="html" xml:lang="en"> +<TMPL_IF NAME="LICENSE"> + <TMPL_VAR LICENSE> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> <TMPL_ELSE> - <TMPL_IF NAME="LICENSE"> - <rights type="html"> - <TMPL_VAR LICENSE ESCAPE=HTML> - </rights> - </TMPL_IF> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> +</TMPL_IF> +</rights> +<TMPL_ELSE> +<TMPL_IF NAME="LICENSE"> +<rights type="html"> + <TMPL_VAR LICENSE ESCAPE=HTML> +</rights> +</TMPL_IF> </TMPL_IF> <TMPL_IF NAME="GUID"> - <id><TMPL_VAR GUID></id> +<id><TMPL_VAR GUID></id> <TMPL_ELSE> - <id><TMPL_VAR PAGEURL></id> +<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> diff --git a/templates/calendarmonth.tmpl b/templates/calendarmonth.tmpl index 37ad78c5c..23cd95430 100644 --- a/templates/calendarmonth.tmpl +++ b/templates/calendarmonth.tmpl @@ -1,3 +1,5 @@ +[[!sidebar content=""" [[!calendar type=month month=<TMPL_VAR MONTH> year=<TMPL_VAR YEAR> pages="<TMPL_VAR PAGESPEC>"]] +"""]] [[!inline pages="creation_month(<TMPL_VAR MONTH>) and creation_year(<TMPL_VAR YEAR>) and <TMPL_VAR PAGESPEC>" show=0 feeds=no reverse=yes]] diff --git a/templates/change.tmpl b/templates/change.tmpl index 0e61a80f4..c9f6ce42b 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -27,7 +27,7 @@ <span class="desc"><br />Commit type:</span> <span class="committype"><TMPL_VAR COMMITTYPE></span> <span class="desc"><br />Date:</span> -<span class="changedate"><TMPL_VAR COMMITDATE> +<span class="changedate"><TMPL_VAR COMMITDATE></span> </div> <div class=changelog> <TMPL_LOOP NAME="MESSAGE"> diff --git a/templates/page.tmpl b/templates/page.tmpl index 968066a19..7e850a56b 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -3,6 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta http-equiv="Cache-Control" content="must-revalidate" /> <title><TMPL_VAR TITLE></title> <TMPL_IF NAME="FAVICON"> <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" /> @@ -91,7 +92,7 @@ </div> <!-- .pageheader --> <TMPL_IF SIDEBAR> -<div id="sidebar"> +<div class="sidebar"> <TMPL_VAR SIDEBAR> </div> </TMPL_IF> diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl index a61b92b61..069ae1997 100644 --- a/templates/rssitem.tmpl +++ b/templates/rssitem.tmpl @@ -1,29 +1,29 @@ <item> - <TMPL_IF NAME="AUTHOR"> +<TMPL_IF NAME="AUTHOR"> <title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title> <dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator> - <TMPL_ELSE> +<TMPL_ELSE> <title><TMPL_VAR TITLE></title> - </TMPL_IF> - <TMPL_IF NAME="GUID"> - <guid isPermaLink="no"><TMPL_VAR GUID></guid> - <TMPL_ELSE> - <guid><TMPL_VAR URL></guid> - </TMPL_IF> +</TMPL_IF> +<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"> +<TMPL_IF NAME="CATEGORIES"> +<TMPL_LOOP NAME="CATEGORIES"> <category><TMPL_VAR CATEGORY></category> - </TMPL_LOOP> - </TMPL_IF> +</TMPL_LOOP> +</TMPL_IF> <pubDate><TMPL_VAR CDATE_822></pubDate> <dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified> - <TMPL_IF NAME="ENCLOSURE"> +<TMPL_IF NAME="ENCLOSURE"> <enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" /> - <TMPL_ELSE> +<TMPL_ELSE> <description><TMPL_VAR CONTENT ESCAPE=HTML></description> - </TMPL_IF> - <TMPL_IF NAME="COMMENTSURL"> +</TMPL_IF> +<TMPL_IF NAME="COMMENTSURL"> <comments><TMPL_VAR NAME="COMMENTSURL"></comments> - </TMPL_IF> +</TMPL_IF> </item> |