* Make all templates have a footer div to ease themeing. Required template

  and style sheet updates, and unless you're using customised versions,
  you'll want to rebuild wikis on upgrade to this version to avoid
  inconsistencies.
* Allow WIKINAME to to used in footers, as an example of something to put
  there.

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 1471ae926631aef72356917c669546a1ade7f9d7..d92bdd3301eccab36b1d2ca8cab4c61db19c3028 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -318,6 +318,7 @@ sub cgi_editpage ($$) { #{{{
                action => $config{cgiurl},
                table => 0,
                template => scalar template_params("editpage.tmpl"),
+               wikiname => $config{wikiname},
        );
        
        run_hooks(formbuilder_setup => sub {

diff --git a/debian/NEWS b/debian/NEWS
index e66872b425fe89afe39f4165b714d0a6e1f878d4..7a5808ac0848ef9b43adcd3fcc3ea8c8addf94ac 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,12 @@
+ikiwiki (2.1) unstable; urgency=low
+
+  Some wikis need to be rebuilt on upgrade to this version, due to changes to
+  page templates and the style sheet. If you listed your wiki in
+  /etc/ikiwiki/wikilist this will be done automatically when the Debian
+  package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 26 Apr 2007 15:50:36 -0400
+
 ikiwiki (2.00) unstable; urgency=low
 
   With the 2.0 release of ikiwiki, some major changes have been made to the

diff --git a/debian/changelog b/debian/changelog
index 6a4737aedd2a626d91dfee59ec17283e89c76eb7..742ec135a1da2583752e9c5735f0c8c80fdec64b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,8 +24,14 @@ ikiwiki (2.1) UNRELEASED; urgency=low
   * Updated Czech translation from Miroslav Kure.
   * Apply patch from Pawel to avoid using -L in Makefile as it's not available
     in older finds.
+  * Make all templates have a footer div to ease themeing. Required template
+    and style sheet updates, and unless you're using customised versions,
+    you'll want to rebuild wikis on upgrade to this version to avoid
+    inconsistencies.
+  * Allow WIKINAME to to used in footers, as an example of something to put
+    there.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 10 May 2007 14:56:07 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 11 May 2007 15:35:12 -0400
 
 ikiwiki (2.00) unstable; urgency=low
 

diff --git a/debian/postinst b/debian/postinst
index 3f42a4029d6355b0bcf60b0fe6a676854814c9ce..018e04f788cae8ba9ea91669a1555ed5b1eeb6ef 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,7 @@ set -e
 
 # Change this when some incompatible change is made that requires
 # rebuilding all wikis.
-firstcompat=1.51
+firstcompat=2.1
 
 if [ "$1" = configure ] && \
    dpkg --compare-versions "$2" lt "$firstcompat"; then

diff --git a/doc/bugs/Add_a_footer_div_on_all_pages_to_improve_theming.mdwn b/doc/bugs/Add_a_footer_div_on_all_pages_to_improve_theming.mdwn
index 702cc3ce25ef460220ef330dc6093fdd4d0ab78c..e0dd100fa5a43e2615ac0b021560a88bbf5b91a1 100644 (file)
--- a/doc/bugs/Add_a_footer_div_on_all_pages_to_improve_theming.mdwn
+++ b/doc/bugs/Add_a_footer_div_on_all_pages_to_improve_theming.mdwn
@@ -143,4 +143,7 @@ Indeed, the misc.tmpl, recentchanges.tmpl and editpage.tmpl templates lack such
        +</div>
        +
         </body>
-        </html>
\ No newline at end of file
+        </html>
+
+> I took a more intrusive approach to avoid ugly names like "realfooter".
+> [[done]] --[[Joey]]

diff --git a/doc/style.css b/doc/style.css
index c34d9b2d19c903ea8cac0c87f5c87903e0945889..1cd856c534ad1791cc9106581327cc70705c02da 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -39,7 +39,7 @@
        clear: both;
 }
 
-#footer {
+#pageinfo {
        clear: both;
        margin: 1em 0;
        border-top: 1px solid #000;
@@ -109,7 +109,7 @@ td.changelog {
        border: 1px solid #aaa;
 }
 
-.pageinfo {
+.pagedate {
        clear: both;
        font-style: italic;
        display: block;

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index dd3dfd704bfa1c63309a777f8ccd9f2dd54502ff..e8d4228fa9f75096a3209b5ea1610ac97f174d87 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-10 14:57-0400\n"
+"POT-Creation-Date: 2007-05-11 15:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,34 +36,34 @@ msgstr ""
 msgid "Preferences saved."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:348
+#: ../IkiWiki/CGI.pm:349
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:427 ../IkiWiki/Plugin/brokenlinks.pm:24
+#: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
 #: ../IkiWiki/Plugin/inline.pm:183 ../IkiWiki/Plugin/opendiscussion.pm:17
 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95
 #: ../IkiWiki/Render.pm:166
 msgid "discussion"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:473
+#: ../IkiWiki/CGI.pm:474
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:490 ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:516
-#: ../IkiWiki/CGI.pm:542 ../IkiWiki/CGI.pm:586
+#: ../IkiWiki/CGI.pm:491 ../IkiWiki/CGI.pm:506 ../IkiWiki/CGI.pm:517
+#: ../IkiWiki/CGI.pm:543 ../IkiWiki/CGI.pm:587
 #, perl-format
 msgid "editing %s"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:683
+#: ../IkiWiki/CGI.pm:684
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:715
+#: ../IkiWiki/CGI.pm:716
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 02951210ffaad64a6ebcae54cccd685389c6e32b..08f160881f4a768401c73795fd82731e855df94c 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -86,5 +86,8 @@ Optional comment about this change:<br />
 <TMPL_VAR PAGE_PREVIEW>
 </div>
 </TMPL_IF>
+<div id="footer">
+<!-- from <TMPL_VAR NAME=WIKINAME> -->
+</div>
 </body>
 </html>

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 26889ac93d6707becd8814b3f9b12f7adfecc96d..e1943baec13fe3e7ac72b0971d52d6284e98bdf7 100644 (file)
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -17,7 +17,7 @@
 </span>
 <TMPL_VAR CONTENT>
 
-<span class="pageinfo">
+<span class="pagedate">
 Posted <TMPL_VAR CTIME>
 </span>
 

diff --git a/templates/misc.tmpl b/templates/misc.tmpl
index 56be11107d9e077d51783086264974e7eb8afb9c..32e2c934eac8fe8efdade8b40bbf3081293d7391 100644 (file)
--- a/templates/misc.tmpl
+++ b/templates/misc.tmpl
@@ -23,5 +23,9 @@
 <TMPL_VAR PAGEBODY>
 </div>
 
+<div id="footer">
+<!-- from <TMPL_VAR NAME=WIKINAME> -->
+</div>
+
 </body>
 </html>

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 5b3c90b5bef392151e697eda8d9ad7b55bf927fb..fd44a53be0a7e1e1a81d0950bfde16f79ef1a2b9 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -59,6 +59,7 @@
 </div>
 
 <div id="footer">
+<div id="pageinfo">
 
 <TMPL_IF NAME="TAGS">
 <div class="tags">
@@ -87,12 +88,13 @@ Links:
 </div>
 </TMPL_IF>
 
-<div class="pageinfo">
-<!-- from <TMPL_VAR NAME=WIKINAME> -->
+<div class="pagedate">
 Last edited <TMPL_VAR NAME=MTIME>
 </div>
 
+</div>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
+<!-- from <TMPL_VAR NAME=WIKINAME> -->
 </div>
 
 </body>

diff --git a/templates/recentchanges.tmpl b/templates/recentchanges.tmpl
index b02ac4bf5b11f87b7eb39f0d889168a44a31e4dc..e954503f8a0f46df58ece13f3009b81847b769f7 100644 (file)
--- a/templates/recentchanges.tmpl
+++ b/templates/recentchanges.tmpl
@@ -63,7 +63,9 @@
 </table>
 </div>
 
+<div id="footer">
 <!-- from <TMPL_VAR NAME=WIKINAME> -->
+</div>
 
 </body>
 </html>