From c02c8c04539722915a769ff580eb392ba967deee Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason@jasonwoof.com>
Date: Thu, 8 Oct 2009 00:39:09 -0400
Subject: [PATCH] metaform forms now have captions above fields

---
 metaform.php           |    7 ++-----
 metaform/style.css     |   13 ++-----------
 metaform/template.html |   26 +++++++++++++++++++++++---
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/metaform.php b/metaform.php
index c5c8189..f90ad17 100644
--- a/metaform.php
+++ b/metaform.php
@@ -46,10 +46,8 @@ $GLOBALS['types'] = array(
 	'html' =>       array('html',        'unix',       'text'),
 	'pulldown' =>   array('pulldown',    'options',    'varchar(100)'),
 	'radio' =>      array('radio',       'oneline',    'varchar(200)'),
-	'checkbox' =>   array('leftcheck',   'bool',       'int(1)'),
-	'rightcheck' => array('checkbox',    'bool',       'int(1)'),
-	'rightyesno' => array('checkbox',    'yesno',      'varchar(3)'),
-	'yesno' =>      array('leftcheck',   'yesno',      'varchar(3)'),
+	'checkbox' =>   array('checkbox',    'bool',       'int(1)'),
+	'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
 	'delete' =>     array('checkbox',    'yesno',      'n/a'),
 	'image' =>      array('image',       'oneline',    'varchar(120)'),
 	'thumb' =>      array('image',       'oneline',    'varchar(240)'),
@@ -249,7 +247,6 @@ function make_html($whole_file = true) {
 					$tem->show('display_image');
 				break;
 				case 'checkbox':
-				case 'leftcheck':
 					$tem->show('display_yesno');
 				break;
 				case 'date':
diff --git a/metaform/style.css b/metaform/style.css
index e6be557..04cb329 100644
--- a/metaform/style.css
+++ b/metaform/style.css
@@ -1,15 +1,6 @@
-td.field, td.right_caption {
-	text-align: left;
-	vertical-align: bottom;
+.field {
+	margin-bottom: 15px;
 }
-td.caption, td.errorcaption {
-	text-align: right;
-	vertical-align: top;
-}
-.caption, td.errorcaption, td.right_caption {
-	font-weight: bold;
-}
-.errorcaption { color: red; }
 div.error {
 	border: 2px solid red;
 	padding: 13px;
diff --git a/metaform/template.html b/metaform/template.html
index 473db8b..7a4fb84 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -74,9 +74,29 @@
   <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~-->Submit a ~singular~<!--~end~--></h2>
 
   <form action="~file_name~" method="post~enctype_attr~"><!--~opt_db_2 start~--><!--~~editing start~~--><div style="display: none"><input type="hidden" name="~file_name~_edit_id" value="~~~file_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~~" /> mm/dd/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~-->
+<!--~row start~--><!--~image start~-->
+    <div class="caption">~caption.html~</div>
+    <div class="field"><input type="file" name="~name~" /><input type="hidden" name="old_~name~" value="~~~name~.attr~~" /></div><!--~end~--><!--~textbox start~-->
+    <div class="caption">~caption.html~</div>
+    <div class="field"><input type="text" name="~name~" value="~~~name~.attr~~" /></div><!--~end~--><!--~date start~-->
+    <div class="caption">~caption.html~</div>
+    <div class="field"><input type="text" name="~name~" value="~~~name~.mmddyyyy.attr~~" /> mm/dd/yyyy</div><!--~end~--><!--~password start~-->
+    <div class="caption">~caption.html~</div>
+    <div class="field"><input type="password" name="~name~" value="~~~name~.attr~~" /></div><!--~end~--><!--~textarea start~-->
+    <div class="caption">~caption.html~</div>
+    <div class="field"><textarea rows="9" cols="22" name="~name~">~~~name~.html~~</textarea></div><!--~end~--><!--~html start~-->
+    <div class="caption">~caption.html~</div>
+    <div class="field"><textarea class="html_editor" rows="20" cols="50" name="~name~">~~~name~.html~~</textarea></div><!--~end~--><!--~pulldown start~-->
+    <div class="caption">~caption.html~</div>
+    <div class="field"><select name="~name~"><option value="">Choose One:</option><!--~~~name~.options~~--></select></div><!--~end~--><!--~states start~-->
+    <div class="caption">~caption.html~</div>
+    <div class="field"><select name="~name~"><option value="">Choose One:</option><!--~~~name~.states~~--></select></div><!--~end~--><!--~radio start~-->
+    <div class="caption">~caption.html~</div>
+    <div class="field"><input type="radio" name="~name~~~~name~.checked~~" /></div><!--~end~--><!--~checkbox start~-->
+    <div class="caption"><input type="checkbox" name="~name~~~~name~.checked~~" /> ~caption.html~</div>
+    <div class="field"></div><!--~end~--><!--~submit start~-->
+    <div class="field"><input type="submit" name="~name~" value="~caption.attr~" /></div><!--~end~-->
+<!--~end~-->
     </table>
   </form>
 <!--~end~--><!--~~end~~-->
-- 
1.7.10.4