From 77fb5cc34c9a87077dc65548f0d890b366e78c61 Mon Sep 17 00:00:00 2001
From: Sebastian Riedel <sri@labs.kraih.com>
Date: Wed, 15 Sep 2004 16:46:58 +0000
Subject: [PATCH] Templates should be valid XHTML now...

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@176 48953598-375a-da11-a14b-00016c27c3ee
---
 templates/factory/addnew      | 25 ++++++-------
 templates/factory/edit        | 31 ++++++++--------
 templates/factory/footer      |  5 ++-
 templates/factory/frontpage   | 31 ++++++++++------
 templates/factory/header      | 46 +++++++++++++-----------
 templates/factory/list        | 68 +++++++++++++++++------------------
 templates/factory/macros      | 27 +++++++-------
 templates/factory/navbar      |  7 ++--
 templates/factory/pager       | 16 ++++++---
 templates/factory/search_form | 43 +++++++++++-----------
 templates/factory/view        | 67 +++++++++++++---------------------
 11 files changed, 179 insertions(+), 187 deletions(-)

diff --git a/templates/factory/addnew b/templates/factory/addnew
index cdf21a6..f56fcf4 100644
--- a/templates/factory/addnew
+++ b/templates/factory/addnew
@@ -10,16 +10,17 @@ table.
 =cut
 
 #%]
-<h3>Add a new [%classmetadata.moniker%]</h3>
-<FORM METHOD="post" ACTION="[%base%]/[%classmetadata.table%]/do_edit/">
-    <INPUT TYPE="hidden" NAME="action" VALUE="create">
-    <TABLE class="view">
-     [% FOR col = classmetadata.columns;
-        NEXT IF col == "id";
-     %]
-     <TR> <TD class="field"> [% classmetadata.colnames.$col; %] </TD>
-     <TD> [% classmetadata.cgi.$col.as_HTML; %] </TD> </TR>
+<h3>Add a new [% classmetadata.moniker %]</h3>
+<form method=post action="[% base %]/[% classmetadata.table %]/do_edit/">
+    <input type=hidden name=action value=create />
+    <table class=view>
+    [% FOR col = classmetadata.columns %]
+        [% NEXT IF col == "id" %]
+        <tr>
+            <td>[% classmetadata.colnames.$col %]</td>
+            <td>[% classmetadata.cgi.$col.as_HTML; %]</td>
+        </tr>
     [% END; %]
-    </TABLE>
-    <INPUT TYPE="submit" NAME="create" VALUE="create">
-</FORM>
+    </table>
+    <input type=submit name=create value=create />
+</form>
diff --git a/templates/factory/edit b/templates/factory/edit
index 69ca0d2..f1e0fbf 100644
--- a/templates/factory/edit
+++ b/templates/factory/edit
@@ -5,27 +5,24 @@
 This is the edit page. It edits the passed-in object, by displaying a
 form similar to L<add_new> but with the current values filled in.
 
-#%]
+=cut
 
+#%]
 [% PROCESS macros %]
 [% INCLUDE header %]
-
 [% FOR item = objects; %]
