fix UI bugs

iamghost007 · Aug 29, 2016 · 3172235 · 3172235
1 parent 13fce16
commit 3172235
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 69 deletions.
diff --git a/bark-ui/index.html b/bark-ui/index.html
@@ -83,7 +83,7 @@
                     <li><a href="#/undercons"><i class="fa fa-gear fa-fw"></i> Settings</a></li>
                     <li class="divider"></li>
                     <li><a href="/apidocs/index.html" target="_blank"><i class="fa fa-book fa-fw"></i> API DOCs</a></li>
-                    <li><a href="https://wiki.vip.corp.ebay.com/display/PersonalizationCN/Bark+User+Guidebook" target="_blank"><i class="fa fa-question-circle fa-fw"></i> User Guide</a></li>
+                    <li><a href="https://github.com/eBay/DQSolution/blob/master/bark-doc/userguide.md" target="_blank"><i class="fa fa-question-circle fa-fw"></i> User Guide</a></li>
                     <li><a href="mailto://[email protected]" ><i class="fa fa-envelope fa-fw"></i> Contact us</a></li>
                     <li class="divider"></li>
                     <li><a href="" ng-click="logout()"><i class="fa fa-sign-out fa-fw"></i> Logout</a>
@@ -119,9 +119,9 @@
       </div>
 
       <div class="col-xs-12 col-md-3" style="padding-right:0;">
-        <div id="rightbar" ng-controller="SideBarCtrl" class="" style="background-color:#262626;">
+        <!-- <div id="rightbar" ng-controller="SideBarCtrl" class="" style="background-color:#262626;"> -->
           <ng-include src="'/sidebar.html'"/>
-        </div>
+        <!-- </div> -->
 
       </div>
 

