projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 5740506)
rename ispage variable
authorJoey Hess <joey@kitenet.net>
Thu, 6 May 2010 02:36:50 +0000 (22:36 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 6 May 2010 02:36:50 +0000 (22:36 -0400)
IkiWiki.pm patch | blob | history
IkiWiki/Render.pm patch | blob | history
debian/NEWS patch | blob | history
templates/page.tmpl patch | blob | history

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0da2c93c8e4df2731e416a053bcd1bf7f559d854..a79b66039023a8300fd491aa4a8c769b2809dc40 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1747,6 +1747,7 @@ sub misctemplate ($$;@) {
        });
 
        $template->param(
+               dynamic => 1,
                title => $title,
                wikiname => $config{wikiname},
                content => $content,
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 7d66bf5ec79eb84ed1698433588149a7cf8b94d7..e5ba0079b7b74706ebc1723a9206de3de3770ba1 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -138,7 +138,6 @@ sub genpage ($$) {
                title => $page eq 'index' 
                        ? $config{wikiname} 
                        : pagetitle(basename($page)),
-               ispage => 1,
                wikiname => $config{wikiname},
                content => $content,
                backlinks => $backlinks,
diff --git a/debian/NEWS b/debian/NEWS
index 6074d6260ec2d46d45e7933e986535d2de640934..0f2c1f5624de47ae3dbfb18a846e175d4f87d88c 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -4,7 +4,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   If you have locally modified versions of that template, you will need
   to update it to contain the following in the HTML <head>:
 
-    <TMPL_UNLESS ISPAGE>
+    <TMPL_IF DYNAMIC>
     <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
     <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
     </TMPL_IF>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 4920d3cc8e52779e7ac0080713c7bd8024390135..41fffa2636d918ba19c66fe23c44b54c41399ba6 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 </TMPL_IF>
 <head>
-<TMPL_UNLESS ISPAGE>
+<TMPL_IF DYNAMIC>
 <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
 <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
 </TMPL_IF>
@@ -48,7 +48,7 @@
 </TMPL_IF>
 </span>
 </span>
-<TMPL_IF ISPAGE>
+<TMPL_UNLESS DYNAMIC>
 <TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
@@ -132,7 +132,7 @@
 </TMPL_IF>
 
 <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
-<TMPL_IF ISPAGE>
+<TMPL_UNLESS DYNAMIC>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
 <TMPL_IF TAGS>
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.