diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-10-22 18:51:10 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-10-22 18:51:10 +0200 |
| commit | 325ea5ddb22022016d057ba54501844e16642f8b (patch) | |
| tree | 1784e31db8ce11d54266d8f9023d5ffebfc63b61 | |
| parent | 3e2f923e92cf5757631a0ed28223a68d38e71f6f (diff) | |
| parent | 5a2106a2510b0bb38880db90eded65695ffd8674 (diff) | |
Merge branch 'master' into scsscs
| -rw-r--r-- | page.tmpl | 37 | ||||
| -rw-r--r-- | rssitem.tmpl | 2 |
2 files changed, 20 insertions, 19 deletions
@@ -11,7 +11,6 @@ </TMPL_IF> </TMPL_IF> <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF> -<meta http-equiv="Cache-Control" content="must-revalidate" /> <title><TMPL_VAR TITLE></title> <TMPL_IF FAVICON> <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" /> @@ -100,23 +99,6 @@ isn't that nice to know? --> <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> </TMPL_IF> -<TMPL_IF OTHERLANGUAGES> -<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF> -<ul> -<TMPL_LOOP OTHERLANGUAGES> -<li> -<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a> -<TMPL_IF MASTER> -(master) -<TMPL_ELSE> - (<TMPL_VAR PERCENT>%) -</TMPL_IF> -</li> -</TMPL_LOOP> -</ul> -<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> -</TMPL_IF> - <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> <TMPL_IF SIDEBAR> @@ -131,6 +113,7 @@ isn't that nice to know? --> <TMPL_VAR CONTENT> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> +<TMPL_UNLESS DYNAMIC> <TMPL_IF COMMENTS> <TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF> <TMPL_VAR COMMENTS> @@ -143,6 +126,7 @@ isn't that nice to know? --> </TMPL_IF> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> </TMPL_IF> +</TMPL_UNLESS> </div> @@ -177,6 +161,23 @@ Links: <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> </TMPL_IF> +<TMPL_IF OTHERLANGUAGES> +<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF> +<ul> +<TMPL_LOOP OTHERLANGUAGES> +<li> +<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a> +<TMPL_IF MASTER> +(master) +<TMPL_ELSE> + (<TMPL_VAR PERCENT>%) +</TMPL_IF> +</li> +</TMPL_LOOP> +</ul> +<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> +</TMPL_IF> + <TMPL_IF COPYRIGHT> <div class="pagecopyright"> <a name="pagecopyright"></a> diff --git a/rssitem.tmpl b/rssitem.tmpl index a64a4eb..272b340 100644 --- a/rssitem.tmpl +++ b/rssitem.tmpl @@ -8,7 +8,7 @@ <TMPL_IF GUID> <guid isPermaLink="no"><TMPL_VAR GUID></guid> <TMPL_ELSE> - <guid><TMPL_VAR URL></guid> + <guid isPermaLink="no"><TMPL_VAR URL></guid> </TMPL_IF> <link><TMPL_VAR PERMALINK></link> <TMPL_IF CATEGORIES> |