From: joey Date: Thu, 10 May 2007 20:35:00 +0000 (+0000) Subject: web commit by Fred: Updated patch X-Git-Tag: 2.1~46 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0e8cbac4e572afe5c4aa294c858770486480eeb9;p=ikiwiki.git web commit by Fred: Updated patch --- 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 67db77c4b..702cc3ce2 100644 --- 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 @@ -33,43 +33,114 @@ Indeed, the misc.tmpl, recentchanges.tmpl and editpage.tmpl templates lack such >>> Sure, go ahead --[[Joey]] -This patch is against current svn. +>>>>Here is an updated patch against current svn. --Fred Index: templates/recentchanges.tmpl =================================================================== - --- templates/recentchanges.tmpl (révision 3543) + --- templates/recentchanges.tmpl (révision 3575) +++ templates/recentchanges.tmpl (copie de travail) - @@ -64,6 +64,8 @@ - + @@ -12,7 +12,11 @@ + + + + + + + +
+ + +
+ + / + @@ -65,5 +69,10 @@ - + + + + +
+
+ + + + + Index: templates/page.tmpl + =================================================================== + --- templates/page.tmpl (révision 3575) + +++ templates/page.tmpl (copie de travail) + @@ -13,7 +13,11 @@ + + + + + + + +
+ + +
+ + + @@ -95,5 +99,10 @@ + +
+ +
+ + + +
+ +
+ + Index: templates/editpage.tmpl =================================================================== - --- templates/editpage.tmpl (révision 3543) + --- templates/editpage.tmpl (révision 3575) +++ templates/editpage.tmpl (copie de travail) - @@ -86,5 +86,7 @@ + @@ -12,6 +12,11 @@ + + + + + + + + +
+ + + +

+ Your changes conflict with other changes made to the page. + @@ -86,5 +91,11 @@

- + + + + +
+
+ + Index: templates/misc.tmpl =================================================================== - --- templates/misc.tmpl (révision 3543) + --- templates/misc.tmpl (révision 3575) +++ templates/misc.tmpl (copie de travail) - @@ -22,6 +22,8 @@ -
+ @@ -12,7 +12,11 @@ + + + + + + + +
+ + +
+ + / + @@ -23,5 +27,10 @@
- + + +
+ + + +
+ +
+ + - + \ No newline at end of file