You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/08/25 23:56:46 UTC
svn commit: r1620473 - in /lucene/dev/trunk/solr: CHANGES.txt
webapp/web/css/styles/common.css webapp/web/css/styles/menu.css
webapp/web/js/scripts/app.js
Author: shalin
Date: Mon Aug 25 21:56:46 2014
New Revision: 1620473
URL: http://svn.apache.org/r1620473
Log:
SOLR-5966: Admin UI Menu is fixed and doesn't respect smaller viewports
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/webapp/web/css/styles/common.css
lucene/dev/trunk/solr/webapp/web/css/styles/menu.css
lucene/dev/trunk/solr/webapp/web/js/scripts/app.js
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1620473&r1=1620472&r2=1620473&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Aug 25 21:56:46 2014
@@ -134,6 +134,9 @@ Bug Fixes
* SOLR-6426: SolrZkClient clean can fail due to a race with children nodes. (Mark Miller)
+* SOLR-5966: Admin UI Menu is fixed and doesn't respect smaller viewports.
+ (Aman Tandon, steffkes via shalin)
+
Other Changes
---------------------
Modified: lucene/dev/trunk/solr/webapp/web/css/styles/common.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/common.css?rev=1620473&r1=1620472&r2=1620473&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/common.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/common.css Mon Aug 25 21:56:46 2014
@@ -195,6 +195,11 @@ ul
z-index: 42;
}
+.scroll #header
+{
+ position: absolute;
+}
+
#header #solr
{
background-image: url( ../../img/solr.png );
Modified: lucene/dev/trunk/solr/webapp/web/css/styles/menu.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/menu.css?rev=1620473&r1=1620472&r2=1620473&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/menu.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/menu.css Mon Aug 25 21:56:46 2014
@@ -24,6 +24,12 @@ limitations under the License.
width: 150px;
}
+.scroll #menu-wrapper
+{
+ position: absolute;
+ top: 90px;
+}
+
.has-environment #menu-wrapper
{
top: 160px;
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/app.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/app.js?rev=1620473&r1=1620472&r2=1620473&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/app.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/app.js Mon Aug 25 21:56:46 2014
@@ -144,6 +144,8 @@ var sammy = $.sammy
this.active_core = active_element;
}
+
+ check_fixed_menu();
}
);
}
@@ -403,6 +405,9 @@ var solr_admin = function( app_config )
}
);
+ check_fixed_menu();
+ $( window ).resize( check_fixed_menu );
+
var system_url = config.solr_path + '/admin/info/system?wt=json';
$.ajax
(
@@ -594,6 +599,11 @@ var solr_admin = function( app_config )
);
};
+ check_fixed_menu = function check_fixed_menu()
+ {
+ $( '#wrapper' ).toggleClass( 'scroll', $( window ).height() < $( '#menu-wrapper' ).height() + $( '#header' ).height() + 40 );
+ }
+
};
var connection_check_delay = 1000;