X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Felements%2Fedit.html;h=829b77615f50b1317567de5579cb07061b681e96;hp=5e7b3067493153b39a94ba2fbc3d02f70bb7e8bc;hb=793956b8a0c19d7d39103e94235b0ca13f0f3e84;hpb=057fc61586d26199005660b908ece68a7a1da681
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 5e7b30674..829b77615 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -263,12 +263,12 @@ Example:
% unless ( $opt{'no_pkey_display'} ) {
-
+
<% ( $opt{labels} && exists $opt{labels}->{$pkey} )
? $opt{labels}->{$pkey}
: $pkey
%>
-
+
#<% ( !$clone && $object->$pkey() ) || "(NEW)" %>
% }
@@ -277,9 +277,7 @@ Example:
% my $tablenum = $opt{'tablenum'} || 0;
+ CLASS="<% $opt{html_table_class} || 'fsinnerbox' %>"
>
% my $g_row = 0;
@@ -515,12 +513,15 @@ Example:
% }
% foreach my $name_obj ( @existing ) {
%
+% my $m2_label = $f->{'m2_label'};
+% $m2_label = &{ $f->{'m2_label_callback'} }($name_obj) if $f->{'m2_label_callback'};
+%
% my $ex_label = ' '. ($f->{'m2_label'} || $field ). ' ';
+% '> '. ($m2_label || $field ). ' ';
%
% if ( $f->{'layer_values_callback'} ) {
% my %switches = ( 'mode' => $mode );
@@ -637,7 +638,7 @@ Example:
// only spawn if we're the last element... return if not
- var field_regex = /(\d+)(_[a-z_]+)?$/;
+ var field_regex = /(\d+)(_[a-z_0-9]+)?$/;
var match = field_regex.exec(what.name);
if ( !match ) {
alert(what.name + " didn't match for " + what);
@@ -701,7 +702,7 @@ Example:
var row = table.insertRow(<%$field%>_rownum++);
- var label_cell = document.createElement('TD');
+ var label_cell = document.createElement('TH');
label_cell.id = '<% $field %>_label' + <%$field%>_fieldnum;
@@ -823,13 +824,13 @@ Example:
% ## set extra field values for validation. ie price plan fields
% my $extra_fields_to_validate = $opt{'extra_fields_validate'};
% my %validate_error_messages = (
-% 'digits' => 'Please only enter numbers here.',
-% 'email' => 'Please enter a valid email here.',
+% 'digits: true' => 'Please only enter numbers here.',
+% 'email: true' => 'Please enter a valid email here.',
% );
% foreach my $extra_fields (keys %$extra_fields_to_validate) {
% my $validate_type = $extra_fields_to_validate->{$extra_fields};
-% $js_form_validate->{edit_topform}->{validate_fields}{$extra_fields} = $validate_type.': true';
-% $js_form_validate->{edit_topform}->{error_message}{$extra_fields} = $validate_error_messages{$validate_type};
+% $js_form_validate->{edit_topform}->{validate_fields}{$extra_fields} = $validate_type;
+% $js_form_validate->{edit_topform}->{error_message}{$extra_fields} = $validate_error_messages{$validate_type};
% }
% unless ($opt{'embed'}) {