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/01/24 00:08:09 UTC

svn commit: r1437792 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/webapp/ solr/webapp/web/css/styles/cloud.css solr/webapp/web/tpl/cloud.html

Author: steffkes
Date: Wed Jan 23 23:08:08 2013
New Revision: 1437792

URL: http://svn.apache.org/viewvc?rev=1437792&view=rev
Log:
SOLR-3915: Color Legend for Cloud UI (merge r1437791)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/webapp/   (props changed)
    lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cloud.css
    lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cloud.html

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1437792&r1=1437791&r2=1437792&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Jan 23 23:08:08 2013
@@ -61,6 +61,8 @@ Optimizations
 * SOLR-4341: Admin UI - Plugins/Stats Page contains loooong
   Values which result in horizontal Scrollbar (steffkes)
 
+* SOLR-3915: Color Legend for Cloud UI (steffkes)
+
 Other Changes
 ----------------------
 

Modified: lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cloud.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cloud.css?rev=1437792&r1=1437791&r2=1437792&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cloud.css (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cloud.css Wed Jan 23 23:08:08 2013
@@ -231,11 +231,39 @@
   color: #00f;
 }
 
+#content #cloud #legend
+{
+  border: 1px solid #f0f0f0;
+  padding: 10px;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+}
+
+#content #cloud #legend li
+{
+  padding-left: 15px;
+  position: relative;
+}
+
+#content #cloud #legend li svg
+{
+  position: absolute;
+  left: 0;
+  top: 2px;
+}
+
+#content #graph-content
+{
+  min-height: 400px;
+}
+
 #content #graph-content .node
 {
   fill: #333;
 }
 
+#content #cloud #legend circle,
 #content #graph-content .node circle
 {
   fill: #fff;
@@ -265,6 +293,7 @@
   stroke-width: 1.5px;
 }
 
+#content #cloud #legend .gone circle,
 #content #graph-content .node.gone circle,
 #content #graph-content .link.gone
 {
@@ -276,8 +305,16 @@
   fill: #f0f0f0;
 }
 
+#content #cloud #legend ul .gone
+{
+  color: #e0e0e0;
+}
+
+#content #cloud #legend .recovery_failed,
+#content #cloud #legend .recovery_failed circle,
 #content #graph-content .node.recovery_failed circle
 {
+  color: #C43C35;
   stroke: #C43C35;
 }
 
@@ -286,8 +323,11 @@
   fill: #C43C35;
 }
 
+#content #cloud #legend .down,
+#content #cloud #legend .down circle,
 #content #graph-content .node.down circle
 {
+  color: #c48f00;
   stroke: #c48f00;
 }
 
@@ -296,8 +336,11 @@
   fill: #c48f00;
 }
 
+#content #cloud #legend .recovering,
+#content #cloud #legend .recovering circle,
 #content #graph-content .node.recovering circle
 {
+  color: #d5dd00;
   stroke: #d5dd00;
 }
 
@@ -306,8 +349,11 @@
   fill: #d5dd00;
 }
 
+#content #cloud #legend .active,
+#content #cloud #legend .active circle,
 #content #graph-content .node.active circle
 {
+  color: #57A957;
   stroke: #57A957;
 }
 
@@ -316,11 +362,17 @@
   fill: #57A957;
 }
 
+#content #cloud #legend .leader circle,
 #content #graph-content .node.leader circle
 {
   fill: #000;
 }
 
+#content #cloud #legend .leader circle
+{
+  stroke: #fff;
+}
+
 #content #graph-content .link.lvl-2,
 #content #graph-content .link.leader
 {

Modified: lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cloud.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cloud.html?rev=1437792&r1=1437791&r2=1437792&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cloud.html (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cloud.html Wed Jan 23 23:08:08 2013
@@ -39,6 +39,17 @@ limitations under the License.
 
       <div id="canvas"></div>
 
+      <div id="legend">
+        <ul>
+          <li class="leader"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Leader</li>
+          <li class="active"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Active</li>
+          <li class="recovering"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Recovering</li>
+          <li class="down"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Down</li>
+          <li class="recovery_failed"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Recovery Failed</li>
+          <li class="gone"><svg width="15" height="15"><g transform="translate(5,2)"><g transform="translate(0,5)"><circle r="4.5"></circle></g></g></svg> Gone</li>
+        </ul>
+      </div>
+
     </div>
 
   </div>