metaform: simplify code (form msg, cancel dest)

diff --git a/metaform/style.less b/metaform/style.less
index 65eeea9..a21b367 100644 (file)
--- a/metaform/style.less
+++ b/metaform/style.less
@@ -27,7 +27,7 @@ body {
 #centerer {
        position: relative;
        background: @nav-color;
-       margin: 0 auto;
+       margin: 15 auto;
        width: @site-width;
        -moz-box-shadow: 2px 2px 15px #777;
        -webkit-box-shadow: 2px 2px 15px #777;

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 {~~-->

diff --git a/metaform/template.php b/metaform/template.php
index 79d018c..4e8d49f 100644 (file)
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -151,12 +151,7 @@ function ~file_name~_main_form($id = false) {~pulldowns {~
        pulldown('~name~', ~pulldown_options~);~}~~has_pulldowns {~
 ~}~~opt_db {~
        if($id) {
-               # add hidden field for database id of row we're editing
                tem_set('id', $id);
-               tem_set('editing');
-               tem_set('edit_msg');
-       } else {
-               tem_set('new_msg');
        }
 ~}~
        if(isset($_POST['~always_field~'])) {