From 6d777ed1fafabab8c308c9ffa24f1dd48f33a9a5 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 15 May 2006 11:05:04 +0000 Subject: [PATCH] more ACL and re-skinning work, now with RT! --- httemplate/elements/freeside.css | 15 ++++++ httemplate/elements/header.html | 21 +++++--- httemplate/elements/xmenu.css | 16 ++++-- httemplate/search/cust_main.cgi | 9 +++- rt/FREESIDE_MODIFIED | 3 ++ rt/html/Elements/FreesideNewCust | 3 ++ rt/html/Elements/FreesideSearch | 10 ++++ rt/html/Elements/Header | 10 ++-- rt/html/Elements/PageLayout | 25 ++++++--- rt/html/Elements/SimpleSearch | 10 +++- rt/html/Elements/Tabs | 8 ++- rt/html/Elements/TitleBoxStart | 2 +- rt/html/NoAuth/webrt.css | 114 ++++++++++++++++++++++++++++----------- rt/html/Search/Bulk.html | 2 +- 14 files changed, 188 insertions(+), 60 deletions(-) create mode 100644 httemplate/elements/freeside.css create mode 100644 rt/html/Elements/FreesideNewCust create mode 100644 rt/html/Elements/FreesideSearch diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css new file mode 100644 index 000000000..5908e6aab --- /dev/null +++ b/httemplate/elements/freeside.css @@ -0,0 +1,15 @@ +* { + font-family: Arial, Verdana, Helvetica, sans-serif; +} + +A:link IMG, A:visited { border-style: none } +A:focus {text-decoration: underline } + +a:link, a:visited { + /* text-decoration: none; */ + color: #000000; +} +/* a:hover { text-decoration: underline } */ + +/* a:focus { background-color: #ccccee } */ + diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 49814577e..0eb5695ce 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -16,6 +16,7 @@ + <% tie my %report_menu, 'Tie::IxHash', @@ -183,10 +184,16 @@ + + @@ -200,7 +207,7 @@ freeside - <%= $conf->config('company_name') %> Billing + <%= $conf->config('company_name') || 'ExampleCo' %> Logged in as <%= getotaker %> 
Preferences 

@@ -248,13 +255,13 @@
- +
- +
diff --git a/httemplate/elements/xmenu.css b/httemplate/elements/xmenu.css index 5bb8a0deb..60881b813 100644 --- a/httemplate/elements/xmenu.css +++ b/httemplate/elements/xmenu.css @@ -55,9 +55,14 @@ border: 1px solid white; } -.webfx-menu a:visited, -.webfx-menu a:visited:hover { +.webfx-menu a:visited { color: black; + border: 1px solid white; +} + +.webfx-menu a:hover { + color: black; + border: 1px solid #7e0079; } .webfx-menu a:hover { @@ -98,11 +103,12 @@ /* border: 1px solid #7E0079; */ /* border: 1px solid #000000; */ /* border: none */ + color: white; padding: 2px; font-family: Verdana, Helvetica, Sans-Serif; - font-size: 11px; + /* font-size: 11px; */ /* IE5.0 has the wierdest box model for inline elements */ padding: expression(constExpression(ie50 ? "0px" : "2px")); @@ -132,6 +138,10 @@ height: expression(constExpression(ie50 ? "17px" : "auto")); } +.webfx-menu-bar a:link { + color: white; +} + .webfx-menu-bar a:hover { /* color: black; */ color: white; diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi index 8b70ff490..733e5dc15 100755 --- a/httemplate/search/cust_main.cgi +++ b/httemplate/search/cust_main.cgi @@ -186,6 +186,13 @@ if ( $cgi->param('browse') push @cust_main, @{&companysearch}; } + if ( $cgi->param('search_cust') ) { + $sortby = \*company_sort; + $orderby = "ORDER BY LOWER(company || ' ' || last || ' ' || first )"; + warn "smart searching for: ". $cgi->param('search_cust'); + push @cust_main, smart_search( 'search' => $cgi->param('search_cust') ); + } + @cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main if ! $cgi->param('cancelled') && ( @@ -313,7 +320,7 @@ END $conf->config('ticket_system-custom_priority_field-values'); } - print "

". $pager. &table(). <
". $pager. include('/elements/table-grid.html'). < (bill) name diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED index a013b832c..82f0ff2e6 100644 --- a/rt/FREESIDE_MODIFIED +++ b/rt/FREESIDE_MODIFIED @@ -21,3 +21,6 @@ html/Ticket/Elements/ShowCustomers html/Ticket/ModifyCustomers.html html/NoAuth/images/small-logo.png html/NoAuth/webrt.css + +html/Elements/TitleBoxStart +html/Search/Bulk.html diff --git a/rt/html/Elements/FreesideNewCust b/rt/html/Elements/FreesideNewCust new file mode 100644 index 000000000..851c66425 --- /dev/null +++ b/rt/html/Elements/FreesideNewCust @@ -0,0 +1,3 @@ +
+ diff --git a/rt/html/Elements/FreesideSearch b/rt/html/Elements/FreesideSearch new file mode 100644 index 000000000..f0efb60d4 --- /dev/null +++ b/rt/html/Elements/FreesideSearch @@ -0,0 +1,10 @@ + + + +  +
diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header index a2563fee3..bad8b58eb 100644 --- a/rt/html/Elements/Header +++ b/rt/html/Elements/Header @@ -67,7 +67,7 @@ function hideshow(num) { <& /Elements/Callback, _CallbackName => 'Head', %ARGS &> - - +
- +
freeside<% &RT::URI::freeside::FreesideGetConfig('company_name') %> Ticketing<% &RT::URI::freeside::FreesideGetConfig('company_name') || 'ExampleCo' %> % if ($session{'CurrentUser'} && $session{'CurrentUser'}->Id && $LoggedIn) { <&|/l&>Skip Menu | +<&|/l, "".$session{'CurrentUser'}->Name."" &>Logged in as [_1] +
%if ($session{'CurrentUser'}->HasRight( Right => 'ModifySelf', Object => $RT::System )) { <&|/l&>Preferences % } @@ -89,8 +91,6 @@ ONLOAD=" % unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) { | <&|/l&>Logout % } -
-<&|/l, "".$session{'CurrentUser'}->Name."" &>Logged in as [_1] % } else { <&|/l&>Not logged in. % } diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout index 94bdbe194..5289f78f3 100644 --- a/rt/html/Elements/PageLayout +++ b/rt/html/Elements/PageLayout @@ -43,32 +43,43 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} - -
<%$AppName%> + + + + + + % foreach my $action (sort keys %{$topactions}) { - % } +
<%$AppName%> + <%$topactions->{"$action"}->{'html'} |n %>
+ + + + + %# Vertical menu - +
+ <& /Elements/Menu, toptabs => $toptabs, current_toptab => $current_toptab &> - -
+ <%$title%>
+ % if ($actions) { % my @actions; @@ -80,7 +91,7 @@ % } % } %#<% join(" | ", @actions) | n %> -<% '['. join("] [", @actions). ']' | n %> +<% '['. join("] [", @actions). '] ' | n %> % if ($subactions) { % my @actions; % foreach my $action (sort keys %{$subactions}) { diff --git a/rt/html/Elements/SimpleSearch b/rt/html/Elements/SimpleSearch index e76f801df..55d65fc89 100644 --- a/rt/html/Elements/SimpleSearch +++ b/rt/html/Elements/SimpleSearch @@ -43,7 +43,13 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -
- + + +  
diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs index f5839a9e5..22720072c 100644 --- a/rt/html/Elements/Tabs +++ b/rt/html/Elements/Tabs @@ -57,9 +57,13 @@ <%INIT> my $action; my $basetopactions = { - A => { html => $m->scomp('/Elements/CreateTicket') +# A => { html => $m->scomp('/Elements/CreateTicket') +# }, + A => { html => $m->scomp('/Elements/FreesideNewCust') }, - B => { html => $m->scomp('/Elements/SimpleSearch') + B => { html => $m->scomp('/Elements/FreesideSearch') + }, + C => { html => $m->scomp('/Elements/SimpleSearch') } }; my $basetabs = { diff --git a/rt/html/Elements/TitleBoxStart b/rt/html/Elements/TitleBoxStart index 804e5cfaa..d98fe2744 100644 --- a/rt/html/Elements/TitleBoxStart +++ b/rt/html/Elements/TitleBoxStart @@ -78,7 +78,7 @@ $title_class => '' $titleright_href => undef $titleright => undef -$contentbg => "#dddddd" +$contentbg => "#d4d4d4" $color => "#336699" <%init> diff --git a/rt/html/NoAuth/webrt.css b/rt/html/NoAuth/webrt.css index bc688ac1d..4748694e5 100644 --- a/rt/html/NoAuth/webrt.css +++ b/rt/html/NoAuth/webrt.css @@ -43,7 +43,13 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -SPAN.nav { font-family: Verdana, Arial, Helvetica, sans-serif; + +/* * { + font-family: Arial, Verdana, Helvetica, sans-serif; + font-size: 1.2em; +} */ + +SPAN.nav { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 12px; %# color: #FFFFFF; color: #000000; @@ -51,7 +57,7 @@ SPAN.nav { font-family: Verdana, Arial, Helvetica, sans-serif; white-space: nowrap} .nav2 { font-size: 10px; white-space: nowrap} -.nav { font-family: Verdana, Arial, Helvetica, sans-serif; +.nav { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 13px; %# font-weight: normal; font-weight: bold; @@ -59,17 +65,17 @@ SPAN.nav { font-family: Verdana, Arial, Helvetica, sans-serif; color: #000000; text-decoration: none; white-space: nowrap} -.currentnav { font-family: Verdana, Arial, Helvetica, sans-serif; +.currentnav { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 13px; font-weight: bold; color: #FFFF66; text-decoration: none; white-space: nowrap} -.topnav { font-family: Verdana, Arial, Helvetica, sans-serif; +.topnav { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 16px; font-weight: normal; -%# color: #FFFFFF; - color: #000000; + color: #FFFFFF; +%# color: #000000; text-decoration: none; white-space: nowrap} @@ -81,37 +87,43 @@ SPAN.nav { font-family: Verdana, Arial, Helvetica, sans-serif; a.topnav-0 { font-family: Verdana, sans-serif; font-size: 16px; font-weight: normal; - color: #000000; +%# color: #000000; + color: #FFFFFF; text-decoration: none; white-space: nowrap} a.topnav-1 { font-family: Verdana, sans-serif; font-size: 14px; font-weight: normal; - color: #000000; +%# color: #000000; + color: #FFFFFF; text-decoration: none; white-space: nowrap} a.topnav-2 { font-family: Verdana, sans-serif; font-size: 12px; font-weight: normal; - color: #000000; +%# color: #000000; + color: #FFFFFF; text-decoration: none; white-space: nowrap} a.topnav-3 { font-family: Verdana, sans-serif; font-size: 11px; font-weight: normal; - color: #000000; +%# color: #000000; + color: #FFFFFF; text-decoration: none; white-space: nowrap} a.topnav-4 { font-family: Verdana, sans-serif; font-size: 11px; font-weight: normal; - color: #000000; +%# color: #000000; + color: #FFFFFF; text-decoration: none; white-space: nowrap} a.topnav-5 { font-family: Verdana, sans-serif; font-size: 11px; font-weight: normal; - color: #000000; +%# color: #000000; + color: #FFFFFF; text-decoration: none; white-space: nowrap} li.topnav-0-minor { @@ -175,7 +187,7 @@ li.topnav-5-major { padding-bottom: .5em; } -.currenttopnav { font-family: Verdana, Arial, Helvetica, sans-serif; +.currenttopnav { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 16px; font-weight: bold; %# color: #FFFF66; @@ -191,37 +203,37 @@ li.topnav-5-major { a.currenttopnav-0 { font-family: Verdana, sans-serif; font-size: 16px; font-weight: bold; - color: #000000; background-color: #cccccc; + color: #ffffff; background-color: #7e0079; text-decoration: none; white-space: nowrap} a.currenttopnav-1 { font-family: Verdana, sans-serif; font-size: 14px; font-weight: bold; - color: #000000; background-color: #cccccc; + color: #ffffff; background-color: #7e0079; text-decoration: none; white-space: nowrap} a.currenttopnav-2 { font-family: Verdana, sans-serif; font-size: 12px; font-weight: normal; - color: #000000; background-color: #cccccc; + color: #ffffff; background-color: #7e0079; text-decoration: none; white-space: nowrap} a.currenttopnav-3 { font-family: Verdana, sans-serif; font-size: 11px; font-weight: normal; - color: #000000; background-color: #cccccc; + color: #ffffff; background-color: #7e0079; text-decoration: none; white-space: nowrap} a.currenttopnav-4 { font-family: Verdana, sans-serif; font-size: 11px; font-weight: normal; - color: #000000; background-color: #cccccc; + color: #ffffff; background-color: #7e0079; text-decoration: none; white-space: nowrap} a.currenttopnav-5 { font-family: Verdana, sans-serif; font-size: 11px; font-weight: normal; - color: #000000; background-color: #cccccc; + color: #ffffff; background-color: #7e0079; text-decoration: none; white-space: nowrap} li.currenttopnav-0-minor { @@ -285,18 +297,18 @@ li.currenttopnav-5-major { padding-bottom: .5em; } -.topactions { font-family: Verdana, Arial, Helvetica, sans-serif; +.topactions { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 10px; color: #FFFFFF; text-decoration: none; white-space: nowrap} -.subnav { font-family: Verdana, Arial, Helvetica, sans-serif; +.subnav { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 11px; font-weight: normal; color: #FFFFFF; text-decoration: none; white-space: nowrap} -.currentsubnav { font-family: Verdana, Arial, Helvetica, sans-serif; +.currentsubnav { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 11px; font-weight: bold; color: #FFFF66; @@ -355,6 +367,20 @@ li.currenttopnav-5-major { vertical-align: top; text-align: right; } +.black { + background-color: #000000; + color: #ffffff; + background-position: left top; + vertical-align: top; + text-align: left; + } +.blackright { + background-color: #000000; + color: #ffffff; + background-position: left top; + vertical-align: top; + text-align: right; + } .mediumgray { background-color: #cccccc; background-position: left top; @@ -367,6 +393,30 @@ li.currenttopnav-5-major { vertical-align: top; text-align: right; } +.darkmediumgray { + background-color: #aaaaaa; + background-position: left top; + vertical-align: top; + text-align: left; + } +.darkmediumgrayright { + background-color: #aaaaaa; + background-position: left top; + vertical-align: top; + text-align: right; + } +.bggray { + background-color: #e8e8e8; + background-position: left top; + vertical-align: top; + text-align: left; + } +.bggrayright { + background-color: #e8e8e8; + background-position: left top; + vertical-align: top; + text-align: right; + } .white { background-color: #ffffff; background-position: left top; @@ -396,26 +446,26 @@ div.downloadattachment { } -td { font-family: Verdana, Arial, Helvetica, sans-serif; +td { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 11px; background-position: left top; } .black { background-color: #000000; background-position: left top; } -span.rtname { font-family: Verdana, Arial, Helvetica, sans-serif; +span.rtname { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 18px; font-weight: normal; color: #ffffff} -span.title { font-family: Verdana, Arial, Helvetica, sans-serif; +span.title { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 20px; font-weight: bold; color: #ffffff} -.header { font-family: Verdana, Arial, Helvetica, sans-serif; +.header { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 12px; font-weight: bold; color: #0066CC} -.subheader { font-family: Verdana, Arial, Helvetica, sans-serif; +.subheader { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 11px; font-weight: bold; color: #0066CC } @@ -426,7 +476,7 @@ span.title { font-family: Verdana, Arial, Helvetica, sans-serif; .labeltop { font-weight: normal; text-align: right; vertical-align: top } -.productnav { font-family: Verdana, Arial, Helvetica, sans-serif; +.productnav { font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 11px; color: #000000; text-align: center; @@ -450,6 +500,7 @@ TD.mainbody { padding-right: 1em; margin-left: 1em; margin-right: 1em; + background-color: #e8e8e8; } td.boxcontainer + td.boxcontainer { @@ -492,7 +543,7 @@ TD.titlebox { SPAN.message { font-size: 100%; - font-family: Verdana, Arial, Helvetica, sans-serif; + font-family: Arial, Verdana, Helvetica, sans-serif; } @@ -549,8 +600,9 @@ A:link IMG, A:visited IMG { border-style: none } a:focus {text-decoration: underline } A IMG { color: white } /* The only way to hide the border in NS 4.x */ -a:link { text-decoration: none} -a:visited { text-decoration: none} +/* a:link { text-decoration: none} */ +/* a:visited { text-decoration: none} */ + a:hover { text-decoration: underline} /* a:focus { background-color: #ccccee } */ diff --git a/rt/html/Search/Bulk.html b/rt/html/Search/Bulk.html index f9eef26b6..b7c64e3f8 100644 --- a/rt/html/Search/Bulk.html +++ b/rt/html/Search/Bulk.html @@ -68,7 +68,7 @@ $Tickets->RedoSearch(); while (my $Ticket = $Tickets->Next) { $i++; if ($i % 2) { - $bgcolor = "#dddddd"; + $bgcolor = "#d4d4d4"; } else { $bgcolor = "#ffffff"; -- 2.11.0