diff --git a/bark-ui/js/controllers/health-ctrl.js b/bark-ui/js/controllers/health-ctrl.js
@@ -118,9 +118,9 @@ define(['./module'], function (controllers) {
                         formatter: function(info) {
                             var dqFormat = info.data.dq>100?'':'%';
                             return [
-                                '<span style="font-size:1.8em;">' + formatUtil.encodeHTML(info.data.sysName) + ' &gt; </span>', 
+                                '<span style="font-size:1.8em;">' + formatUtil.encodeHTML(info.data.sysName) + ' &gt; </span>',
                                 '<span style="font-size:1.5em;">' + formatUtil.encodeHTML(info.data.name)+'</span><br>',
-                                '<span style="font-size:1.5em;">dq : '+info.data.dq+dqFormat + '</span>'
+                                '<span style="font-size:1.5em;">dq : ' + info.data.dq.toFixed(2) + dqFormat + '</span>'
                             ].join('');
                         }
                     },
@@ -160,7 +160,7 @@ define(['./module'], function (controllers) {
                     // }
                     // param.event.event.preventDefault();
                     if (param.data.name) {
-                    
+
                         showBig(param.data.name);
                         // return false;
                     }

diff --git a/bark-ui/js/controllers/sidebar-ctrl.js b/bark-ui/js/controllers/sidebar-ctrl.js
@@ -20,6 +20,7 @@ define(['./module'], function(controllers) {
 
         pageInit();
 
+
         function pageInit() {
           var url = $config.uri.statistics;
 
@@ -31,12 +32,12 @@ define(['./module'], function(controllers) {
               sideBarList();
           });
 
-          
+
         }
 
         var renderDataAssetPie = function(status) {
             resizePieChart();
-            $scope.dataAssetPieChart = echarts.init(document.getElementById('data-asset-pie'), 'dark');
+            $scope.dataAssetPieChart = echarts.init($('#data-asset-pie')[0], 'dark');
             $scope.dataAssetPieChart.setOption($barkChart.getOptionPie(status));
         }
 
@@ -62,7 +63,7 @@ define(['./module'], function(controllers) {
             $('#'+chartId).click(function() {
               showBig($scope.briefmetrics[parentIndex].metrics[index]);
             });
-          
+
         };
 
         var showBig = function(metric){
@@ -128,8 +129,10 @@ define(['./module'], function(controllers) {
         }
 
         function resizePieChart() {
-            document.getElementById('data-asset-pie').style.width = $('#data-asset-pie').parent().width()+'px';
-            document.getElementById('data-asset-pie').style.height = $('#data-asset-pie').parent().width()+'px';
+          $('#data-asset-pie').css({
+              height: $('#data-asset-pie').parent().width(),
+              width: $('#data-asset-pie').parent().width()
+          });
         }
     }
     ]);

diff --git a/bark-ui/login/login.html b/bark-ui/login/login.html
@@ -70,9 +70,9 @@ <h3>
                         <img src="../img/logo.gif" class="img-rounded" style="width:80%;">
                     </div>
 
-                    <input type="input" class="form-control" placeholder="Corp id" autocomplete="on" style="margin-bottom:20px;">
+                    <input type="input" class="form-control" placeholder="username" autocomplete="on" style="margin-bottom:20px;">
 
-                    <input type="password" class="form-control" placeholder="Corp password" autocomplete="on">
+                    <input type="password" class="form-control" placeholder="password" autocomplete="on">
 
                     <div class="checkbox">
                     <label style="color:white;">

diff --git a/bark-ui/pages/dataassets/createdataasset.html b/bark-ui/pages/dataassets/createdataasset.html
@@ -80,7 +80,7 @@ <h5 class="over-title margin-bottom-15">Register Data Asset</h5>
                       </div>
                     </div>
                   </div>
-                  <div class="col-md-12 col-lg-12 col-sm-12">
+                  <!-- <div class="col-md-12 col-lg-12 col-sm-12">
                     <div class="form-group">
                       <label class="col-md-2 col-lg-2 col-sm-2 control-label">
                         Data folder pattern:
@@ -94,7 +94,7 @@ <h5 class="over-title margin-bottom-15">Register Data Asset</h5>
                         </span>
                       </div>
                     </div>
-                  </div>
+                  </div> -->
                   <div class="col-md-12 col-lg-12 col-sm-12">
                     <div class="form-group" ng-class="{'has-error':Form.platformSelector.$dirty&&Form.platformSelector.$invalid, 'has-success':Form.platformSelector.$valid}">
                       <label for="platformSelector" class="col-md-2 col-lg-2 col-sm-2 control-label">
@@ -169,7 +169,7 @@ <h5 class="over-title margin-bottom-15">Register Data Asset</h5>
                       </div>
                     </div>
                   </div>
-
+<!-- 
                   <div class="col-md-12 col-lg-12 col-sm-12">
                     <div class="form-group">
                       <label class="col-md-2 col-lg-2 col-sm-2 control-label">
@@ -198,7 +198,7 @@ <h5 class="over-title margin-bottom-15">Register Data Asset</h5>
                         </div>
                       </div>
                     </div>
-                  </div>
+                  </div> -->
 
                 </div>
 

diff --git a/bark-ui/sidebar.html b/bark-ui/sidebar.html
@@ -12,69 +12,73 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
  -->
-<div id="side-bar-stats" class="row" style="border-bottom:5px solid #060606;margin-left:0;margin-right:0">
 
-  <!--<div class="row-container">-->
-    <div class="col-xs-12 col-md-12 col-lg-6 " id="sidebar-option">
+<div id="rightbar" ng-controller="SideBarCtrl" class="" style="background-color:#262626;">
 
-      <div >
+  <div id="side-bar-stats" class="row" style="border-bottom:5px solid #060606;margin-left:0;margin-right:0">
 
-        <div class="sidebar-stat-center">
-            <img src="/img/sidebar1.png" >
-            <span><a class="bark-link" href="#/dataassets">{{datasets}}&nbsp;Data Assets</a></span>
-        </div>
+    <!--<div class="row-container">-->
+      <div class="col-xs-12 col-md-12 col-lg-6 " id="sidebar-option">
+
+        <div >
+
+          <div class="sidebar-stat-center">
+              <img src="/img/sidebar1.png" >
+              <span><a class="bark-link" href="#/dataassets">{{datasets}}&nbsp;Data Assets</a></span>
+          </div>
+
+          <div class="sidebar-stat-center">
+              <img src="/img/sidebar2.png">
+              <span><a class="bark-link" href="#/metrics">{{metrics}}&nbsp;DQ Metrics</a></span>
+          </div>
 
-        <div class="sidebar-stat-center">
-            <img src="/img/sidebar2.png">
-            <span><a class="bark-link" href="#/metrics">{{metrics}}&nbsp;DQ Metrics</a></span>
         </div>
 
       </div>
-
-    </div>
-    <div class="col-xs-12 col-md-12 col-lg-6">
-      <div id="data-asset-pie"></div>
-    </div>
-  <!--</div>-->
-</div>
+      <div class="col-xs-12 col-md-12 col-lg-6">
+        <div id="data-asset-pie"></div>
+      </div>
+    <!--</div>-->
+  </div>
 
 
-<div id="side-bar-metrics" class="row" style="margin-top:20px;overflow-y:auto;overflow-x:hidden;margin-left:0;margin-right:0;height:1px;">
-    <div ng-repeat="outerItems in briefmetrics">
-        <div class="well" style="padding:0px;background:transparent;border:0px;position:relative; ">
-          <!-- <img class="bullseye" src="/img/bullseye.png" title="image1" > -->
-          <div class="col-sm-4 col-lg-4 col-md-4 "><h4 ><a href="#/metrics/{{outerItems.name}}"> {{outerItems.name}}</a></h4></div>
-          <div class="col-sm-3 col-lg-3 col-md-3 " style="display: flex;justify-content: center;height:46px;"><div ng-class="outerItems.dq >=90 ? 'led-green':'led-yellow'" style="align-self: center;"></div></div>
-          <div class="col-sm-5 col-lg-5 col-md-5 " style="display: flex;justify-content: center;height:46px;"><a style="align-self: center;" class="btn btn-primary" href="https://jirap.corp.ebay.com/" target="_blank">Report&nbsp;issue</a></div>
-        </div>
-        <br/>
-        <div class="well side-bar-scroll">
-          <div class="panel-group" ng-repeat="items in outerItems.metrics" style="margin-bottom:0px;background:transparent;">
-            <div class="panel panel-default" style="position:relative;background:transparent;">
-              <div class="panel-heading" style="background:transparent;">
-                <h4 class="panel-title side-metrics">
-                    <a data-toggle="collapse" href={{"#"+outerItems.name+$index}} ng-init="items.tag=true" ng-click="items.tag=!items.tag;draw(items, $parent.$index, $index);" >
-                      <i class="faChevron" ng-class="items.tag ? 'fa fa-caret-right':'fa fa-caret-down'" style="width:10px"></i>
+  <div id="side-bar-metrics" class="row" style="margin-top:20px;overflow-y:auto;overflow-x:hidden;margin-left:0;margin-right:0;height:1px;">
+      <div ng-repeat="outerItems in briefmetrics">
+          <div class="well" style="padding:0px;background:transparent;border:0px;position:relative; ">
+            <!-- <img class="bullseye" src="/img/bullseye.png" title="image1" > -->
+            <div class="col-sm-4 col-lg-4 col-md-4 "><h4 ><a href="#/metrics/{{outerItems.name}}"> {{outerItems.name}}</a></h4></div>
+            <div class="col-sm-3 col-lg-3 col-md-3 " style="display: flex;justify-content: center;height:46px;"><div ng-class="outerItems.dq >=90 ? 'led-green':'led-yellow'" style="align-self: center;"></div></div>
+            <div class="col-sm-5 col-lg-5 col-md-5 " style="display: flex;justify-content: center;height:46px;"><a style="align-self: center;" class="btn btn-primary" href="https://github.com/eBay/DQSolution/issues" target="_blank">Report&nbsp;issue</a></div>
+          </div>
+          <br/>
+          <div class="well side-bar-scroll">
+            <div class="panel-group" ng-repeat="items in outerItems.metrics" style="margin-bottom:0px;background:transparent;">
+              <div class="panel panel-default" style="position:relative;background:transparent;">
+                <div class="panel-heading" style="background:transparent;">
+                  <h4 class="panel-title side-metrics">
+                      <a data-toggle="collapse" href={{"#"+outerItems.name+$index}} ng-init="items.tag=true" ng-click="items.tag=!items.tag;draw(items, $parent.$index, $index);" >
+                        <i class="faChevron" ng-class="items.tag ? 'fa fa-caret-right':'fa fa-caret-down'" style="width:10px"></i>
 
-                      <i class="fa fa-line-chart faArrows"></i>
-                      <span class="side-date">{{items.timestamp | date:'MM/dd HH:mm':'-0700'}}</span>
-                      &nbsp;&nbsp;
-                      <span class="side-name" title="{{items.name}}">{{items.name |strShorten}}</span>
-                      <span ng-if="items.dq <= 100" class="pull-right" ng-class="items.dqfail?'side-percent-red':'side-percent'">{{items.dq | number:2}}%</span>
-                      <span ng-if="items.dq > 100" class="pull-right" ng-class="items.dqfail?'side-percent-red':''">{{items.dq/1000 | number:0}}K</span>
-                    </a>
-                  </h4>
-                </div>
-                <div id={{outerItems.name+$index}} class="panel-collapse collapse">
-                  <!-- <div class="panel-body">
-                    <highchart config="items.chartId">
-                  </div> -->
-                  <div class="panel-body" style="cursor:pointer;padding:0px 15px;">
-                    <div id={{'chart'+$parent.$index+'-'+$index}} class="side-chart"></div>
+                        <i class="fa fa-line-chart faArrows"></i>
+                        <span class="side-date">{{items.timestamp | date:'MM/dd HH:mm':'-0700'}}</span>
+                        &nbsp;&nbsp;
+                        <span class="side-name" title="{{items.name}}">{{items.name |strShorten}}</span>
+                        <span ng-if="items.dq <= 100" class="pull-right" ng-class="items.dqfail?'side-percent-red':'side-percent'">{{items.dq | number:2}}%</span>
+                        <span ng-if="items.dq > 100" class="pull-right" ng-class="items.dqfail?'side-percent-red':''">{{items.dq/1000 | number:0}}K</span>
+                      </a>
+                    </h4>
+                  </div>
+                  <div id={{outerItems.name+$index}} class="panel-collapse collapse">
+                    <!-- <div class="panel-body">
+                      <highchart config="items.chartId">
+                    </div> -->
+                    <div class="panel-body" style="cursor:pointer;padding:0px 15px;">
+                      <div id={{'chart'+$parent.$index+'-'+$index}} class="side-chart"></div>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
-          </div>
-      </div>
-  </div>
+        </div>
+    </div>
+</div>