X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=0587567452487d88f27640a736ed4bf2a1202553;hb=443150b6184876c967adffa199c20f53d5b76075;hp=ca74ca5b9170171f68edee887bbd0dfce3802d49;hpb=3ce7691203a7737406bf2d4442f7fd84b81f847e;p=freeside.git diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index ca74ca5b9..058756745 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -1,11 +1,3 @@ -% -% 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 $conf = new FS::Conf; -% -% - @@ -16,7 +8,12 @@ - <% include('menu.html', 'freeside_baseurl' => $fsurl ) %> + <% include('menu.html', 'freeside_baseurl' => $fsurl, + 'position' => $menu_position, + ) |n + %> + + <% include('init_overlib.html') |n %> - <% $head %> + <% $head |n %> - 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 @@ % } @@ -118,67 +129,120 @@ input.fsblackbuttonselected {

	- <% $conf->config('company_name') \|\| 'ExampleCo' %> + <% $company_name \|\| 'ExampleCo' %>	Logged in as <% getotaker %> Preferences +	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 ( $menu_position eq 'top' ) { + + + + + + + + + + + + + + +% } + +


+ +
+
+
- +	+% 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') ) { +% if ( $curuser->access_right('List invoices') ) { Advanced -% } +% } % } -	- - - Advanced - +% if ( $curuser->access_right('View customer services') ) { + + + Advanced + +% }	- - - Advanced +% if ( $conf->config("ticket_system") ) { + + + Advanced +% }

+ + + +% if ( $menu_position eq 'left' ) { + - + +% } + + + + + +% if ( $menu_position eq 'left' ) { +