clean up overlib usage for customer notes

3 files changed, 31 insertions, 17 deletions

diff --git a/httemplate/elements/popup_link_onclick.html b/httemplate/elements/popup_link_onclick.html
index 41383fdf6..d14a2e795 100644
--- a/httemplate/elements/popup_link_onclick.html
+++ b/httemplate/elements/popup_link_onclick.html
@@ -25,7 +25,7 @@ Example:
 % }
 <%init>
 
-my($action, $actionlabel) = ( '', '' );
+my( $action, $actionlabel, $frame ) = ( '', '', '' );
 my( $width, $height ) = ( 540, 336 );
 my $closetext = 'Close';
 my $color = '#333399';
@@ -45,11 +45,18 @@ $width       = $params->{'width'}       if exists $params->{'width'};
 $height      = $params->{'height'}      if exists $params->{'height'};
 $color       = $params->{'color'}       if exists $params->{'color'};
 $closetext   = $params->{'closetext'}   if exists $params->{'closetext'};
+$frame       = $params->{'frame'}       if exists $params->{'frame'};
 
 #stupid safari is caching the "location" of popup iframs, and submitting them
 #instead of displaying them.  this should prevent that.
 my $popup_name = 'popup-'.time. "-$$-". rand() * 2**32;
 
-my $onclick = "overlib( OLiframeContent('$action', $width, $height, '$popup_name' ), CAPTION, '$actionlabel', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '$color', CGCOLOR, '$color', CLOSETEXT, '$closetext' ); return false;";
+my $onclick =
+  "overlib( OLiframeContent('$action', $width, $height, '$popup_name' ), ".
+    "CAPTION, '$actionlabel', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, ".
+    "DRAGGABLE, CLOSECLICK, ".
+    "BGCOLOR, '$color', CGCOLOR, '$color', CLOSETEXT, '$closetext'".
+    ( $frame ? ", FRAME, $frame" : '' ).
+  "); return false;";
 
 </%init>
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 05d1c8d69..94cf13258 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -4,10 +4,7 @@
   <A HREF="<% $p %>edit/cust_main.cgi?<% $custnum %>">Edit this customer</A> | 
 % } 
 
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws_iframe.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws_draggable.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/iframecontentmws.js"></SCRIPT>
+<% include('/elements/init_overlib.html') %>
 
 <SCRIPT TYPE="text/javascript">
 function areyousure(href, message) {
@@ -100,7 +97,15 @@ Comments
 %        ! $conf->exists('cust_main-disable_notes')
 %      ) {
 
-  <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<% $p %>edit/cust_main_note.cgi?custnum=<% $cust_main->custnum %>', 616, 386, 'cust_main_note_popup' ), CAPTION, 'Enter customer note', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK); return false;">Add customer note</A>
+  <% include( '/elements/popup_link-cust_main.html',
+                'label'       => 'Add customer note',
+                'action'      => $p. 'edit/cust_main_note.cgi',
+                'actionlabel' => 'Enter customer note',
+                'cust_main'   => $cust_main,
+                'width'       => 616,
+                'height'      => 408,
+            )
+  %>
 
 %   }
 
diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html
index f2d116930..ed50c58c2 100755
--- a/httemplate/view/cust_main/notes.html
+++ b/httemplate/view/cust_main/notes.html
@@ -22,10 +22,7 @@ body { background: #e8e8e8 }
 % my (@notes) = $cust_main->notes();
 % if ( scalar(@notes) ) { 
 
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws_iframe.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws_crossframe.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/iframecontentmws.js"></SCRIPT>
+<% include('/elements/init_overlib.html') %>
 
 <TABLE CLASS="inv" CELLSPACING=0 CELLPADDING=0 BORDER=0 >
 
@@ -43,12 +40,17 @@ body { background: #e8e8e8 }
 %
 %   my $pop = popurl(3);
 %   my $notenum = $note->notenum;
-%   my $clickjs = qq!onclick="overlib( OLiframeContent('${pop}edit/! .
-%                 qq!cust_main_note.cgi?custnum=$custnum&! .
-%                 qq!notenum=$notenum', 616, ! .
-%                 qq!386, 'cust_main_note_popup' ), CAPTION, 'Edit customer ! .
-%                 qq!note', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, ! .
-%                 qq!CLOSECLICK, FRAME, top); return false;"!;
+%   my $onclick = include( '/elements/popup_link_onclick.html',
+%                            'action'      => popurl(3).
+%                                             'edit/cust_main_note.cgi'.
+%                                             "?custnum=$custnum".
+%                                             ";notenum=$notenum",
+%                            'actionlabel' => 'Edit customer note',
+%                            'width'       => 616,
+%                            'height'      => 408,
+%                            'frame'       => 'top',
+%                        );
+%   my $clickjs = qq!onclick="$onclick"!;
 %
 %   my ($el, $eel);
 %   if ($curuser->access_right('Edit customer note') ) {