From 6d777ed1fafabab8c308c9ffa24f1dd48f33a9a5 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 15 May 2006 11:05:04 +0000 Subject: more ACL and re-skinning work, now with RT! --- 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 +- 7 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 rt/html/Elements/FreesideNewCust create mode 100644 rt/html/Elements/FreesideSearch (limited to 'rt/html/Elements') 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> -- cgit v1.2.1