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/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 &> - - +

- +

<% &RT::URI::freeside::FreesideGetConfig('company_name') %> Ticketing

<% &RT::URI::freeside::FreesideGetConfig('company_name') || 'ExampleCo' %>

% if ($session{'CurrentUser'} && $session{'CurrentUser'}->Id && $LoggedIn) { +<&|/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 From 74d840d48a629908e202de13bce668ccd945843b Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 22 May 2006 20:38:21 +0000 Subject: missing > tag on INPUT --- rt/html/Elements/FreesideNewCust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rt/html/Elements') diff --git a/rt/html/Elements/FreesideNewCust b/rt/html/Elements/FreesideNewCust index 851c66425..af8f9f1a7 100644 --- a/rt/html/Elements/FreesideNewCust +++ b/rt/html/Elements/FreesideNewCust @@ -1,3 +1,3 @@ -- cgit v1.2.1 From 3a820c27d5290f9d2761636b2b4fe865caeb0804 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 2 Jun 2006 13:20:24 +0000 Subject: add a service search --- rt/html/Elements/FreesideSvcSearch | 10 ++++++++++ rt/html/Elements/PageLayout | 10 +++++----- rt/html/Elements/Tabs | 4 +++- 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 rt/html/Elements/FreesideSvcSearch (limited to 'rt/html/Elements') diff --git a/rt/html/Elements/FreesideSvcSearch b/rt/html/Elements/FreesideSvcSearch new file mode 100644 index 000000000..47c430f1a --- /dev/null +++ b/rt/html/Elements/FreesideSvcSearch @@ -0,0 +1,10 @@ + diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout index 5289f78f3..dd0fd7504 100644 --- a/rt/html/Elements/PageLayout +++ b/rt/html/Elements/PageLayout @@ -45,14 +45,14 @@ %# END BPS TAGGED BLOCK }}} - + - +%# -% foreach my $action (sort keys %{$topactions}) { - % } diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs index 22720072c..dcb652e12 100644 --- a/rt/html/Elements/Tabs +++ b/rt/html/Elements/Tabs @@ -63,7 +63,9 @@ my $basetopactions = { }, B => { html => $m->scomp('/Elements/FreesideSearch') }, - C => { html => $m->scomp('/Elements/SimpleSearch') + C => { html => $m->scomp('/Elements/FreesideSvcSearch') + }, + D => { html => $m->scomp('/Elements/SimpleSearch') } }; my $basetabs = { -- cgit v1.2.1 From a8665e44dbd99bd864e48231928405a31cedce5f Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 9 Jul 2006 14:35:30 +0000 Subject: fix the image path in the kludged looknfeel integration --- rt/html/Elements/Header | 2 +- rt/html/Elements/PageLayout | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'rt/html/Elements') diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header index bad8b58eb..c1bc92afd 100644 --- a/rt/html/Elements/Header +++ b/rt/html/Elements/Header @@ -67,7 +67,7 @@ function hideshow(num) { <& /Elements/Callback, _CallbackName => 'Head', %ARGS &> - - + %#

<%$AppName%> -

<%$AppName%> +%#

+% my $notfirst = 0; foreach my $action (sort keys %{$topactions}) { +

> <%$topactions->{"$action"}->{'html'} |n %>

<%$AppName%> @@ -62,15 +62,15 @@ - - + + %# Vertical menu - +

<& /Elements/Menu, toptabs => $toptabs, current_toptab => $current_toptab &>

-- cgit v1.2.1 From b19897e1db4c110d7d7e8b52800cda5ab58ce9e0 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 14 Aug 2006 12:13:40 +0000 Subject: sprinkle some magic ajax fairy dust on referring customer SELEKTAH. rewind! make smart search smarter, re-layout the top search bars and add an invoice one --- rt/html/Elements/FreesideInvoiceSearch | 20 ++++++++++++++++++++ rt/html/Elements/FreesideNewCust | 2 +- rt/html/Elements/FreesideSearch | 7 ++++--- rt/html/Elements/FreesideSvcSearch | 7 ++++--- rt/html/Elements/PageLayout | 2 +- rt/html/Elements/SimpleSearch | 7 ++++--- rt/html/Elements/Tabs | 6 ++++-- 7 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 rt/html/Elements/FreesideInvoiceSearch (limited to 'rt/html/Elements') diff --git a/rt/html/Elements/FreesideInvoiceSearch b/rt/html/Elements/FreesideInvoiceSearch new file mode 100644 index 000000000..3842b2ff9 --- /dev/null +++ b/rt/html/Elements/FreesideInvoiceSearch @@ -0,0 +1,20 @@ +% if ( $FS::CurrentUser::CurrentUser->access_right('View invoices') ) { + + + + + +% if ( $FS::CurrentUser::CurrentUser->access_right('List invoices') ) { + Advanced +% } +
+ + + + +% } diff --git a/rt/html/Elements/FreesideNewCust b/rt/html/Elements/FreesideNewCust index af8f9f1a7..c752437da 100644 --- a/rt/html/Elements/FreesideNewCust +++ b/rt/html/Elements/FreesideNewCust @@ -1,3 +1,3 @@ - + diff --git a/rt/html/Elements/FreesideSearch b/rt/html/Elements/FreesideSearch index f0efb60d4..99b8da072 100644 --- a/rt/html/Elements/FreesideSearch +++ b/rt/html/Elements/FreesideSearch @@ -1,10 +1,11 @@ - - +
+Advanced + diff --git a/rt/html/Elements/FreesideSvcSearch b/rt/html/Elements/FreesideSvcSearch index 47c430f1a..e9ad56426 100644 --- a/rt/html/Elements/FreesideSvcSearch +++ b/rt/html/Elements/FreesideSvcSearch @@ -1,10 +1,11 @@ - - +
+ Advanced + diff --git a/rt/html/Elements/PageLayout b/rt/html/Elements/PageLayout index 52353fa46..f13ee0dda 100644 --- a/rt/html/Elements/PageLayout +++ b/rt/html/Elements/PageLayout @@ -52,7 +52,7 @@ %# % my $notfirst = 0; foreach my $action (sort keys %{$topactions}) { - % } diff --git a/rt/html/Elements/SimpleSearch b/rt/html/Elements/SimpleSearch index 55d65fc89..e9fc5c6ed 100644 --- a/rt/html/Elements/SimpleSearch +++ b/rt/html/Elements/SimpleSearch @@ -46,10 +46,11 @@ - - +
+Advanced + diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs index dcb652e12..721f920d5 100644 --- a/rt/html/Elements/Tabs +++ b/rt/html/Elements/Tabs @@ -63,9 +63,11 @@ my $basetopactions = { }, B => { html => $m->scomp('/Elements/FreesideSearch') }, - C => { html => $m->scomp('/Elements/FreesideSvcSearch') + C => { html => $m->scomp('/Elements/FreesideInvoiceSearch') }, - D => { html => $m->scomp('/Elements/SimpleSearch') + D => { html => $m->scomp('/Elements/FreesideSvcSearch') + }, + E => { html => $m->scomp('/Elements/SimpleSearch') } }; my $basetabs = { -- cgit v1.2.1

> +	<%$topactions->{"$action"}->{'html'} \|n %>