You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2015/06/08 14:12:32 UTC

[2/2] incubator-kylin git commit: KYLIN-811 , enhance query page UI, grid selectable and resize select box

KYLIN-811 ,enhance query page UI,grid selectable and resize select box


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

Branch: refs/heads/origin/0.8.0
Commit: d853c7a31ecc4d41e401607c043a9c0ebe054189
Parents: 39be6b3
Author: jiazhong <ji...@ebay.com>
Authored: Mon Jun 8 20:11:17 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Mon Jun 8 20:12:05 2015 +0800

----------------------------------------------------------------------
 webapp/app/less/app.less                    | 12 +++---------
 webapp/app/less/layout.less                 |  6 ++++++
 webapp/app/partials/query/query_detail.html | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d853c7a3/webapp/app/less/app.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/app.less b/webapp/app/less/app.less
index a1cbfc8..f53a3ed 100644
--- a/webapp/app/less/app.less
+++ b/webapp/app/less/app.less
@@ -381,14 +381,7 @@ pre {
   background: url("../image/icon_table.png") no-repeat;
 }
 
-//input.ng-invalid-required {
-//  border: 1px solid #dd4b39;
-//}
-//
-//input.ng-invalid-required:after {
-//  content: "*";
-//  color: red;
-//}
+
 
 .nav-pills>li {
 cursor: pointer;
@@ -554,13 +547,14 @@ ul.messenger.messenger-fixed.messenger-on-top .messenger-message .messenger-mess
 }
 
 /** Enable the text selectable on notification of Messenger **/
-ul.messenger .messenger-message-inner {
+ul.messenger .messenger-message-inner,.ngCellText {
   -moz-user-select: text;
   -webkit-user-select: text;
   -o-user-select: text;
   user-select: text;
 }
 
+
 .load-hive-metawrapper input[type="radio"]{
   margin-left:0px !important;
 }

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d853c7a3/webapp/app/less/layout.less
----------------------------------------------------------------------
diff --git a/webapp/app/less/layout.less b/webapp/app/less/layout.less
index b3ea6b6..2553ab2 100644
--- a/webapp/app/less/layout.less
+++ b/webapp/app/less/layout.less
@@ -19,8 +19,14 @@
   padding-top: 45px;
 }
 
+body{
+  overflow: auto !important;
+  min-width: 960px;
+
+}
 .main-container {
   padding-bottom: 45px;
+  min-width: 960px;
 }
 
 .main-content {

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d853c7a3/webapp/app/partials/query/query_detail.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/query/query_detail.html b/webapp/app/partials/query/query_detail.html
index 9217257..c06bf0f 100644
--- a/webapp/app/partials/query/query_detail.html
+++ b/webapp/app/partials/query/query_detail.html
@@ -59,7 +59,7 @@
             <span class="label label-lg label-info" ng-if="curQuery.status=='executing'">
                 <i class="fa fa-cog fa-spin"></i> Executing...</span>
         </li>
-        <li class="col-md-3 " style="display: inline">
+        <li class="col-md-5 " style="display: inline">
             <label>Project: &nbsp;</label>
             <span>{{curQuery.project}}</span>
         </li>
@@ -126,7 +126,7 @@
     </div>
 
     <div ng-if="curQuery.graph.show" class="row">
-        <div class="col-xs-2">
+        <div class="col-xs-4 col-lg-3">
             <div class="graph_content">
                 <label>Graph Type</label>
 
@@ -139,7 +139,7 @@
                 <label>Dimensions</label>
                 <div>
                     <select
-                            chosen style="width: 100%"
+                            chosen style="width: 100%;"
                             ng-model="curQuery.graph.state.dimensions" ng-change="refreshGraphData(curQuery)"
                             ng-options="dimension as dimension.column.label for dimension in curQuery.graph.meta.dimensions | filter: mappingToChartype">
                         <option value="">-- choose dimension --</option>
@@ -152,7 +152,7 @@
 
                 <div>
                     <select ng-if="curQuery.graph.type.metrics.multiple"
-                            chosen style="width: 100%"
+                            chosen style="width: 100%;"
                             multiple
                             data-placeholder="Select Metrics.."
                             ng-model="curQuery.graph.state.metrics"
@@ -172,7 +172,7 @@
             </div>
         </div>
 
-        <div class="col-xs-10">
+        <div class="col-xs-8 col-lg-9">
             <div ng-if="curQuery.graph.data.length > 0">
                 <div ng-if="curQuery.graph.type.value == 'bar'">
                     <nvd3-multi-bar-chart