XHTML update

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@179 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/templates/beer/addnew b/templates/beer/addnew
index e19c7c280ec2da8fb7dccfe39392cd99bae9d7ac..248fe287d12a69bb4aaa40761784907ff4c2f8e4 100644 (file)
--- a/templates/beer/addnew
+++ b/templates/beer/addnew
@@ -1,31 +1,32 @@
 <h3>Add a new [%classmetadata.moniker%]</h3>
 [% USE element_maker = Class("HTML::Element") %]
-<P>
-<FORM METHOD="post" ACTION="[%base%]/[%classmetadata.moniker%]/do_edit/">
-    <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";
-        SET element = classmetadata.cgi.$col;
-        IF col == "brewery";
-            SET create_url = base _ "/brewery/edit";
-            SET new_element = element_maker.new("option", 
-                "class", "redirect",
-                "value", create_url).push_content("Create new brewery");
-            SET child = element.content_list.first;
-            SET foo = element.attr("name", "navi");
-            SET child = child.attr("selected", "selected");
-            SET element =
-            element.unshift_content(element_maker.new("option", value," "));
-            element.attr("onChange", "go()");
-            SET element = element.unshift_content(new_element);
-        END;
-        %]
-     <TR> <TD class="field"> [% classmetadata.colnames.$col; %]
-     </TD>
-          <TD> [% element.as_HTML; %] </TD> </TR>
-    [% END; %]
-    </TABLE>
-    <INPUT TYPE="submit" NAME="create" VALUE="create">
-</FORM>
+<p>
+<form method="post" action="[% base %]/[% classmetadata.moniker %]/do_edit/">
+    <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";
+            SET element = classmetadata.cgi.$col;
+            IF col == "brewery";
+                SET create_url = base _ "/brewery/edit";
+                SET new_element = element_maker.new("option", 
+                    "class", "redirect",
+                    "value", create_url).push_content("Create new brewery");
+                SET child = element.content_list.first;
+                SET foo = element.attr("name", "navi");
+                SET child = child.attr("selected", "selected");
+                SET element =
+                element.unshift_content(element_maker.new("option", value," "));
+                element.attr("onChange", "go()");
+                SET element = element.unshift_content(new_element);
+            END;
+            %]
+            <tr>
+                <td class="field">[% classmetadata.colnames.$col; %]</td>
+                <td>[% element.as_HTML; %]</td>
+            </tr>
+        [% END; %]
+    </table>
+    <input type="submit" name="create" value="create"/>
+</form>

