summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
authorivan <ivan>2008-07-14 23:09:18 +0000
committerivan <ivan>2008-07-14 23:09:18 +0000
commitbf6ffa84af7cd733511dc87aff86264f10a21b22 (patch)
treeb1e1860a394a5044e97cb2e92449ba3a6b6d30a2 /httemplate
parent513db608436a7584579c1824cac796eadc390579 (diff)
fuck embedded iframes and their stupid display problems with scrolling. also make the gridding more consistent
Diffstat (limited to 'httemplate')
-rwxr-xr-xhttemplate/edit/process/cust_main_note.cgi8
-rwxr-xr-xhttemplate/view/cust_main/notes.html4
2 files changed, 4 insertions, 8 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/notes.html b/httemplate/view/cust_main/notes.html
index 4c97c9f64..f7b4ddb30 100755
--- a/httemplate/view/cust_main/notes.html
+++ b/httemplate/view/cust_main/notes.html
@@ -6,7 +6,9 @@
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
- <TH CLASS="grid" BGCOLOR="#cccccc">Time</TH>
+% if ( $conf->exists('cust_main_note-display_times') ) {
+ <TH CLASS="grid" BGCOLOR="#cccccc">Time</TH>
+% }
<TH CLASS="grid" BGCOLOR="#cccccc">Person</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Note</TH>
</TR>