From 1ad4ac7890228dfd78064f5ef8925e325e9aba29 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Thu, 12 Feb 2009 16:19:32 -0500
Subject: [PATCH] metaform: added nice allignment to display page, added
 proper formatting for checkboxes and dates added hidden div
 to make html template pass w3c xhtml 1.0 strict validator

---
 metaform.php           |    7 +++++++
 metaform/template.html |   17 ++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/metaform.php b/metaform.php
index 62ef506..f89e720 100644
--- a/metaform.php
+++ b/metaform.php
@@ -233,6 +233,13 @@ function make_html($whole_file = true) {
 		}
 		if($GLOBALS['opt_display']) {
 			switch($input) {
+				case 'checkbox':
+				case 'leftcheck':
+					$tem->show('display_yesno');
+				break;
+				case 'date':
+					$tem->show('display_date');
+				break;
 				case 'textarea':
 					$tem->show('display_multiline');
 				break;
diff --git a/metaform/template.html b/metaform/template.html
index 2be0fee..de12f03 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -48,13 +48,20 @@
 <!--~opt_display_1 start~-->
 <!--~~display_body start~~-->
   <h2>~singular.cap~ details</h2>
-<!--~display_row start~--><!--~display_short start~-->
-    <div><span class="caption">~caption.html~:</span> ~~~name~.html~~</div>
+    <table border="0" cellpadding="3" cellspacing="0" summary="">
+<!--~display_row start~--><!--~display_yesno start~-->
+      <tr><td class="caption">~caption.html~:</td><td>~~~name~.yesno~~</td></tr>
+<!--~end~--><!--~display_date start~-->
+      <tr><td class="caption">~caption.html~:</td><td>~~~name~.mmddyyyy~~</td></tr>
+<!--~end~--><!--~display_short start~-->
+      <tr><td class="caption">~caption.html~:</td><td>~~~name~.html~~</td></tr>
 <!--~end~--><!--~display_html start~-->
-    <div><span class="caption">~caption.html~:</span> <div style="padding-left: 20px; border: 1px solid black">~~~name~~~</div></div>
+      <tr><td class="caption">~caption.html~:</span></td><td></td></tr>
+      <tr><td colspan="2"><div style="padding: 15px; border: 1px solid black">~~~name~~~</div></td></tr>
 <!--~end~--><!--~display_multiline start~-->
-    <div><span class="caption">~caption.html~:</span> <div style="padding-left: 20px">~~~name~.htmlbrtab~~</div></div>
+      <tr><td class="caption">~caption.html~:</td><td>~~~name~.htmlbrtab~~</td></tr>
 <!--~end~--><!--~end~-->
+    </table>
 
     <p><a href="~form_name~?~form_name~_edit_id=~~id.attr~~">Edit</a></p>
 <!--~~end~~-->
@@ -64,7 +71,7 @@
 <!--~~form start~~--><!--~form start~-->
   <h2><!--~opt_db_1 start~--><!--~~new_msg start~~-->Add a new ~singular~<!--~~end~~--><!--~~edit_msg start~~-->Edit ~singular~ "~~~always_field~.html~~"<!--~~end~~--><!--~end~--><!--~opt_db_1_else start~-->~form_name.cap~ form<!--~end~--></h2>
 
-  <form action="~form_name~" method="post~enctype_attr~"><!--~opt_db_2 start~--><!--~~editing start~~--><input type="hidden" name="~form_name~_edit_id" value="~~~form_name~_edit_id.attr~~" /><!--~~end~~--><!--~end~--><!--~uploads start~--><input type="hidden" name="MAX_FILE_SIZE" value="~~upload_max_filesize~~" /><!--~end~-->
+  <form action="~form_name~" method="post~enctype_attr~"><!--~opt_db_2 start~--><!--~~editing start~~--><div style="display: none"><input type="hidden" name="~form_name~_edit_id" value="~~~form_name~_edit_id.attr~~" /></div><!--~~end~~--><!--~end~--><!--~uploads start~--><input type="hidden" name="MAX_FILE_SIZE" value="~~upload_max_filesize~~" /><!--~end~-->
     <table cellspacing="0" cellpadding="4" border="0" summary=""><!--~row start~-->
 
       <tr><!--~image start~--><td class="caption">~caption.html~: </td><td class="field"><input type="file" name="~name~" /><input type="hidden" name="old_~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~textbox start~--><td class="caption">~caption.html~: </td><td class="field"><input type="text" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~date start~--><td class="caption">~caption.html~: </td><td class="field"><input type="text" name="~name~" value="~~~name~.mmddyyyy.attr~~" /> dd/mm/yyyy</td><!--~end~--><!--~password start~--><td class="caption">~caption.html~: </td><td class="field"><input type="password" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~textarea start~--><td class="caption">~caption.html~: </td><td class="field"><textarea rows="9" cols="22" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~html start~--><td class="caption">~caption.html~: </td><td></td></tr><tr><td colspan="2"><textarea class="html_editor" rows="20" cols="50" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~pulldown start~--><td class="caption">~caption.html~: </td><td class="field"><select name="~name~"><option value="">Choose One:</option><!--~~~name~.options~~--></select></td><!--~end~--><!--~states start~--><td class="caption">~caption.html~: </td><td class="field"><select name="~name~"><option value="">Choose One:</option><!--~~~name~.states~~--></select></td><!--~end~--><!--~radio start~--><td class="caption">~caption.html~: </td><td class="field"><input type="radio" name="~name~~~~name~.checked~~" /></td><!--~end~--><!--~checkbox start~--><td class="caption">~caption.html~? </td><td class="field"><input type="checkbox" name="~name~~~~name~.checked~~" /></td><!--~end~--><!--~leftcheck start~--><td class="caption"><input type="checkbox" name="~name~~~~name~.checked~~" /></td><td class="right_caption">~caption.html~?</td><!--~end~--><!--~submit start~--><td class="submit_row" colspan="2"><input type="submit" name="~name~" value="~caption.attr~" /></td><!--~end~--></tr><!--~end~-->
-- 
1.7.10.4