IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 19:00:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(alerting): fix spacing

Browse Source
This commit is contained in:
bergquist 2016-05-16 14:29:54 +02:00
parent 495404ef73
commit 2ce9d4571c
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/services/alert_srv.ts
View File

@ -78,12 +78,14 @@ export class AlertSrv {
scope.text2 = payload.text2;
scope.confirmText = payload.confirmText;
scope.confirmTextRequired = payload.confirmText !== "";
scope.onConfirm = function() {
if (!scope.confirmTextRequired || (scope.confirmTextRequired && scope.confirmTextValid)) {
payload.onConfirm();
scope.dismiss();
}
};
scope.updateConfirmText = function(value) {
scope.confirmInput = value;
scope.confirmTextValid = scope.confirmText === scope.confirmInput;

7
public/app/features/alerts/partials/alerts_page.html
View File

@ -20,17 +20,17 @@
</thead>
<tr ng-repeat="alert in ctrl.alerts">
<td>
<a href="/alerts/{{alert.id}}/states">
<a href="alerts/{{alert.id}}/states">
{{alert.title}}
</a>
</td>
<td class="text-center">
<a href="/alerts/{{alert.id}}/states">
<a href="alerts/{{alert.id}}/states">
<i class="icon-gf {{alert.iconCss}}"></i>
</a>
</td>
<td class="text-center">
<a href="/dashboard/{{alert.dashboardUri}}?panelId={{alert.panelId}}&fullscreen&edit" class="btn btn-inverse btn-small">
<a href="dashboard/{{alert.dashboardUri}}?panelId={{alert.panelId}}&fullscreen&edit" class="btn btn-inverse btn-small">
<i class="fa fa-edit"></i>
edit
</a>
@ -39,4 +39,3 @@
</table>
</div>

3
public/app/partials/confirm_modal.html
View File

@ -23,7 +23,7 @@
<div class="modal-content-confirm-text" ng-if="confirmTextRequired">
<span><i class="fa fa-warning"></i>Please type in the name of the dashboard to confirm.</span>
<span><i class="fa fa-warning"></i> Please type in the name of the dashboard to confirm.</span>
<input type="text" class="gf-form-input width-16 {{confirmInputStyle}}" style="display: inline-block;" ng-model="confirmInput" ng-change="updateConfirmText(confirmInput)">
</div>
@ -34,4 +34,3 @@
</div>
</div>

1
public/sass/components/_modals.scss
View File

@ -173,4 +173,3 @@
text-overflow: ellipsis;
}
}