metaform: simplify code (form msg, cancel dest)

[wfpl.git] / metaform / template.html

diff --git a/metaform/template.html b/metaform/template.html
index 3629541..d60f62e 100644 (file)
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -55,9 +55,9 @@
        <!--~~}~~--><!--~}~-->
 
        <!--~~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>
+               <h2><!--~opt_db {~--><!--~~id unset {~~-->Add a new ~singular~<!--~~}~~--><!--~~id {~~-->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="edit_id" value="~~id attr~~"></div><!--~~}~~--><!--~}~--><!--~uploads {~--><input type="hidden" name="MAX_FILE_SIZE" value="~~upload_max_filesize~~"><!--~}~--><!--~hidden_fields {~--><!--~ first {~-->
+               <form action="~file_name attr~" method="post~enctype_attr~"><!--~opt_db {~--><!--~~id {~~--><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 {~-->
@@ -104,7 +104,7 @@
                </form><!--~opt_listing {~-->
 
                <div class="caption">&nbsp;</div>
-               <div class="field"><!--~~id {~~--><a href="~file_name attr~?id=~~id~~">Cancel</a><!--~~}~~--><!--~~id unset {~~--><a href="~file_name attr~">Cancel</a><!--~~}~~--></div><!--~}~-->
+               <div class="field"><a href="~file_name attr~~~id {~~?id=~~id~~~~}~~">Cancel</a></div><!--~}~-->
        <!--~}~--><!--~~}~~--><!--~opt_listing {~-->
 
        <!--~~listings once {~~-->