X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=54383bc27111c8a843e566a4cafc944500f079ea;hb=c670aeaa5896a9d62dd1bd093b4b13dba0a52c68;hp=7bf56702d64ad1aae6705c58630a7b688f1a5ec0;hpb=c648976f0b7975f2328ebd7ba8c711fad0ca4195;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 7bf56702d..54383bc27 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -10,12 +10,15 @@ <% include('menu.html', 'freeside_baseurl' => $fsurl, 'position' => $menu_position, - ) + 'nocss' => $nocss, + ) |n %> + <% include('init_overlib.html') |n %> + - <% $head %> + <% $head |n %> - <% $etc %> STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0"> + <% $etc |n %> STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0"> - - + - - - -
freeside - <% $conf->config('company_name') || 'ExampleCo' %> + freeside + <% $company_name || 'ExampleCo' %> Logged in as <% getotaker %> 
Preferences 
 -
- - - - -% if ( $conf->config('ticket_system') eq 'RT_Internal' ) { -% eval "use RT;"; - - - -% } - - - -
- - Freeside v<% $FS::VERSION %>
- ">Documentation
- - 		- - RT v<% $RT::VERSION %>
- Documentation
- -
- + 		Logged in as <% getotaker %> 
Preferences +% if ( $conf->config("ticket_system") +% && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) { + | Ticketing preferences +% } +
@@ -93,9 +72,16 @@ input.fsblackbutton { border-left-color:#cccccc; border-right-color:#aaaaaa; border-bottom-color:#aaaaaa; + font-family: Arial, Verdana, Helvetica, sans-serif; font-weight:bold; padding-left:12px; padding-right:12px; + padding-top:0px; + padding-bottom:0px; + margin-left:0px; + margin-right:0px; + margin-top:2px; + margin-bottom:0px; overflow:visible; filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff333333',EndColorStr='#ff666666') } @@ -108,12 +94,40 @@ input.fsblackbuttonselected { border-left-color:#cccccc; border-right-color:#aaaaaa; border-bottom-color:#aaaaaa; + font-family: Arial, Verdana, Helvetica, sans-serif; font-weight:bold; padding-left:12px; padding-right:12px; + padding-top:0px; + padding-bottom:0px; + margin-left:0px; + margin-right:0px; + margin-top:2px; + margin-bottom:0px; overflow:visible; filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079') } + +input.fstext { + border: 2px inset #eee; + /*border-top-color:#aaaaaa; + border-left-color:#aaaaaa; + border-right-color:#cccccc; + border-bottom-color:#cccccc; + */ + vertical-align:bottom; + text-align:right; + font-family: Arial,Verdana,Helvetica,sans-serif; + padding-left: 0px; + padding-right: 0px; + padding-top: 0px; + padding-bottom: 0px; + margin-left:0px; + margin-right:0px; + margin-top:0px; + margin-bottom:1px; +} + @@ -125,12 +139,22 @@ input.fsblackbuttonselected { - + + + @@ -148,60 +172,56 @@ input.fsblackbuttonselected { - - - @@ -235,6 +255,15 @@ input.fsblackbuttonselected {
+
+ + + + + + +
<% include('/elements/about_freeside.html') |n %><% include('/elements/about_rt.html') |n %>
+
-
- -
- 		+% if ( $curuser->access_right('List customers') ) {
-
- Advanced - +
+ Advanced +
+% } 		% if ( $conf->exists('address2-search') ) {
- +
- +
% } 		-% if ( $FS::CurrentUser::CurrentUser->access_right('View invoices') ) { +% if ( $curuser->access_right('View invoices') ) {
- -% if ( $FS::CurrentUser::CurrentUser->access_right('List invoices') ) { - - Advanced + +% if ( $curuser->access_right('List invoices') ) { + Adv % } -
- +
% } 		+% if ( $curuser->access_right('View customer services') ) {
-
- Advanced - +
+ Advanced +
+% } 		+ % if ( $conf->config("ticket_system") ) {
-
- Advanced - +
+ Advanced +
% }
+ + + + + + +
<% include('/elements/about_freeside.html') |n %>
<% include('/elements/about_rt.html') |n %>
+ @@ -246,16 +275,42 @@ input.fsblackbuttonselected { <% $title %> +% unless ( $nobr ) {

+% } + <% $menubar !~ /^\s*$/ ? "$menubar

" : '' %> <%init> -my($title, $menubar) = ( shift, shift ); -my $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. -my $head = @_ ? shift : ''; #$head is for things that go in the section +my( $title, $menubar, $etc, $head ) = ( '', '', '', '' ); +my( $nobr, $nocss ) = ( 0, 0 ); +if ( ref($_[0]) ) { + my $opt = shift; + $title = $opt->{title}; + $menubar = $opt->{menubar}; + $etc = $opt->{etc}; + $head = $opt->{head}; + $nobr = $opt->{nobr}; + $nocss = $opt->{nocss}; +} else { + ($title, $menubar) = ( shift, shift ); + $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. + $head = @_ ? shift : ''; #$head is for things that go in the section +} + my $conf = new FS::Conf; -my $menu_position = $FS::CurrentUser::CurrentUser->option('menu_position') - || 'left'; +my $curuser = $FS::CurrentUser::CurrentUser; + +my $menu_position = $curuser->option('menu_position') + || 'top'; #new default for 1.9 + +my $company_name; +my @agentnums = $curuser->agentnums; +if ( scalar(@agentnums) == 1 ) { + $company_name = $conf->config('company_name', $agentnums[0] ); +} else { + $company_name = $conf->config('company_name'); +}