Merge pull request #437 from cardosogabriel/deploy-add3

HAWKULAR-370 Add Deployment modal

console/src/main/scripts/bower.json

@@ -22,7 +22,7 @@
     "ngInfiniteScroll": "1.2.1",
     "bootstrap-select": "1.6",
     "hawkular-charts": "0.4.15",
-    "hawkular-ui-services": "0.6.3",
+    "hawkular-ui-services": "0.6.7",
     "hawtio-core-navigation": "2.0.51",
     "hawtio-core": "2.0.18",
     "hawtio-template-cache": "2.0.3",

console/src/main/scripts/plugins/metrics/html/app-details/modals/detail-deployments-add.html

@@ -5,43 +5,34 @@
   <h4 class="modal-title">Add Deployment</h4>
 </div>
 
+<wizard name="deployAdd" on-finish="dac.finishedDeployWizard()">
 
-<div class="modal-body">
-
-  <wizard name="deployAdd" on-finish="dac.finishedDeployWizard()">
-
-    <wz-step title="Select a Deployment File">
-
+  <wz-step title="Select a Deployment File">
+    <div class="modal-body">
       <p><strong>Step 1 of 3: Select a Deployment File</strong></p>
-
-      <p class="required-info">* All fields are required.</p>
-
+      <p class="hk-required-info"><span class="hk-required">*</span> All fields are required.</p>
       <form class="form-horizontal" name="deployFileForm" novalidate>
         <div class="form-group">
           <label class="col-sm-3 control-label">Deployment File</label>
-
           <div class="col-sm-9">
             <input fileread="dac.deploymentData.binaryFile" type="file" accept="application/zip"
                    ng-model="dac.deploymentData.filePath" hk-valid-file required
                    name="deployFile" />
-            <i ng-show="deployFileForm.deployFile.$error.required">* required</i><br>
+            <!-- <i ng-show="deployFileForm.deployFile.$error.required">* required</i><br> -->
           </div>
         </div>
       </form>
-      <div class="pull-right">
+    </div>
+    <div class="modal-footer">
         <button type="button" class="btn btn-default" ng-click="dac.onClose()">Cancel</button>
         <button type="button" wz-next class="btn btn-primary"
                 ng-disabled="deployFileForm.$invalid"
                 ng-click="dac.exitStep1()" >Next &#62;</button>
-      </div>
-
-
-    </wz-step>
-
-
-    <!-- Verify File Step  -->
-    <wz-step title="Verify File">
+    </div>
+  </wz-step>
 
+  <wz-step title="Verify File">
+    <div class="modal-body">
       <p><strong>Step 2 of 3: Verify File</strong></p>
 
       <div class="hk-form-verify hk-form-read-only">
@@ -105,38 +96,38 @@ <h4 class="modal-title">Add Deployment</h4>
           <!--</div>-->
         </form>
       </div>
-      <div class="pull-right">
-        <button type="button" wz-previous class="btn btn-default">&#60; Back</button>
-        <button type="button" wz-next class="btn btn-primary" ng-click="dac.exitStep2()">Next &#62;</button>
-      </div>
-    </wz-step>
+    </div>
+    <div class="modal-footer">
+      <button type="button" wz-previous class="btn btn-default">&#60; Back</button>
+      <button type="button" wz-next class="btn btn-primary" ng-click="dac.exitStep2()">Next &#62;</button>
+    </div>
+  </wz-step>
 
 
-    <wz-step title="Upload and Deploy">
+  <wz-step title="Upload and Deploy">
 
-      <div class="">
-        <p><strong>Step 3 of 3: Upload and Deploy</strong></p>
+    <div class="modal-body">
+      <p><strong>Step 3 of 3: Upload and Deploy</strong></p>
 
-        <div class="text-center hk-spinner-container" ng-show="dac.deploymentData.uploading">
-          <div class="spinner spinner-lg"></div>
-        </div>
-
-        <div class="alert alert-success" ng-show="!dac.deploymentData.uploading">
-          <span class="pficon pficon-ok"></span>
-          <strong>Success!</strong> The file was successfully uploaded and deployed.
-        </div>
+      <div class="text-center hk-spinner-container" ng-show="dac.deploymentData.uploading">
+        <div class="spinner spinner-lg"></div>
+      </div>
 
