[Rt-commit] r3826 - in rt/branches/3.5-TESTING: . html/Elements html/Search

[jesse at bestpractical.com]

Author: jesse
Date: Fri Sep  2 13:01:17 2005
New Revision: 3826

Modified:
   rt/branches/3.5-TESTING/   (props changed)
   rt/branches/3.5-TESTING/html/Elements/Footer
   rt/branches/3.5-TESTING/html/Elements/MyRT
   rt/branches/3.5-TESTING/html/Search/Bulk.html
   rt/branches/3.5-TESTING/html/Search/Results.html
Log:
 r14191 at hualien:  jesse | 2005-09-01 12:35:09 -0400
  * HTML merge bugs fixed


Modified: rt/branches/3.5-TESTING/html/Elements/Footer
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/Footer	(original)
+++ rt/branches/3.5-TESTING/html/Elements/Footer	Fri Sep  2 13:01:17 2005
@@ -54,15 +54,17 @@
 
   <p id="bpscredits">
     <span>
-<&|/l,     '&#187;&#124;&#171;', $RT::VERSION, '2005', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>[_1] RT [_2] Copyright 1996-[_3] [_4].</&><br>
+<&|/l,     '&#187;&#124;&#171;', $RT::VERSION, '2005', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>[_1] RT [_2] Copyright 1996-[_3] [_4].</&>
+</span>
+</p>
 % if (!$Menu) {
   <p id="legal">
 <&|/l&>Distributed under version 2 <a href="http://www.gnu.org/copyleft/gpl.html"> of the GNU GPL.</a></&><br>
 <&|/l, '<a href="mailto:sales at bestpractical.com">sales at bestpractical.com</a>' &>To inquire about support, training, custom development or licensing, please contact [_1].</&><br>
   </p>
 % }
-</div>
 
+</div>
 % if ($Debug >= 2 ) {
 % require Data::Dumper;
 % my $d = Data::Dumper->new([\%ARGS], [qw(%ARGS)]);

Modified: rt/branches/3.5-TESTING/html/Elements/MyRT
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/MyRT	(original)
+++ rt/branches/3.5-TESTING/html/Elements/MyRT	Fri Sep  2 13:01:17 2005
@@ -97,4 +97,4 @@
     }
 }
 
-</%INIT>==== ORIGINAL VERSION html/Elements/MyRT 112539663870187
+</%INIT>

Modified: rt/branches/3.5-TESTING/html/Search/Bulk.html
==============================================================================
--- rt/branches/3.5-TESTING/html/Search/Bulk.html	(original)
+++ rt/branches/3.5-TESTING/html/Search/Bulk.html	Fri Sep  2 13:01:17 2005
@@ -152,13 +152,6 @@
 $cfs->LimitToGlobal();
 $cfs->LimitToQueue($_) for keys %$seen_queues;
 </%perl>
-<&|/Elements/TitleBox, title => loc('Edit Custom Fields'), color => "#336633"&>
-<%perl>
-my $cfs = RT::CustomFields->new($session{'CurrentUser'});
-$cfs->LimitToGlobal();
-$cfs->LimitToQueue($_) for keys %$seen_queues;
-</%perl>
-
 <table>
 <tr>
 <th><&|/l&>Name</&></th>
@@ -197,7 +190,7 @@
 <& /Ticket/Elements/BulkLinks &>
 </&>
 
-<& /Elements/Submit, Label => loc('Update'), CheckAll => 1, ClearAll => 1 &>
+<& /Elements/Submit, Label => loc('Update') &>
 
 
 </form>

Modified: rt/branches/3.5-TESTING/html/Search/Results.html
==============================================================================
--- rt/branches/3.5-TESTING/html/Search/Results.html	(original)
+++ rt/branches/3.5-TESTING/html/Search/Results.html	Fri Sep  2 13:01:17 2005
@@ -64,15 +64,12 @@
     BaseURL => $RT::WebPath."/Search/Results.html?"
 
    &>
+% my @vars = (Query => $Query, Format => $Format,  Rows => $Rows, OrderBy => $OrderBy,  Order => $Order, HideResults => $HideResults, Page => $Page );
 <div align="right">
 <form method="get" action="<%$RT::WebPath%>/Search/Results.html">
-<input type="hidden" class="hidden" name="Query" value="<%$Query%>" />
-<input type="hidden" class="hidden" name="Format" value="<%$Format%>" />
-<input type="hidden" class="hidden" name="HideResults" value="<%$HideResults%>" />
-<input type="hidden" class="hidden" name="Rows" value="<%$Rows%>" />
-<input type="hidden" class="hidden" name="Page" value="<%$Page%>" />
-<input type="hidden" class="hidden" name="OrderBy" value="<%$OrderBy%>" />
-<input type="hidden" class="hidden" name="Order" value="<%$Order%>" />
+%while (my $var = shift (@vars)) {
+<input type="hidden" class="hidden" name="<%$var%>" value="<%shift(@vars)%>"/>
+%}
 <& /Elements/Refresh, Name => 'TicketsRefreshInterval', Default => $session {'tickets_refresh_interval'} &>
 <input type="submit" class="button" value="<&|/l&>Go!</&>">
 </form>
@@ -84,27 +81,14 @@
 <a href="<%$RSSFeedURL%>"><&|/l&>RSS</&></a> |
 <a href="<%$RT::WebPath%>/Tools/Offline.html<%$ShortQueryString%>"><&|/l&>Work offline</&></a><br/>
 <form method="get" action="<%$RT::WebPath%>/Search/Chart.html"><&|/l&>chart</&>
-% my @vars = (Query => $Query, Format => $Format,  Rows => $Rows, OrderBy => $OrderBy,  Order => $Order);
+% @vars = (Query => $Query, Format => $Format,  Rows => $Rows, OrderBy => $OrderBy,  Order => $Order);
 %while (my $var = shift (@vars)) {
 <input type="hidden" class="hidden" name="<%$var%>" value="<%shift(@vars)%>"/>
 %}
-</%perl>
 <&|/l, $m->scomp('Elements/SelectGroupBy', Name => 'PrimaryGroupBy') &>grouped by [_1]</&>
 <&|/l, $m->scomp('Elements/SelectChartType', Name => 'ChartStyle') &>style: [_1]</&>
-
 <input type="submit" class="button" value="<%loc('Go')%>"/>
 </form>
-<form method="get" action="<%$RT::WebPath%>/Search/Chart.html"><&|/l&>chart</&>
-% my @vars = (Query => $Query, Format => $Format,  Rows => $Rows, OrderBy => $OrderBy,  Order => $Order);
-%while (my $var = shift (@vars)) {
-<input type="hidden" name="<%$var%>" value="<%shift(@vars)%>"/>
-%}
-</%perl>
-<&|/l, $m->scomp('Elements/SelectGroupBy', Name => 'PrimaryGroupBy') &>grouped by [_1]</&>
-<&|/l, $m->scomp('Elements/SelectChartType', Name => 'ChartStyle') &>style: [_1]</&>
-
-<input type="submit" value="<%loc('Go')%>"/>
-</form>
 <& /Elements/Callback, _CallbackName => 'SearchActions', QueryString => $QueryString&>
 </div>
 <%INIT>