[Rt-commit] r12882 - in rt/branches/3.8-TESTING: . share/html/Dashboards share/html/Dashboards/Elements share/html/NoAuth/iCal share/html/Search share/html/Search/Elements share/html/Ticket share/html/Ticket/Elements share/html/Ticket/Graphs/Elements
alexmv at bestpractical.com
alexmv at bestpractical.com
Wed Jun 4 15:27:07 EDT 2008
Author: alexmv
Date: Wed Jun 4 15:26:59 2008
New Revision: 12882
Modified:
rt/branches/3.8-TESTING/ (props changed)
rt/branches/3.8-TESTING/share/html/Dashboards/Elements/ShowDashboards
rt/branches/3.8-TESTING/share/html/Dashboards/Elements/ShowSubscription
rt/branches/3.8-TESTING/share/html/Dashboards/Modify.html
rt/branches/3.8-TESTING/share/html/Dashboards/Queries.html
rt/branches/3.8-TESTING/share/html/Dashboards/Subscription.html
rt/branches/3.8-TESTING/share/html/NoAuth/iCal/dhandler
rt/branches/3.8-TESTING/share/html/Search/Chart
rt/branches/3.8-TESTING/share/html/Search/Elements/ResultViews
rt/branches/3.8-TESTING/share/html/Ticket/Elements/ShowSummary
rt/branches/3.8-TESTING/share/html/Ticket/Graphs/Elements/ShowGraph
rt/branches/3.8-TESTING/share/html/Ticket/Graphs/index.html
rt/branches/3.8-TESTING/share/html/Ticket/ModifyLinks.html
Log:
r32519 at kohr-ah: chmrr | 2008-06-04 15:24:45 -0400
* Use new-style config options for newly merged-in code
Modified: rt/branches/3.8-TESTING/share/html/Dashboards/Elements/ShowDashboards
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Dashboards/Elements/ShowDashboards (original)
+++ rt/branches/3.8-TESTING/share/html/Dashboards/Elements/ShowDashboards Wed Jun 4 15:26:59 2008
@@ -60,7 +60,7 @@
% my $i = 0;
% for my $dashboard (sort {$b->Id <=> $a->Id} @$Dashboards) {
% my $url = sprintf '%s/Dashboards/Modify.html?id=%d',
-% $RT::WebPath,
+% RT->Config->Get('WebPath'),
% $dashboard->Id;
<tr class="collection-as-table <% ++$i % 2 ? 'oddline' : 'evenline' %>">
Modified: rt/branches/3.8-TESTING/share/html/Dashboards/Elements/ShowSubscription
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Dashboards/Elements/ShowSubscription (original)
+++ rt/branches/3.8-TESTING/share/html/Dashboards/Elements/ShowSubscription Wed Jun 4 15:26:59 2008
@@ -52,7 +52,7 @@
</%ARGS>
<%INIT>
my $url = sprintf '%s/Dashboards/Subscription.html?DashboardId=%d',
- $RT::WebPath,
+ RT->Config->Get('WebPath'),
$Dashboard->Id,;
my $frequency = loc("None");
Modified: rt/branches/3.8-TESTING/share/html/Dashboards/Modify.html
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Dashboards/Modify.html (original)
+++ rt/branches/3.8-TESTING/share/html/Dashboards/Modify.html Wed Jun 4 15:26:59 2008
@@ -53,7 +53,7 @@
&>
<& /Elements/ListActions, actions => \@results &>
-<form action="<%$RT::WebPath%>/Dashboards/Modify.html" method="post" enctype="multipart/form-data" name="ModifyDashboard">
+<form action="<%RT->Config->Get('WebPath')%>/Dashboards/Modify.html" method="post" enctype="multipart/form-data" name="ModifyDashboard">
%unless ($Dashboard->Id) {
<input type="hidden" class="hidden" name="id" value="new" />
Modified: rt/branches/3.8-TESTING/share/html/Dashboards/Queries.html
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Dashboards/Queries.html (original)
+++ rt/branches/3.8-TESTING/share/html/Dashboards/Queries.html Wed Jun 4 15:26:59 2008
@@ -55,7 +55,7 @@
<& /Elements/ListActions, actions => \@results &>
-<form action="<%$RT::WebPath%>/Dashboards/Queries.html" method="post" enctype="multipart/form-data" name="DashboardQueries">
+<form action="<%RT->Config->Get('WebPath')%>/Dashboards/Queries.html" method="post" enctype="multipart/form-data" name="DashboardQueries">
<input type="hidden" class="hidden" name="id" value="<%$Dashboard->Id%>" />
<input type="hidden" class="hidden" name="Privacy" value="<%$Dashboard->Privacy%>" />
<table width="100%" border="0">
Modified: rt/branches/3.8-TESTING/share/html/Dashboards/Subscription.html
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Dashboards/Subscription.html (original)
+++ rt/branches/3.8-TESTING/share/html/Dashboards/Subscription.html Wed Jun 4 15:26:59 2008
@@ -53,7 +53,7 @@
<& /Elements/ListActions, actions => \@results &>
-<form action="<%$RT::WebPath%>/Dashboards/Subscription.html" method="post" enctype="multipart/form-data" name="SubscribeDashboard">
+<form action="<%RT->Config->Get('WebPath')%>/Dashboards/Subscription.html" method="post" enctype="multipart/form-data" name="SubscribeDashboard">
<input type="hidden" class="hidden" name="DashboardId" value="<% $fields{'DashboardId'} %>" />
<table width="100%" border="0">
<tr>
@@ -194,7 +194,7 @@
$ok || Abort("Couldn't unsubscribe to dashboard $DashboardId.");
# put the user back into a useful place with a message
- RT::Interface::Web::Redirect($RT::WebURL."Dashboards/index.html?Unsubscribe=$DashboardId");
+ RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."Dashboards/index.html?Unsubscribe=$DashboardId");
}
my %fields = (
Modified: rt/branches/3.8-TESTING/share/html/NoAuth/iCal/dhandler
==============================================================================
--- rt/branches/3.8-TESTING/share/html/NoAuth/iCal/dhandler (original)
+++ rt/branches/3.8-TESTING/share/html/NoAuth/iCal/dhandler Wed Jun 4 15:26:59 2008
@@ -85,7 +85,7 @@
$feed->add_properties('x-wr-caldesc' => ["Due dates for RT tickets: $search" => {value => "TEXT"}]);
$feed->add_properties('calscale' => ['gregorian']);
$feed->add_properties('method' => ['publish']);
-$feed->add_properties('prodid' => ["-//$RT::rtname//"]);
+$feed->add_properties('prodid' => ["-//" . RT->Config->Get('rtname') ."//"]);
while (my $t = $tickets->Next) {
next unless $t->DueObj->Unix > 0;
@@ -96,7 +96,7 @@
my $start = Data::ICal::Entry::Event->new;
my $end = Data::ICal::Entry::Event->new;
$_->add_properties(
- url => $RT::WebURL . "?q=".$t->id,
+ url => RT->Config->Get('WebURL') . "?q=".$t->id,
organizer => $t->OwnerObj->Name,
dtstamp => $now->iCal,
created => $t->CreatedObj->iCal,
Modified: rt/branches/3.8-TESTING/share/html/Search/Chart
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Search/Chart (original)
+++ rt/branches/3.8-TESTING/share/html/Search/Chart Wed Jun 4 15:26:59 2008
@@ -75,7 +75,7 @@
my $chart = $chart_class->new( 600 => 400 );
-my $font = $RT::ChartFont || ['verdana', 'arial', gdMediumBoldFont];
+my $font = RT->Config->Get('ChartFont') || ['verdana', 'arial', gdMediumBoldFont];
$chart->set_title_font( $font, 12 ) if $chart->can('set_title_font');
$chart->set_legend_font( $font, 12 ) if $chart->can('set_legend_font');
$chart->set_x_label_font( $font, 10 ) if $chart->can('set_x_label_font');
Modified: rt/branches/3.8-TESTING/share/html/Search/Elements/ResultViews
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Search/Elements/ResultViews (original)
+++ rt/branches/3.8-TESTING/share/html/Search/Elements/ResultViews Wed Jun 4 15:26:59 2008
@@ -59,7 +59,7 @@
<ul class="search-result-views">
<li><a href="<%RT->Config->Get('WebPath')%>/Search/Results.tsv<%$QueryString%>"><&|/l&>Spreadsheet</&></a></li>
<li><a href="<%$RSSFeedURL%>"><&|/l&>RSS</&></a></li>
-<li><a href="<% $RT::WebURL %>NoAuth/iCal/<% $ical_path %>"><% loc('iCal') %></a></li>
+<li><a href="<%RT->Config->Get('WebURL')%>/NoAuth/iCal/<% $ical_path %>"><% loc('iCal') %></a></li>
<li><a href="<%RT->Config->Get('WebPath')%>/Tools/Offline.html<%$ShortQueryString%>"><&|/l&>Editable text</&></a></li>
</ul>
<form method="get" action="<%RT->Config->Get('WebPath')%>/Search/Chart.html">
Modified: rt/branches/3.8-TESTING/share/html/Ticket/Elements/ShowSummary
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Ticket/Elements/ShowSummary (original)
+++ rt/branches/3.8-TESTING/share/html/Ticket/Elements/ShowSummary Wed Jun 4 15:26:59 2008
@@ -96,7 +96,7 @@
<& /Ticket/Elements/ShowDates, Ticket => $Ticket &>
</&>
% my (@extra);
-% push @extra, titleright_raw => '<a href="'. $RT::WebPath. '/Ticket/Graphs/index.html?id='.$Ticket->id.'">'.loc('Graph').'</a>' unless $RT::DisableGraphViz;
+% push @extra, titleright_raw => '<a href="'. RT->Config->Get('WebPath'). '/Ticket/Graphs/index.html?id='.$Ticket->id.'">'.loc('Graph').'</a>' unless RT->Config->Get('DisableGraphViz');
<&| /Widgets/TitleBox, title => loc('Links'),
title_href => RT->Config->Get('WebPath')."/Ticket/ModifyLinks.html?id=".$Ticket->Id,
class => 'ticket-info-links', @extra &>
Modified: rt/branches/3.8-TESTING/share/html/Ticket/Graphs/Elements/ShowGraph
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Ticket/Graphs/Elements/ShowGraph (original)
+++ rt/branches/3.8-TESTING/share/html/Ticket/Graphs/Elements/ShowGraph Wed Jun 4 15:26:59 2008
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<div><img src="<% $RT::WebPath %>/Ticket/Graphs/<% $Type %>/<% $id %>?<% $m->comp('/Elements/QueryString', %ARGS) %>" usemap="#<% $graph->{'NAME'} || 'test' %>" style="border: none" />
+<div><img src="<% RT->Config->Get('WebPath') %>/Ticket/Graphs/<% $Type %>/<% $id %>?<% $m->comp('/Elements/QueryString', %ARGS) %>" usemap="#<% $graph->{'NAME'} || 'test' %>" style="border: none" />
<% safe_run_child { Encode::decode_utf8( $graph->as_cmapx ) } |n %>
</div>
<& ShowLegends, %ARGS, Ticket => $ticket &>
Modified: rt/branches/3.8-TESTING/share/html/Ticket/Graphs/index.html
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Ticket/Graphs/index.html (original)
+++ rt/branches/3.8-TESTING/share/html/Ticket/Graphs/index.html Wed Jun 4 15:26:59 2008
@@ -56,7 +56,7 @@
<& Elements/ShowGraph, %ARGS, Ticket => $ticket &>
-<form action="<% $RT::WebPath %><% $m->request_comp->path %>">
+<form action="<% RT->Config->Get('WebPath') . $m->request_comp->path %>">
<input type="hidden" class="hidden" name="id" value="<% $id %>" />
<& Elements/EditGraphProperties, %ARGS, Ticket => $ticket &>
Modified: rt/branches/3.8-TESTING/share/html/Ticket/ModifyLinks.html
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Ticket/ModifyLinks.html (original)
+++ rt/branches/3.8-TESTING/share/html/Ticket/ModifyLinks.html Wed Jun 4 15:26:59 2008
@@ -58,7 +58,7 @@
<input type="hidden" class="hidden" name="id" value="<%$Ticket->id%>" />
% $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
% my (@extra);
-% push @extra, titleright_raw => '<a href="'. $RT::WebPath. '/Ticket/Graphs/index.html?id='.$Ticket->id.'">'.loc('Graph').'</a>' unless $RT::DisableGraphViz;
+% push @extra, titleright_raw => '<a href="'. RT->Config->Get('WebPath') . '/Ticket/Graphs/index.html?id='.$Ticket->id.'">'.loc('Graph').'</a>' unless RT->Config->Get('DisableGraphViz');
<&| /Widgets/TitleBox, title => loc('Edit Links'), class=>'ticket-info-links', @extra &>
<& /Elements/EditLinks, Object => $Ticket, Merge => 1 &>
</&>
More information about the Rt-commit
mailing list