kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhongj...@apache.org
Subject kylin git commit: KYLIN-1708 tip enhancement, remove illegal character
Date Thu, 19 May 2016 07:34:59 GMT
Repository: kylin
Updated Branches:
  refs/heads/v1.5.2-release 5f0ed10e6 -> 60a7c747a


KYLIN-1708 tip enhancement, remove illegal character


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

Branch: refs/heads/v1.5.2-release
Commit: 60a7c747ad9ec8ad8b9b25b309e0a6639919efa6
Parents: 5f0ed10
Author: Jason <jiatuer@163.com>
Authored: Thu May 19 15:07:55 2016 +0800
Committer: Jason <jiatuer@163.com>
Committed: Thu May 19 15:07:55 2016 +0800

----------------------------------------------------------------------
 webapp/app/index.html                                   |  3 +--
 webapp/app/partials/cubeDesigner/advanced_settings.html |  6 +-----
 webapp/app/partials/cubeDesigner/info.html              | 12 ++----------
 webapp/app/partials/cubeDesigner/measures.html          |  6 ++----
 webapp/app/partials/cubeDesigner/refresh_settings.html  |  4 ++--
 .../app/partials/modelDesigner/conditions_settings.html |  9 ++++-----
 webapp/app/partials/modelDesigner/model_info.html       |  2 +-
 7 files changed, 13 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/60a7c747/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/webapp/app/index.html b/webapp/app/index.html
index e99b81a..36245f1 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -260,7 +260,6 @@
   <div class="callout callout-info">
     <p>{{text}}</p>
   </div>
-
-
+</script>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/kylin/blob/60a7c747/webapp/app/partials/cubeDesigner/advanced_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index 0e1f972..5f18b51 100755
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -208,9 +208,6 @@
 
 
         <div class="form-group large-popover">
-          <!--<h4 style="margin-left:42px">-->
-            <!--Rowkeys <i class="fa fa-info-circle" style="white-space:pre-wrap" popover-trigger="mouseenter"
popover=" 'dict' encoding will try to build a dictionary for the dimension. 'fixed_length'
encoding will encode the dimension vlaues by fixed length bytes with padding. 'int' encoding
uses variable integer to encode integers"></i>-->
-          <!--</h4>-->
           <h3 style="margin-left:42px">Rowkeys  <i kylinpopover placement="right"
title="Rowkey" template="rowkeyTip.html" class="fa fa-info-circle"></i></h3>
 
           <div style="margin-left:42px">
@@ -309,8 +306,7 @@
     </ng-form>
 
 </div>
-
-<script type="text/ng-template" id="rowkeyTip.html">


+<script type="text/ng-template" id="rowkeyTip.html">
   <div>
     <h4>Shard By this column?</h4>
     <p>

http://git-wip-us.apache.org/repos/asf/kylin/blob/60a7c747/webapp/app/partials/cubeDesigner/info.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/info.html b/webapp/app/partials/cubeDesigner/info.html
index d2bc235..755fc12 100644
--- a/webapp/app/partials/cubeDesigner/info.html
+++ b/webapp/app/partials/cubeDesigner/info.html
@@ -122,20 +122,12 @@
     </div>
 
 </div>
-
-<script id="tip-cube-name.html" type="text/ng-template">
-  <strong>HTML</strong> allowed.<br />
-  Binding allowed: {{ value }}<br />
-  <button ng-click="value = 2">Test</button>
-</script>
-
-<script type="text/ng-template" id="cubeNameTip.html">


+<script type="text/ng-template" id="cubeNameTip.html">
 <ol>
   <li>Cube name is unique name of entire system.</li>
   <li>Can not edit cube name after created.</li>
 </ol>
 </script>
-
-<script type="text/ng-template" id="notificationEventsTip.html">


+<script type="text/ng-template" id="notificationEventsTip.html">
   <p>ERROR status will trigger a notification anyway.</p>
 </script>

