[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-844-gb38807d
Thomas Sibley
trs at bestpractical.com
Mon Dec 13 11:49:54 EST 2010
The branch, 3.9-trunk has been updated
via b38807dd7eacdab3b3a13840cf4747d1a9c14ce4 (commit)
via 8094acd73f51b1a01ba1ca652127ce70728123ea (commit)
via 21371af58557e41121b5100914e9576df9f6dd12 (commit)
from 9d552858806b92f1cf60d1cedaa47129ac0bdd73 (commit)
Summary of changes:
lib/RT/Interface/Web.pm | 20 ++++++++++++++++----
share/html/Admin/Elements/EditRights | 10 +++++-----
share/html/Admin/Elements/EditRightsCategoryTabs | 14 +++++++-------
share/html/Elements/Menu | 4 ++--
share/html/NoAuth/css/aileron/nav.css | 3 +--
5 files changed, 31 insertions(+), 20 deletions(-)
- Log -----------------------------------------------------------------
commit 21371af58557e41121b5100914e9576df9f6dd12
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Dec 13 10:46:44 2010 -0500
Cleanup the menu HTML output
diff --git a/share/html/Elements/Menu b/share/html/Elements/Menu
index da6a754..de57805 100755
--- a/share/html/Elements/Menu
+++ b/share/html/Elements/Menu
@@ -52,10 +52,9 @@
% $item_id =~ s/\s/-/g;
<%" " x ($depth+1)%><li id="li-<%$item_id%>"\
% if ($child->has_children) {
-class="has-children" \
+ class="has-children"\
% }
>\
-
% if ($child->raw_html) {
<% $child->raw_html |n %>
% } else {
@@ -65,6 +64,7 @@ class="has-children" \
</a>\
% }
% if ($child->has_children) {
+
<& Menu, menu => $child, toplevel => 0, parent_id => ($parent_id? $parent_id."-": '').$child->key, depth=> ($depth+1) &>
<%" " x ($depth+1)%></li>
% } else {
commit 8094acd73f51b1a01ba1ca652127ce70728123ea
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Dec 13 11:25:32 2010 -0500
Fix the same weird Chrome bug as in a64ca60fe for aileron
diff --git a/share/html/NoAuth/css/aileron/nav.css b/share/html/NoAuth/css/aileron/nav.css
index 7960a05..23ef731 100644
--- a/share/html/NoAuth/css/aileron/nav.css
+++ b/share/html/NoAuth/css/aileron/nav.css
@@ -67,9 +67,8 @@
#main-navigation {
position: absolute;
- top: 0;
+ top: 1px;
left: 0;
- left: auto;
z-index: 9999;
text-color: #000;
}
commit b38807dd7eacdab3b3a13840cf4747d1a9c14ce4
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Dec 13 11:34:10 2010 -0500
Make sure to localize more parts of the rights editor
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index 691f28b..368f793 100755
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -2398,7 +2398,10 @@ sub GetPrincipalsMap {
my $system = RT::Groups->new($session{'CurrentUser'});
$system->LimitToSystemInternalGroups();
$system->OrderBy( FIELD => 'Type', ORDER => 'ASC' );
- push @map, ['System' => $system => 'Type' => 1];
+ push @map, [
+ 'System' => $system, # loc_left_pair
+ 'Type' => 1,
+ ];
}
elsif (/Groups/) {
my $groups = RT::Groups->new($session{'CurrentUser'});
@@ -2413,7 +2416,10 @@ sub GetPrincipalsMap {
IncludeSubgroupMembers => 0,
);
- push @map, ['User Groups' => $groups => 'Name' => 0];
+ push @map, [
+ 'User Groups' => $groups, # loc_left_pair
+ 'Name' => 0
+ ];
}
elsif (/Roles/) {
my $roles = RT::Groups->new($session{'CurrentUser'});
@@ -2429,7 +2435,10 @@ sub GetPrincipalsMap {
next;
}
$roles->OrderBy( FIELD => 'Type', ORDER => 'ASC' );
- push @map, ['Roles' => $roles => 'Type' => 1];
+ push @map, [
+ 'Roles' => $roles, # loc_left_pair
+ 'Type' => 1
+ ];
}
elsif (/Users/) {
my $Privileged = RT::Group->new($session{'CurrentUser'});
@@ -2460,7 +2469,10 @@ sub GetPrincipalsMap {
my $display = sub {
$m->scomp('/Elements/ShowUser', User => $_[0], NoEscape => 1)
};
- push @map, ['Users' => $Users => $display => 0];
+ push @map, [
+ 'Users' => $Users, # loc_left_pair
+ $display => 0
+ ];
}
}
return @map;
diff --git a/share/html/Admin/Elements/EditRights b/share/html/Admin/Elements/EditRights
index bcd4579..fb252e5 100644
--- a/share/html/Admin/Elements/EditRights
+++ b/share/html/Admin/Elements/EditRights
@@ -60,10 +60,10 @@ $m->callback( Principals => $Principals, Context => $Context );
unless ( $AddPrincipal ) {
my $last = $Principals->[-1];
if ( $last->[0] =~ /Groups/i ) {
- $AddPrincipal = 'group';
+ $AddPrincipal = 'group'; # loc
}
elsif ( $last->[0] =~ /Users/i ) {
- $AddPrincipal = 'user';
+ $AddPrincipal = 'user'; # loc
}
}
</%init>
@@ -89,7 +89,7 @@ unless ( $AddPrincipal ) {
for my $category (@$Principals) {
my ($name, $collection, $col, $loc) = @$category;
</%perl>
-<li class="category"><% $name %></li>
+<li class="category"><% loc($name) %></li>
<%perl>
while ( my $obj = $collection->Next ) {
my $display = ref $col eq 'CODE' ? $col->($obj) : $obj->$col;
@@ -102,7 +102,7 @@ for my $category (@$Principals) {
}
</%perl>
% if ( $AddPrincipal ) {
- <li class="category"><&|/l&>Add</&> <% loc($AddPrincipal) %></li>
+ <li class="category"><&|/l, loc($AddPrincipal) &>Add [_1]</&></li>
<li>
<a href="#acl-AddPrincipal">
<input type="text" value=""
@@ -158,7 +158,7 @@ if ($obj->isa('RT::Group') and $obj->Domain eq 'UserDefined') {
if ( $AddPrincipal ) {
</%perl>
<div id="acl-AddPrincipal">
- <h3><&|/l&>Add rights for this</&> <% loc($AddPrincipal) %></h3>
+ <h3><&|/l, loc($AddPrincipal) &>Add rights for this [_1]</&></h3>
<& EditRightsCategoryTabs, Context => $Context, id => 'acl-AddPrincipal' &>
</div>
% }
diff --git a/share/html/Admin/Elements/EditRightsCategoryTabs b/share/html/Admin/Elements/EditRightsCategoryTabs
index f3b4f86..08bc3f6 100644
--- a/share/html/Admin/Elements/EditRightsCategoryTabs
+++ b/share/html/Admin/Elements/EditRightsCategoryTabs
@@ -41,10 +41,10 @@ if ($Principal) {
}
my %category_desc = (
- 'General' => 'General rights',
- 'Staff' => 'Rights for Staff',
- 'Admin' => 'Rights for Administrators',
- 'Status' => 'Status changes',
+ 'General' => loc('General rights'),
+ 'Staff' => loc('Rights for Staff'),
+ 'Admin' => loc('Rights for Administrators'),
+ 'Status' => loc('Status changes'),
);
my %catsort = ( General => 1, Staff => 2, Admin => 3, Status => 4 );
@@ -55,7 +55,7 @@ $acldesc ||= join '-', ($Principal ? $Principal->PrincipalId : 'addprincipal'),
<div class="category-tabs">
<ul>
% for my $category (sort { $catsort{$a} <=> $catsort{$b} } keys %categories) {
- <li><a href="#<% "$id-$category" %>"><% loc($category_desc{$category} || 'Miscellaneous') %></a></li>
+ <li><a href="#<% "$id-$category" %>"><% $category_desc{$category} || loc('Miscellaneous') %></a></li>
% }
</ul>
% for my $category (sort { $catsort{$a} <=> $catsort{$b} } keys %categories) {
@@ -68,10 +68,10 @@ $acldesc ||= join '-', ($Principal ? $Principal->PrincipalId : 'addprincipal'),
id="SetRights-<% $acldesc %>-<% $right %>"
value="<% $right %>"
<% $current_rights{$right} ? 'checked' : '' %> />
- <label for="SetRights-<% $acldesc %>-<% $right %>" title="<% $right %>">
+ <label for="SetRights-<% $acldesc %>-<% $right %>" title="<% loc($right) %>">
<% loc($available_rights{$right}) %>
<span class="separator">—</span>
- <span class="rightname"><% $right %></span>
+ <span class="rightname"><% loc($right) %></span>
</label>
</li>
% }
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list