Merge commit '2.13' into HEAD

[maypole.git] / lib / Maypole / templates / factory / edit

diff --git a/lib/Maypole/templates/factory/edit b/lib/Maypole/templates/factory/edit
index 3b0aca635d6b0a569f0ed32601a0fedbdca8e072..bac8c6dbec42422138975b059dde5fdb0ce60eb4 100644 (file)
--- a/lib/Maypole/templates/factory/edit
+++ b/lib/Maypole/templates/factory/edit
@@ -23,12 +23,12 @@ form similar to L<addnew> but with the current values filled in.
 <legend>Edit [% object.name %]</legend>
    [% FOR col = classmetadata.columns;
     NEXT IF col == "id" OR col == classmetadata.table _ "_id";
-    '<label><span class="field">';
-    classmetadata.colnames.$col; ":</span>";
-    object.to_field(col).as_XML;
-    "</label>";
-    IF errors.$col; 
+    SET col_label = classmetadata.colnames.$col; %]
+    <label><span class="field"> [% col_label %] </span> [% object.to_field(col).as_XML %]</label>
+    [% IF errors.$col; 
        '<span class="error">'; errors.$col;'</span>';
+    ELSIF  errors.$col_label; 
+       '<span class="error">'; errors.$col_label;'</span>';
     END;
     END %]
     <input type="submit" name="edit" value="edit"/>