[Rt-commit] r15170 - in rt/3.8/branches/3.8.1-releng: . sbin share/html/Elements share/html/Search

[falcone at bestpractical.com]

Author: falcone
Date: Thu Aug 14 16:05:21 2008
New Revision: 15170

Modified:
   rt/3.8/branches/3.8.1-releng/   (props changed)
   rt/3.8/branches/3.8.1-releng/sbin/rt-setup-database.in
   rt/3.8/branches/3.8.1-releng/share/html/Dashboards/Elements/ShowSubscription
   rt/3.8/branches/3.8.1-releng/share/html/Elements/PageLayout
   rt/3.8/branches/3.8.1-releng/share/html/Search/Bulk.html

Log:
- Merge //mirror/bps-public/rt/3.8/trunk to //mirror/bps-public/rt/3.8/branches/3.8.1-releng

Modified: rt/3.8/branches/3.8.1-releng/sbin/rt-setup-database.in
==============================================================================
--- rt/3.8/branches/3.8.1-releng/sbin/rt-setup-database.in	(original)
+++ rt/3.8/branches/3.8.1-releng/sbin/rt-setup-database.in	Thu Aug 14 16:05:21 2008
@@ -327,7 +327,7 @@
         }
     }
 
-    print "\nHI THERE IT'S VERY IMPORTANT TO BACK UP BEFORE THIS STEP\n\n";
+    print "\nIT'S VERY IMPORTANT TO BACK UP BEFORE THIS STEP\n\n";
     _yesno() or exit(-2) unless $args{'force'};
 
     foreach my $v ( @versions ) {

Modified: rt/3.8/branches/3.8.1-releng/share/html/Dashboards/Elements/ShowSubscription
==============================================================================
--- rt/3.8/branches/3.8.1-releng/share/html/Dashboards/Elements/ShowSubscription	(original)
+++ rt/3.8/branches/3.8.1-releng/share/html/Dashboards/Elements/ShowSubscription	Thu Aug 14 16:05:21 2008
@@ -63,13 +63,13 @@
 
     if ($freq eq 'weekly') {
         my $day = (qw/Monday Tuesday Wednesday Thursday Friday Saturday Sunday/)[$Subscription->SubValue('Dow')];
-        $frequency = loc("[_1] (on [_2]) at [_3]", $freq, $day, $hour);
+        $frequency = loc("weekly (on [_1]) at [_2]", loc($day), $hour);
     }
     elsif ($freq eq 'monthly') {
-        $frequency = loc("[_1] (day [_2]) at [_3]", $freq, $Subscription->SubValue('Dom'), $hour);
+        $frequency = loc("monthly (day [_1]) at [_2]", $Subscription->SubValue('Dom'), $hour);
     } 
     elsif ($freq eq 'daily') {
-        $frequency = loc("[_1] at [_2]", $freq, $hour);
+        $frequency = loc("daily at [_1]", $hour);
     }
 }
 </%INIT>

Modified: rt/3.8/branches/3.8.1-releng/share/html/Elements/PageLayout
==============================================================================
--- rt/3.8/branches/3.8.1-releng/share/html/Elements/PageLayout	(original)
+++ rt/3.8/branches/3.8.1-releng/share/html/Elements/PageLayout	Thu Aug 14 16:05:21 2008
@@ -92,7 +92,7 @@
          push @li, 'last' if $tab eq $tabs[-1];
          $class->{li} = join ' ', @li;
 
-         my $href = $path;
+         my $href = $page_tabs->{$tab}->{'path'} || "";
          $href = RT->Config->Get('WebPath') .'/'. $href
             unless $path =~ /^\w+:/;
          my $target = $page_tabs->{$tab}->{'target'} || '';

Modified: rt/3.8/branches/3.8.1-releng/share/html/Search/Bulk.html
==============================================================================
--- rt/3.8/branches/3.8.1-releng/share/html/Search/Bulk.html	(original)
+++ rt/3.8/branches/3.8.1-releng/share/html/Search/Bulk.html	Thu Aug 14 16:05:21 2008
@@ -61,7 +61,8 @@
 % foreach my $var qw(Query Format OrderBy Order Rows Page) {
 <input type="hidden" class="hidden" name="<%$var%>" value="<%$ARGS{$var} || ''%>" />
 %}
-<& /Elements/CollectionList, Query => $Query,
+<& /Elements/CollectionList, 
+    Query => $Query,
     DisplayFormat => $Format,
     Format => $ARGS{'Format'},
     Verbatim => 1,
@@ -207,7 +208,10 @@
 
 
 <%INIT>
-$Rows = $RowsPerPage unless (defined $Rows);
+unless ( defined $Rows ) {
+    $Rows = $RowsPerPage;
+    $ARGS{Rows} = $RowsPerPage;
+}
 my $title = loc("Update multiple tickets");
 
 # Iterate through the ARGS hash and remove anything with a null value.