diff options
Diffstat (limited to 'rt/html')
| -rw-r--r-- | rt/html/Elements/Header | 5 | ||||
| -rw-r--r-- | rt/html/Elements/Menu | 2 | ||||
| -rw-r--r-- | rt/html/Elements/Tabs | 4 | ||||
| -rw-r--r-- | rt/html/Ticket/Elements/AddCustomers | 12 | ||||
| -rw-r--r-- | rt/html/Ticket/Elements/ShowCustomers | 2 |
5 files changed, 13 insertions, 12 deletions
diff --git a/rt/html/Elements/Header b/rt/html/Elements/Header index 27658df42..4a16d5667 100644 --- a/rt/html/Elements/Header +++ b/rt/html/Elements/Header @@ -78,7 +78,7 @@ ONLOAD=" <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF"> <tr> <td rowspan=2><img border=0 alt="freeside" src="<%$RT::WebImagesURL%>/small-logo.png" width="92" height="62"></td> - <td align="left" rowspan=2><font size=6><% FS::Conf->new->config('company_name') %> Ticketing</font></td> + <td align="left" rowspan=2><font size=6><% &RT::URI::freeside::FreesideGetConfig('company_name') %> Ticketing</font></td> <td align="right" valign="top"> % if ($session{'CurrentUser'} && $session{'CurrentUser'}->Id && $LoggedIn) { <SPAN STYLE="display: none"><A HREF="#skipnav"><&|/l&>Skip Menu</&></A> |</SPAN> @@ -102,7 +102,7 @@ ONLOAD=" <tr> <td align=right> <FONT SIZE="-3"> - <A HREF="http://www.sisd.com/freeside">Freeside</A> v<% $FS::VERSION %><BR> + <A HREF="http://www.sisd.com/freeside">Freeside</A> v<% &RT::URI::freeside::FreesideVersion() %><BR> <A HREF="../docs/">Documentation</A><BR> </FONT> </td> @@ -124,6 +124,7 @@ ONLOAD=" $r->headers_out->{'Pragma'} = 'no-cache'; $r->headers_out->{'Cache-control'} = 'no-cache'; +require RT::URI::freeside; </%INIT> <%ARGS> diff --git a/rt/html/Elements/Menu b/rt/html/Elements/Menu index 0e57585c5..e933fb4f0 100644 --- a/rt/html/Elements/Menu +++ b/rt/html/Elements/Menu @@ -78,7 +78,7 @@ % } else { % $sep=0; % } -<li style="<%$style%>"><A HREF="<%$RT::WebPath%>/<%$toptabs->{$tab}->{'path'}%>" style="font-size: <%$size%>;" class="<%$class%>" +<li style="<%$style%>"><A HREF="<% ($toptabs->{$tab}->{'path'} =~ /^http/) ? '' : "${RT::WebPath}/" %><%$toptabs->{$tab}->{'path'}%>" style="font-size: <%$size%>;" class="<%$class%>" <%($class eq 'currenttopnav') ? "name='focus'" : ""|n %> <% !$level && "accesskey='".$accesskey++."'" |n%>><% $toptabs->{$tab}->{'title'}%></A> %# Second-level items diff --git a/rt/html/Elements/Tabs b/rt/html/Elements/Tabs index 4fc229b84..4a018bfad 100644 --- a/rt/html/Elements/Tabs +++ b/rt/html/Elements/Tabs @@ -64,7 +64,7 @@ my $basetopactions = { }; my $basetabs = { ' A'=> { title => 'Billing Main', - path => '../', + path => &RT::URI::freeside::FreesideURL(), }, A => { #title => loc('Homepage'), title => 'Ticketing Main', @@ -93,6 +93,8 @@ if (!defined $toptabs) { if (!defined $topactions) { $topactions = $basetopactions; } + + require RT::URI::freeside; # Now let callbacks add their extra tabs $m->comp('/Elements/Callback', diff --git a/rt/html/Ticket/Elements/AddCustomers b/rt/html/Ticket/Elements/AddCustomers index 66480e2f1..bfa6de9c6 100644 --- a/rt/html/Ticket/Elements/AddCustomers +++ b/rt/html/Ticket/Elements/AddCustomers @@ -19,9 +19,8 @@ % foreach my $customer (@Customers) { <tr> <td> - <input type="checkbox" name="Ticket-AddCustomer-<% $customer->custnum %>" VALUE="1" <% scalar(@Customers) == 1 ? 'CHECKED' : '' %>> -%# <% $customer->name %> - <A HREF="<% $p %>view/cust_main.cgi?<% $customer->custnum %>"><% small_custview( $customer, scalar(FS::Conf->new->config('countrydefault')), 1 ) |n %> + <input type="checkbox" name="Ticket-AddCustomer-<% $customer->{'custnum'} %>" VALUE="1" <% scalar(@Customers) == 1 ? 'CHECKED' : '' %>> + <A HREF="<%$freeside_url%>/view/cust_main.cgi?<% $customer->{'custnum'} %>"><% &RT::URI::freeside::small_custview($customer->{'custnum'}, &RT::URI::freeside::FreesideGetConfig('countrydefault'), 1) |n %> </td> </tr> % } @@ -31,9 +30,11 @@ <%INIT> my ($msg); +my $freeside_url = &RT::URI::freeside::FreesideURL(); + my @Customers = (); if ( $CustomerString ) { - @Customers = smart_search( 'search' => $CustomerString ); + @Customers = &RT::URI::freeside::smart_search( 'search' => $CustomerString ); warn scalar(@Customers); } @@ -42,9 +43,6 @@ if ($ServiceString) { @Services = (); #service_search(); } -eval { use FS::CGI qw( popurl small_custview ); }; -my $p = eval { popurl(3); }; - </%INIT> <%ARGS> diff --git a/rt/html/Ticket/Elements/ShowCustomers b/rt/html/Ticket/Elements/ShowCustomers index 5519d24cf..612727ede 100644 --- a/rt/html/Ticket/Elements/ShowCustomers +++ b/rt/html/Ticket/Elements/ShowCustomers @@ -21,7 +21,7 @@ % my $cust_main = ''; <tr> <td class="value"> - <A HREF="<% $customerURI->Resolver->HREF %>"><% $customerURI->Resolver->AsStringLong |n %> + <A HREF="<% $customerURI->Resolver->HREF %>"><% $customerURI->Resolver->AsStringLong |n %></A> </td> </tr> % } |