diff --git a/src/app/features/admin/adminUsersCtrl.js b/src/app/features/admin/adminUsersCtrl.js index 3c45d067a6e..bee287ce6af 100644 --- a/src/app/features/admin/adminUsersCtrl.js +++ b/src/app/features/admin/adminUsersCtrl.js @@ -20,8 +20,7 @@ function (angular) { $scope.deleteUser = function(user) { $scope.appEvent('confirm-modal', { - title: 'Delete user', - text: 'Are you sure you want to delete user: ' + user.login, + title: 'Do you want to delete ' + user.login + '?', onConfirm: function() { backendSrv.delete('/api/admin/users/' + user.id).then(function() { $scope.getUsers(); diff --git a/src/app/features/dashboard/dashboardNavCtrl.js b/src/app/features/dashboard/dashboardNavCtrl.js index 9eb002ac499..73ffc2e4e4d 100644 --- a/src/app/features/dashboard/dashboardNavCtrl.js +++ b/src/app/features/dashboard/dashboardNavCtrl.js @@ -78,7 +78,8 @@ function (angular, _, moment) { $scope.appEvent('confirm-modal', { title: 'Someone else has updated this dashboard!', - text: "Do you STILL want to save?", + text: "Would you still like to save this dashboard?", + yesText: "Save & Overwrite", icon: "fa-warning", onConfirm: function() { $scope.saveDashboard({overwrite: true}); @@ -91,7 +92,8 @@ function (angular, _, moment) { $scope.appEvent('confirm-modal', { title: 'Another dashboard with the same name exists', - text: "Do you STILL want to save and ovewrite it?", + text: "Would you still like to save this dashboard?", + yesText: "Save & Overwrite", icon: "fa-warning", onConfirm: function() { $scope.saveDashboard({overwrite: true}); @@ -102,8 +104,7 @@ function (angular, _, moment) { $scope.deleteDashboard = function() { $scope.appEvent('confirm-modal', { - title: 'Delete dashboard', - text: 'Do you want to delete dashboard ' + $scope.dashboard.title + '?', + title: 'Do you want to delete dashboard ' + $scope.dashboard.title + '?', onConfirm: function() { $scope.deleteDashboardConfirmed(); } diff --git a/src/app/features/dashboard/rowCtrl.js b/src/app/features/dashboard/rowCtrl.js index bf10d9842a3..6a79460da5b 100644 --- a/src/app/features/dashboard/rowCtrl.js +++ b/src/app/features/dashboard/rowCtrl.js @@ -49,8 +49,7 @@ function (angular, app, _, config) { $scope.delete_row = function() { $scope.appEvent('confirm-modal', { - title: 'Delete row', - text: 'Are you sure you want to delete this row?', + title: 'Are you sure you want to delete this row?', onConfirm: function() { $scope.dashboard.rows = _.without($scope.dashboard.rows, $scope.row); } @@ -82,8 +81,7 @@ function (angular, app, _, config) { $scope.remove_panel_from_row = function(row, panel) { $scope.appEvent('confirm-modal', { - title: 'Remove panel', - text: 'Are you sure you want to remove this panel?', + title: 'Are you sure you want to remove this panel?', onConfirm: function() { row.panels = _.without(row.panels, panel); } diff --git a/src/app/partials/confirm_modal.html b/src/app/partials/confirm_modal.html index 0988187d661..8730cfb1596 100644 --- a/src/app/partials/confirm_modal.html +++ b/src/app/partials/confirm_modal.html @@ -17,29 +17,9 @@
- - + +
- - - - - - - - - - - - - - - - - - - - diff --git a/src/app/partials/unsaved-changes.html b/src/app/partials/unsaved-changes.html index 623c262a592..fd31ba18db5 100644 --- a/src/app/partials/unsaved-changes.html +++ b/src/app/partials/unsaved-changes.html @@ -1,20 +1,22 @@ -
-
- - - Unsaved changes - - +
+ + + + + +
+
-
-
- - - -
+
+ Unsaved changes
+ +
+ + + +
+
diff --git a/src/app/services/alertSrv.js b/src/app/services/alertSrv.js index bf54714c4db..d38c1f4aecc 100644 --- a/src/app/services/alertSrv.js +++ b/src/app/services/alertSrv.js @@ -65,6 +65,8 @@ function (angular, _) { scope.text = payload.text; scope.onConfirm = payload.onConfirm; scope.icon = payload.icon || "fa-check"; + scope.yesText = payload.yesText || "Yes"; + scope.noText = payload.noText || "Cancel"; var confirmModal = $modal({ template: './app/partials/confirm_modal.html', diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less index 0984d8b5d20..b6c127c5319 100644 --- a/src/css/less/grafana.less +++ b/src/css/less/grafana.less @@ -259,7 +259,7 @@ .confirm-modal { border: 1px solid @grafanaTargetFuncBackground; max-width: 500px; - background-color: @modalBackground; + background-color: @grafanaPanelBackground; text-align: center; .modal-close { @@ -267,22 +267,26 @@ font-size: 140%; padding: 10px; } + .confirm-modal-icon { padding-top: 41px; font-size: 280%; color: @green; padding-bottom: 20px; } + .confirm-modal-title { font-size: 18px; color: @linkColor; margin-bottom: 15px; } + .confirm-modal-text { font-size: 16px; - margin-bottom: 25px; } + .confirm-modal-buttons { + margin-top: 35px; margin-bottom: 35px; button { margin-right: 5px diff --git a/src/css/less/variables.light.less b/src/css/less/variables.light.less index 73564b5aa73..ab04ca01585 100644 --- a/src/css/less/variables.light.less +++ b/src/css/less/variables.light.less @@ -54,7 +54,7 @@ @grafanaTargetFuncBackground: darken(@grafanaTargetBackground, 5%); @grafanaTargetFuncHightlight: darken(@grafanaTargetBackground, 10%); -@modalBackground: @white; +@modalBackground: @bodyBackground; // Scaffolding // -------------------------