diff --git a/templates/beerdb.css b/templates/beerdb.css
deleted file mode 100644 (file)
index 07cc28d..0000000
--- a/templates/beerdb.css
+++ /dev/null
@@ -1,145 +0,0 @@
-HTML {
-    PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px
-}
-BODY {
-    PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px;
-    BACKGROUND-COLOR: #ffffea;
-}
-.content {
-    PADDING: 12px;
-    MARGIN-TOP: 1px;  MARGIN-BOTTOM:0px;
-    MARGIN-LEFT: 15px; MARGIN-RIGHT: 15px;
-    BORDER-COLOR: #000000;
-    BORDER-TOP: 0px;
-    BORDER-BOTTOM: 0px;
-    BORDER-LEFT: 1px;
-    BORDER-RIGHT: 1px;
-}
-
-H1 {
-    FONT-SIZE: 30pt; MARGIN: 0px;
-    FONT-FAMILY: Optima, "Lucida Grande",Sans-serif;
-    TEXT-ALIGN: center;
-    PADDING-BOTTOM: 1em;
-}
-H2 {
-    PADDING-RIGHT: 0.25em; PADDING-LEFT: 0.25em; FONT-SIZE: 16pt;
-    PADDING-BOTTOM: 0.5em; MARGIN: 0px; PADDING-TOP: 0.1em;
-FONT-FAMILY: Optima, "Lucida Grande",Sans-serif;
-    TEXT-ALIGN: center;
-}
-
-A { text-decoration: none; color:#225 }
-A:hover { text-decoration: underline; color:#222 }
-
-table { 
-border: 0px solid; 
-background-color: #ffffff;
-
-}
-#matrix th {
-background-color: #DDE;
-border: 1px solid;
-    font: bold 12px Verdana, sans-serif;
-}
-
-#matrix tr.alternate { background-color:#EEF; }
-#matrix td {
-    font: 12px Verdana, sans-serif;
-}
-
-#navlist
-{
-padding: 3px 0;
-margin-left: 0;
-border-bottom: 1px solid #778;
-font: bold 12px Verdana, sans-serif;
-}
-
-#navlist li
-{
-list-style: none;
-margin: 0;
-display: inline;
-}
-
-#navlist li a
-{
-padding: 3px 0.5em;
-margin-left: 3px;
-border: 1px solid #778;
-border-bottom: none;
-background: #DDE;
-text-decoration: none;
-}
-
-#navlist li a:link { color: #448; }
-#navlist li a:visited { color: #667; }
-
-#navlist li a:hover
-{
-color: #000;
-background: #AAE;
-border-color: #227;
-}
-
-#navlist li a#current
-{
-background: white;
-border-bottom: 1px solid white;
-}
-
-td { font: 12px Verdana, sans-serif; }
-.field {
-background-color: #DDE;
-border: 1px solid;
-font-weight: bold;
-}
-
-#vlist
-{
-padding: 0 1px 1px;
-margin-left: 0;
-font: bold 12px Verdana, sans-serif;
-background: gray;
-width: 13em;
-}
-
-#vlist li
-{
-list-style: none;
-margin: 0;
-border-top: 1px solid gray;
-text-align: left;
-}
-
-#vlist li a
-{
-display: block;
-padding: 0.25em 0.5em 0.25em 0.75em;
-border-left: 1em solid #AAB;
-background: #CCD;
-text-decoration: none;
-}
-#vlist li a:hover { 
-    border-color: #227;
-}
-.search {float:right; background: #ffa; padding-left: 5px; padding-right: 5px}
-.list { width: 70%; }
-
-.column-wrap { position: relative; }
-.leftcolumn { position: absolute; left: 10px; top: 50px; width: 200px; 
-    border-right: 1px dotted black;
-}
-.centercolumn { margin-left: 200px; margin-right: 300px; }
-.rightcolumn { position: absolute; right: 0px; top: 50px; width: 300px; }
-
-.messages {
-    margin: 20px; padding: 3px; border: 1px solid black; 
-    background: #ddd; 
-    font: bold 12px Verdana, sans-serif;
-}
-
-.error { color: #d00; }
-
-.chorus { font-style: italic; position: relative; margin-left:50px; }

diff --git a/templates/custom/frontpage b/templates/custom/frontpage
deleted file mode 100644 (file)
index 2cef7ae..0000000
--- a/templates/custom/frontpage
+++ /dev/null
@@ -1,16 +0,0 @@
-[% INCLUDE header %]
-
-<h2> The beer database </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>
-[% END %]
-</TABLE>
-
-<BR>
-[% INCLUDE footer %]

diff --git a/templates/custom/header b/templates/custom/header
deleted file mode 100644 (file)
index b95e32a..0000000
--- a/templates/custom/header
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML>
-    <HEAD>
-        <TITLE> Beer Database </TITLE>
-<META http-equiv=Content-Type content="text/html; charset=utf-8">
-
-<LINK title=myStyle href="/beerdb.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/addnew b/templates/factory/addnew
index f56fcf4e25cc2441ae2aeaf536cb8db35795307e..9345c78b0adbc8d1fdca7d1661089f3c137e6c23 100644 (file)
--- a/templates/factory/addnew
+++ b/templates/factory/addnew
@@ -11,9 +11,9 @@ table.
 
 #%]
 <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>
+<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>
@@ -22,5 +22,5 @@ table.
         </tr>
     [% END; %]
     </table>
-    <input type=submit name=create value=create />
+    <input type="submit" name="create" value="create"/>
 </form>

diff --git a/templates/factory/edit b/templates/factory/edit
index f1e0fbfeefe77f0f39b67a0fb1adc41402b122e5..c5c511b5d9d52bfbbbe6c1e6be3eaec92f45c0e5 100644 (file)
--- a/templates/factory/edit
+++ b/templates/factory/edit
@@ -12,7 +12,7 @@ form similar to L<add_new> but with the current values filled in.
 [% INCLUDE header %]
 [% FOR item = objects; %]
 <h2>Edit [% item.name %]</h2>
-<form action="[% base %]/[% item.table %]/do_edit/[% item.id %]" method=post>
+<form action="[% base %]/[% item.table %]/do_edit/[% item.id %]" method="post">
 [% FOR col = classmetadata.columns;
     NEXT IF col == "id";
     "<p>";
@@ -23,6 +23,6 @@ form similar to L<add_new> but with the current values filled in.
     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/frontpage b/templates/factory/frontpage
index 9cf356213d91d884b9a4d3b6ec761c4dd505a5f8..30861d2e7365dcb7c220ff7f8e924ae74797cbae 100644 (file)
--- a/templates/factory/frontpage
+++ b/templates/factory/frontpage
@@ -12,7 +12,7 @@ It shows a list of all tables it is allowed to display.
 <h2>
     [% config.application_name || "A poorly configured Maypole application" %]
 </h2>
-<table border=0 align=center width=70%>
+<table border="0" align="center" width="70%">
 [% FOR table = config.display_tables %]
     <tr>
         <td>

diff --git a/templates/factory/header b/templates/factory/header
index 7e16e2657e4c74b74c5c955258aabfc95713cb0e..5a5882356e8e868917beb5a3706addf4acb98f74 100644 (file)
--- a/templates/factory/header
+++ b/templates/factory/header
@@ -8,8 +8,9 @@
                 "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 />
+        <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()

diff --git a/templates/factory/list b/templates/factory/list
index 8cd0209fc9531fe457ca1f2e6b959c0d290202e5..120abbbfee125c473832b66de1d444e8407ba10d 100644 (file)
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -6,9 +6,9 @@
     <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%>
+<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";

diff --git a/templates/factory/macros b/templates/factory/macros
index 2442dd5d32b11bfb8b3273a3189f049127e4b9e3..3d45a6fa65c36bae4d5a48db84e17722b41b38d2 100644 (file)
--- a/templates/factory/macros
+++ b/templates/factory/macros
@@ -56,7 +56,7 @@ for some.
         NEXT IF col == "id";
         "<td>";
         IF col == "url";
-            "<A HREF="; item.url; "> "; item.url; "</A>";
+            "<a href="; item.url; "> "; item.url; "</a>";
         ELSIF col == item.stringify_column;
             maybe_link_view(item);
         ELSE;
@@ -78,8 +78,9 @@ 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 method="post"
+    action="[% base %]/[% obj.table %]/[% action %]/[% obj.id %]">
+    <input type="submit" name="[% action %]" value="[% action %]"/>
 </form>
 </td>
 [% END %]

diff --git a/templates/factory/search_form b/templates/factory/search_form
index e5458f80b22e01bf352f74599e8c6c616f463f85..907ef7e5864e9f7c85f60c9e96327520e5807572 100644 (file)
--- a/templates/factory/search_form
+++ b/templates/factory/search_form
@@ -1,8 +1,8 @@
 <h3>Search</h3>
-<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>
+<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";
          %]
@@ -20,5 +20,5 @@
             </tr>
         [% END; %]
     </table>
-    <input type=submit name=search value=search>
+    <input type="submit" name="search" value="search"/>
 </form>

diff --git a/templates/factory/view b/templates/factory/view
index c00046c7606416d57fc1255e2da186b3d50b583e..6736da61c4f9fc825bcda2f9feeb6740a7171a46 100644 (file)
--- a/templates/factory/view
+++ b/templates/factory/view
@@ -14,7 +14,7 @@ C<objects> and displays the object's properties in a table.
     [% SET string = item.stringify_column %]
     <h2> [% item.$string %]</h2>
     [% INCLUDE navbar %]
-    <table class=view>
+    <table class="view">
         <tr>
             <td class="field">[% classmetadata.colnames.$string %]</td>
             <td>[% item.$string %]</td>
@@ -32,10 +32,10 @@ from the C<column_names> method:
 
 #%]
             <tr>
-                <td class=field>[% classmetadata.colnames.$col; %]</td>
+                <td class="field">[% classmetadata.colnames.$col; %]</td>
                 <td>
                     [% IF col == "url";  # Possibly too much magic.
-                        "<A HREF="; item.url; "> "; item.url; "</A>";
+                        "<a href="; item.url; "> "; item.url; "</a>";
                     ELSE;
                         maybe_link_view(item.$col); 
                     END; %]

diff --git a/templates/maypole.css b/templates/maypole.css
new file mode 100644 (file)
index 0000000..07cc28d
--- /dev/null
+++ b/templates/maypole.css
@@ -0,0 +1,145 @@
+HTML {
+    PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px
+}
+BODY {
+    PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px;
+    BACKGROUND-COLOR: #ffffea;
+}
+.content {
+    PADDING: 12px;
+    MARGIN-TOP: 1px;  MARGIN-BOTTOM:0px;
+    MARGIN-LEFT: 15px; MARGIN-RIGHT: 15px;
+    BORDER-COLOR: #000000;
+    BORDER-TOP: 0px;
+    BORDER-BOTTOM: 0px;
+    BORDER-LEFT: 1px;
+    BORDER-RIGHT: 1px;
+}
+
+H1 {
+    FONT-SIZE: 30pt; MARGIN: 0px;
+    FONT-FAMILY: Optima, "Lucida Grande",Sans-serif;
+    TEXT-ALIGN: center;
+    PADDING-BOTTOM: 1em;
+}
+H2 {
+    PADDING-RIGHT: 0.25em; PADDING-LEFT: 0.25em; FONT-SIZE: 16pt;
+    PADDING-BOTTOM: 0.5em; MARGIN: 0px; PADDING-TOP: 0.1em;
+FONT-FAMILY: Optima, "Lucida Grande",Sans-serif;
+    TEXT-ALIGN: center;
+}
+
+A { text-decoration: none; color:#225 }
+A:hover { text-decoration: underline; color:#222 }
+
+table { 
+border: 0px solid; 
+background-color: #ffffff;
+
+}
+#matrix th {
+background-color: #DDE;
+border: 1px solid;
+    font: bold 12px Verdana, sans-serif;
+}
+
+#matrix tr.alternate { background-color:#EEF; }
+#matrix td {
+    font: 12px Verdana, sans-serif;
+}
+
+#navlist
+{
+padding: 3px 0;
+margin-left: 0;
+border-bottom: 1px solid #778;
+font: bold 12px Verdana, sans-serif;
+}
+
+#navlist li
+{
+list-style: none;
+margin: 0;
+display: inline;
+}
+
+#navlist li a
+{
+padding: 3px 0.5em;
+margin-left: 3px;
+border: 1px solid #778;
+border-bottom: none;
+background: #DDE;
+text-decoration: none;
+}
+
+#navlist li a:link { color: #448; }
+#navlist li a:visited { color: #667; }
+
+#navlist li a:hover
+{
+color: #000;
+background: #AAE;
+border-color: #227;
+}
+
+#navlist li a#current
+{
+background: white;
+border-bottom: 1px solid white;
+}
+
+td { font: 12px Verdana, sans-serif; }
+.field {
+background-color: #DDE;
+border: 1px solid;
+font-weight: bold;
+}
+
+#vlist
+{
+padding: 0 1px 1px;
+margin-left: 0;
+font: bold 12px Verdana, sans-serif;
+background: gray;
+width: 13em;
+}
+
+#vlist li
+{
+list-style: none;
+margin: 0;
+border-top: 1px solid gray;
+text-align: left;
+}
+
+#vlist li a
+{
+display: block;
+padding: 0.25em 0.5em 0.25em 0.75em;
+border-left: 1em solid #AAB;
+background: #CCD;
+text-decoration: none;
+}
+#vlist li a:hover { 
+    border-color: #227;
+}
+.search {float:right; background: #ffa; padding-left: 5px; padding-right: 5px}
+.list { width: 70%; }
+
+.column-wrap { position: relative; }
+.leftcolumn { position: absolute; left: 10px; top: 50px; width: 200px; 
+    border-right: 1px dotted black;
+}
+.centercolumn { margin-left: 200px; margin-right: 300px; }
+.rightcolumn { position: absolute; right: 0px; top: 50px; width: 300px; }
+
+.messages {
+    margin: 20px; padding: 3px; border: 1px solid black; 
+    background: #ddd; 
+    font: bold 12px Verdana, sans-serif;
+}
+
+.error { color: #d00; }
+
+.chorus { font-style: italic; position: relative; margin-left:50px; }