SOLR-3371: update sammy paths so the core name is not assumed in request

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1335213 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan McKinley 2012-05-07 19:39:22 +00:00
parent 5a79b09dc8
commit cfbabcf54f
7 changed files with 20 additions and 13 deletions

View File

@ -177,12 +177,12 @@
color: #333;
}
#menu #index p a { background-image: url( ../../img/ico/dashboard.png ); }
#menu #logging p a { background-image: url( ../../img/ico/inbox-document-text.png ); }
#menu #java-properties p a { background-image: url( ../../img/ico/jar.png ); }
#menu #threads p a { background-image: url( ../../img/ico/ui-accordion.png ); }
#menu #cores p a { background-image: url( ../../img/ico/databases.png ); }
#menu #cloud p a { background-image: url( ../../img/ico/network-cloud.png ); }
#menu #index.global p a { background-image: url( ../../img/ico/dashboard.png ); }
#menu #logging.global p a { background-image: url( ../../img/ico/inbox-document-text.png ); }
#menu #java-properties.global p a { background-image: url( ../../img/ico/jar.png ); }
#menu #threads.global p a { background-image: url( ../../img/ico/ui-accordion.png ); }
#menu #cores.global p a { background-image: url( ../../img/ico/databases.png ); }
#menu #cloud.global p a { background-image: url( ../../img/ico/network-cloud.png ); }
#menu-selector .ping.error a
{
@ -228,6 +228,9 @@
padding-left: 26px;
padding-top: 5px;
padding-bottom: 5px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
#content #navigation a:hover

View File

@ -98,7 +98,11 @@ var sammy = $.sammy
if( this.params.splat )
{
var active_element = $( '#' + this.params.splat[0], menu_wrapper );
var selector = '~' === this.params.splat[0][0]
? '#' + this.params.splat[0].replace( /^~/, '' ) + '.global'
: '#menu-selector #' + this.params.splat[0];
var active_element = $( selector, menu_wrapper );
if( 0 === active_element.size() )
{

View File

@ -661,7 +661,7 @@ var init_tree = function( tree_element )
// #/~cloud
sammy.get
(
/^#\/~(cloud)$/,
/^#\/(~cloud)$/,
function( context )
{
var content_element = $( '#content' );

View File

@ -104,7 +104,7 @@ sammy.bind
// #/~cores
sammy.get
(
/^#\/~(cores)$/,
/^#\/(~cores)$/,
function( context )
{
delete app.cores_template;
@ -134,7 +134,7 @@ sammy.get
// #/~cores
sammy.get
(
/^#\/~(cores)\//,
/^#\/(~cores)\//,
function( context )
{
var content_element = $( '#content' );

View File

@ -18,7 +18,7 @@
// #/~java-properties
sammy.get
(
/^#\/~(java-properties)$/,
/^#\/(~java-properties)$/,
function( context )
{
var core_basepath = $( 'li[data-basepath]', app.menu_element ).attr( 'data-basepath' );

View File

@ -383,7 +383,7 @@ var load_logging_viewer = function()
// #/~logging
sammy.get
(
/^#\/~(logging)$/,
/^#\/(~logging)$/,
function( context )
{
var core_basepath = $( 'li[data-basepath]', app.menu_element ).attr( 'data-basepath' );

View File

@ -18,7 +18,7 @@
// #/~threads
sammy.get
(
/^#\/~(threads)$/,
/^#\/(~threads)$/,
function( context )
{
var core_basepath = $( 'li[data-basepath]', app.menu_element ).attr( 'data-basepath' );