Fix monitor display bugs

Change-Id: I14e0e35331049d480beed1fdf721df1bf81dd4ba
Issue-Id: USECASEUI-54
Signed-off-by: shentao <shentao@chinamobile.com>

5 files changed, 26 insertions, 20 deletions

diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-chart.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-chart.html
index 03579f60..c04f1cff 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-chart.html
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-chart.html
@@ -77,14 +77,14 @@
 										</select>
 										</div>
 									</div>
-									<div style="float:left">
+									<div style="float:left" ng-show="goIsShow">
 										<button style="padding-top:6px;" class="btn btn-default" ng-click="genDiagram()">submit</button>
 									</div>
 								</p>
 							</div>
 						
 							<div class="col-md-6 col-sm-12" style="width:100%">
-								<div class="panel panel-success">
+								<div class="panel panel-success" ng-show="chartShow">
 									<div class="panel-heading">Chart
 										<button ng-click="generateCsv('cpu');" class="btn btn-primary" style="float: right;margin-top:-7px;display: none ">CSV</button>
 									</div>
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html
index fdae95b9..0d83682e 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html
@@ -14,7 +14,7 @@
     limitations under the License.
 -->
 <div class="templatemo-content" ng-controller="alarmGridCtrl">
-    <h1>VNF Alarm</h1>
+    <h3>VNF Alarm</h3>
     <div class="row margin-bottom-20">
     </div>
     <div class="row margin-bottom-10">
@@ -40,14 +40,16 @@
         <button ng-click="alarmSearch()">search</button>
     </ul>
     <ul class="list" ng-show='menuState.show'>
-        <li>Start Time
-            <input type="text" class="form-control" readonly ng-click="open1()" uib-datepicker-popup ng-model="condition4" is-open="popup1.opened" datepicker-options ng-required="true" close-text="Close" />
+        <li><p class="input-group" style="float:left">
+			<div style="float:left;line-height:100px;padding-right:4px;">Start Time</div>
+            <div style="float:left;padding-top:33px"><input type="text" class="form-control" readonly ng-click="open1()" uib-datepicker-popup ng-model="condition4" is-open="popup1.opened" datepicker-options ng-required="true" close-text="Close" /></div>
             <div style="display:block;float:left" uib-timepicker ng-model="condition4" hour-step minute-step show-meridian></div>
-        </li>
-        <li>
-            End Time <input type="text" class="form-control" ng-click="open2()" readonly uib-datepicker-popup ng-model="condition5" is-open="popup2.opened" datepicker-options ng-required="true" close-text="Close" />
+        </p></li>
+        <li><p class="input-group" style="float:left">
+            <div style="float:left;line-height:100px;padding-right:4px;">End Time</div>
+			<div style="float:left;padding-top:33px"><input type="text" class="form-control" ng-click="open2()" readonly uib-datepicker-popup ng-model="condition5" is-open="popup2.opened" datepicker-options ng-required="true" close-text="Close" /></div>
             <div style="display:block;float:left" uib-timepicker ng-model="condition5" hour-step minute-step show-meridian></div>
-        </li>
+        </p></li>
     </ul>
     <div class="row">
         <div class="col-md-5" style="border-top:1px dotted #ddd">
@@ -60,7 +62,7 @@
     </div>
     <div class="row">
         <div class="col-md-11">
-            <h4 class="margin-bottom-15">Another Table of Existing Users</h4>
+            <h4 class="margin-bottom-15">Query Result</h4>
         </div>
         <div class="col-md-1">
 
@@ -69,7 +71,7 @@
         </div>
     </div>
     <div>
-        <div ui-grid="gridOptions" style="width: 100%;text-align: center;" ui-grid-edit
+        <div ui-grid="gridOptions" style="width:100%;text-align:center;" ui-grid-edit
              ui-grid-pagination
              ui-grid-selection ui-grid-resize-columns ui-grid-auto-resize>
         </div>
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/left-menu.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/left-menu.html
index cba16b59..728b3280 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/left-menu.html
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/left-menu.html
@@ -17,7 +17,7 @@
     <div id="main-wrapper">
         <div id="navbar" role="navigation">
             <div class="navbar-header">
