From 6aba266b3cf20c8caa41fd246772ebc344051df8 Mon Sep 17 00:00:00 2001
From: shentao <shentao@chinamobile.com>
Date: Wed, 15 Nov 2017 16:38:31 +0800
Subject: Fix monitor display bugs

Change-Id: I14e0e35331049d480beed1fdf721df1bf81dd4ba
Issue-Id: USECASEUI-54
Signed-off-by: shentao <shentao@chinamobile.com>
---
 .../app/uui/fusion/scripts/view-models/alarm.html    | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html')

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>
-- 
cgit 1.2.3-korg