X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Felements%2Fedit.html;h=829b77615f50b1317567de5579cb07061b681e96;hp=feec098f354f2ca913fef0da982fb1a5f7115408;hb=793956b8a0c19d7d39103e94235b0ca13f0f3e84;hpb=8f377efa3643b02c7ab25c989903813591888a1a

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index feec098f3..829b77615 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -263,12 +263,12 @@ Example:
 
 %   unless ( $opt{'no_pkey_display'} ) {
 
-      <FONT SIZE="+1"><B>
+      <FONT CLASS="fsinnerbox-title">
       <% ( $opt{labels} && exists $opt{labels}->{$pkey} )
             ? $opt{labels}->{$pkey}
             : $pkey
       %>
-      </B></FONT>
+      </FONT>
       #<% ( !$clone && $object->$pkey() ) || "(NEW)" %>
 
 %   }
@@ -277,9 +277,7 @@ Example:
 
 % my $tablenum = $opt{'tablenum'} || 0;
 <TABLE ID="TableNumber<% $tablenum++ %>"
-       <% $opt{html_table_class} ? 'CLASS="'. $opt{html_table_class}. '"'
-                                 : 'BGCOLOR="#cccccc" BORDER=0 CELLSPACING=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 = '<INPUT TYPE="button" VALUE="X" TITLE="Remove this '.
 %                      lc($f->{'m2_label'}).
 %                      qq(" onClick="remove_$field($fieldnum);").
 %                      ' STYLE="color:#ff0000;font-weight:bold;'.
 %                              'padding-left:2px;padding-right:2px"'.
-%                      '>&nbsp;'. ($f->{'m2_label'} || $field ). ' ';
+%                      '>&nbsp;'. ($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;
 
@@ -820,6 +821,18 @@ Example:
       : $opt{'html_bottom'}
 %>
 
+%     ## set extra field values for validation.  ie price plan fields
+%     my $extra_fields_to_validate = $opt{'extra_fields_validate'};
+%     my %validate_error_messages = (
+%       '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;
+%      $js_form_validate->{edit_topform}->{error_message}{$extra_fields} = $validate_error_messages{$validate_type};
+%     }
+
 % unless ($opt{'embed'}) {
 
   <BR>