-<h2> Edit [% item.name %]</h2>
-
-<FORM ACTION="[% base %]/[% item.table %]/do_edit/[% item.id %]" METHOD="post">
-[%
-     FOR col = classmetadata.columns;
-        NEXT IF col == "id";
-        "<P>";
-        "<B>"; classmetadata.colnames.$col; "</B>";
-        ": ";
-            item.to_field(col).as_HTML;
-        "</P>";
-        IF errors.$col; 
-            "<FONT COLOR=\"#ff0000\">"; errors.$col; "</FONT>";
-        END;
+<h2>Edit [% item.name %]</h2>
+<form action="[% base %]/[% item.table %]/do_edit/[% item.id %]" method=post>
+[% FOR col = classmetadata.columns;
+    NEXT IF col == "id";
+    "<p>";
+    "<b>"; classmetadata.colnames.$col; "</b>";
+    ": ";
+    item.to_field(col).as_HTML;
+    "</p>";
+    IF errors.$col; 
+        errors.$col;
     END;
-     '<INPUT TYPE="submit" NAME="edit" VALUE="edit">';
+    '<input type=submit name=edit value=edit />';
 END %]
 [% INCLUDE footer %]
diff --git a/templates/factory/footer b/templates/factory/footer
index 599e978..2ab5c0d 100644
--- a/templates/factory/footer
+++ b/templates/factory/footer
@@ -1,3 +1,2 @@
-	</div>
-</body>
-</html>
\ No newline at end of file
+    </body>
+</html>
diff --git a/templates/factory/frontpage b/templates/factory/frontpage
index acee7a7..9cf3562 100644
--- a/templates/factory/frontpage
+++ b/templates/factory/frontpage
@@ -1,16 +1,25 @@
-[% INCLUDE header %]
+[%#
+
+=head1 frontpage
+
+This is the frontpage for your Maypole application.
+It shows a list of all tables it is allowed to display.
 
-<h2> [% config.application_name || "A poorly configured Maypole application" %] </h2>
+=cut
 
-<TABLE BORDER="0" ALIGN="center" WIDTH="70%">
+#%]
+[% INCLUDE header %]
+<h2>
+    [% config.application_name || "A poorly configured Maypole application" %]
+</h2>
+<table border=0 align=center width=70%>
 [% FOR table = config.display_tables %]
-<TR>
-<TD>
-<A HREF="[%table%]/list">List by [%table %]</A>
-</TD>
-</TR>
+    <tr>
+        <td>
+            <a href="[%table%]/list">List by [%table %]</a>
+        </td>
+    </tr>
 [% END %]
-</TABLE>
-
-<BR>
+</table>
+<br/>
 [% INCLUDE footer %]
diff --git a/templates/factory/header b/templates/factory/header
index 90274d4..7e16e26 100644
--- a/templates/factory/header
+++ b/templates/factory/header
@@ -1,20 +1,26 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-        <title>[% config.application_name || "A poorly configured Maypole application" %]</title>
-	<meta http-equiv="Content-Language" content="en" />
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link title="Maypole Default" href="/maypole.css" type="text/css" rel="stylesheet" />
-	<script type="text/javascript">
-<!--
-function go() {
-    box = document.forms[-1].navi;
-    destination = box.options[box.selectedIndex].value;
-    if (box.options[box.selectedIndex].class == 'redirect')
-        location.href = destination;
-}
-// -->
-</script>
-</head>
-<body>
-	<div class="content">
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>
+            [%
+                config.application_name ||
+                "A poorly configured Maypole application"
+            %]
+        </title>
+        <meta http-equiv=Content-Type content="text/html; charset=utf-8" />
+        <link title=Maypole href=/maypole.css type=text/css rel=stylesheet />
+        <script language="javascript" type="text/javascript">
+            <!--
+                function go()
+                {
+                    box = document.forms[-1].navi;
+                    destination = box.options[box.selectedIndex].value;
+                    if (box.options[box.selectedIndex].class == 'redirect')
+                        location.href = destination;
+                }
+            // -->
+        </script>
+    </head>
+    <body>
+    <div class="content">
diff --git a/templates/factory/list b/templates/factory/list
index 9f7fe0e..8cd0209 100644
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -1,43 +1,39 @@
 [% PROCESS macros %]
-
 [% INCLUDE header %]
-
 [% IF search %]
-<h2> Search results </h2>
+    <h2>Search results</h2>
 [% ELSE %]
-<h2> Listing of all [% classmetadata.plural %]</h2>
+    <h2>Listing of all [% classmetadata.plural %]</h2>
 [% END %]
-
 [% INCLUDE navbar %]
-<DIV class="search"> [% INCLUDE search_form %] </DIV>
-
-<DIV class="list">
-<TABLE id="matrix" WIDTH="100%">
-<TR>
-[% FOR col = classmetadata.columns.list;
-    NEXT IF col == "id";
-    "<TH>"; 
-    SET additional = "?order=" _ col;
-    SET additional = additional _ "&page=" _ pager.current_page IF pager;
-    SET additional = additional _ "&o2=desc" 
-        IF col == request.query.order and request.query.o2 != "desc";
-     link(classmetadata.table, "list", additional, classmetadata.colnames.$col);
-    "</TH>";
-END %]
-</TR>
-
-[%  SET count = 0;
-FOR item = objects;
-    SET count = count + 1;
-    "<tr";
-    ' class="alternate"' IF count % 2;
-    ">";
-    display_line(item);
-    "</tr>";
-END %]
-</TABLE>
-
-[% INCLUDE pager; %]
-[% INCLUDE addnew; %]
-</DIV>
+<div class=search>[% INCLUDE search_form %]</div>
+<div class=list>
+    <table id=matrix width=100%>
+        <tr>
+            [% FOR col = classmetadata.columns.list;
+                NEXT IF col == "id";
+                "<th>"; 
+                SET additional = "?order=" _ col;
+                SET additional = additional _ "&page=" _ pager.current_page
+                    IF pager;
+                SET additional = additional _ "&o2=desc" 
+                IF col == request.query.order and request.query.o2 != "desc";
+                link(classmetadata.table, "list", additional,
+                    classmetadata.colnames.$col);
+                "</th>";
+            END %]
+        </tr>
+        [%  SET count = 0;
+        FOR item = objects;
+            SET count = count + 1;
+            "<tr";
+            ' class="alternate"' IF count % 2;
+            ">";
+            display_line(item);
+            "</tr>";
+        END %]
+    </table>
+[% INCLUDE pager %]
+[% INCLUDE addnew %]
+</div>
 [% INCLUDE footer %]
diff --git a/templates/factory/macros b/templates/factory/macros
index edae5c1..2442dd5 100644
--- a/templates/factory/macros
+++ b/templates/factory/macros
@@ -13,9 +13,9 @@ catenating the base URL, table, command, and any arguments.
 #%]
 [%
 MACRO link(table, command, additional, label) BLOCK;
-    '<A HREF="' _ base _ "/" _ table _ "/" _ command _ "/" _ additional _ '">';
+    '<a href="' _ base _ "/" _ table _ "/" _ command _ "/" _ additional _ '">';
     label;
-    "</A>";
+    "</a>";
 END;
 %]
 
@@ -31,7 +31,6 @@ command for that object. Otherwise, it just displays the data.
 #%]
 
 [%
-
 MACRO maybe_link_view(object) BLOCK;
     IF object.table; # It's an object, i.e. a has-a
         link(object.table, "view", object.id, object);
@@ -53,7 +52,7 @@ for some.
 
 #%]
 [% MACRO display_line(item) BLOCK;
-     FOR col = classmetadata.columns;
+    FOR col = classmetadata.columns;
         NEXT IF col == "id";
         "<td>";
         IF col == "url";
@@ -64,7 +63,7 @@ for some.
             maybe_link_view(item.$col);
         END;
         "</td>";
-     END;
+    END;
     button(item, "edit");
     button(item, "delete");
 END %]
@@ -78,11 +77,11 @@ This is a generic button, which performs an action on an object.
 
 #%]
 [% MACRO button(obj, action) BLOCK; %]
-<TD>
-<FORM METHOD="post" ACTION="[%base%]/[%obj.table%]/[%action%]/[%obj.id%]">
-    <INPUT TYPE="submit" NAME="[%action%]" VALUE="[%action%]">
-</FORM>
-</TD>
+<td>
+<form method=post action="[% base %]/[% obj.table %]/[% action %]/[% obj.id %]">
+    <input type=submit name=[% action %] value=[% action %] />
+</form>
+</td>
 [% END %]
 [%#
 
@@ -99,12 +98,12 @@ brewery) calls the accesor, and displays a list of the results.
 [% 
 MACRO view_related(object) BLOCK;
     FOR accessor = classmetadata.related_accessors.list;
-        "<H3>"; accessor | ucfirst; "</H3>\n";
-        "<UL id=\"vlist\">";
+        "<h3>"; accessor | ucfirst; "</h3>\n";
+        "<ul id=\"vlist\">";
         FOR thing = object.$accessor;
-            "<LI>"; maybe_link_view(thing); "</LI>\n";
+            "<li>"; maybe_link_view(thing); "</li>\n";
         END;
-        "</UL>";
+        "</ul>";
     END; 
 END;
 
diff --git a/templates/factory/navbar b/templates/factory/navbar
index 40050d3..60a69a9 100644
--- a/templates/factory/navbar
+++ b/templates/factory/navbar
@@ -12,16 +12,13 @@ accessible, with a link to the list page for each one.
 <ul id="navlist">
 [%
     FOR table = config.display_tables;
-        '<LI '; 'id="active"' IF table == classmetadata.table; '>';
-
+        '<li '; 'id="active"' IF table == classmetadata.table; '>';
         # Hack
         SET active = '" id="current' IF table == classmetadata.table;
-
         link(table, "list", active, table);
         SET active = "";
-        '</LI>';
+        '</li>';
     END;
 %]
 </ul>
 </div> 
-
diff --git a/templates/factory/pager b/templates/factory/pager
index 5f10f59..c10fdee 100644
--- a/templates/factory/pager
+++ b/templates/factory/pager
@@ -10,8 +10,7 @@ to the L<Data::Page> interface.
 [%
 IF pager AND pager.first_page != pager.last_page;
 %]
-
-<P ALIGN="center">Pages: 
+<p align=center>Pages: 
 [%
     SET begin_page = pager.current_page - 10;
     IF begin_page < 1;
@@ -25,11 +24,18 @@ IF pager AND pager.first_page != pager.last_page;
           IF num == pager.current_page;
             "["; num; "] ";
           ELSE;
-            SET args = "?page=" _ num; # Order?
             SET label = "[" _ num _ "]";
-          link(classmetadata.table, "list", args, label);
+            SET args = "?page=" _ num;
+            SET action = "list";
+            FOR col = classmetadata.columns.list;
+              IF request.query.$col;
+                SET args = args _ "&" _ col _ "=" _ request.query.$col;
+                SET action = "search";
+              END;
+            END;
+            link(classmetadata.table, action, args, label);
           END;
      END;
 %]
-</P>
+</p>
 [% END %]
diff --git a/templates/factory/search_form b/templates/factory/search_form
index 63f867d..e5458f8 100644
--- a/templates/factory/search_form
+++ b/templates/factory/search_form
@@ -1,23 +1,24 @@
-
 <h3>Search</h3>
-<FORM METHOD="post" ACTION="[%base%]/[%classmetadata.moniker%]/search/">
-    <INPUT TYPE="hidden" NAME="action" VALUE="create">
-    <INPUT TYPE="hidden" NAME="class" VALUE="[%classmetadata.name%]">
-    <TABLE class="view">
-     [% FOR col = classmetadata.columns;
-        NEXT IF col == "id";
-     %]
-     <TR> <TD class="field"> [% classmetadata.colnames.$col; %] </TD>
-     <TD> [% 
-        SET element = classmetadata.cgi.$col;
-        IF element.tag == "select";
-            USE element_maker = Class("HTML::Element");
-            SET element = element.unshift_content(
+<form method=get action="[% base %]/[% classmetadata.moniker %]/search/">
+    <input type=hidden name=action value=create />
+    <input type=hidden name=class value=[% classmetadata.name %] />
+    <table class=view>
+        [% FOR col = classmetadata.columns;
+            NEXT IF col == "id";
+         %]
+            <tr>
+                <td class=field>[% classmetadata.colnames.$col; %]</td>
+                <td>
+                    [% SET element = classmetadata.cgi.$col;
+                    IF element.tag == "select";
+                        USE element_maker = Class("HTML::Element");
+                        SET element = element.unshift_content(
                             element_maker.new("option", value," "));
-        END;
-        element.as_HTML; 
-        %] </TD> </TR>
-    [% END; %]
-    </TABLE>
-    <INPUT TYPE="submit" NAME="search" VALUE="search">
-</FORM>
+                    END;
+                   element.as_HTML; %]
+                </td>
+            </tr>
+        [% END; %]
+    </table>
+    <input type=submit name=search value=search>
+</form>
diff --git a/templates/factory/view b/templates/factory/view
index 29b817e..c00046c 100644
--- a/templates/factory/view
+++ b/templates/factory/view
@@ -10,21 +10,19 @@ C<objects> and displays the object's properties in a table.
 #%]
 [% PROCESS macros %]
 [% INCLUDE header %]
-
 [% FOR item = objects %]
-[% SET string = item.stringify_column %]
-<h2> [% item.$string %]</h2>
-
-[% INCLUDE navbar %]
-
-<TABLE class="view">
-    <TR><TD class="field">[% classmetadata.colnames.$string %]</TD><TD> [% item.$string %] </TD></TR>
-[% 
-    FOR col = classmetadata.columns.list;
-    NEXT IF col == "id" OR col == string;
-    NEXT UNLESS item.$col;
-%]
-
+    [% SET string = item.stringify_column %]
+    <h2> [% item.$string %]</h2>
+    [% INCLUDE navbar %]
+    <table class=view>
+        <tr>
+            <td class="field">[% classmetadata.colnames.$string %]</td>
+            <td>[% item.$string %]</td>
+        </tr>
+        [% FOR col = classmetadata.columns.list;
+            NEXT IF col == "id" OR col == string;
+            NEXT UNLESS item.$col;
+        %]
 [%# 
 
 =for doc
@@ -33,24 +31,14 @@ It gets the displayable form of a column's name from the hash returned
 from the C<column_names> method:
 
 #%]
-
-    <TR>
-    <TD class="field"> [% classmetadata.colnames.$col; %] </TD>
-    <TD> [%
-
-#=cut
-
-    IF col == "url";  # Possibly too much magic.
-                "<A HREF="; item.url; "> "; item.url; "</A>";
-    ELSE;
-
-#=for doc
-
-#One interesting macro used in this template is C<maybe_link_view>:
-
-        maybe_link_view(item.$col); 
-%] 
-
+            <tr>
+                <td class=field>[% classmetadata.colnames.$col; %]</td>
+                <td>
+                    [% IF col == "url";  # Possibly too much magic.
+                        "<A HREF="; item.url; "> "; item.url; "</A>";
+                    ELSE;
+                        maybe_link_view(item.$col); 
+                    END; %]
 [%#
 
 This tests whether or not the returned value is an object, and if so,
@@ -62,13 +50,10 @@ if there is no C<name> method or other stringification method defined.
 =cut
 
 #%] 
-
-[% END; %]
- </TD>
-</TR>
-[% END; %]
-</TABLE>
-
+                </td>
+            </tr>
+        [% END; %]
+    </table>
 [%#
 
 =for doc
@@ -82,11 +67,7 @@ displays the results in a table.
 #%]
 [%
     view_related(item);
-
-#=cut
-
     button(item, "edit");
     button(item, "delete");
 %]
 [% END; %]
-
-- 
2.39.5