fuck embedded iframes and their stupid display problems with scrolling. also make the gridding more consistent

3 files changed, 53 insertions, 80 deletions

diff --git a/httemplate/edit/process/cust_main_note.cgi b/httemplate/edit/process/cust_main_note.cgi
index 9689ca6d6..5127c72d1 100755
--- a/httemplate/edit/process/cust_main_note.cgi
+++ b/httemplate/edit/process/cust_main_note.cgi
@@ -2,17 +2,11 @@
 %  $cgi->param('error', $error);
 <% $cgi->redirect(popurl(2). 'cust_main_note.cgi?'. $cgi->query_string ) %>
 %} else {
-%    
 <% header('Note ' . ($notenum ? 'updated' : 'added') ) %>
     <SCRIPT TYPE="text/javascript">
-      parent.cust_main_notes.location.reload();
-      try{parent.cust_main_notes.cClick()}
-      catch(err){}
-      try{parent.cClick()}
-      catch(err){}
+      window.top.location.reload();
     </SCRIPT>
     </BODY></HTML>
-%
 % }
 <%init>
 
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 63df35ad1..2231d4148 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -111,19 +111,7 @@ Comments
 
 <BR>
 
-%   if ($notecount) {
-
-<iframe src="<% $p %>view/cust_main/notes.html?custnum=<% $cust_main->custnum %>" height="186" width="616" name="cust_main_notes" frameborder="0" marginborder="0" marginheight="0" scrolling="auto">
-  <div><br>[iframe not supported]<br><br></div>
-</iframe>
-
-%   }else{ # make firefox happy wrt POSTDATA
-
-<iframe src="<% $p %>view/cust_main/notes.html?custnum=<% $cust_main->custnum %>" height="24" width="616" name="cust_main_notes" frameborder="0" marginborder="0" marginheight="0" scrolling="auto">
-  <div><br>[iframe not supported]<br><br></div>
-</iframe>
-
-%   }
+<% include('cust_main/notes.html', 'custnum' => $cust_main->custnum ) %>
 
 % }
 
diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html
index ed50c58c2..4c97c9f64 100755
--- a/httemplate/view/cust_main/notes.html
+++ b/httemplate/view/cust_main/notes.html
@@ -1,36 +1,21 @@
-%
-% my $conf = new FS::Conf;
-% my $curuser = $FS::CurrentUser::CurrentUser;
-%
-% $cgi->param('custnum') =~ /^(\d+)$/
-%   or die "No customer specified (bad URL)!";
-% my $custnum = $1;
-%
-% my $cust_main = qsearchs('cust_main', {'custnum' => $custnum} );
-% die "Custimer not found!" unless $cust_main;
-%
-
-<STYLE TYPE="text/css">
+% if ( scalar(@notes) ) {
 
-body { background: #e8e8e8 }
-.inv table { border: none }
-.inv TH { border: none }
-.inv TD { border: none }
+  <% include('/elements/init_overlib.html') %>
 
-</STYLE>
+  <% include("/elements/table-grid.html") %>
 
-% my (@notes) = $cust_main->notes();
-% if ( scalar(@notes) ) { 
+  <TR>
+    <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">Time</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">Person</TH>
+    <TH CLASS="grid" BGCOLOR="#cccccc">Note</TH>
+  </TR>
 
-<% include('/elements/init_overlib.html') %>
-
-<TABLE CLASS="inv" CELLSPACING=0 CELLPADDING=0 BORDER=0 >
-
-%   my $bgcolor1 = '#eeeeee';
-%   my $bgcolor2 = '#ffffff';
-%   my $bgcolor = '';
+% my $bgcolor1 = '#eeeeee';
+% my $bgcolor2 = '#ffffff';
+% my $bgcolor = '';
 %
-%   foreach my $note (@notes) {
+% foreach my $note (@notes) {
 %
 %   if ( $bgcolor eq $bgcolor1 ) {
 %     $bgcolor = $bgcolor2;
@@ -41,7 +26,7 @@ body { background: #e8e8e8 }
 %   my $pop = popurl(3);
 %   my $notenum = $note->notenum;
 %   my $onclick = include( '/elements/popup_link_onclick.html',
-%                            'action'      => popurl(3).
+%                            'action'      => popurl(2).
 %                                             'edit/cust_main_note.cgi'.
 %                                             "?custnum=$custnum".
 %                                             ";notenum=$notenum",
@@ -52,44 +37,50 @@ body { background: #e8e8e8 }
 %                        );
 %   my $clickjs = qq!onclick="$onclick"!;
 %
-%   my ($el, $eel);
+%   my $edit = '';
 %   if ($curuser->access_right('Edit customer note') ) {
-%     $el  = qq!<A HREF="javascript:void(0);" $clickjs>!;
-%     $eel = qq!</A>!;
-%   }else{
-%     $el = $eel = '';
+%     $edit = qq! <A HREF="javascript:void(0);" $clickjs>(edit)</A>!;
 %   }
 
-<TR>
-  <% note_datestr($note,$conf,$bgcolor, $el, $eel) %>
-  <TD CLASS="inv" BGCOLOR="<% $bgcolor %>">
-    <% $el %> &nbsp;<%$note->otaker%>&nbsp; <% $eel %>
-  </TD>
-  <TD CLASS="inv" BGCOLOR="<% $bgcolor %>">
-    &nbsp;<%$note->comments%>
-  </TD>
-</TR>
+    <TR>
+      <% note_datestr($note,$conf,$bgcolor) %>
+      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+        &nbsp;<% $note->otaker%>
+      </TD>
+      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
+        &nbsp;<%$note->comments%><% $edit %>
+      </TD>
+    </TR>
 
 % } #end display notes
 
 </TABLE>
 
-% } 
-%
-%#subroutines
-%
-%sub note_datestr {
-% my($note, $conf, $bgcolor, $el, $eel) = @_ or return '';
-% my $format=qq{<TD class="inv" bgcolor="$bgcolor" align="left">$el<B>%b</B>$eel</TD>}.
-%            qq{<TD class="inv" bgcolor="$bgcolor" align="right">$el<B>&nbsp;%o,</B>$eel</TD>}.
-%            qq{<TD class="inv" bgcolor="$bgcolor" align="right">$el<B>&nbsp;%Y&nbsp;</B>$eel</TD>};
-% $format .= qq{<TD class="inv" bgcolor="$bgcolor" ALIGN="right">$el<B>&nbsp;%l$eel</TD>}.
-%            qq{<TD class="inv" bgcolor="$bgcolor" ALIGN="center">$el<B>:</B>$eel</TD>}.
-%            qq{<TD class="inv" bgcolor="$bgcolor" ALIGN="left">$el<B>%M</B>$eel</TD>}.
-%            qq{<TD class="inv" bgcolor="$bgcolor" ALIGN="left">$el<B>&nbsp;%P&nbsp;</B>$eel</TD>}
-%     if $conf->exists('cust_main_note-display_times');
-%   ( my $strip = time2str($format, $note->_date) ) =~ s/ (\d)/$1/g;
-%   $strip;
 % }
-%
+<%init>
+
+my $conf = new FS::Conf;
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+my(%opt) = @_;
+
+my $custnum = $opt{'custnum'};
+
+my $cust_main = qsearchs('cust_main', {'custnum' => $custnum} );
+die "Custimer not found!" unless $cust_main;
+
+my (@notes) = $cust_main->notes();
+
+#subroutines
+
+sub note_datestr {
+  my($note, $conf, $bgcolor) = @_ or return '';
+  my $td = '<TD CLASS="grid" BGCOLOR="$bgcolor" ALIGN="right">';
+  my $format = "$td%b&nbsp;%o,&nbsp;%Y</TD>";
+  $format .= "$td%l:%M%P</TD>"
+    if $conf->exists('cust_main_note-display_times');
+  ( my $strip = time2str($format, $note->_date) ) =~ s/ (\d)/$1/g;
+  $strip;
+}
 
+</%init>