-                <div class="logo"><h1>UUI</h1></div>
+                <div class="logo"><h1>Usecase UI</h1></div>
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
                     <span class="sr-only">Toggle navigation</span>
                     <span class="icon-bar"></span>
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-chart.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-chart.html
index 9f9ccbb3..eb6c50fb 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-chart.html
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-chart.html
@@ -94,13 +94,13 @@
 										</div>
 									</div>
 									<div ng-show="goIsShow" style="float:left">
-										<button style="padding-top:6px;" class="btn btn-default" ng-click="genDiagram()">Go</button>
+										<button style="padding-top:6px;" class="btn btn-default" ng-click="genDiagram()">submit</button>
 									</div>
 								</p>
 							</div>
 						
 							<div class="col-md-12 col-sm-12" >
-								<div class="panel panel-success">
+								<div class="panel panel-success" ng-show="chartShow">
 									<div class="panel-heading">Chart
 										<button ng-click="generateCsv('cpu');" class="btn btn-primary" style="float: right;margin-top:-7px;display: none ">CSV</button>
 									</div>
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html
index f2fc7320..83f4385e 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html
@@ -15,7 +15,7 @@
 -->
 <div class="templatemo-content-wrapper" ng-controller="perGridCtrl">
     <div class="templatemo-content">
-        <h1>Performance</h1>
+        <h3>Performance</h3>
         <div>
             <ul class="list">
                 <li>Source Id <input type="text" ng-model="seek1"/></li>
@@ -24,10 +24,14 @@
                 <button ng-click="getSearch()">search</button>
             </ul>
             <ul class="list" ng-show='menuState.show'>
-                <li>Start Time <input type="text" class="form-control" readonly ng-click="open1()" uib-datepicker-popup ng-model="seek4" is-open="popup1.opened" datepicker-options ng-required="true" close-text="Close" />
-                    <div style="display:block;float:left" uib-timepicker ng-model="seek4" hour-step minute-step show-meridian></div></li>
-                <li>End Time <input type="text" class="form-control" readonly ng-click="open2()" uib-datepicker-popup ng-model="seek5" is-open="popup2.opened" datepicker-options ng-required="true" close-text="Close" />
-                    <div style="display:block;float:left" uib-timepicker ng-model="seek5" hour-step minute-step show-meridian></div></li>
+                <li> <p class="input-group" style="float:left">
+						<div style="float:left;line-height:100px;padding-right:4px;">StartTime</div><div style="float:left;padding-top:33px"><input type="text" class="form-control" readonly ng-click="open1()" uib-datepicker-popup ng-model="seek4" is-open="popup1.opened" datepicker-options ng-required="true" close-text="Close" /></div>
+						<div style="display:block;float:left;" uib-timepicker ng-model="seek4" hour-step minute-step show-meridian></div>
+					</p></li>
+                <li><p class="input-group" style="float:left">
+					<div style="float:left;line-height:100px;padding-right:4px;">End Time</div><div style="float:left;padding-top:33px"><input type="text" class="form-control" readonly ng-click="open2()" uib-datepicker-popup ng-model="seek5" is-open="popup2.opened" datepicker-options ng-required="true" close-text="Close" /></div>
+                    <div style="display:block;float:left" uib-timepicker ng-model="seek5" hour-step minute-step show-meridian></div>
+					</p></li>
             </ul>
             <div class="row">
                 <div class="col-md-5" style="border-top:1px dotted #ddd">
@@ -42,7 +46,7 @@
             <div class="row">
                 <div class="col-md-11">
                     <div class="table-responsive">
-                        <h4 class="margin-bottom-15">Another Table of Existing Users</h4>
+                        <h4 class="margin-bottom-15">Query Result</h4>
                     </div>
                 </div>
                 <div class="col-md-1">