X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=5362b0bee7c8df13a5240f884f8e5269ab1ffeef;hp=ea8c418c3fd7d690c85797ef6d10bc53483e24be;hb=12c2362c84bea9f2e03ed9c67b2de8d453202ebf;hpb=b19897e1db4c110d7d7e8b52800cda5ab58ce9e0 diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index ea8c418c3..5362b0bee 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -1,21 +1,19 @@ -<% - 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; - -%> - <%= $title %> + <% $title %> - <%= include('menu.html', 'freeside_baseurl' => $fsurl ) %> + <% include('menu.html', 'freeside_baseurl' => $fsurl, + 'position' => $menu_position, + ) + %> + + <% include('init_overlib.html') %> - <%= $head %> + <% $head %> - STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0"> + <% $etc %> STYLE="margin-top:0; margin-bottom:0; margin-left:0; margin-right:0"> - + - @@ -59,20 +62,31 @@ - <% if ( $conf->config('ticket_system') eq 'RT_Internal' ) { %> - <% eval "use RT;"; %> +% if ( $conf->config('ticket_system') eq 'RT_Internal' ) { +% eval "use RT;"; + - <% } %> +% } +
freesidefreeside - <%= $conf->config('company_name') || 'ExampleCo' %> + <% $conf->config('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', + ) + %> v<% $FS::VERSION %>
+ " TARGET="_blank">Documentation
 		- RT v<%= $RT::VERSION %>
- Documentation
+ RT v<% $RT::VERSION %>
+ Documentation
@@ -115,77 +129,146 @@ input.fsblackbuttonselected { - + + + +% if ( $menu_position eq 'top' ) { + + + + + + + + + + + + +% } + + + +
+ +
+
+
-
- + +
-
+% if ( $FS::CurrentUser::CurrentUser->access_right('List customers') ) { +
- Advanced + Advanced
+% } + 		+% if ( $conf->exists('address2-search') ) { +
+ + +
+ +
+% } 		- <% if ( $FS::CurrentUser::CurrentUser->access_right('View invoices') ) { %> -
+% if ( $FS::CurrentUser::CurrentUser->access_right('View invoices') ) { + + - <% if ( $FS::CurrentUser::CurrentUser->access_right('List invoices') ) { %> - Advanced - <% } %> +% if ( $FS::CurrentUser::CurrentUser->access_right('List invoices') ) { + + Advanced +% } +
- <% } %> +% } 		-
-
- Advanced - + +
+ Advanced +
-
+% if ( $conf->config("ticket_system") ) { +
- Advanced + Advanced
+% }
+ + + +% if ( $menu_position eq 'left' ) { + - - + + +% } + + + + + +% if ( $menu_position eq 'left' ) { + - - + +% } + +

- + 		+ - <%= $title %> + <% $title %>

- <%= $menubar !~ /^\s*$/ ? "$menubar

" : '' %> + <% $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 $conf = new FS::Conf; + +my $menu_position = $FS::CurrentUser::CurrentUser->option('menu_position') + || 'left'; + +