Author: dom Date: 2006-09-10 16:36:42 +0100 (Sun, 10 Sep 2006) New Revision: 849

Modified: trunk/Changes trunk/README.CSS trunk/templates/backlink_results.tt trunk/templates/differences.tt trunk/templates/display_metadata.tt trunk/templates/edit_conflict.tt trunk/templates/node_history.tt trunk/templates/preferences.tt Log: Tidies up various template bugs (closes #132, #133)

Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/Changes 2006-09-10 15:36:42 UTC (rev 849) @@ -8,6 +8,7 @@ enable_node_image, enable_common_categories, enable_common_locales Search::InvertedIndex support is deprecated as of this release. Please upgrade to Plucene if you are still using it. + Tidy up some template bits

0.56 14 June 2006 Fix bug introduced in feed formatting where Atom feeds would be

Modified: trunk/README.CSS =================================================================== --- trunk/README.CSS 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/README.CSS 2006-09-10 15:36:42 UTC (rev 849) @@ -60,7 +60,7 @@

span.node_name Used in: backlink_results.tt delete_confirm.tt delete_done.tt - differences.tt node_history.tt + differences.tt node_history.tt, edit_conflict.tt Purpose: Inlines a node name in a snippet of explanatory text, without linking to it.

@@ -99,9 +99,9 @@ div#maincontent Used in: backlink_results.tt, delete_confirm.tt, delete_done.tt, delete_password_wrong.tt, edit_conflict.tt, edit_form.tt, - home_node.tt, newpage.tt, node.tt, preferences.tt, + home_node.tt, newpage.tt, node.tt, node_history.tt, preferences.tt, recent_changes.tt, search_results.tt, site_index.tt, - search.tt, userstats.tt, wanted_pages.tt + search.tt, userstats.tt, wanted_pages.tt, differences.tt Purpose: Defines the main textual content of the page content includes the navbar and footer; maincontent does not

Modified: trunk/templates/backlink_results.tt =================================================================== --- trunk/templates/backlink_results.tt 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/templates/backlink_results.tt 2006-09-10 15:36:42 UTC (rev 849) @@ -3,7 +3,7 @@ <div id="content"> [% INCLUDE navbar.tt %] <div id="maincontent"> -<h1 align=center> +<h1> [% site_name %] - Backlinks to <span class="node_name">[% node_name %]</span> </h1>

Modified: trunk/templates/differences.tt =================================================================== --- trunk/templates/differences.tt 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/templates/differences.tt 2006-09-10 15:36:42 UTC (rev 849) @@ -1,8 +1,8 @@ -[% USE CGI %] [% INCLUDE header.tt %] [% INCLUDE banner.tt %] <div id="content"> [% INCLUDE navbar.tt %] +<div id="maincontent"> <h1> [% site_name %] - Differences between [% right_version %] and [% left_version %] of <span class="node_name">[% node_name %]</span> </h1> @@ -37,5 +37,5 @@ <input type="submit" name="Go" value="Search" class="form_button" /> </form> </p> - +</div> [% INCLUDE footer.tt %]

Modified: trunk/templates/display_metadata.tt =================================================================== --- trunk/templates/display_metadata.tt 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/templates/display_metadata.tt 2006-09-10 15:36:42 UTC (rev 849) @@ -1,6 +1,8 @@ [% USE CGI %] <!-- METADATA STARTS --> - +[% IF phone OR fax OR address OR postcode OR formatted_website_text + OR hours_text OR map_link OR categories.size OR locales.size OR + node_image %] <div id="metadata" class="vcard"> [% IF node_image %] <div id="node_image_box"> @@ -82,5 +84,5 @@ </ul> [% END %] </div> - +[% END %] <!-- METADATA ENDS -->

Modified: trunk/templates/edit_conflict.tt =================================================================== --- trunk/templates/edit_conflict.tt 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/templates/edit_conflict.tt 2006-09-10 15:36:42 UTC (rev 849) @@ -4,7 +4,7 @@ <div id="content"> [% INCLUDE navbar.tt %] <div id="maincontent"> -<h2>Edit "[% node_name %]"</h2> +<h2>Edit "<span class="node_name">[% node_name %]</span>"</h2>

<div class="warning_text"> Someone has committed changes to this node since you began editing.

Modified: trunk/templates/node_history.tt =================================================================== --- trunk/templates/node_history.tt 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/templates/node_history.tt 2006-09-10 15:36:42 UTC (rev 849) @@ -3,8 +3,8 @@ [% INCLUDE banner.tt %] <div id="content"> [% INCLUDE navbar.tt %] - -<h1 align="center"> +<div id="maincontent"> +<h1> [% site_name %] - History of <span class="node_name">[% node_name %]</span> </h1> <p> @@ -44,5 +44,5 @@ and as an <a href="[% cgi_url %]?action=list_all_versions;format=atom;id=[% node_param %]">atom feed</a>. </p> - +</div> [% INCLUDE footer.tt %]

Modified: trunk/templates/preferences.tt =================================================================== --- trunk/templates/preferences.tt 2006-09-10 15:21:39 UTC (rev 848) +++ trunk/templates/preferences.tt 2006-09-10 15:36:42 UTC (rev 849) @@ -1,13 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html lang="[% language %]"> -<head> - <title>[% site_name %] - Set username/preferences</title> - [% IF stylesheet %] - <link rel="stylesheet" href="[% stylesheet %]" type="text/css"> - [% END %] -</head> - -<body> +[% INCLUDE header.tt page_title = "Set username/preferences" %] [% INCLUDE banner.tt %] <div id="content"> [% INCLUDE navbar.tt %]