urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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.
master
joey 2007-05-11 20:09:58 +00:00
parent 02fd4b9f33
commit 190202dd4e
12 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IkiWiki/CGI.pm
View File

@ -318,6 +318,7 @@ sub cgi_editpage ($$) { #{{{
action => $config{cgiurl}, action => $config{cgiurl},
table => 0, table => 0,
template => scalar template_params("editpage.tmpl"), template => scalar template_params("editpage.tmpl"),
wikiname => $config{wikiname},
); );
run_hooks(formbuilder_setup => sub { run_hooks(formbuilder_setup => sub {

9
debian/NEWS vendored
View File

@ -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 ikiwiki (2.00) unstable; urgency=low
With the 2.0 release of ikiwiki, some major changes have been made to the With the 2.0 release of ikiwiki, some major changes have been made to the

8
debian/changelog vendored
View File

@ -24,8 +24,14 @@ ikiwiki (2.1) UNRELEASED; urgency=low
* Updated Czech translation from Miroslav Kure. * Updated Czech translation from Miroslav Kure.
* Apply patch from Pawel to avoid using -L in Makefile as it's not available * Apply patch from Pawel to avoid using -L in Makefile as it's not available
in older finds. 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 ikiwiki (2.00) unstable; urgency=low

2
debian/postinst vendored
View File

@ -4,7 +4,7 @@ set -e
# Change this when some incompatible change is made that requires # Change this when some incompatible change is made that requires
# rebuilding all wikis. # rebuilding all wikis.
firstcompat=1.51 firstcompat=2.1
if [ "$1" = configure ] && \ if [ "$1" = configure ] && \
dpkg --compare-versions "$2" lt "$firstcompat"; then dpkg --compare-versions "$2" lt "$firstcompat"; then

3
doc/bugs/Add_a_footer_div_on_all_pages_to_improve_theming.mdwn
View File

@ -144,3 +144,6 @@ Indeed, the misc.tmpl, recentchanges.tmpl and editpage.tmpl templates lack such
+ +
</body> </body>
</html> </html>
> I took a more intrusive approach to avoid ugly names like "realfooter".
> [[done]] --[[Joey]]

4
doc/style.css
View File

@ -39,7 +39,7 @@
clear: both; clear: both;
} }
#footer { #pageinfo {
clear: both; clear: both;
margin: 1em 0; margin: 1em 0;
border-top: 1px solid #000; border-top: 1px solid #000;
@ -109,7 +109,7 @@ td.changelog {
border: 1px solid #aaa; border: 1px solid #aaa;
} }
.pageinfo { .pagedate {
clear: both; clear: both;
font-style: italic; font-style: italic;
display: block; display: block;

16
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -36,34 +36,34 @@ msgstr ""
msgid "Preferences saved." msgid "Preferences saved."
msgstr "" msgstr ""
#: ../IkiWiki/CGI.pm:348 #: ../IkiWiki/CGI.pm:349
#, perl-format #, perl-format
msgid "%s is not an editable page" msgid "%s is not an editable page"
msgstr "" 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/inline.pm:183 ../IkiWiki/Plugin/opendiscussion.pm:17
#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95
#: ../IkiWiki/Render.pm:166 #: ../IkiWiki/Render.pm:166
msgid "discussion" msgid "discussion"
msgstr "" msgstr ""
#: ../IkiWiki/CGI.pm:473 #: ../IkiWiki/CGI.pm:474
#, perl-format #, perl-format
msgid "creating %s" msgid "creating %s"
msgstr "" msgstr ""
#: ../IkiWiki/CGI.pm:490 ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:516 #: ../IkiWiki/CGI.pm:491 ../IkiWiki/CGI.pm:506 ../IkiWiki/CGI.pm:517
#: ../IkiWiki/CGI.pm:542 ../IkiWiki/CGI.pm:586 #: ../IkiWiki/CGI.pm:543 ../IkiWiki/CGI.pm:587
#, perl-format #, perl-format
msgid "editing %s" msgid "editing %s"
msgstr "" msgstr ""
#: ../IkiWiki/CGI.pm:683 #: ../IkiWiki/CGI.pm:684
msgid "You are banned." msgid "You are banned."
msgstr "" msgstr ""
#: ../IkiWiki/CGI.pm:715 #: ../IkiWiki/CGI.pm:716
msgid "login failed, perhaps you need to turn on cookies?" msgid "login failed, perhaps you need to turn on cookies?"
msgstr "" msgstr ""

3
templates/editpage.tmpl
View File

@ -86,5 +86,8 @@ Optional comment about this change:<br />
<TMPL_VAR PAGE_PREVIEW> <TMPL_VAR PAGE_PREVIEW>
</div> </div>
</TMPL_IF> </TMPL_IF>
<div id="footer">
<!-- from <TMPL_VAR NAME=WIKINAME> -->
</div>
</body> </body>
</html> </html>

2
templates/inlinepage.tmpl
View File

@ -17,7 +17,7 @@
</span> </span>
<TMPL_VAR CONTENT> <TMPL_VAR CONTENT>
<span class="pageinfo"> <span class="pagedate">
Posted <TMPL_VAR CTIME> Posted <TMPL_VAR CTIME>
</span> </span>

4
templates/misc.tmpl
View File

@ -23,5 +23,9 @@
<TMPL_VAR PAGEBODY> <TMPL_VAR PAGEBODY>
</div> </div>
<div id="footer">
<!-- from <TMPL_VAR NAME=WIKINAME> -->
</div>
</body> </body>
</html> </html>

6
templates/page.tmpl
View File

@ -59,6 +59,7 @@
</div> </div>
<div id="footer"> <div id="footer">
<div id="pageinfo">
<TMPL_IF NAME="TAGS"> <TMPL_IF NAME="TAGS">
<div class="tags"> <div class="tags">
@ -87,12 +88,13 @@ Links:
</div> </div>
</TMPL_IF> </TMPL_IF>
<div class="pageinfo"> <div class="pagedate">
<!-- from <TMPL_VAR NAME=WIKINAME> -->
Last edited <TMPL_VAR NAME=MTIME> Last edited <TMPL_VAR NAME=MTIME>
</div> </div>
</div>
<TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF> <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
<!-- from <TMPL_VAR NAME=WIKINAME> -->
</div> </div>
</body> </body>

2
templates/recentchanges.tmpl
View File

@ -63,7 +63,9 @@
</table> </table>
</div> </div>
<div id="footer">
<!-- from <TMPL_VAR NAME=WIKINAME> --> <!-- from <TMPL_VAR NAME=WIKINAME> -->
</div>
</body> </body>
</html> </html>