fix elements/ links here too

[freeside.git] / httemplate / view / cust_main.cgi

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 6b22777..101fe2c 100755 (executable)
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -22,10 +22,10 @@
 
 
 
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_draggable.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/iframecontentmws.js"></SCRIPT>
+<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>
 
 <SCRIPT TYPE="text/javascript">
 function areyousure(href, message) {
@@ -102,8 +102,7 @@ var confirm_cancel = '<FORM METHOD="POST" ACTION="<% $p %>misc/cust_main-cancel.
 </TR>
 </TABLE>
 %
-%if ( defined $cust_main->dbdef_table->column('comments')
-%     && $cust_main->comments =~ /[^\s\n\r]/              ) {
+%if ( $cust_main->comments =~ /[^\s\n\r]/ ) {
 %
 
 <BR>
@@ -118,11 +117,11 @@ Comments
 % } 
 <BR><BR>
 % my $notecount = scalar($cust_main->notes());
-% if ($conf->exists('cust_main-use_notes') || $notecount) {
+% if ( ! $conf->exists('cust_main-disable_notes') || $notecount) {
 
 <A NAME="cust_main_note"><FONT SIZE="+2">Notes</FONT></A><BR>
 %   if ( $curuser->access_right('Add customer note') &&
-%        $conf->exists('cust_main-use_notes')
+%        ! $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>
@@ -137,16 +136,20 @@ Comments
   <div><br>[iframe not supported]<br><br></div>
 </iframe>
 
-%   } else {
+%   }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>
 
-<BR>
 %   }
+
 % }
 
 
 % if ( $conf->config('ticket_system') ) { 
 
-  <BR>
+  <BR><BR>
   <% include('cust_main/tickets.html', $cust_main ) %>
 % }