From 52a2dbebe522c0866e18f09a169d39a0cbd4d7b8 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 27 Nov 2004 19:09:47 +0000 Subject: ticket system integration framework and skin RT --- rt/html/Elements/Footer | 2 ++ rt/html/Elements/Header | 34 ++++++++++++++++++++++++++++++---- rt/html/Elements/PageLayout | 17 +++++++++-------- rt/html/Elements/SimpleSearch | 2 +- rt/html/Elements/Tabs | 7 ++++++- 5 files changed, 48 insertions(+), 14 deletions(-) (limited to 'rt/html/Elements') diff --git a/rt/html/Elements/Footer b/rt/html/Elements/Footer index 5c833f886..052bf87e9 100644 --- a/rt/html/Elements/Footer +++ b/rt/html/Elements/Footer @@ -28,9 +28,11 @@ % } <& /Elements/Callback, %ARGS &> + % if ($Debug) {
<&|/l&>Time to display: <%Time::HiRes::tv_interval( $m->{'rt_base_time'} )%> diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header index 23ab5f781..92c186bd5 100644 --- a/rt/html/Elements/Header +++ b/rt/html/Elements/Header @@ -42,10 +42,9 @@ ONLOAD=" > - - - - + + + + + + + +
   + freesideTicketing % if ($session{'CurrentUser'} && $session{'CurrentUser'}->Id && $LoggedIn) { <&|/l&>Skip Menu | <&|/l&>Preferences @@ -59,6 +58,33 @@ ONLOAD=" <&|/l&>Not logged in. % }
+ + + + + + + +
+ + Freeside <% $FS::VERSION %>
+ Freeside home page
+ Documentation
+
+
+ + RT <% $RT::VERSION %>
+ RT home page
+ Documentation
+
+
+
<%INIT> diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout index 685317581..86b6b565e 100644 --- a/rt/html/Elements/PageLayout +++ b/rt/html/Elements/PageLayout @@ -21,12 +21,12 @@ %# %# %# END LICENSE BLOCK - -
<%$AppName%> + + % foreach my $action (sort keys %{$topactions}) { - % } @@ -35,18 +35,18 @@
<%$AppName%> + <%$topactions->{"$action"}->{'html'} |n %>
%# Vertical menu -
+ <& /Elements/Menu, toptabs => $toptabs, current_toptab => $current_toptab &> - -
+ <%$title%>
+ % if ($actions) { % my @actions; @@ -57,7 +57,8 @@ % push @actions, "{$action}->{'path'}."\">".$actions->{$action}->{'title'}.""; % } % } -<% join(" | ", @actions) | n %> +%#<% join(" | ", @actions) | n %> +<% '['. join("] [", @actions). ']' | n %> % if ($subactions) { % my @actions; % foreach my $action (sort keys %{$subactions}) { @@ -95,5 +96,5 @@ $tabs => undef $actions => undef $subactions => undef $title => $m->callers(-1)->path -$AppName => undef +$AppName => '' diff --git a/rt/html/Elements/SimpleSearch b/rt/html/Elements/SimpleSearch index 4a0d10656..85f37403f 100644 --- a/rt/html/Elements/SimpleSearch +++ b/rt/html/Elements/SimpleSearch @@ -23,5 +23,5 @@ %# END LICENSE BLOCK
-  + 
diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs index 4db3849c6..6791e5062 100644 --- a/rt/html/Elements/Tabs +++ b/rt/html/Elements/Tabs @@ -40,7 +40,12 @@ my $basetopactions = { B => { html => $m->scomp('/Elements/SimpleSearch') } }; -my $basetabs = { A => { title => loc('Homepage'), +my $basetabs = { + ' A'=> { title => 'Billing Main', + path => '..', + }, + A => { #title => loc('Homepage'), + title => 'Ticketing Main', path => '', }, B => { title => loc('Tickets'), -- cgit v1.2.1