form gen: refactor and simplify optional output

[wfpl.git] / metaform / template.html

diff --git a/metaform/template.html b/metaform/template.html
index 6912144..a5fb63e 100644 (file)
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -46,7 +46,7 @@
                <!--~~ last {~~-->
                        </div>
                <!--~~}~~-->
-       <!--~~}~~--><!--~opt_display_1 {~-->
+       <!--~~}~~--><!--~opt_display {~-->
 
        <!--~~display {~~-->
                <h2>~singular cap~ details</h2>
@@ -74,9 +74,9 @@
        <!--~~}~~--><!--~}~-->
 
        <!--~~form {~~--><!--~form {~-->
-               <h2><!--~opt_db_1 {~--><!--~~new_msg {~~-->Add a new ~singular~<!--~~}~~--><!--~~edit_msg {~~-->Edit ~singular~ "~~~always_field~ html~~"<!--~~}~~--><!--~}~--><!--~opt_db_1_else {~-->Submit a ~singular~<!--~}~--></h2>
+               <h2><!--~opt_db {~--><!--~~new_msg {~~-->Add a new ~singular~<!--~~}~~--><!--~~edit_msg {~~-->Edit ~singular~ "~~~always_field~ html~~"<!--~~}~~--><!--~}~--><!--~opt_db_else {~-->Submit a ~singular~<!--~}~--></h2>
 
-               <form action="~file_name~" method="post~enctype_attr~"><!--~opt_db_2 {~--><!--~~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~~" /><!--~}~-->
+               <form action="~file_name~" 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~~" /><!--~}~-->
 <!--~row {~--><!--~image {~-->
                        <div class="caption">~caption html~</div>
                        <div class="field"><input type="file" name="~name~" /><input type="hidden" name="old_~name~" value="~~~name~ attr~~" /></div><!--~}~--><!--~file {~-->
@@ -104,7 +104,7 @@
                        <div class="field"><input type="submit" name="~name~" value="~caption attr~" /></div><!--~}~-->
 <!--~}~-->
                </form>
-       <!--~}~--><!--~~}~~--><!--~opt_listing_1 {~-->
+       <!--~}~--><!--~~}~~--><!--~opt_listing {~-->
 
        <!--~~listings {~~-->
                <h2>~plural cap~ Listing</h2>
@@ -115,7 +115,7 @@
                        <table cellspacing="0" cellpadding="4" border="1" summary="">
                                <!--~listing_head_col {~--><th>~caption~</th><!--~}~--><th>&nbsp;</th><!--~~rows {~~-->
                                <tr><!--~listing_row_col {~-->
-                                       <td class="listing"><a href="~file_name~?~file_name~_<!--~opt_display_a_else {~-->edit_<!--~}~-->id=~~id~~"><!--~listing_value_enc {~-->~~~name~ ~listing_enc~~~<!--~}~--><!--~listing_value_thumb {~--><img src="~~~name~ thumb_src~~" width="~~~name~ thumb_width~~" height="~~~name~ thumb_height~~" alt="" /><!--~}~--></a></td><!--~}~-->
+                                       <td class="listing"><a href="~file_name~?~file_name~_<!--~opt_display_else {~-->edit_<!--~}~-->id=~~id~~"><!--~listing_value_enc {~-->~~~name~ ~listing_enc~~~<!--~}~--><!--~listing_value_thumb {~--><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><!--~~}~~-->