incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cr...@apache.org
Subject [1/7] git commit: UI Tweaks
Date Wed, 13 Nov 2013 03:29:19 GMT
Updated Branches:
  refs/heads/blur-console-v2 019d71639 -> e53983cd9


UI Tweaks


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/2ebcb971
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/2ebcb971
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/2ebcb971

Branch: refs/heads/blur-console-v2
Commit: 2ebcb971502400777735d5a61dbc49a5fce7051d
Parents: 019d716
Author: Chris Rohr <crohr@nearinfinity.com>
Authored: Tue Nov 12 22:25:33 2013 -0500
Committer: Chris Rohr <crohr@nearinfinity.com>
Committed: Tue Nov 12 22:25:33 2013 -0500

----------------------------------------------------------------------
 .../org/apache/blur/console/util/NodeUtil.java  |  6 +--
 .../org/apache/blur/console/util/TableUtil.java |  4 +-
 .../apache/blur/console/webapp/css/console.css  | 52 +++++++++++++++++---
 .../org/apache/blur/console/webapp/index.html   |  8 +--
 .../apache/blur/console/webapp/js/dashboard.js  |  1 +
 .../console/webapp/partials/dashboard.tpl.html  | 12 ++---
 6 files changed, 61 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2ebcb971/contrib/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java
