X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=8e902f038917c0c80e275a4ab7c1be29a7246f2c;hb=7bc780834a604a2e678d028f875fd4b546412cfb;hp=a1813405c5db1612ea7b76d9d4dfbf188941c0bd;hpb=e0f170ed96e65e693debb06dd1d56a912d06fe39;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index a1813405c..8e902f038 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -10,9 +10,11 @@ <% include('menu.html', 'freeside_baseurl' => $fsurl, 'position' => $menu_position, - ) + ) |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"> - + @@ -60,8 +62,17 @@ % if ( $conf->config('ticket_system') eq 'RT_Internal' ) { @@ -70,8 +81,8 @@ % } @@ -149,16 +160,18 @@ input.fsblackbuttonselected {

		- <% $conf->config('company_name') \|\| 'ExampleCo' %> + <% $company_name \|\| 'ExampleCo' %>	Logged in as <% getotaker %> Preferences
			- Freeside v<% $FS::VERSION %> - ">Documentation + <% include('/elements/popup_link.html', + 'action' => $fsurl.'docs/about.html', + 'label' => 'Freeside', + 'actionlabel' => 'About', + 'width' => 300, + 'height' => 360, + 'color' => '#7e0079', + 'scrolling' => 'no', + ) \|n + %> v<% $FS::VERSION %> + " TARGET="_blank">Documentation		- RT v<% $RT::VERSION %> - Documentation + RT v<% $RT::VERSION %> + Documentation	- +	+% if ( $curuser->access_right('List customers') ) { Advanced +% }	@@ -173,11 +186,11 @@ input.fsblackbuttonselected {	-% if ( $FS::CurrentUser::CurrentUser->access_right('View invoices') ) { +% if ( $curuser->access_right('View invoices') ) { -% if ( $FS::CurrentUser::CurrentUser->access_right('List invoices') ) { +% if ( $curuser->access_right('List invoices') ) { Advanced % } @@ -199,7 +212,7 @@ input.fsblackbuttonselected {	% if ( $conf->config("ticket_system") ) { - + Advanced @@ -246,16 +259,41 @@ 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 ) = ( 0 ); +if ( ref($_[0]) ) { + my $opt = shift; + $title = $opt->{title}; + $menubar = $opt->{menubar}; + $etc = $opt->{etc}; + $head = $opt->{head}; + $nobr = $opt->{nobr}; +} 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'); +}