You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ar...@apache.org on 2016/10/03 16:53:07 UTC
lucene-solr:branch_6x: SOLR-8140: Remove unfinished admin-extra
Includes UI element and never-implemented commented-out code
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 8e31e5013 -> 5b1066206
SOLR-8140: Remove unfinished admin-extra
Includes UI element and never-implemented commented-out code
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5b106620
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5b106620
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5b106620
Branch: refs/heads/branch_6x
Commit: 5b106620698c103027066341a0e16a675541a31a
Parents: 8e31e50
Author: Alexandre Rafalovitch <ar...@apache.org>
Authored: Mon Oct 3 23:52:46 2016 +0700
Committer: Alexandre Rafalovitch <ar...@apache.org>
Committed: Mon Oct 3 23:52:46 2016 +0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +
solr/webapp/web/css/angular/dashboard.css | 8 +-
.../web/js/angular/controllers/core-overview.js | 83 --------------------
solr/webapp/web/partials/core_overview.html | 17 ----
4 files changed, 3 insertions(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5b106620/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3e900e1..4b13a5b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -206,6 +206,8 @@ Other Changes
* SOLR-9588: Remove Guava dependency from SolrJ (Ishan Chattopadhyaya, noble)
+* SOLR-8140: Remove mentions of unimplemented admin-extra from the new Admin UI (Alexandre Rafalovitch)
+
================== 6.2.1 ==================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5b106620/solr/webapp/web/css/angular/dashboard.css
----------------------------------------------------------------------
diff --git a/solr/webapp/web/css/angular/dashboard.css b/solr/webapp/web/css/angular/dashboard.css
index c681bc8..734d62a 100644
--- a/solr/webapp/web/css/angular/dashboard.css
+++ b/solr/webapp/web/css/angular/dashboard.css
@@ -123,11 +123,6 @@ limitations under the License.
margin-top: 10px;
}
-#content #dashboard #admin-extra
-{
- float: left;
-}
-
#content #dashboard #healthcheck
{
float: right;
@@ -152,7 +147,6 @@ limitations under the License.
#content #dashboard #replication.master h2 { background-image: url( ../../img/ico/node-master.png ); }
#content #dashboard #replication.slave h2 { background-image: url( ../../img/ico/node-slave.png ); }
#content #dashboard #instance h2 { background-image: url( ../../img/ico/server.png ); }
-#content #dashboard #admin-extra h2 { background-image: url( ../../img/ico/plus-button.png ); }
#content #dashboard #collection h2 { background-image: url( ../../img/ico/book-open-text.png ); }
#content #dashboard #shards h2 { background-image: url( ../../img/ico/documents-stack.png ); }
@@ -182,4 +176,4 @@ limitations under the License.
#dashboard #shards .shard .replica.odd {
background-color: #fff;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5b106620/solr/webapp/web/js/angular/controllers/core-overview.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/angular/controllers/core-overview.js b/solr/webapp/web/js/angular/controllers/core-overview.js
index 710e6f2..20f30e1 100644
--- a/solr/webapp/web/js/angular/controllers/core-overview.js
+++ b/solr/webapp/web/js/angular/controllers/core-overview.js
@@ -139,86 +139,3 @@ function($scope, $rootScope, $routeParams, Luke, CoreSystem, Update, Replication
$scope.refresh();
});
-/*******
-
-// @todo admin-extra
- var core_basepath = this.active_core.attr( 'data-basepath' );
- var content_element = $( '#content' );
-
- content_element
- .removeClass( 'single' );
-
- if( !app.core_menu.data( 'admin-extra-loaded' ) )
- {
- app.core_menu.data( 'admin-extra-loaded', new Date() );
-
- $.get
- (
- core_basepath + '/admin/file/?file=admin-extra.menu-top.html&contentType=text/html;charset=utf-8',
- function( menu_extra )
- {
- app.core_menu
- .prepend( menu_extra );
- }
- );
-
- $.get
- (
- core_basepath + '/admin/file/?file=admin-extra.menu-bottom.html&contentType=text/html;charset=utf-8',
- function( menu_extra )
- {
- app.core_menu
- .append( menu_extra );
- }
- );
- }
-
-
-
-////////////////////////////////// ADMIN EXTRA
- $.ajax
- (
- {
- url : core_basepath + '/admin/file/?file=admin-extra.html',
- dataType : 'html',
- context : $( '#admin-extra', dashboard_element ),
- beforeSend : function( xhr, settings )
- {
- $( 'h2', this )
- .addClass( 'loader' );
-
- $( '.message', this )
- .show()
- .html( 'Loading' );
-
- $( '.content', this )
- .hide();
- },
- success : function( response, text_status, xhr )
- {
- $( '.message', this )
- .hide()
- .empty();
-
- $( '.content', this )
- .show()
- .html( response );
- },
- error : function( xhr, text_status, error_thrown)
- {
- this
- .addClass( 'disabled' );
-
- $( '.message', this )
- .show()
- .html( 'We found no "admin-extra.html" file.' );
- },
- complete : function( xhr, text_status )
- {
- $( 'h2', this )
- .removeClass( 'loader' );
- }
- }
- );
-
-***/
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5b106620/solr/webapp/web/partials/core_overview.html
----------------------------------------------------------------------
diff --git a/solr/webapp/web/partials/core_overview.html b/solr/webapp/web/partials/core_overview.html
index 5f86221..3b92fc3 100644
--- a/solr/webapp/web/partials/core_overview.html
+++ b/solr/webapp/web/partials/core_overview.html
@@ -205,23 +205,6 @@ limitations under the License.
</div>
</div>
- <div class="clearfix">
-
- <div class="block" id="admin-extra">
-
- <h2><span>Admin Extra</span></h2>
-
- <div class="message-container">
- <div class="message"></div>
- </div>
-
- <div class="content">
-
- </div>
-
- </div>
-
- </div>
</div>