You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by up...@apache.org on 2015/10/07 13:09:52 UTC
svn commit: r1707247 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/webapp/ solr/webapp/web/ solr/webapp/web/css/angular/
solr/webapp/web/js/angular/ solr/webapp/web/js/angular/controllers/
solr/webapp/web/partials/
Author: upayavira
Date: Wed Oct 7 11:09:52 2015
New Revision: 1707247
URL: http://svn.apache.org/viewvc?rev=1707247&view=rev
Log:
SOLR-4388 Add a Collections UI for SolrCloud
Added:
lucene/dev/branches/branch_5x/solr/webapp/web/css/angular/collections.css
- copied unchanged from r1707245, lucene/dev/trunk/solr/webapp/web/css/angular/collections.css
lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/controllers/collections.js
- copied unchanged from r1707245, lucene/dev/trunk/solr/webapp/web/js/angular/controllers/collections.js
lucene/dev/branches/branch_5x/solr/webapp/web/partials/collections.html
- copied unchanged from r1707245, lucene/dev/trunk/solr/webapp/web/partials/collections.html
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/webapp/ (props changed)
lucene/dev/branches/branch_5x/solr/webapp/web/css/angular/menu.css
lucene/dev/branches/branch_5x/solr/webapp/web/index.html
lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/app.js
lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/services.js
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/css/angular/menu.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/css/angular/menu.css?rev=1707247&r1=1707246&r2=1707247&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/css/angular/menu.css (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/css/angular/menu.css Wed Oct 7 11:09:52 2015
@@ -255,6 +255,7 @@ limitations under the License.
#menu #threads.global p a { background-image: url( ../../img/ico/ui-accordion.png ); }
+#menu #collections.global p a { background-image: url( ../../img/ico/documents-stack.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 ); }
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/index.html?rev=1707247&r1=1707246&r2=1707247&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/index.html (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/index.html Wed Oct 7 11:09:52 2015
@@ -27,6 +27,7 @@ limitations under the License.
<link rel="stylesheet" type="text/css" href="css/angular/analysis.css?_=${version}">
<link rel="stylesheet" type="text/css" href="css/angular/cloud.css?_=${version}">
<link rel="stylesheet" type="text/css" href="css/angular/cores.css?_=${version}">
+ <link rel="stylesheet" type="text/css" href="css/angular/collections.css?_=${version}">
<link rel="stylesheet" type="text/css" href="css/angular/dashboard.css?_=${version}">
<link rel="stylesheet" type="text/css" href="css/angular/dataimport.css?_=${version}">
<link rel="stylesheet" type="text/css" href="css/angular/files.css?_=${version}">
@@ -60,6 +61,7 @@ limitations under the License.
<script src="js/angular/controllers/index.js"></script>
<script src="js/angular/controllers/logging.js"></script>
<script src="js/angular/controllers/cloud.js"></script>
+ <script src="js/angular/controllers/collections.js"></script>
<script src="js/angular/controllers/cores.js"></script>
<script src="js/angular/controllers/threads.js"></script>
<script src="js/angular/controllers/java-properties.js"></script>
@@ -151,7 +153,8 @@ limitations under the License.
</ul>
</li>
- <li id="cores" class="global" ng-class="{active:page=='cores'}"><p><a href="#/~cores">Core Admin</a></p></li>
+ <li ng-show="isCloudEnabled" id="collections" class="global" ng-class="{active:page=='collections'}"><p><a href="#/~collections">Collections</a></p></li>
+ <li ng-hide="isCloudEnabled" id="cores" class="global" ng-class="{active:page=='cores'}"><p><a href="#/~cores">Core Admin</a></p></li>
<li id="java-properties" class="global" ng-class="{active:page=='java-props'}"><p><a href="#/~java-properties">Java Properties</a></li>
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/app.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/app.js?rev=1707247&r1=1707246&r2=1707247&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/app.js (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/app.js Wed Oct 7 11:09:52 2015
@@ -51,6 +51,14 @@ solrAdminApp.config([
templateUrl: 'partials/cores.html',
controller: 'CoreAdminController'
}).
+ when('/~collections', {
+ templateUrl: 'partials/collections.html',
+ controller: 'CollectionsController'
+ }).
+ when('/~collections/:collection', {
+ templateUrl: 'partials/collections.html',
+ controller: 'CollectionsController'
+ }).
when('/~threads', {
templateUrl: 'partials/threads.html',
controller: 'ThreadsController'
Modified: lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/services.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/services.js?rev=1707247&r1=1707246&r2=1707247&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/services.js (original)
+++ lucene/dev/branches/branch_5x/solr/webapp/web/js/angular/services.js Wed Oct 7 11:09:52 2015
@@ -32,6 +32,8 @@ solrAdminServices.factory('System',
"rename": {params:{action: "RENAME"}},
"createAlias": {params:{action: "CREATEALIAS"}},
"deleteAlias": {params:{action: "DELETEALIAS"}},
+ "deleteReplica": {params:{action: "DELETEREPLICA"}},
+ "addReplica": {params:{action: "ADDREPLICA"}},
"reload": {method: "GET", params:{action:"RELOAD", core: "@core"}},
"optimize": {params:{}}
});