X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.html;h=6602896c8010233d85c039788600f76a0e3f06e8;hb=27821e975197ac26ce54c3e123eea871d85de6ff;hp=8827bfee40e06419fe95f4068d0534ab33b91ee2;hpb=c06ba3b1d66efa1478a5aea39fb833b81d35f846;p=wfpl.git

diff --git a/metaform/template.html b/metaform/template.html
index 8827bfe..6602896 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -23,11 +23,11 @@
 		<h2>~singular cap~ details</h2>
 
 		<!--~~admin_privs {~~--><!--~opt_listing {~-->
-			<p><a href="~file_name~?~file_name~_new=1">Add another ~singular attr~</a></p>
+			<p><a href="~file_name~?new=1">Add another ~singular attr~</a></p>
 
 			<p><a href="~file_name~">Back to ~plural attr~</a></p>
 <!--~}~-->
-			<p><a href="~file_name~?~file_name~_edit_id=~~id attr~~">Edit</a></p>
+			<p><a href="~file_name~?edit_id=~~id attr~~">Edit</a></p>
 		<!--~~}~~-->
 
 		<table border="0" cellpadding="3" cellspacing="0" summary="">
@@ -50,14 +50,14 @@
 		<!--~~admin_privs {~~--><!--~opt_listing {~-->
 			<p><a href="~file_name~">Back to ~plural attr~</a></p>
 <!--~}~-->
-			<p><a href="~file_name~?~file_name~_edit_id=~~id attr~~">Edit</a></p>
+			<p><a href="~file_name~?edit_id=~~id attr~~">Edit</a></p>
 		<!--~~}~~-->
 	<!--~~}~~--><!--~}~-->
 
 	<!--~~form {~~--><!--~form {~-->
 		<h2><!--~opt_db {~--><!--~~new_msg {~~-->Add a new ~singular~<!--~~}~~--><!--~~edit_msg {~~-->Edit ~singular~ "~~~always_field~ html~~"<!--~~}~~--><!--~}~--><!--~opt_db unset {~-->Submit a ~singular~<!--~}~--></h2>
 
-		<form action="~~wfpl_basename~~" method="post~enctype_attr~"><!--~opt_db {~--><!--~~editing {~~--><div style="display: none"><input type="hidden" name="~file_name~_edit_id" value="~~~file_name~_edit_id attr~~"></div><!--~~}~~--><!--~}~--><!--~uploads {~--><input type="hidden" name="MAX_FILE_SIZE" value="~~upload_max_filesize~~"><!--~}~--><!--~hidden_fields {~--><!--~ first {~-->
+		<form action="~~wfpl_basename~~" method="post~enctype_attr~"><!--~opt_db {~--><!--~~editing {~~--><div style="display: none"><input type="hidden" name="edit_id" value="~~id attr~~"></div><!--~~}~~--><!--~}~--><!--~uploads {~--><input type="hidden" name="MAX_FILE_SIZE" value="~~upload_max_filesize~~"><!--~}~--><!--~hidden_fields {~--><!--~ first {~-->
 			<div style="display: none"><!--~}~--><input type="hidden" name="~name~" value="~~~name~ attr~~"><!--~ last {~--></div><!--~}~--><!--~}~-->
 <!--~visible_fields {~--><!--~fieldset {~-->
 			<fieldset><legend>~caption html~</legend><!--~}~--><!--~end_fieldset {~-->
@@ -67,7 +67,11 @@
 			<div class="caption">~caption html~</div>
 			<div class="field"><input type="file" name="~name~"><input type="hidden" name="old_~name~" value="~~~name~ attr~~"></div><!--~}~--><!--~textbox {~-->
 			<div class="caption">~caption html~</div>
-			<div class="field"><input type="text" name="~name~" value="~~~name~ attr~~"></div><!--~}~--><!--~date {~-->
+			<div class="field"><input type="text" name="~name~" value="~~~name~ attr~~"></div><!--~}~--><!--~email {~-->
+			<div class="caption">~caption html~</div>
+			<div class="field"><input type="email" name="~name~" value="~~~name~ attr~~"></div><!--~}~--><!--~search {~-->
+			<div class="caption">~caption html~</div>
+			<div class="field"><input type="search" name="~name~" value="~~~name~ attr~~"></div><!--~}~--><!--~date {~-->
 			<div class="caption">~caption html~</div>
 			<div class="field"><input type="text" name="~name~" value="~~~name~ mmddyyyy attr~~"> mm/dd/yyyy</div><!--~}~--><!--~password {~-->
 			<div class="caption">~caption html~</div>
@@ -100,19 +104,19 @@
 		</form><!--~opt_listing {~-->
 
 		<div class="caption">&nbsp;</div>
-		<div class="field"><!--~~~file_name attr~_edit_id {~~--><a href="~file_name attr~?~file_name attr~_id=~~~file_name attr~_edit_id~~"><!--~~}~~--><!--~~~file_name attr~_edit_id unset {~~--><a href="~file_name attr~"><!--~~}~~-->Cancel</a></div><!--~}~-->
+		<div class="field"><!--~~id {~~--><a href="~file_name attr~?id=~~id~~">Cancel</a><!--~~}~~--><!--~~id unset {~~--><a href="~file_name attr~">Cancel</a><!--~~}~~--></div><!--~}~-->
 	<!--~}~--><!--~~}~~--><!--~opt_listing {~-->
 
 	<!--~~listings once {~~-->
 		<h2>~plural cap~ Listing</h2>
 
 		<!--~~listings once_if {~~-->
-			<p><a href="~file_name~?~file_name~_new=1">[Add a new ~singular~]</a></p>
+			<p><a href="~file_name~?new=1">[Add a new ~singular~]</a></p>
 
 			<table cellspacing="0" cellpadding="4" border="1" summary="">
 				<tr><!--~listing_headers {~--><th>~caption~</th><!--~}~--><th>&nbsp;</th></tr><!--~~listings {~~-->
 				<tr><!--~listing_fields {~-->
-					<td class="listing"><a href="~file_name~?~file_name~_<!--~opt_display unset {~-->edit_<!--~}~-->id=~~id~~"><!--~enc {~-->~~~name~ ~enc~~~<!--~~~name~ empty {~~--><em>(blank)</em><!--~~}~~--><!--~}~--><!--~thumb {~--><!--~~~name~ nonempty {~~--><img src="~~~name~ thumb_src~~" width="~~~name~ thumb_width~~" height="~~~name~ thumb_height~~" alt=""><!--~~}~~--><!--~}~--></a></td><!--~}~-->
+					<td class="listing"><a href="~file_name~?~opt_display unset {~edit_~}~id=~~id~~"><!--~enc {~-->~~~name~ ~enc~~~<!--~~~name~ empty {~~--><em>(blank)</em><!--~~}~~--><!--~}~--><!--~thumb {~--><!--~~~name~ nonempty {~~--><img src="~~~name~ thumb_src~~" width="~~~name~ thumb_width~~" height="~~~name~ thumb_height~~" alt=""><!--~~}~~--><!--~}~--></a></td><!--~}~-->
 					<td><a href="~file_name~?~file_name~_delete_id=~~id~~" onclick="return confirm('Permanently delete?')">[delete this ~singular~]</a></td>
 				</tr><!--~~}~~-->
 
@@ -122,7 +126,7 @@
 			<p>No ~plural~ in database.</p>
 		<!--~~}~~-->
 
-		<p><a href="~file_name~?~file_name~_new=1">[Add a new ~singular~]</a></p>
+		<p><a href="~file_name~?new=1">[Add a new ~singular~]</a></p>
 	<!--~~}~~--><!--~}~-->
 
 <!--~~}~~-->