-        <div class="alert alert-error" ng-show="!dac.deploymentData.uploading">
-          <span class="pficon pficon-error-circle-o-"></span>
-          <strong>Error!</strong> An error has occurred with the deployment.
-        </div>
+      <div class="alert alert-success" ng-show="!dac.deploymentData.uploading">
+        <span class="pficon pficon-ok"></span>
+        <strong>Success!</strong> The file was successfully uploaded and deployed.
       </div>
 
-      <div class="pull-right">
-        <button type="button" class="btn btn-primary"  wz-finish>OK</button>
+      <div class="alert alert-error" ng-show="!dac.deploymentData.uploading">
+        <span class="pficon pficon-error-circle-o-"></span>
+        <strong>Error!</strong> An error has occurred with the deployment.
       </div>
+    </div>
 
-    </wz-step>
-  </wizard>
+    <div class="modal-footer">
+      <button type="button" class="btn btn-primary"  wz-finish>OK</button>
+    </div>
 
-</div>
+  </wz-step>
+
+</wizard>

console/src/main/scripts/plugins/metrics/html/modals/alerts-ds-setup.html

@@ -85,10 +85,10 @@ <h4 class="modal-title">Datasource Alert Settings</h4>
   </tabset>
 </div>
 <div class="modal-footer alert-settings">
+  <button type="button" class="btn btn-default" ng-click="das.cancel()">Cancel</button>
   <button type="button" class="btn btn-primary" ng-click="das.save()"
           ng-disabled="das.saveProgress || !das.isSettingChange">
     <div ng-show="das.saveProgress" class="spinner spinner-xs hk-modal-spinner"></div>
     Save
   </button>
-  <button type="button" class="btn btn-default" ng-click="das.cancel()">Cancel</button>
 </div>

console/src/main/scripts/plugins/metrics/html/modals/alerts-jvm-setup.html

@@ -164,10 +164,10 @@ <h4 class="modal-title">JVM Alert Settings</h4>
 
 </div>
 <div class="modal-footer">
+  <button type="button" class="btn btn-default" ng-click="jas.cancel()">Cancel</button>
   <button type="button" class="btn btn-primary" ng-click="jas.save()"
           ng-disabled="jas.saveProgress || !jas.isSettingChange">
     <div ng-show="jas.saveProgress" class="spinner spinner-xs hk-modal-spinner"></div>
     Save
   </button>
-  <button type="button" class="btn btn-default" ng-click="jas.cancel()">Cancel</button>
 </div>

console/src/main/scripts/plugins/metrics/html/modals/alerts-url-availability-setup.html

@@ -6,27 +6,25 @@ <h4 class="modal-title">Availability Alert Settings</h4>
 </div>
 
 <div class="modal-body hk-alert-settings">
-  <div class="hk-tab-content">
-    <p>Configure conditions settings for Availability alerts and notifications.</p>
+  <p>Configure conditions settings for Availability alerts and notifications.</p>
 
-    <form class="form-horizontal">
-      <hk-fieldset-dampening hk-duration="mas.adm.avail.responseDuration"
-                             hk-title="Downtime"
-                             hk-switch="mas.adm.avail.conditionEnabled"
-                             hk-title-met="Everytime the URL is down."
-                             hk-title-unmet="Only when the URL is down for more than:"></hk-fieldset-dampening>
+  <form class="form-horizontal">
+    <hk-fieldset-dampening hk-duration="mas.adm.avail.responseDuration"
+                           hk-title="Downtime"
+                           hk-switch="mas.adm.avail.conditionEnabled"
+                           hk-title-met="Everytime the URL is down."
+                           hk-title-unmet="Only when the URL is down for more than:"></hk-fieldset-dampening>
 
