[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-661-gdf7cc72
Jesse Vincent
jesse at bestpractical.com
Thu Sep 2 17:47:32 EDT 2010
The branch, 3.9-trunk has been updated
via df7cc7242f6e817eaad6c4806f48b389596c1b06 (commit)
via 9e12eaf466989eddd91d7d5a60c2e2fc89aeccb4 (commit)
via 881ec1d7b357fe7ead05ed07816ca2846ee815fe (commit)
via 2053cb3d85f7bea47c384ce98bf1c9a667a299a5 (commit)
via 531e6619f193b403b45c7dd533b3e0245cf014e2 (commit)
from 5c68eccd79c886a91fae0c13cc4aa4ac24c338a5 (commit)
Summary of changes:
bin/fastcgi_server.in | 2 +-
configure.ac | 2 +-
sbin/rt-test-dependencies.in | 2 +
share/html/Admin/Tools/Configuration.html | 2 +-
share/html/Elements/Menu | 41 +++++++----------------------
5 files changed, 15 insertions(+), 34 deletions(-)
- Log -----------------------------------------------------------------
commit 531e6619f193b403b45c7dd533b3e0245cf014e2
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Thu Sep 2 13:09:43 2010 -0400
Tighten up the HTML generated for RT's Menus for easier debugging.
diff --git a/share/html/Elements/Menu b/share/html/Elements/Menu
index e209838..605ff40 100755
--- a/share/html/Elements/Menu
+++ b/share/html/Elements/Menu
@@ -69,24 +69,14 @@ my @tabs = sort keys %$toptabs;
$sep = $toptabs->{$tab}->{'separator'} ? 1 : 0;
my @aclass;
- push @aclass, 'selected'
- if $path eq $current;
-
- push @aclass, 'odd'
- if $level % 2;
-
+ push @aclass, 'selected' if $path eq $current;
+ push @aclass, 'odd' if $level % 2;
$class->{a} = join ' ', @aclass;
my @li;
- push @li, 'first'
- if $count == 1;
-
- push @li, 'pre-separator'
- if $sep;
-
- push @li, 'post-separator'
- if $postsep;
-
+ push @li, 'first' if $count == 1;
+ push @li, 'pre-separator' if $sep;
+ push @li, 'post-separator' if $postsep;
push @li, 'last' if ( $tab eq $tabs[-1]);
$class->{li} = join ' ', @li;
@@ -95,14 +85,8 @@ my @tabs = sort keys %$toptabs;
: RT->Config->Get('WebPath') . "/" . $toptabs->{$tab}->{'path'};
</%perl>
- <li<% $class->{'li'} ? qq[ class="$class->{li}"] : ''|n %> >
- <% $count > 1 && !$postsep && qq[<span class="bullet">· </span>]|n%>
- <a href="<% $url %>"
- <% $class->{a} && qq[ class="$class->{a}"] |n %>
- <% $target && qq[ target="$target"] |n %>
- <% !$level && " accesskey='".$accesskey++."'" |n %>>
- <% $toptabs->{$tab}->{'title'}%></a>
-
+ <li<% $class->{'li'} ? qq[ class="$class->{li}"] : ''|n %>><% $count > 1 && !$postsep && qq[<span class="bullet">· </span>]|n%><a href="<% $url %>" <% $class->{a} && qq[ class="$class->{a}"] |n %> <% $target && qq[ target="$target"] |n %> <% !$level && " accesskey='".$accesskey++."'" |n %>><% $toptabs->{$tab}->{'title'}%></a>
+%
%# Second-level items
% if ($toptabs->{$tab}->{'subtabs'}
% and keys %{$toptabs->{$tab}->{'subtabs'}})
@@ -123,16 +107,11 @@ my @tabs = sort keys %$toptabs;
</ul>
<%INIT>
-my ($tab, $class, $count);
-
-my @ul;
-push @ul, 'last-menu-level'
- if $last_level;
-push @ul, 'odd'
- if $level % 2;
+my ($tab, $class, $count, @ul);
+push @ul, 'last-menu-level' if $last_level;
+push @ul, 'odd' if $level % 2;
my $menu_class = join ' ', @ul;
</%INIT>
-
<%ARGS>
$toptabs => {}
$current_toptab => ''
commit 2053cb3d85f7bea47c384ce98bf1c9a667a299a5
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Thu Sep 2 13:33:31 2010 -0400
Adding two previously-missing test files
diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index a080ec8..8ee51bd 100755
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -247,6 +247,8 @@ Term::ReadKey
.
$deps{'DEV'} = [ text_to_hash( << '.') ];
+Email::Abstract
+Test::Email
HTML::Form
HTML::TokeParser
WWW::Mechanize
commit 881ec1d7b357fe7ead05ed07816ca2846ee815fe
Author: Christian Loos <cloos at netsandbox.de>
Date: Mon Aug 23 22:17:53 2010 +0200
fix highlighting of site config values
Description contains the localized string for site config,
so this worked only for englisch before.
diff --git a/share/html/Admin/Tools/Configuration.html b/share/html/Admin/Tools/Configuration.html
index ec5e241..a351052 100644
--- a/share/html/Admin/Tools/Configuration.html
+++ b/share/html/Admin/Tools/Configuration.html
@@ -97,7 +97,7 @@ foreach my $key ( RT->Config->Options( Overridable => undef, Sorted => 0 ) ) {
% }
</td>
<td class="collection-as-table" style="white-space: nowrap">
-% if ( $description =~ /^.*site config$/ ) {
+% if ( $meta->{'Source'}{'SiteConfig'} ) {
<span style="font-weight: bold"><% $description %></span>
% } else {
<% $description %>
commit 9e12eaf466989eddd91d7d5a60c2e2fc89aeccb4
Author: Tom Lanyon <tom at netspot.com.au>
Date: Fri Aug 27 20:58:07 2010 +0930
Logic bug in bin/fastcgi_server; allow use of --port.
Patch below (against 3.8-trunk) fixes bin/fastcgi_server --port <foo>.
Without this, it always listens on $RT::VarPath/fastcgi.sock.
Regards,
Tom
diff --git a/bin/fastcgi_server.in b/bin/fastcgi_server.in
index bf3fdcc..63df548 100644
--- a/bin/fastcgi_server.in
+++ b/bin/fastcgi_server.in
@@ -198,7 +198,7 @@ $ENV{'RT_WEBMUX_HEAVY_LOAD'} = 1;
use File::Basename;
require (dirname(__FILE__) .'/webmux.pl');
-unless ( $opt{'socket'} && $opt{'port'} ) {
+unless ( $opt{'socket'} || $opt{'port'} ) {
require File::Spec;
$opt{'socket'} = File::Spec->catfile($RT::VarPath, 'fastcgi.sock');
}
commit df7cc7242f6e817eaad6c4806f48b389596c1b06
Author: Tom Lanyon <tom at netspot.com.au>
Date: Fri Aug 27 21:01:45 2010 +0930
Changed perl [] to autoconf quadrigraphs in configure.ac.
The test against WEB_HANDLER in ./configure.in was getting mangled by autoconf
due to the square brackets. This probably wasn't picked up sooner because
the broken test always succeeded, even if WEB_HANDLER was set incorrectly. :)
Patch included against 3.8-trunk.
Regards,
Tom
diff --git a/configure.ac b/configure.ac
index c9d26e9..ce41489 100755
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_ARG_WITH(web-handler,
]),
WEB_HANDLER=$withval,
WEB_HANDLER=fastcgi)
-my_web_handler_test=$($PERL -e 'print "ok" unless grep $_ !~ /^(modperl1|modperl2|fastcgi(?:-server)?|speedycgi|standalone)$/i, grep defined && length, split /\s*,\s*/, $ARGV[0]' $WEB_HANDLER)
+my_web_handler_test=$($PERL -e 'print "ok" unless grep $_ !~ /^(modperl1|modperl2|fastcgi(?:-server)?|speedycgi|standalone)$/i, grep defined && length, split /\s*,\s*/, $ARGV@<:@0@:>@' $WEB_HANDLER)
if test "$my_web_handler_test" != "ok"; then
AC_MSG_ERROR([Only modperl1, modperl2, fastcgi, fastcgi-server, speedycgi and standalone are valid web-handlers])
fi
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list