b/contrib/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java
index 4e317aa..92f3796 100644
--- a/contrib/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java
+++ b/contrib/blur-console/src/main/java/org/apache/blur/console/util/NodeUtil.java
@@ -58,7 +58,7 @@ public class NodeUtil {
 		Map<String, Object> online = new HashMap<String, Object>();
 		online.put("data", new int[][]{{0,onlineControllers.size()}});
 		online.put("label", "Online");
-		online.put("color", "#7DC77D");
+		online.put("color", "#66CDCC" /*"#7DC77D"*/);
 
 		Map<String, Object> offline = new HashMap<String, Object>();
 		offline.put("data", new int[][]{{0,offlineControllers.size()}});
@@ -98,7 +98,7 @@ public class NodeUtil {
 			Map<String, Object> online = new HashMap<String, Object>();
 			online.put("data", new int[][]{{0,onlineShardServers.size()}});
 			online.put("label", "Online");
-			online.put("color", "#7DC77D");
+			online.put("color", "#66CDCC" /*"#7DC77D"*/);
 
 			Map<String, Object> offline = new HashMap<String, Object>();
 			offline.put("data", new int[][]{{0,offlineShardServers.size()}});
@@ -182,7 +182,7 @@ public class NodeUtil {
 		Map<String, Object> online = new HashMap<String, Object>();
 		online.put("data", new int[][]{{0,onlineZookeepers.size()}});
 		online.put("label", "Online");
-		online.put("color", "#7DC77D");
+		online.put("color", "#66CDCC" /*"#7DC77D"*/);
 
 		Map<String, Object> offline = new HashMap<String, Object>();
 		offline.put("data", new int[][]{{0,offlineZookeepers.size()}});

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2ebcb971/contrib/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java
b/contrib/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java
index 2c7acce..cb23c4c 100644
--- a/contrib/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java
+++ b/contrib/blur-console/src/main/java/org/apache/blur/console/util/TableUtil.java
@@ -89,13 +89,13 @@ public class TableUtil {
 		Map<String, Object> eData = new HashMap<String, Object>();
 		eData.put("data", enabledPoints);
 		eData.put("label", "Enabled");
-		eData.put("color", "#7DC77D");
+		eData.put("color", "#66CDCC" /*"#7DC77D"*/);
 		datasets.add(eData);
 		
 		Map<String, Object> dData = new HashMap<String, Object>();
 		dData.put("data", disabledPoints);
 		dData.put("label", "Disabled");
-		dData.put("color", "#CCCCCC");
+		dData.put("color", "#333333");
 		datasets.add(dData);
 		
 		data.put("tables", clusterInfo);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2ebcb971/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/css/console.css
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/css/console.css
b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/css/console.css
index 25e3dba..7b1f161 100644
--- a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/css/console.css
+++ b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/css/console.css
@@ -17,18 +17,43 @@
 
 body { padding-top: 70px; }
 .nav, .pagination, .carousel a { cursor: pointer; }
+nav.navbar-inverse { background-color: #4c66a4; }
+nav.navbar-inverse .navbar-brand { color: #fff; }
 
 .app { padding: 0 10px; }
 
-.tab-content {
-    overflow: auto; /* prevent content from running below tabs */
+.tabs-left > ul {
+    position: fixed !important;
+    width: 40px;
+    overflow-y: hidden;
+    white-space: nowrap;
+    background-color: #232937;
+    height: 100%;
+    top: 50px;
+    left: 0;
+}
+
+.tabs-left > ul a {
+    padding: 10px;
+    color: #CCC;
+    border-radius: 0;
+    margin-right: 0px;
+    font-size: 20px;
+}
+
+.tabs-left > ul a:hover {
+    color: #333;
+}
+
+.tabs-left > ul > li.active > a, .tabs-left > ul > li.active > a:hover
{
+    border: none;
 }
 
 /* Remove border on bottom, left, right */
-.tabs-left > .nav-tabs { border-bottom: 0; }
+/*.tabs-left > .nav-tabs { border-bottom: 0; }*/
 
 /* Show/hide tabbable areas */
-.tab-content > .tab-pane { display: none; }
+/*.tab-content > .tab-pane { display: none; }
 .tab-content > .active { display: block; }
 
 .tabs-left > .nav-tabs > li {
@@ -60,14 +85,27 @@ body { padding-top: 70px; }
 .tabs-left > .nav-tabs .active > a:focus {
     border-color: #ddd transparent #ddd #ddd;
     *border-right-color: #fff;
+}*/
+
+.tab-content {
+    overflow: auto; /* prevent content from running below tabs */
 }
 
-.tab-content .row {
+.tabs-left > .tab-content {
+    margin-left: 40px;
+}
+
+.tabs-left > .tab-content .row {
     margin-right: 0px;
     margin-left: 0px;
     margin-bottom: 5px;
 }
 
-.center {
-    text-align: center;
+.horizontal-chart-holder {
+    border-right: 1px solid #CCC;
+}
+
+.vertical-chart-holder {
+    border-top: 1px solid #CCC;
+    margin-top: 29px;
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2ebcb971/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/index.html
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/index.html
b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/index.html
index a34b712..deed228 100644
--- a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/index.html
+++ b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/index.html
@@ -35,19 +35,19 @@ Licensed to the Apache Software Foundation (ASF) under one
         <div class="app" ng-app="blurApp">
             <tabset vertical="true" class="tabs-left">
                 <tab>
-                    <tab-heading><i class="glyphicon glyphicon-dashboard" title="Dashboard"></i>
Dashboard</tab-heading>
+                    <tab-heading tooltip="Dashboard" tooltip-placement="right" tooltip-append-to-body="true"><i
class="glyphicon glyphicon-dashboard"></i></tab-heading>
                     <ng-include src="'partials/dashboard.tpl.html'"></ng-include>
                 </tab>
                 <tab>
-                    <tab-heading><i class="glyphicon glyphicon-list" title="Tables"></i>
Tables</tab-heading>
+                    <tab-heading tooltip="Tables" tooltip-placement="right" tooltip-append-to-body="true"><i
class="glyphicon glyphicon-list"></i></tab-heading>
                     <ng-include src="'partials/tables.tpl.html'"></ng-include>
                 </tab>
                 <tab>
-                    <tab-heading><i class="glyphicon glyphicon-tasks" title="Recent
Queries"></i> Queries</tab-heading>
+                    <tab-heading tooltip="Queries" tooltip-placement="right" tooltip-append-to-body="true"><i
class="glyphicon glyphicon-tasks"></i></tab-heading>
                     Queries
                 </tab>
                 <tab>
-                    <tab-heading><i class="glyphicon glyphicon-search" title="Search"></i>
Search</tab-heading>
+                    <tab-heading tooltip="Search" tooltip-placement="right" tooltip-append-to-body="true"><i
class="glyphicon glyphicon-search"></i></tab-heading>
                     Search
                 </tab>
             </tabset>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2ebcb971/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/dashboard.js
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/dashboard.js
b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/dashboard.js
index a395488..eb7f0ec 100644
--- a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/dashboard.js
+++ b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/js/dashboard.js
@@ -23,6 +23,7 @@ blurApp.controller('DashboardCtrl', function($scope, $http, $timeout) {
     $scope.nodeData = {};
     $scope.tableData = {};
     $scope.queryData = {};
+    $scope.hasslowwarnings = false;
 
     (function node_tick() {
         $http.get('/service/dashboard/node/status').success(function (data) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2ebcb971/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/partials/dashboard.tpl.html
----------------------------------------------------------------------
diff --git a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/partials/dashboard.tpl.html
b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/partials/dashboard.tpl.html
index 2e6a12f..70a1a84 100644
--- a/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/partials/dashboard.tpl.html
+++ b/contrib/blur-console/src/main/resources/org/apache/blur/console/webapp/partials/dashboard.tpl.html
@@ -19,11 +19,11 @@ Licensed to the Apache Software Foundation (ASF) under one
 -->
 
 <div ng-controller="DashboardCtrl">
-    <div id="slow-query-warnings" class="alert alert-danger hidden">Warning</div>
+    <div id="slow-query-warnings" class="alert alert-danger" ng-show="hasslowwarnings">Warning</div>
     <div class="row">
         <div class="col-md-8">
             <div class="row">
-                <div class="col-md-6 center">
+                <div class="col-md-6 text-center horizontal-chart-holder">
                     <h4>Zookeepers</h4>
                     <div ng-if="!nodeData.zookeepers.errmsg">
                         <div piechart chartdata="nodeData.zookeepers.chart"></div>
@@ -32,7 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one
                         <div class="alert alert-danger">{{nodeData.zookeepers.errmsg}}</div>
                     </div>
                 </div>
-                <div class="col-md-6 center">
+                <div class="col-md-6 text-center horizontal-chart-holder">
                     <h4>Controllers</h4>
                     <div ng-if="!nodeData.controllers.errmsg">
                         <div piechart chartdata="nodeData.controllers.chart"></div>
@@ -61,9 +61,9 @@ Licensed to the Apache Software Foundation (ASF) under one
         </div>
         <div class="col-md-4">
             <div class="row">
-                <div class="col-md-12 center">
+                <div class="col-md-12 text-center">
                     <h4>Shards</h4>
-                    <div ng-repeat="cluster in nodeData.clusters" style="text-align:center">
+                    <div ng-repeat="cluster in nodeData.clusters" class="text-center">
                         <div ng-if="!cluster.errmsg">
                             <div piechart chartdata="cluster.chart" title="{{cluster.name}}"></div>
                         </div>
@@ -74,7 +74,7 @@ Licensed to the Apache Software Foundation (ASF) under one
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-12 center">
+                <div class="col-md-12 text-center vertical-chart-holder">
                     <h4>Tables</h4>
                     <div stackedbarchart chartdata="tableData.chart" xlabels="tableData.clusters"></div>
                 </div>


Mime
View raw message