IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small improvements to dashboard alerts, less intrusive, do not push down page anymore, Closes #822

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-09-18 15:07:49 +02:00
parent f2a6fc4d5a
commit a68a179c1e
4 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/controllers/dashboardNavCtrl.js
View File

@ -78,7 +78,7 @@ function (angular, _, moment, config, store) {
var clone = angular.copy($scope.dashboard); var clone = angular.copy($scope.dashboard);
$scope.db.saveDashboard(clone) $scope.db.saveDashboard(clone)
.then(function(result) { .then(function(result) {
alertSrv.set('Dashboard Saved', 'Dashboard has been saved as "' + result.title + '"','success', 5000); alertSrv.set('Dashboard Saved', 'Saved as "' + result.title + '"','success', 3000);
if (result.url !== $location.path()) { if (result.url !== $location.path()) {
$location.search({}); $location.search({});
@ -88,7 +88,7 @@ function (angular, _, moment, config, store) {
$rootScope.$emit('dashboard-saved', $scope.dashboard); $rootScope.$emit('dashboard-saved', $scope.dashboard);
}, function(err) { }, function(err) {
alertSrv.set('Save failed', err, 'error',5000); alertSrv.set('Save failed', err, 'error', 5000);
}); });
}; };

2
src/css/less/bootswatch.light.less
View File

@ -59,6 +59,7 @@ a.text-success:hover { color: darken(@green, 10%); }
} }
.brand { .brand {
padding: 0px 15px;
&:hover { &:hover {
color: @navbarLinkColorHover; color: @navbarLinkColorHover;
@ -461,7 +462,6 @@ legend {
// ----------------------------------------------------- // -----------------------------------------------------
.alert { .alert {
.border-radius(0);
text-shadow: none; text-shadow: none;
&-heading, h1, h2, h3, h4, h5, h6 { &-heading, h1, h2, h3, h4, h5, h6 {

37
src/css/less/overrides.less
View File

@ -317,13 +317,38 @@ div.flot-text {
color: @textColor !important; color: @textColor !important;
} }
.dashboard-notice { .page-alert-list {
z-index:8000; z-index:8000;
margin-left:0px; min-width: 300px;
padding:3px 0px 3px 0px; max-width: 300px;
width:100%; position: fixed;
padding-left:20px; right: 20px;
color: @white; top: 56px;
.alert {
color: @white;
padding-bottom: 13px;
position: relative;
}
.alert-close {
position: absolute;
top: -4px;
right: -2px;
width: 19px;
height: 19px;
padding: 0;
background: @grayLighter;
border-radius: 50%;
border: none;
font-size: 1.1rem;
color: @grayDarker;
}
.alert-title {
font-weight: bold;
padding-bottom: 2px;
}
} }

17
src/index.html
View File

@ -24,12 +24,17 @@
<link rel="stylesheet" href="css/grafana.light.min.css" ng-if="grafana.style === 'light'"> <link rel="stylesheet" href="css/grafana.light.min.css" ng-if="grafana.style === 'light'">
<div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} dashboard-notice" ng-show="$last"> <div class="page-alert-list">
<button type="button" class="close" ng-click="dashAlerts.clear(alert)" style="padding-right:50px">&times;</button> <div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} alert">
<strong>{{alert.title}}</strong> <span ng-bind-html='alert.text'></span> <div style="padding-right:10px" class='pull-right small'> {{$index + 1}} alert(s) </div> <button type="button" class="alert-close" ng-click="dashAlerts.clear(alert)">
</div> <i class="icon-remove-sign"></i>
</button>
<div class="alert-title">{{alert.title}}</div>
<div ng-bind-html='alert.text'></div>
</div>
</div>
<div ng-view></div> <div ng-view></div>
</body> </body>
</html> </html>