diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/elements/header.html | 34 | ||||
| -rwxr-xr-x | httemplate/view/cust_main.cgi | 9 |
2 files changed, 23 insertions, 20 deletions
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 0174e1f92..98a8d7c5e 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -4,11 +4,12 @@ Example: <& /elements/header.html', { - 'title' => 'Title', - 'menubar' => \@menubar, - 'etc' => '', #included in <BODY> tag, for things like onLoad= - 'head' => '', #included before closing </HEAD> tag - 'nobr' => 0, #1 for no <BR><BR> after the title + 'title' => 'Title', + 'menubar' => \@menubar, + 'etc' => '', #included in <BODY> tag, for things like onLoad= + 'head' => '', #included before closing </HEAD> tag + 'nobr' => 0, #1 for no <BR><BR> after the title + 'no_jquery' => #for use from RT, which loads its own } &> @@ -23,7 +24,7 @@ Example: <HTML> <HEAD> <TITLE> - <% $title_noescape || encode_entities($title) %> + <% encode_entities($title) || $title_noescape %> </TITLE> <!-- per RT, to prevent IE compatibility mode --> <meta http-equiv="X-UA-Compatible" content="IE=edge" /> @@ -42,7 +43,11 @@ Example: ) |n %> - <SCRIPT SRC="<% $fsurl %>elements/jquery.js"></SCRIPT> +% unless ( $no_jquery ) { + <link rel="stylesheet" href="<% $fsurl %>elements/jquery-ui.min.css"> + <SCRIPT SRC="<% $fsurl %>elements/jquery.js"></SCRIPT> + <SCRIPT SRC="<% $fsurl %>elements/jquery-ui.min.js"></SCRIPT> +% } <% include('init_overlib.html') |n %> <% include('rs_init_object.html') |n %> @@ -176,7 +181,7 @@ Example: <%init> my( $title, $title_noescape, $menubar, $etc, $head ) = ( '', '', '', '', '' ); -my( $nobr, $nocss ) = ( 0, 0 ); +my( $nobr, $nocss, $no_jquery ) = ( 0, 0, 0 ); my $mobile; @@ -184,12 +189,13 @@ if ( ref($_[0]) ) { my $opt = shift; $title = $opt->{title}; $title_noescape = $opt->{title_noescape}; - $menubar = $opt->{menubar}; - $etc = $opt->{etc}; - $head = $opt->{head}; - $nobr = $opt->{nobr}; - $nocss = $opt->{nocss}; - $mobile = $opt->{mobile}; + $menubar = $opt->{menubar}; + $etc = $opt->{etc}; + $head = $opt->{head}; + $nobr = $opt->{nobr}; + $nocss = $opt->{nocss}; + $mobile = $opt->{mobile}; + $no_jquery = $opt->{no_jquery}; } else { ($title, $menubar) = ( shift, shift ); $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index 233c496ac..95cb5da7c 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -220,13 +220,10 @@ my $cust_main = qsearchs( { }); die "Customer not found!" unless $cust_main; -my $title = encode_entities($cust_main->name); -$title = '#'. $cust_main->display_custnum. " $title"; -# if $conf->exists('cust_main-title-display_custnum'); -$title = mt("Customer")." ".$title; +my $title = mt("Customer").' #'. $cust_main->display_custnum. ': '. + encode_entities($cust_main->name); -my @agentnums = $curuser->agentnums; -if (scalar(@agentnums) > 1 ) { +if ( $curuser->num_agents ) { $title = encode_entities($cust_main->agent->agent). " $title"; } |