http://git-wip-us.apache.org/repos/asf/kylin/blob/60a7c747/webapp/app/partials/cubeDesigner/measures.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html
index 9f12317..5778003 100755
--- a/webapp/app/partials/cubeDesigner/measures.html
+++ b/webapp/app/partials/cubeDesigner/measures.html
@@ -320,12 +320,10 @@
     <button class="btn btn-primary" ng-click="cancel()">Close</button>
   </div>
 </script>
-
-<script type="text/ng-template" id="expressionTip.html">


+<script type="text/ng-template" id="expressionTip.html">
   <p>All cubes have to contain one measure for Count(1), suggest use "_Count_" as name
(Has been generated automatically)</p>
 </script>
-
-<script type="text/ng-template" id="paramvalueTip.html">


+<script type="text/ng-template" id="paramvalueTip.html">
   <ol>
     <li>Only accept single column in param value with "Column" type</li>
     <li>Distinct Count is approximate, please indicate Error Rate, higher accuracy
degree accompanied with larger storage size and longer build time</li>

http://git-wip-us.apache.org/repos/asf/kylin/blob/60a7c747/webapp/app/partials/cubeDesigner/refresh_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/refresh_settings.html b/webapp/app/partials/cubeDesigner/refresh_settings.html
index 4c18639..0d88e7c 100755
--- a/webapp/app/partials/cubeDesigner/refresh_settings.html
+++ b/webapp/app/partials/cubeDesigner/refresh_settings.html
@@ -155,10 +155,10 @@
   </ng-form>
 </div>
 
-<script type="text/ng-template" id="autoMergeThresholdsTip.html">


+<script type="text/ng-template" id="autoMergeThresholdsTip.html">
     <p>The thresholds will be checked ascendingly to see if any consectuive segments'
time range has exceeded it. For example the [7 days, 30 days] will result in daily incremental
segments being merged every 7 days, and the 7-days segments will get merged every 30 days.</p>
 </script>
 
-<script type="text/ng-template" id="retentionTip.html">


+<script type="text/ng-template" id="retentionTip.html">
 <p>By default it's '0',which will keep all historic cube segments ,or will keep latest
[Retention Threshold] days cube segments.</p>
 </script>

http://git-wip-us.apache.org/repos/asf/kylin/blob/60a7c747/webapp/app/partials/modelDesigner/conditions_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/conditions_settings.html b/webapp/app/partials/modelDesigner/conditions_settings.html
index d000aab..a4e49a9 100644
--- a/webapp/app/partials/modelDesigner/conditions_settings.html
+++ b/webapp/app/partials/modelDesigner/conditions_settings.html
@@ -168,18 +168,17 @@
     </ol>
 </script>
 
-<script type="text/ng-template" id="partitionTimeTip.html">


+<script type="text/ng-template" id="partitionTimeTip.html">
   <p>Column should contain time value (type can be Timestamp, String, VARCHAR, etc.)</p>
 </script>
 
-<script typ type="text/ng-template" id="filterTip.html">


+<script type="text/ng-template" id="filterTip.html">
     <ol>
       <li>Where clause to filter data from source</li>
       <li>Do not include date column which will be used for incremental refresh</li>
       <li>Do not include "Where"</li>
     </ol>
 </script>
-
-<script type="text/ng-template" id="separateTimeColumnTip.html">


-<p>For cases where fact table saves date and hour at two columns (KYLIN-1427)</p>
+<script type="text/ng-template" id="separateTimeColumnTip.html">
+  <p>For cases where fact table saves date and hour at two columns (KYLIN-1427)</p>
 </script>

http://git-wip-us.apache.org/repos/asf/kylin/blob/60a7c747/webapp/app/partials/modelDesigner/model_info.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/model_info.html b/webapp/app/partials/modelDesigner/model_info.html
index cab710b..1e83426 100644
--- a/webapp/app/partials/modelDesigner/model_info.html
+++ b/webapp/app/partials/modelDesigner/model_info.html
@@ -80,7 +80,7 @@
     </div>
 </div>
 
-<script type="text/ng-template" id="modelNameTip.html">


+<script type="text/ng-template" id="modelNameTip.html">
 <ol>
   <li>Model name is unique name of entire system.</li>
   <li>Can not edit model name after created.</li>


Mime
View raw message