From 39120f69d4372781aba0df58d06736be450009e1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 9 May 2009 01:44:08 +0000
Subject: use service-def specific labels, at least for service pages that use
 {view,edit}/elements/svc_Common.html RT#4081

---
 httemplate/edit/elements/edit.html | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'httemplate/edit/elements/edit.html')

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index d18a37d5a..4a6079a85 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -132,37 +132,39 @@ Example:
     # initialization callbacks
     ###
 
-    ###global callbacks
+    ###global callbacks, always run if provided
 
-    #always run if provided, after decoding long CGI "redirect=" responses but
+    #after decoding long CGI "redirect=" responses but
     # before object creation/search
     # (useful if you have a long form that might trigger redirect= and you need
     #  to do things with $cgi params - they're not decoded in the calling
     #  <%init> block yet)
     'begin_callback' = sub { my( $cgi, $fields_listref, $opt_hashref ) = @_; },
 
-    #always run, after the mode-specific object creation/search
+    #after the mode-specific object creation/search
     'end_callback' = sub { my( $cgi, $object, $fields_listref, $opt_hashref ) = @_; },
 
-    ###mode-specific callbacks
+    ###mode-specific callbacks.  one (and only one) of these four is called
    
+    #run when adding
+    'new_callback' => sub { my( $cgi, $object, $fields_listref, $opt_hashref ) = @_; },
+
+    #run when editing
+    'edit_callback' => sub { my( $cgi, $object, $fields_listref, $opt_hashref ) = @_; },
+
     #run when re-displaying with an error
     'error_callback' => sub { my( $cgi, $object, $fields_listref, $opt_hashref ) = @_; },
    
-    #run when editing
-    'edit_callback' => sub { my( $cgi, $object, $fields_listref ) = @_; },
-   
+    #run when cloning
+    'clone_callback' => sub { my( $cgi, $object, $fields_listref, $opt_hashref ) = @_; },
+
+    ###callbacks called in new mode only
+
     # returns a hashref for the new object
     'new_hashref_callback'
 
     # returns the new object iself (otherwise, ->new is called)
     'new_object_callback'
-   
-    #run when adding
-    'new_callback' => sub { my( $cgi, $object, $fields_listref ) = @_; },
-
-    #run when cloning
-    'clone_callback' => sub { my( $cgi, $object, $fields_listref, $opt_hashref ) = @_; },
 
     ###display callbacks
 
@@ -618,7 +620,7 @@ if ( $cgi->param('error') ) {
     map { $_ => scalar($cgi->param($_)) } fields($table)
   });
 
