[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-1006-g1a26e29
Thomas Sibley
trs at bestpractical.com
Wed Dec 22 12:25:53 EST 2010
The branch, 3.9-trunk has been updated
via 1a26e2962c92afc20781cd7b35eaec504777c83c (commit)
via 9e1a6c9f308d4076b6b3a2537605dfd7777210bf (commit)
via 2e4d4af146c3f1e844c68a67b70539a6cb4b9983 (commit)
from fabd3be5a5ede720e4fde0ffea6d56d2ff10c639 (commit)
Summary of changes:
share/html/Elements/Tabs | 26 +++++++++++++-------------
share/html/NoAuth/css/aileron/InHeader | 2 +-
share/html/NoAuth/css/aileron/nav.css | 12 ++++++++++++
share/html/NoAuth/css/web2/InHeader | 2 +-
share/html/NoAuth/css/web2/nav.css | 20 ++++++++++++++++----
5 files changed, 43 insertions(+), 19 deletions(-)
- Log -----------------------------------------------------------------
commit 2e4d4af146c3f1e844c68a67b70539a6cb4b9983
Author: Thomas Sibley <trs at bestpractical.com>
Date: Wed Dec 22 10:48:57 2010 -0500
Remove the ...'s sprinkled in the menus
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index 3a1c82a..b2557df 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -79,11 +79,11 @@ my $build_main_nav = sub {
path => '/Dashboards/' . $dash->id . '/' . $dash->Name,);
}
- $dashes->child( more => title => loc('All Dashboards...'), path => 'Dashboards/index.html' );
+ $dashes->child( more => title => loc('All Dashboards'), path => 'Dashboards/index.html' );
}
my $dashboard = RT::Dashboard->new( $session{CurrentUser} );
if ( $dashboard->CurrentUserCanCreateAny ) {
- $dashes->child('dashboard_create' => title => loc('New Dashboard...') => path => "/Dashboards/Modify.html?Create=1" );
+ $dashes->child('dashboard_create' => title => loc('New Dashboard') => path => "/Dashboards/Modify.html?Create=1" );
}
my $tickets = Menu->child( search => title => loc('Tickets'), path => '/Search/Build.html' );
@@ -433,7 +433,7 @@ my $build_admin_menu = sub {
my $obj = RT::Ticket->new( $session{'CurrentUser'} );
$obj->Load($id);
- my $actions = PageMenu()->child( actions => title => loc('Actions...'), sort_order => 95 );
+ my $actions = PageMenu()->child( actions => title => loc('Actions'), sort_order => 95 );
my $tabs = PageMenu();
$tabs->child( bookmark => raw_html => $m->scomp( '/Ticket/Elements/Bookmark', id => $id ),
sort_order => 99
@@ -611,7 +611,7 @@ my $build_admin_menu = sub {
$current_search_menu->child( chart => title => loc('Chart'),
path => "/Search/Chart.html$args" );
- my $more = $current_search_menu->child( more => title => loc('Feeds...') );
+ my $more = $current_search_menu->child( more => title => loc('Feeds') );
$more->child(
spreadsheet => title => loc('Spreadsheet'),
commit 9e1a6c9f308d4076b6b3a2537605dfd7777210bf
Author: Thomas Sibley <trs at bestpractical.com>
Date: Wed Dec 22 10:49:27 2010 -0500
Standardize on submenu indicators
diff --git a/share/html/NoAuth/css/aileron/InHeader b/share/html/NoAuth/css/aileron/InHeader
index 4dba1de..e53d203 100644
--- a/share/html/NoAuth/css/aileron/InHeader
+++ b/share/html/NoAuth/css/aileron/InHeader
@@ -64,6 +64,6 @@ jQuery(document).ready(function(){
};
jQuery("#app-nav.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').supersubs().superfish();
- jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled sf-shadow').supersubs().superfish({ autoArrows: false, dropShadows: false }).supposition();
+ jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled').supersubs().superfish({ dropShadows: false }).supposition();
});
</script>
diff --git a/share/html/NoAuth/css/aileron/nav.css b/share/html/NoAuth/css/aileron/nav.css
index 23ef731..d4cd861 100644
--- a/share/html/NoAuth/css/aileron/nav.css
+++ b/share/html/NoAuth/css/aileron/nav.css
@@ -65,6 +65,18 @@
margin-top: -3px;
}
+#page-menu.sf-menu li .sf-sub-indicator {
+ top: 0.7em;
+}
+
+#page-menu.sf-menu li:hover ul, #page-menu.sf-menu li.sfHover ul {
+ top: 2.5em;
+}
+
+#page-menu.sf-menu li ul {
+ border-bottom: 2px solid #ccc;
+}
+
#main-navigation {
position: absolute;
top: 1px;
diff --git a/share/html/NoAuth/css/web2/InHeader b/share/html/NoAuth/css/web2/InHeader
index d756953..c05a03c 100644
--- a/share/html/NoAuth/css/web2/InHeader
+++ b/share/html/NoAuth/css/web2/InHeader
@@ -69,7 +69,7 @@ jQuery(document).ready(function(){
extraWidth: 2
};
- jQuery("#page-menu.toplevel").addClass("sf-menu sf-js-enabled").supersubs().superfish().supposition();
+ jQuery("#page-menu.toplevel").addClass("sf-menu sf-js-enabled").supersubs().superfish({ dropShadows: false }).supposition();
jQuery("#app-nav.toplevel").addClass("sf-menu sf-vertical sf-js-enabled").supersubs().superfish().supposition();
jQuery("#prefs-menu").addClass("sf-menu sf-js-enabled").supersubs().superfish().supposition();
});
diff --git a/share/html/NoAuth/css/web2/nav.css b/share/html/NoAuth/css/web2/nav.css
index a85d33d..1858bcc 100644
--- a/share/html/NoAuth/css/web2/nav.css
+++ b/share/html/NoAuth/css/web2/nav.css
@@ -64,7 +64,7 @@
padding-left: 0.5em;
}
-#app-nav .sf-sub-indicator {
+.sf-sub-indicator {
background-image: url(../images/arrows-grey.png);
margin-top: -3px;
}
@@ -100,6 +100,7 @@
#prefs-menu .sf-sub-indicator {
background-image: url(../images/arrows-grey.png);
+ margin-top: 0;
}
#main-navigation ul li {
@@ -195,21 +196,32 @@
#page-navigation .sf-menu ul {
- background: #eee;
+ background: white;
+ border-bottom: 2px solid #ccc;
}
#page-navigation .sf-menu li:hover, #page-navigation .sf-menu li.sfHover, #page-navigation .sf-menu a:focus, #page-navigation .sf-menu a:hover, #page-navigation .sf-menu a:active {
background: none;
-
}
#page-navigation .sf-menu a:visited, #page-navigation .sf-menu a {
border: none;
- padding: 0.25em;
color: #000;
}
+#page-navigation .sf-menu a {
+ padding: 0.25em;
+}
+
+#page-navigation .sf-menu a.sf-with-ul {
+ /* allow space for the submenu indicator */
+ padding-right: 2em;
+}
+
+#page-menu.sf-menu li .sf-sub-indicator {
+ top: 0.7em;
+}
#page-actions {
commit 1a26e2962c92afc20781cd7b35eaec504777c83c
Author: Thomas Sibley <trs at bestpractical.com>
Date: Wed Dec 22 10:52:55 2010 -0500
Fix indenting
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index b2557df..12617cd 100755
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -546,17 +546,17 @@ my $build_admin_menu = sub {
my $search = Menu()->child('search');
# Don't display prev links if we're on the first ticket
if ( $item_map->{$id}->{prev} ) {
- $search->child( 'first', title => '<< ' . loc('First') => class => "nav",
- path => "/Ticket/Display.html?id=" . $item_map->{first});
+ $search->child( 'first', title => ' ' . loc('First'), escape_title => 0, class => "nav",
+ path => "/Ticket/Display.html?id=" . $item_map->{first});
$search->child( prev => title => '< ' . loc('Prev') => class => "nav",
- path => "/Ticket/Display.html?id=" . $item_map->{$id}->{prev});
+ path => "/Ticket/Display.html?id=" . $item_map->{$id}->{prev});
}
- # Don't display next links if we're on the last ticket
- if ( $item_map->{$id}->{next} ) {
- $search->child( next => title => loc('Next') . ' >' => class => "nav",
- path => "/Ticket/Display.html?id=" . $item_map->{$id}->{next});
- $search->child( last => title => loc('Last') . ' >>' => class => "nav",
- path => "/Ticket/Display.html?id=" . $item_map->{last});
+ # Don't display next links if we're on the last ticket
+ if ( $item_map->{$id}->{next} ) {
+ $search->child( next => title => loc('Next') . ' >' => class => "nav",
+ path => "/Ticket/Display.html?id=" . $item_map->{$id}->{next});
+ $search->child( last => title => loc('Last') . ' >>' => class => "nav",
+ path => "/Ticket/Display.html?id=" . $item_map->{last});
}
}
}
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list