Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Adjustmenting save button position
Browse files Browse the repository at this point in the history
  • Loading branch information
@cardosogabriel @mtho11
cardosogabriel authored and mtho11 committed Sep 9, 2015
1 parent 4100b96 commit a57faae
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 39 deletions.
2 changes: 1 addition & 1 deletion console/src/main/scripts/plugins/metrics/html/modals/alerts-ds-setup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion console/src/main/scripts/plugins/metrics/html/modals/alerts-jvm-setup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
24 changes: 11 additions & 13 deletions console/src/main/scripts/plugins/metrics/html/modals/alerts-url-availability-setup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
50 changes: 26 additions & 24 deletions console/src/main/scripts/plugins/metrics/html/modals/alerts-url-response-setup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 4 additions & 0 deletions console/src/main/scripts/plugins/metrics/less/metrics.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ h3 {
font-size: ceil(@font-size-base + 1);
}

a:hover {
cursor: pointer;
}


// Alerts

Expand Down

0 comments on commit a57faae

Please sign in to comment.