X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Fheader.html;h=5c4d736d23ab526518d07e982e34fb764a97e6aa;hp=7bf56702d64ad1aae6705c58630a7b688f1a5ec0;hb=43e42a04ae37ca7a84c05d9ff8b94d9f8cde6dcf;hpb=807bc6bf91e6208fd40bcdf99ce4c0149c2598d2
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index 7bf56702d..5c4d736d2 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -1,4 +1,26 @@
+<%doc>
+
+Example:
+
+ include( '/elements/header.html',
+ {
+ 'title' => 'Title',
+ 'menubar' => \@menubar,
+ 'etc' => '', #included in
tag, for things like onLoad=
+ 'head' => '', #included before closing tag
+ 'nobr' => 0, #1 for no
after the title
+ }
+ );
+
+ #old-style
+ include( '/elements/header.html', 'Title', $menubar, $etc, $head);
+
+
+%doc>
+%#
+%# above is what RT declares, should we switch now? hopefully no glitches result
+%# or just fuck it, XHTML died anyway, HTML 5 or bust?
@@ -10,76 +32,64 @@
<% include('menu.html', 'freeside_baseurl' => $fsurl,
'position' => $menu_position,
- )
+ 'nocss' => $nocss,
+ ) |n
%>
+ <% include('init_overlib.html') |n %>
+ <% include('rs_init_object.html') |n %>
+ <% include('logout.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">
- |
-
- <% $conf->config('company_name') || 'ExampleCo' %>
+ | |
+
+ <% $company_name || 'ExampleCo' %>
|
- Logged in as <% getotaker %> Preferences
- |
-
-
-
-
-
-
+ | Logged in as <% getotaker %> [ logout ] Preferences
+% if ( $conf->config("ticket_system")
+% && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) {
+ | Ticketing preferences
+% }
+
|
@@ -93,9 +103,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,38 +125,77 @@ 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;
+ font-size: 13px;
+ padding-left: 0px;
+ padding-right: 0px;
+ padding-top: 0px;
+ padding-bottom: 0px;
+ margin-left:0px;
+ margin-right:0px;
+ margin-top:0px;
+ margin-bottom:1px;
+}
+
- |
+ |
% if ( $menu_position eq 'top' ) {
-
+ |
|
+
+
+
+
+ <% include('/elements/about_freeside.html') |n %> |
+ <% include('/elements/about_rt.html') |n %> |
+
+
+ |
+
-
+ |
|
-
+ |
|
@@ -147,61 +203,65 @@ input.fsblackbuttonselected {
-
- |
|
@@ -246,16 +315,57 @@ 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');
+}
+
+my $prospect_label = '(name, company or phone)';
+
+my $cust_width = 246;
+my $cust_label = '(cust #, name, company';
+if ( $conf->exists('address1-search') ) {
+ $cust_label .= ', address';
+ $cust_width += 56;
+}
+$cust_label .= ' or contact phone)';
+
+my $address2_label = '(Unit #)';
+my $inv_label = '(inv #)';
+my $svc_label = '(user, email, ip, mac, domain or service phone)';
+my $ticketing_label = '(ticket #, subject, email or fulltext:text)';
%init>