You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by st...@apache.org on 2013/03/27 09:40:23 UTC
svn commit: r1461447 - in /lucene/dev/trunk/solr: ./
example/solr/collection1/conf/ webapp/web/js/scripts/
Author: steffkes
Date: Wed Mar 27 08:40:22 2013
New Revision: 1461447
URL: http://svn.apache.org/r1461447
Log:
SOLR-4405: Admin UI - admin-extra files are not rendered into the core-menu
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.html
lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.menu-bottom.html
lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.menu-top.html
lucene/dev/trunk/solr/webapp/web/js/scripts/dashboard.js
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1461447&r1=1461446&r2=1461447&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Mar 27 08:40:22 2013
@@ -99,6 +99,8 @@ Bug Fixes
* SOLR-4636: If opening a reader fails for some reason when opening a SolrIndexSearcher,
a Directory can be left unreleased. (Mark Miller)
+* SOLR-4405: Admin UI - admin-extra files are not rendered into the core-menu (steffkes)
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.html?rev=1461447&r1=1461446&r2=1461447&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.html (original)
+++ lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.html Wed Mar 27 08:40:22 2013
@@ -15,17 +15,10 @@
limitations under the License.
-->
-<!-- The content of this page will be statically included into the top
-of the admin page. Uncomment this as an example to see there the content
-will show up.
-
-<hr>
-<i>This line will appear before the first table</i>
-<tr>
-<td colspan="2">
-This row will be appended to the end of the first table
-</td>
-</tr>
-<hr>
+<!-- The content of this page will be statically included into the top-
+right box of the cores overview page. Uncomment this as an example to
+see there the content will show up.
+<img src="img/ico/construction.png"> This line will appear at the top-
+right box on collection1's Overview
-->
Modified: lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.menu-bottom.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.menu-bottom.html?rev=1461447&r1=1461446&r2=1461447&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.menu-bottom.html (original)
+++ lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.menu-bottom.html Wed Mar 27 08:40:22 2013
@@ -1 +1,25 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<!-- admin-extra.menu-bottom.html -->
+<!--
+<li>
+ <a href="#" style="background-image: url(img/ico/construction.png);">
+ LAST ITEM
+ </a>
+</li>
+-->
Modified: lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.menu-top.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.menu-top.html?rev=1461447&r1=1461446&r2=1461447&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.menu-top.html (original)
+++ lucene/dev/trunk/solr/example/solr/collection1/conf/admin-extra.menu-top.html Wed Mar 27 08:40:22 2013
@@ -1 +1,25 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<!-- admin-extra.menu-top.html -->
+<!--
+<li>
+ <a href="#" style="background-image: url(img/ico/construction.png);">
+ FIRST ITEM
+ </a>
+</li>
+-->
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/dashboard.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/dashboard.js?rev=1461447&r1=1461446&r2=1461447&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/dashboard.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/dashboard.js Wed Mar 27 08:40:22 2013
@@ -48,27 +48,26 @@ sammy.get
content_element
.removeClass( 'single' );
- var core_menu = this.active_core.closest( 'ul' );
- if( !core_menu.data( 'admin-extra-loaded' ) )
+ if( !app.core_menu.data( 'admin-extra-loaded' ) )
{
- core_menu.data( 'admin-extra-loaded', new Date() );
+ app.core_menu.data( 'admin-extra-loaded', new Date() );
$.get
(
- core_basepath + '/admin/file/?file=admin-extra.menu-top.html',
+ core_basepath + '/admin/file/?file=admin-extra.menu-top.html&contentType=text/html;charset=utf-8',
function( menu_extra )
{
- core_menu
+ app.core_menu
.prepend( menu_extra );
}
);
-
+
$.get
(
- core_basepath + '/admin/file/?file=admin-extra.menu-bottom.html',
+ core_basepath + '/admin/file/?file=admin-extra.menu-bottom.html&contentType=text/html;charset=utf-8',
function( menu_extra )
{
- core_menu
+ app.core_menu
.append( menu_extra );
}
);