-      <hk-fieldset-notification hk-alert-email="mas.adm.avail.email"
-                                hk-disabled="!mas.adm.avail.conditionEnabled"></hk-fieldset-notification>
-    </form>
-  </div>
+    <hk-fieldset-notification hk-alert-email="mas.adm.avail.email"
+                              hk-disabled="!mas.adm.avail.conditionEnabled"></hk-fieldset-notification>
+  </form>
 </div>
 
 <div class="modal-footer">
+  <button type="button" class="btn btn-default" ng-click="mas.cancel()">Cancel</button>
   <button type="button" class="btn btn-primary" ng-click="mas.save()"
           ng-disabled="!mas.isSettingChange || mas.saveProgress">
     <div ng-show="mas.saveProgress" class="spinner spinner-xs hk-modal-spinner"></div>
     Save
   </button>
-  <button type="button" class="btn btn-default" ng-click="mas.cancel()">Cancel</button>
 </div>

console/src/main/scripts/plugins/metrics/html/modals/alerts-url-response-setup.html

@@ -6,40 +6,42 @@ <h4 class="modal-title">Response Time Alert Settings</h4>
 </div>
 
 <div class="modal-body hk-alert-settings">
-  <div class="hk-tab-content">
-    <p>Configure conditions settings for Response Time alerts and notifications.</p>
+  <div class="row">
+    <div class="col-sm-9">
+      <p>Configure conditions settings for Response Time alerts and notifications.</p>
+    </div>
+    <div class="col-sm-3">
+      <hk-switch hk-model="mas.adm.thres.conditionEnabled"
+                 id="usage-less-switch" class="pull-right"></hk-switch>
+    </div>
+  </div>
 
-    <form class="form-horizontal">
-      <fieldset>
-        <legend>Response Time</legend>
-        <div class="form-group">
-          <label class="col-sm-3 control-label" >Time (maximum, {{mas.adm.thres.conditionThreshold}})</label>
-          <div class="col-sm-5 inline-row">
-            <hk-time-input hk-duration="mas.adm.thres.conditionThreshold"
-                           hk-disabled="!mas.adm.thres.conditionEnabled"
-                           id="dw-duration"></hk-time-input>
-          </div>
-          <div class="col-sm-4">
-            <hk-switch hk-model="mas.adm.thres.conditionEnabled"
-                       id="usage-less-switch" class="pull-right"></hk-switch>
-          </div>
+  <form class="form-horizontal">
+    <fieldset>
+      <legend>Response Time</legend>
+      <div class="form-group">
+        <label class="col-sm-3 control-label" >Time (maximum)</label>
+        <div class="col-sm-5 inline-row">
+          <hk-time-input hk-duration="mas.adm.thres.conditionThreshold"
+                         hk-disabled="!mas.adm.thres.conditionEnabled"
+                         id="dw-duration"></hk-time-input>
         </div>
-      </fieldset>
+      </div>
+    </fieldset>
 
-      <hk-fieldset-dampening hk-duration="mas.adm.thres.responseDuration"
-                             hk-disabled="!mas.adm.thres.conditionEnabled"></hk-fieldset-dampening>
+    <hk-fieldset-dampening hk-duration="mas.adm.thres.responseDuration"
+                           hk-disabled="!mas.adm.thres.conditionEnabled"></hk-fieldset-dampening>
 
-      <hk-fieldset-notification hk-alert-email="mas.adm.thres.email"
-                                hk-disabled="!mas.adm.thres.conditionEnabled"></hk-fieldset-notification>
-    </form>
-  </div>
+    <hk-fieldset-notification hk-alert-email="mas.adm.thres.email"
+                              hk-disabled="!mas.adm.thres.conditionEnabled"></hk-fieldset-notification>
+  </form>
 </div>
 
 <div class="modal-footer">
+  <button type="button" class="btn btn-default" ng-click="mas.cancel()">Cancel</button>
   <button type="button" class="btn btn-primary" ng-click="mas.save()"
           ng-disabled="!mas.isSettingChange || mas.saveProgress">
     <div ng-show="mas.saveProgress" class="spinner spinner-xs hk-modal-spinner"></div>
     Save
   </button>
-  <button type="button" class="btn btn-default" ng-click="mas.cancel()">Cancel</button>
 </div>