-  &{$opt{'error_callback'}}($cgi, $object, $fields, \%opt )
+  &{$opt{'error_callback'}}( $cgi, $object, $fields, \%opt )
     if $opt{'error_callback'};
 
 } elsif ( $cgi->param('clone') =~ /^(\d+)$/ ) {
@@ -632,7 +634,7 @@ if ( $cgi->param('error') ) {
 
   $object = qsearchs({ %qsearch, 'hashref' => { $pkey => $clone } });
 
-  &{$opt{'clone_callback'}}($cgi, $object, $fields, \%opt )
+  &{$opt{'clone_callback'}}( $cgi, $object, $fields, \%opt )
     if $opt{'clone_callback'};
 
   #$object->$pkey('');
@@ -657,7 +659,7 @@ if ( $cgi->param('error') ) {
   warn "$table $pkey => $1"
     if $opt{'debug'};
 
-  &{$opt{'edit_callback'}}($cgi, $object, $fields)
+  &{$opt{'edit_callback'}}( $cgi, $object, $fields, \%opt )
     if $opt{'edit_callback'};
 
 } else { #adding
@@ -672,7 +674,7 @@ if ( $cgi->param('error') ) {
               ? &{$opt{'new_object_callback'}}( $cgi, $hashref, $fields, \%opt )
               : $class->new( $hashref );
 
-  &{$opt{'new_callback'}}($cgi, $object, $fields)
+  &{$opt{'new_callback'}}( $cgi, $object, $fields, \%opt )
     if $opt{'new_callback'};
 
 }
-- 
cgit v1.2.1


From 87a986f35b347affed5f1e1ff5c5c7c59ccd4ad1 Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Mon, 20 Jul 2009 14:26:12 +0000
Subject: bundle bill linked packages into top line total when desired #5724

---
 httemplate/edit/elements/edit.html | 117 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 115 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit/elements/edit.html')

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 4a6079a85..23d4db30d 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -289,7 +289,8 @@ Example:
 %     foreach grep exists($f->{$_}), qw( hashref agent_virt agent_null_right );
 %
 %   if ( $type eq 'tablebreak-tr-title' ) {
-%     $include_common{'table_id'} = 'TableNumber'. $tablenum++
+%     $include_common{'table_id'} = 'TableNumber'. $tablenum++;
+%     $include_common{'colspan'} = $f->{colspan} if $f->{colspan};
 %   }
 %
 %   my $layer_prefix_on = '';
@@ -317,6 +318,27 @@ Example:
 %     @include;
 %   };
 %
+%   my $column_sub = sub {
+%     my %opt = @_;
+%
+%     my $column   = delete($opt{field});
+%     my $fieldnum = delete($opt{fieldnum});
+%     my $include  = delete($opt{type}) || 'text';
+%     $include = "input-$include" if $include =~ /^(text|money|percentage)$/;
+%
+%     ( "/elements/$include.html",
+%         'field'        => $field.'__'.$column.$fieldnum,
+%         'id'           => $field.'__'.$column.$fieldnum,
+%         'layer_prefix' => $field.'__'.$column.$fieldnum.".",
+%         ( $fieldnum
+%             ? ('cell_style' => 'border-top:1px solid black')
+%             : ()
+%         ),
+%         'cgi' => $cgi,
+%         %opt,
+%     );
+%   };
+%
 %   unless ( $type =~ /^column/ ) {
 %     $g_row = 1 if $type eq 'tablebreak-tr-title';
 %     $g_row++;
@@ -382,8 +404,35 @@ Example:
 %         'layer_values' => $layer_values,
 %         'cell_style'   => ( $fieldnum ? 'border-top:1px solid black' : '' ),
 %       );
+%       $existing[0] =~ s(^/elements/tr-)(/elements/);
+%       my @label = @existing;
+%       $label[0] = '/elements/tr-td-label.html';
 
+        <% include( @label ) %>
+        <TD>
         <% include( @existing ) %>
+        </TD>
+
+%       if ( $f->{'m2_fields'} ) {
+%         foreach my $c ( @{ $f->{'m2_fields'} } ) {
+%           my $column = $c->{field};
+%           my @column = &{ $column_sub }( %$c,
+%                                          'fieldnum' => $fieldnum,
+%                                          'curr_value' => $name_obj->$column()
+%                                        );
+
+            <TD id='<% $field %>__<% $column %>_label<% $fieldnum %>'
+                style='text-align:right;vertical-align:top;
+                       border-top:1px solid black;padding-top:5px;'>
+              <% $c->{'label'} || '' %>
+            </TD>
+            <TD style='border-top:1px solid black;padding-top:3px;'>
+              <% include( @column ) %>
+            </TD>
+%         }
+%       }
+
+        </TR>
 
 %       $fieldnum++;
 %       $g_row++;
@@ -409,9 +458,40 @@ Example:
 %     'onchange'   => $onchange,
 %     ( $fieldnum ? ('cell_style' => 'border-top:1px solid black') : () ),
 %   );
+%
+%   if ( $f->{'m2name_table'} || $f->{'m2m_method'} ) {
+%     $include[0] =~ s(^/elements/tr-)(/elements/);
+%     my @label = @include;
+%     $label[0] = '/elements/tr-td-label.html';
+
+      <% include( @label ) %>
+      <TD>
+      <% include( @include ) %>
+      </TD>
+
+%     if ( $f->{'m2_fields'} ) {
+%       foreach my $c ( @{ $f->{'m2_fields'} } ) {
+%         my $column = $c->{field};
+%         my @column = &{ $column_sub }( %$c, 'fieldnum' => $fieldnum );
+
+          <TD id='<% $field %>__<% $column %>_label<% $fieldnum %>'
+              style='text-align:right;vertical-align:top;
+                     border-top:1px solid black;padding-top:5px;'>
+            <% $c->{'label'} || '' %>
+          </TD>
+          <TD style='border-top:1px solid black;padding-top:3px;'>
+            <% include( @column ) %>
+          </TD>
+%       }
+%     }
 
-    <% include( @include ) %>
+      </TR>
 
+%   } else {
+
+      <% include( @include ) %>
+
+%   }
 %   if ( $f->{'m2name_table'} || $f->{'m2m_method'} ) {
 
       <SCRIPT TYPE="text/javascript">
@@ -499,6 +579,39 @@ Example:
 
           row.appendChild(widget_cell);
 
+%         if ( $f->{'m2_fields'} ) {
+%           foreach my $c ( @{ $f->{'m2_fields'} } ) {
+%             my $column = $c->{field};
+%             my @column = &{ $column_sub }(%$c, 'fieldnum' => 'MAGIC_NUMBER');
+
+              var column =  <% include(@column, html_only=>1) |js_string %>;
+              column  = column.replace(  magic_regex, <%$field%>_fieldnum );
+
+              var column_label = document.createElement('TD');
+              column_label.id =
+                '<% $field %>__<% $column %>_label' + <%$field%>_fieldnum;
+
+              column_label.style.textAlign = "right";
+              column_label.style.verticalAlign = "top";
+              column_label.style.borderTop = "1px solid black";
+              column_label.style.paddingTop = "5px";
+
+              column_label.innerHTML = '<% $c->{'label'} || '' %>';
+
+              row.appendChild(column_label);
+          
+              var column_widget = document.createElement('TD');
+
+              column_widget.style.borderTop = "1px solid black";
+              column_widget.style.paddingTop = "3px";
+
+              column_widget.innerHTML = column;
+
+              row.appendChild(column_widget);
+
+%           }
+%         }
+
 %         if ( $f->{'m2_new_js'} ) {
             // take out items selected in previous dropdowns
             var new_element = document.getElementById("<%$field%>" + <%$field%>_fieldnum );
-- 
cgit v1.2.1


From 3d76fb8e984b75d67e5f96f51cfd7761a22736e1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 22 Aug 2009 00:29:58 +0000
Subject: use name_singular if available too

---
 httemplate/edit/elements/edit.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/edit/elements/edit.html')

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 23d4db30d..e290bdb86 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -677,7 +677,7 @@ Example:
 
 <BR>
 
-<INPUT TYPE="submit" ID="submit" VALUE="<% ( !$clone && $object->$pkey() ) ? "Apply changes" : "Add $opt{'name'}" %>">
+<INPUT TYPE="submit" ID="submit" VALUE="<% ( !$clone && $object->$pkey() ) ? "Apply changes" : "Add ". ( $opt{'name'} || $opt{'name_singular'} ) %>">
 
 </FORM>
 
@@ -797,7 +797,7 @@ if ( $cgi->param('error') ) {
 
 $opt{action} ||= $object->$pkey() ? 'Edit' : 'Add';
 
-my $title = $opt{action}. ' '. $opt{name};
+my $title = $opt{action}. ' '. ( $opt{name} || $opt{'name_singular'} );
 
 my $viewall_url = $p . ( $opt{'viewall_dir'} || 'search' ) . "/$table.html";
 $viewall_url = $opt{'viewall_url'} if $opt{'viewall_url'};  
-- 
cgit v1.2.1


From 20727883e43b7abed5160870b3fa3059a7cb1d83 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 18 Sep 2009 19:28:59 +0000
Subject: better error message when the clone object isn't found, RT#6128

---
 httemplate/edit/elements/edit.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate/edit/elements/edit.html')

diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index e290bdb86..fd73e031e 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -745,7 +745,8 @@ if ( $cgi->param('error') ) {
   $qsearch{'extra_sql'} = ' AND '. $opt{'agent_clone_extra_sql'}
     if $opt{'agent_clone_extra_sql'};
 
-  $object = qsearchs({ %qsearch, 'hashref' => { $pkey => $clone } });
+  $object = qsearchs({ %qsearch, 'hashref' => { $pkey => $clone } })
+    or die "$pkey $clone not found in $table";
 
   &{$opt{'clone_callback'}}( $cgi, $object, $fields, \%opt )
     if $opt{'clone_callback'};
-- 
cgit v1.2.1