From 89db08bf9aab471a41d9d3293ae7dcfb0925d522 Mon Sep 17 00:00:00 2001
From: zx chen <346839943@qq.com>
Date: Thu, 18 Aug 2016 18:22:45 +0800
Subject: [PATCH] KYLIN-1866-web-add-streaming-tip-issue

---
 webapp/app/less/app.less                           |  2 +-
 .../app/partials/cubeDesigner/streamingConfig.html | 31 +++++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/webapp/app/less/app.less b/webapp/app/less/app.less
index cc52b41..7698843 100644
--- a/webapp/app/less/app.less
+++ b/webapp/app/less/app.less
@@ -790,7 +790,7 @@ input:-moz-placeholder {
 }
 
 .panel-group .panel{
-  overflow: auto !important;
+  overflow: visible !important;
 }
 
 .middle-popover .popover{
diff --git a/webapp/app/partials/cubeDesigner/streamingConfig.html b/webapp/app/partials/cubeDesigner/streamingConfig.html
index 38cb2cd..ed0ef5e 100644
--- a/webapp/app/partials/cubeDesigner/streamingConfig.html
+++ b/webapp/app/partials/cubeDesigner/streamingConfig.html
@@ -32,6 +32,7 @@
         <div class="row">
           <label class="col-xs-12 col-sm-3 control-label no-padding-right">
             <b>Topic</b>
+            <i class="fa fa-info-circle" kylinpopover placement="right" title="Topic"  template="KafkaTopicTip.html"></i>
           </label>
           <div class="col-xs-12 col-sm-6"   ng-class="{'has-error':form.cube_streaming_form.topic.$invalid && (form.cube_streaming_form.topic.$dirty||form.cube_streaming_form.$submitted)}">
             <input  ng-if="state.mode=='edit'"  name="topic" required ng-model="kafkaMeta.topic" type="text"
@@ -137,6 +138,7 @@
             <div class="row">
               <label class="col-xs-12 col-sm-3 control-label no-padding-right">
                 <b>Timeout</b>
+                <i class="fa fa-info-circle" kylinpopover placement="right" title="Timeout" template="TimeoutTip.html"></i>
               </label>
 
               <div class="col-xs-12 col-sm-6"
@@ -162,6 +164,7 @@
             <div class="row">
               <label class="col-xs-12 col-sm-3 control-label no-padding-right">
                 <b>Buffer Size</b>
+                <i class="fa fa-info-circle" kylinpopover placement="right" title="Buffer Size" template="BufferSizecTip.html"></i>
               </label>
 
               <div class="col-xs-12 col-sm-6"
@@ -187,6 +190,7 @@
             <div class="row">
               <label class="col-xs-12 col-sm-3 control-label no-padding-right">
                 <b>Margin</b>
+                <i class="fa fa-info-circle" kylinpopover placement="right" title="Margin" template="MarginTip.html"></i>
               </label>
 
               <div class="col-xs-12 col-sm-6"
@@ -224,6 +228,7 @@
             <div class="row">
               <label class="col-xs-12 col-sm-3 control-label no-padding-right">
                 <b>Parser Name</b>
+                <i class="fa fa-info-circle" kylinpopover placement="right" title="Parser Name" template="ParserName.html"></i>
               </label>
 
               <div class="col-xs-12 col-sm-6"
@@ -246,7 +251,8 @@
           <div class="form-group" ng-if="state.mode=='edit'" ng-class="{'required':state.mode=='edit'}">
             <div class="row">
               <label class="col-xs-12 col-sm-3 control-label no-padding-right">
-                <b>Parser Timestamp Column</b>
+                <b>Parser Timestamp Field</b>
+                <i class="fa fa-info-circle" kylinpopover placement="right" title="Parser Timestamp Field" template="ParserTimestampFieldsTip.html"></i>
               </label>
 
               <div class="col-xs-12 col-sm-6 streamingParserCtr">
@@ -264,6 +270,7 @@
             <div class="row">
               <label class="col-xs-12 col-sm-3 control-label no-padding-right">
                 <b>Parser Properties</b>
+                <i class="fa fa-info-circle" kylinpopover placement="right" title="Parser Properties" template="ParserPropertiesTip.html"></i>
               </label>
 
               <div class="col-xs-12 col-sm-6"
@@ -289,3 +296,25 @@
     </div>
   </form>
 </div>
+
+<script type="text/ng-template" id="KafkaTopicTip.html">
+    <p>Input the kafka topic that contains source data.</p>
+  </script>
+<script type="text/ng-template" id="TimeoutTip.html">
+    <p>Set timeout for kafka client.</p>
+  </script>
+<script type="text/ng-template" id="BufferSizecTip.html">
+    <p>Set byte size for kafka client’s buffer.</p>
+  </script>
+<script type="text/ng-template" id="MarginTip.html">
+    <p>When the messages in kafka is not strictly sorted on timestamp, read more data (expressed in ts) before and after the specified interval to avoid data loss.</p>
+  </script>
+<script type="text/ng-template" id="ParserName.html">
+    <p>Set the parser to parse source data messages. The default parser works for json messages with a timestamp field.</p>
+  </script>
+<script type="text/ng-template" id="ParserTimestampFieldsTip.html">
+    <p>Provide the name of the timestamp field to the default parser.</p>
+  </script>
+<script type="text/ng-template" id="ParserPropertiesTip.html">
+    <p>Provide a list of KV properties to the parser, delimited by semicolon.</p>
+</script>
-- 
2.7.2.windows.1