X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=0587567452487d88f27640a736ed4bf2a1202553;hb=0cc20c3d66e50d640422c2d587d97ddf7768493b;hp=0a939aa9e32b662abf633c17c3d4d60882dac3ac;hpb=9c8e3bcad078ed4d4d0f13369210db0fe7aa1ce5;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 0a939aa9e..058756745 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -10,10 +10,10 @@ <% include('menu.html', 'freeside_baseurl' => $fsurl, 'position' => $menu_position, - ) + ) |n %> - <% include('init_overlib.html') %> + <% 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"> - + @@ -70,7 +70,7 @@ 'height' => 360, 'color' => '#7e0079', 'scrolling' => 'no', - ) + ) |n %> v<% $FS::VERSION %>
" TARGET="_blank">Documentation
@@ -165,7 +165,7 @@ input.fsblackbuttonselected {
freesidefreeside - <% $conf->config('company_name') || 'ExampleCo' %> + <% $company_name || 'ExampleCo' %> Logged in as <% getotaker %> 
Preferences 
 		-% if ( $FS::CurrentUser::CurrentUser->access_right('List customers') ) { +% if ( $curuser->access_right('List customers') ) {

Advanced @@ -186,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 % } @@ -202,17 +202,19 @@ input.fsblackbuttonselected { +% if ( $curuser->access_right('View customer services') ) {
Advanced +% } 		% if ( $conf->config("ticket_system") ) {
-
+
Advanced
@@ -259,16 +261,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') +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'); +} +