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 2012/05/21 10:37:34 UTC
svn commit: r1340933 - in /lucene/dev/trunk/solr/webapp/web:
css/styles/cloud.css js/scripts/cloud.js
Author: steffkes
Date: Mon May 21 08:37:34 2012
New Revision: 1340933
URL: http://svn.apache.org/viewvc?rev=1340933&view=rev
Log:
SOLR-3459: Fix Cloud's Graph-Views for multiple collections
Modified:
lucene/dev/trunk/solr/webapp/web/css/styles/cloud.css
lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js
Modified: lucene/dev/trunk/solr/webapp/web/css/styles/cloud.css
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/css/styles/cloud.css?rev=1340933&r1=1340932&r2=1340933&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/css/styles/cloud.css (original)
+++ lucene/dev/trunk/solr/webapp/web/css/styles/cloud.css Mon May 21 08:37:34 2012
@@ -236,17 +236,17 @@
stroke-width: 1.5px;
}
-#content #graph-content .node.lvl-2 text
+#content #graph-content .node.lvl-3 text
{
cursor: pointer;
}
-#content #graph-content .node.lvl-2:hover circle
+#content #graph-content .node.lvl-3:hover circle
{
stroke: #000 !important;
}
-#content #graph-content .node.lvl-2:hover text
+#content #graph-content .node.lvl-3:hover text
{
fill: #000 !important;
}
@@ -314,8 +314,18 @@
fill: #000;
}
-#content #graph-content .link.lvl-1,
+#content #graph-content .link.lvl-2,
#content #graph-content .link.leader
{
stroke: #c0c0c0;
+}
+
+#content #graph-content .node.lvl-0 circle
+{
+ stroke: #fff;
+}
+
+#content #graph-content .link.lvl-1
+{
+ stroke: #fff;
}
\ No newline at end of file
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js?rev=1340933&r1=1340932&r2=1340933&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/cloud.js Mon May 21 08:37:34 2012
@@ -156,12 +156,12 @@ var helper_path_class = function( p )
var classes = [ 'link' ];
classes.push( 'lvl-' + p.target.depth );
- if( p.target.data.leader )
+ if( p.target.data && p.target.data.leader )
{
classes.push( 'leader' );
}
- if( p.target.data.state )
+ if( p.target.data && p.target.data.state )
{
classes.push( p.target.data.state );
}
@@ -174,12 +174,12 @@ var helper_node_class = function( d )
var classes = [ 'node' ];
classes.push( 'lvl-' + d.depth );
- if( d.data.leader )
+ if( d.data && d.data.leader )
{
classes.push( 'leader' );
}
- if( d.data.state )
+ if( d.data && d.data.state )
{
classes.push( d.data.state );
}
@@ -197,7 +197,7 @@ var helper_data = {
var helper_node_text = function( d )
{
- if( !d.data.uri )
+ if( !d.data || !d.data.uri )
{
return d.name;
}
@@ -361,7 +361,11 @@ var prepare_graph = function( graph_elem
eval( 'state = ' + response.znode.data + ';' );
var leaf_count = 0;
- var collections = [];
+ var graph_data = {
+ name: null,
+ children : []
+ };
+
for( var c in state )
{
var shards = [];
@@ -424,10 +428,8 @@ var prepare_graph = function( graph_elem
},
children: shards
};
- collections.push( collection );
+ graph_data.children.push( collection );
}
-
- var graph_data = collections.shift();
helper_data.protocol = $.unique( helper_data.protocol );
helper_data.host = $.unique( helper_data.host );