From 10e462292b42813dce6e1034064c55c7fddd42a4 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 20 Mar 2010 22:14:02 +0000 Subject: [PATCH] more RT integration / reskin / 2.1, RT#6640 --- httemplate/elements/calendar-win2k-2.css | 1 + httemplate/elements/freeside-menu.css | 84 ++++++++++++------------ httemplate/elements/freeside.css | 16 ++++- httemplate/elements/header.html | 32 ++------- httemplate/elements/menu.html | 22 +++++++ httemplate/elements/xmenu.top.css | 41 +++++++++--- httemplate/elements/xmenu.top.js | 2 +- httemplate/images/arrow.down.black.png | Bin 0 -> 168 bytes httemplate/images/black-gradient.png | Bin 397 -> 0 bytes httemplate/images/black-gray-gradient.png | Bin 384 -> 0 bytes rt/FREESIDE_MODIFIED | 17 ++--- rt/share/html/Elements/Footer | 19 ------ rt/share/html/Elements/PageLayout | 2 + rt/share/html/Elements/SelectDate | 17 ++++- rt/share/html/NoAuth/css/freeside2.1/layout.css | 3 +- rt/share/html/Prefs/SearchOptions.html | 2 +- rt/share/html/User/Prefs.html | 2 +- 17 files changed, 146 insertions(+), 114 deletions(-) create mode 100644 httemplate/images/arrow.down.black.png delete mode 100644 httemplate/images/black-gradient.png delete mode 100644 httemplate/images/black-gray-gradient.png diff --git a/httemplate/elements/calendar-win2k-2.css b/httemplate/elements/calendar-win2k-2.css index 6f37b7dcd..7b8de002a 100644 --- a/httemplate/elements/calendar-win2k-2.css +++ b/httemplate/elements/calendar-win2k-2.css @@ -12,6 +12,7 @@ cursor: default; background: #d4c8d0; font-family: tahoma,verdana,sans-serif; + z-index:2; } .calendar table { diff --git a/httemplate/elements/freeside-menu.css b/httemplate/elements/freeside-menu.css index 8bdec31fa..165f7f4b9 100644 --- a/httemplate/elements/freeside-menu.css +++ b/httemplate/elements/freeside-menu.css @@ -1,66 +1,70 @@ input.fsblackbutton { - background-color:#333333; - color: #ffffff; - border:1px solid; - border-top-color:#cccccc; - border-left-color:#cccccc; - border-right-color:#aaaaaa; - border-bottom-color:#aaaaaa; + background-color:#aaaaaa; + color: #333333; + border:1px solid #cccccc; + + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; + 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; + + margin-bottom:4px; overflow:visible; - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff333333',EndColorStr='#ff666666') +} + +input.fsblackbutton:hover,input.fsblackbutton:focus, +input.fsblackbuttonselected:hover, input.fsblackbuttonselected:focus { + background:#aaaaaa; } input.fsblackbuttonselected { - background-color:#7e0079; - color: #ffffff; - border:1px solid; - border-top-color:#cccccc; - border-left-color:#cccccc; - border-right-color:#aaaaaa; - border-bottom-color:#aaaaaa; + background-color:#aaaaaa; + color: #7e0079; + border:1px solid #7e0079; + + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; + 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; + + margin-bottom:4px; 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; - */ + border: 1px solid #666666; + padding: 1px; + 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; + + margin:0px; +} + +input.fstext:focus { + border: 1px solid #7e0079; +} + +a.fslink { + text-decoration: underline; +} + +a:hover.fslink { + color: #7e0079; } a.fsblackbutton { @@ -79,7 +83,6 @@ a.fsblackbutton { font-size:16px; text-decoration:none; overflow:visible; - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff333333',EndColorStr='#ff666666') } a.fsblackbuttonselected, @@ -100,7 +103,6 @@ a:visited:hover.fsblackbutton { font-size:16px; text-decoration:none; overflow:visible; - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079') } a.fsdarkbutton { @@ -119,7 +121,6 @@ a.fsdarkbutton { font-size:16px; text-decoration:none; overflow:visible; - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff555555',EndColorStr='#ff666666') } a.fsdarkbuttonselected, @@ -140,6 +141,5 @@ a:visited:hover.fsdarkbutton { font-size:16px; text-decoration:none; overflow:visible; - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr='#ff330033',EndColorStr='#ff7e0079') } diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css index c310e2fa0..73434f360 100644 --- a/httemplate/elements/freeside.css +++ b/httemplate/elements/freeside.css @@ -10,7 +10,21 @@ a:link, a:visited { /* text-decoration: none; */ color: #000000; } -/* a:hover { text-decoration: underline } */ + +a:hover { + text-decoration: underline; + color: #7e0079; +} + +textarea, input { + border: 1px solid #666666; + padding: 1px; +} + +textarea:focus, input:focus { + background-color: #ffffdd; + border: 1px solid #7e0079; +} /* a:focus { background-color: #ccccee } */ diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 08de3b686..11211607b 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -84,7 +84,7 @@ Example: <% $company_name || 'ExampleCo' %> - Logged in as <% getotaker %>  [ logout ]
Preferences + Logged in as <% getotaker %>  logout
Preferences % if ( $conf->config("ticket_system") % && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) { | Ticketing preferences @@ -102,32 +102,12 @@ Example: - + - - - - - - - -
<% include('/elements/about_freeside.html') |n %><% include('/elements/about_rt.html') |n %>
- - - - - - - - - - - - % } @@ -138,7 +118,7 @@ Example: % if ( $curuser->access_right('List prospects') ) {

- Adv + Adv
% } @@ -148,7 +128,7 @@ Example: % if ( $curuser->access_right('List customers') ) {

- Advanced + Advanced
% } @@ -170,7 +150,7 @@ Example:
% if ( $curuser->access_right('List invoices') ) { - Adv\ + Adv\ % }
@@ -191,7 +171,7 @@ Example: % if ( $conf->config("ticket_system") ) {

- Advanced + Advanced
% } diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index a26624ee8..a4fcde6a1 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -489,6 +489,26 @@ $config_menu{'Miscellaneous'} = [ \%config_misc, '' ] if $curuser->access_right('Edit advertising sources') || $curuser->access_right('Edit global advertising sources'); + +my $wiki = 'http://www.freeside.biz/mediawiki/index.php'; +my $doc_link = $conf->config('support-key') + ? "$wiki/Supported:Documentation" + : $curuser->access_right('Configuration') + ? "$wiki/Freeside:1.9:Documentation" + : "$wiki/Freeside:1.9:Documentation:User"; + +eval "use RT;" + if $conf->config('ticket_system') eq 'RT_Internal'; + +tie my %help_menu, 'Tie::IxHash', 'Billing documentation' => [ $doc_link, 'Freeside documentation' ]; +$help_menu{'Ticketing documentation'} = [ 'http://wiki.bestpractical.com/', 'Request Tracker Wiki' ] + if $conf->config('ticket_system') eq 'RT_Internal'; +$help_menu{'separator'} = ''; +$help_menu{"About Freeside v$FS::VERSION"} = [ 'XXXfinishme', 'doh!' ]; +$help_menu{"About RT v$RT::VERSION"} = [ 'http://www.bestpractical.com/rt', 'Request Tracker Homepage' ] + if $conf->config('ticket_system') eq 'RT_Internal'; + + tie my %menu, 'Tie::IxHash', 'Billing Main' => [ $fsurl, 'Billing start page', ], ; @@ -521,6 +541,8 @@ $menu{'Configuration'} = [ \%config_menu, 'Configuraiton and setup' ] || $curuser->access_right('Phone configuration') || $curuser->access_right('Edit advertising sources') || $curuser->access_right('Edit global advertising sources'); +$menu{'Help'} = [ \%help_menu, '' ]; + use vars qw($gmenunum); $gmenunum = 0; diff --git a/httemplate/elements/xmenu.top.css b/httemplate/elements/xmenu.top.css index a545be0bd..eb4da64e6 100644 --- a/httemplate/elements/xmenu.top.css +++ b/httemplate/elements/xmenu.top.css @@ -126,45 +126,70 @@ padding: 1px 5px 1px 5px; font-size: 16px; + /* font-weight: bold; */ - /* color: black; */ - color: white; + color: black; + /* color: white; */ text-decoration: none; + /* text-decoration: underline; */ /* IE5.0 Does not paint borders and padding on inline elements without a height/width */ height: expression(constExpression(ie50 ? "17px" : "auto")); - background-color:#333333; +/* background-color:#333333; border:1px solid; border-top-color:#cccccc; border-left-color:#cccccc; border-right-color:#aaaaaa; border-bottom-color:#aaaaaa; +*/ +/* -moz-border-radius: 15px; + -webkit-border-radius: 15px; + border-radius: 15px; + behavior: url(border-radius.htc); +*/ + + border: 1px solid #cccccc; margin-right: 4px } .webfx-menu-bar a:link { - color: white; + /* color: white; */ + color: black; } .webfx-menu-bar a:hover { - /* color: black; */ - color: white; + color: black; + /* color: white; */ /* background: rgb(120,172,255); */ /* background: #BC79B8; */ - background: #7e0079; + /* background: #7e0079; */ + text-decoration: underline; + /* font-weight: bold; */ /* border-left: 1px solid rgb(234,242,255); border-right: 1px solid rgb(0,66,174); border-top: 1px solid rgb(234,242,255); border-bottom: 1px solid rgb(0,66,174); */ - border:1px solid; +/* border:1px solid; border-top-color:#cccccc; border-left-color:#cccccc; border-right-color:#aaaaaa; border-bottom-color:#aaaaaa; +*/ +/* -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; + behavior: url(border-radius.htc); +*/ + + /* border: 1px solid #7e0079; */ +/* border: 1px solid #d8d8d8; + background: #bbbbbb; +*/ + color: #7e0079; } diff --git a/httemplate/elements/xmenu.top.js b/httemplate/elements/xmenu.top.js index 8d81035a2..b9df515c4 100644 --- a/httemplate/elements/xmenu.top.js +++ b/httemplate/elements/xmenu.top.js @@ -370,7 +370,7 @@ WebFXMenuButton.prototype.toString = function () { )) + ">" + this.text + - (this.subMenu ? "" : "") + + (this.subMenu ? "" : "") + ""; }; diff --git a/httemplate/images/arrow.down.black.png b/httemplate/images/arrow.down.black.png new file mode 100644 index 0000000000000000000000000000000000000000..92a8b518d97c496e66c09c425743277f14dcffdd GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)S$P6S?dE4876k~CayA#8@b22Z19JTX37%0Qw>FVdQ&MBb@0MpmEPN#-7Jt$$uLRrn%4s3 z%b~lDnVPrV%Msc3_~aY+56=$R)gAX+D%>;mK^*Tme5wbuCg;$rM>>nq&57ksqwf4J@6?1nu*JvZGp-TQfumy*%uu*JR; zb>6&Of1L5`;*F_FNmF-CQJVTkwbfex`gVz^EN=I-yz+Zt7H(@}rfoa9L@Zt7_+-n6 mr#*Zf7Qg=)V}I)7AMrUpdz)>y{yYTqJcFmJpUXO@geCwADV-Jo diff --git a/httemplate/images/black-gray-gradient.png b/httemplate/images/black-gray-gradient.png deleted file mode 100644 index f5c318fe75de0467da654feac6209ce0e781b9cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^;vhB$6OcU1ngo(yOY(Mi0n$M5(|LD2km4-xh%9Dc z;1&j9Muu5)B!GhKC7!;n?AKUi*qIbwzxLk+6p}4*jVN)>&&^HED`9XhN=+LP`mfSZrp` z=-gBqZMuqO?%U=UnjNQv_!C~j&Z z=;g@v&agZq8ed-!W$IKbeV}UFsRZ76ysWHl?HeQx6y9C@CFACTulc(VfAQV+Sv+m0 WUj2#2sjq % $m->callback( %ARGS ); - % if ($Debug >= 2 ) { % require Data::Dumper; % my $d = Data::Dumper->new([\%ARGS], [qw(%ARGS)]); diff --git a/rt/share/html/Elements/PageLayout b/rt/share/html/Elements/PageLayout index b5800ce70..f30d815a5 100755 --- a/rt/share/html/Elements/PageLayout +++ b/rt/share/html/Elements/PageLayout @@ -46,6 +46,8 @@ %# %# END BPS TAGGED BLOCK }}} +<% include('/elements/init_calendar.html') |n %> + % if (0) { ## new ticket via customer, and we already have a ticket search box
% foreach my $action (reverse sort keys %{$topactions}) { diff --git a/rt/share/html/Elements/SelectDate b/rt/share/html/Elements/SelectDate index 32a173db4..183086f3d 100755 --- a/rt/share/html/Elements/SelectDate +++ b/rt/share/html/Elements/SelectDate @@ -45,10 +45,21 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - +%# in PageLayout instead, once <% include('/elements/init_calendar.html') |n %> + + <%init> unless ((defined $Default) or ($current <= 0)) { diff --git a/rt/share/html/NoAuth/css/freeside2.1/layout.css b/rt/share/html/NoAuth/css/freeside2.1/layout.css index b7b87abc2..0e7912d98 100644 --- a/rt/share/html/NoAuth/css/freeside2.1/layout.css +++ b/rt/share/html/NoAuth/css/freeside2.1/layout.css @@ -53,7 +53,8 @@ body { padding:0; margin:0; - background: #547CCC url(<%RT->Config->Get('WebPath')%>/NoAuth/css/freeside2.1/images/background-gradient.png) top left repeat-x ; + /*background: #547CCC url(<%RT->Config->Get('WebPath')%>/NoAuth/css/freeside2.1/images/background-gradient.png) top left repeat-x ; */ + background: #f8f8f8; font-family: arial, helvetica, sans-serif; color: #000000; diff --git a/rt/share/html/Prefs/SearchOptions.html b/rt/share/html/Prefs/SearchOptions.html index e40265f23..5e5ed46f1 100644 --- a/rt/share/html/Prefs/SearchOptions.html +++ b/rt/share/html/Prefs/SearchOptions.html @@ -45,7 +45,7 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<& /Elements/Header, Title => loc("Search Preferences") &> +<& /Elements/Header, Title => loc("Ticketing Search Preferences") &> <& /User/Elements/Tabs, current_tab => "Prefs/SearchOptions.html", Title => loc("Search Preferences") diff --git a/rt/share/html/User/Prefs.html b/rt/share/html/User/Prefs.html index f52fdcbdf..43c981dea 100755 --- a/rt/share/html/User/Prefs.html +++ b/rt/share/html/User/Prefs.html @@ -45,7 +45,7 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<& /Elements/Header, Title=>loc("Preferences") &> +<& /Elements/Header, Title=>loc("Ticketing Preferences") &> <& /User/Elements/Tabs, current_tab => 'User/Prefs.html', Title => loc("Preferences") &> -- 2.11.0