From d411836d3f29ff735f78aeeea2585bc4181fe1ba Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 10 Mar 2015 17:42:36 +0100 Subject: [PATCH] clean up alerts --- .../coding-rules-custom-rule-creation.hbs | 4 +- .../coding-rules-manual-rule-creation.hbs | 2 +- .../rule/coding-rules-profile-activation.hbs | 4 +- .../rule/coding-rules-rule-profiles.hbs | 2 +- .../src/main/hbs/issue/manual-issue.hbs | 2 +- .../hbs/quality-gates/quality-gate-edit.hbs | 4 +- .../main/hbs/source-viewer/source-viewer.hbs | 2 +- .../js/coding-rules/bulk-change-modal-view.js | 4 +- .../rule/custom-rule-creation-view.js | 5 +-- .../rule/manual-rule-creation-view.js | 5 +-- .../src/main/js/common/modal-form.js | 4 +- .../sonar-web/src/main/less/components.less | 2 +- .../components/{messages.less => alerts.less} | 43 +++++++++---------- .../sonar-web/src/main/less/deprecated.less | 40 ++++++++--------- 14 files changed, 58 insertions(+), 65 deletions(-) rename server/sonar-web/src/main/less/components/{messages.less => alerts.less} (65%) diff --git a/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-custom-rule-creation.hbs b/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-custom-rule-creation.hbs index 1ebb3cedade..5f402c4fd92 100644 --- a/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-custom-rule-creation.hbs +++ b/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-custom-rule-creation.hbs @@ -9,8 +9,8 @@
-
-
{{t 'coding_rules.reactivate.help'}}
+
+
{{t 'coding_rules.reactivate.help'}}
diff --git a/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-manual-rule-creation.hbs b/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-manual-rule-creation.hbs index 6b256d983de..364c1533e90 100644 --- a/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-manual-rule-creation.hbs +++ b/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-manual-rule-creation.hbs @@ -8,7 +8,7 @@
-
{{t 'coding_rules.reactivate.help'}}
+
{{t 'coding_rules.reactivate.help'}}
diff --git a/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-profile-activation.hbs b/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-profile-activation.hbs index 4f3d1b8abbd..2b47036fd89 100644 --- a/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-profile-activation.hbs +++ b/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-profile-activation.hbs @@ -8,11 +8,11 @@
-
+
{{#empty qualityProfiles}} {{#unless change}} -
{{t 'coding_rules.active_in_all_profiles'}}
+
{{t 'coding_rules.active_in_all_profiles'}}
{{/unless}} {{/empty}} diff --git a/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-rule-profiles.hbs b/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-rule-profiles.hbs index cea2bdaa799..2a28c69d62e 100644 --- a/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-rule-profiles.hbs +++ b/server/sonar-web/src/main/hbs/coding-rules/rule/coding-rules-rule-profiles.hbs @@ -12,7 +12,7 @@ {{/if}} {{#if isTemplate}} -
+
{{t 'coding_rules.quality_profiles.template_caption'}}
{{/if}} diff --git a/server/sonar-web/src/main/hbs/issue/manual-issue.hbs b/server/sonar-web/src/main/hbs/issue/manual-issue.hbs index 5c567daeac3..bbcf333395b 100644 --- a/server/sonar-web/src/main/hbs/issue/manual-issue.hbs +++ b/server/sonar-web/src/main/hbs/issue/manual-issue.hbs @@ -38,7 +38,7 @@
- +
diff --git a/server/sonar-web/src/main/hbs/quality-gates/quality-gate-edit.hbs b/server/sonar-web/src/main/hbs/quality-gates/quality-gate-edit.hbs index 805d65ff307..5aeb891a816 100644 --- a/server/sonar-web/src/main/hbs/quality-gates/quality-gate-edit.hbs +++ b/server/sonar-web/src/main/hbs/quality-gates/quality-gate-edit.hbs @@ -6,7 +6,7 @@
-
+
@@ -19,4 +19,4 @@ {{#eq method "create"}}{{/eq}} {{t 'cancel'}}
- \ No newline at end of file + diff --git a/server/sonar-web/src/main/hbs/source-viewer/source-viewer.hbs b/server/sonar-web/src/main/hbs/source-viewer/source-viewer.hbs index 843f5d004c2..123d21e86a2 100644 --- a/server/sonar-web/src/main/hbs/source-viewer/source-viewer.hbs +++ b/server/sonar-web/src/main/hbs/source-viewer/source-viewer.hbs @@ -82,6 +82,6 @@ {{else}} -
{{t 'code_viewer.no_source_code_displayed_due_to_security'}}
+
{{t 'code_viewer.no_source_code_displayed_due_to_security'}}
{{/if}} diff --git a/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js b/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js index e6fd7fd33c6..0502a8a3ff1 100644 --- a/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js +++ b/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js @@ -37,14 +37,14 @@ define([ var profileBase = _.findWhere(this.options.app.qualityProfiles, { key: profile }), profileName = profileBase != null ? profileBase.name : profile, message = tp('coding_rules.bulk_change.success', profileName, succeeded); - this.ui.messagesContainer.append('
' + message + '
'); + this.ui.messagesContainer.append('
' + message + '
'); }, showWarnMessage: function (profile, succeeded, failed) { var profileBase = _.findWhere(this.options.app.qualityProfiles, { key: profile }), profileName = profileBase != null ? profileBase.name : profile, message = tp('coding_rules.bulk_change.warning', profileName, succeeded, failed); - this.ui.messagesContainer.append('
' + message + '
'); + this.ui.messagesContainer.append('
' + message + '
'); }, onRender: function () { diff --git a/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-creation-view.js b/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-creation-view.js index e2dd5d78f48..e5aab7c4dae 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-creation-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-creation-view.js @@ -153,8 +153,7 @@ define([ }, sendRequest: function (action, options) { - this.$('.modal-error').hide(); - this.$('.modal-warning').hide(); + this.$('.alert').addClass('hidden'); var that = this, url = baseUrl + '/api/rules/' + action; return $.post(url, options).done(function () { @@ -167,7 +166,7 @@ define([ }).fail(function (jqXHR) { if (jqXHR.status === 409) { that.existingRule = jqXHR.responseJSON.rule; - that.$('.modal-warning').show(); + that.$('.alert-warning').removeClass('hidden'); that.ui.modalFoot.html(Templates['coding-rules-custom-rule-reactivation']()); } else { that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings); diff --git a/server/sonar-web/src/main/js/coding-rules/rule/manual-rule-creation-view.js b/server/sonar-web/src/main/js/coding-rules/rule/manual-rule-creation-view.js index ead147351ba..1686fa83fc3 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/manual-rule-creation-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/manual-rule-creation-view.js @@ -101,8 +101,7 @@ define([ }, sendRequest: function (action, options) { - this.$('.modal-error').hide(); - this.$('.modal-warning').hide(); + this.$('.alert').addClass('hidden'); var that = this, url = baseUrl + '/api/rules/' + action; return $.post(url, options).done(function (r) { @@ -114,7 +113,7 @@ define([ }).fail(function (jqXHR) { if (jqXHR.status === 409) { that.existingRule = jqXHR.responseJSON.rule; - that.$('.modal-warning').show(); + that.$('.alert-warning').removeClass('hidden'); } else { that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings); } diff --git a/server/sonar-web/src/main/js/common/modal-form.js b/server/sonar-web/src/main/js/common/modal-form.js index 1ad5f7cf089..d62e69407e3 100644 --- a/server/sonar-web/src/main/js/common/modal-form.js +++ b/server/sonar-web/src/main/js/common/modal-form.js @@ -49,13 +49,13 @@ define(['common/modals'], function (ModalView) { var container = this.ui.messagesContainer.empty(); if (_.isArray(errors)) { errors.forEach(function (error) { - var html = '
' + error.msg + '
'; + var html = '
' + error.msg + '
'; container.append(html); }); } if (_.isArray(warnings)) { warnings.forEach(function (warn) { - var html = '
' + warn.msg + '
'; + var html = '
' + warn.msg + '
'; container.append(html); }); } diff --git a/server/sonar-web/src/main/less/components.less b/server/sonar-web/src/main/less/components.less index d0747ada542..58c47a924de 100644 --- a/server/sonar-web/src/main/less/components.less +++ b/server/sonar-web/src/main/less/components.less @@ -21,7 +21,7 @@ @import "components/source"; @import "components/bubble-popup"; @import "components/modals"; -@import "components/messages"; +@import "components/alerts"; @import "components/issues"; @import "components/measures"; @import "components/rules"; diff --git a/server/sonar-web/src/main/less/components/messages.less b/server/sonar-web/src/main/less/components/alerts.less similarity index 65% rename from server/sonar-web/src/main/less/components/messages.less rename to server/sonar-web/src/main/less/components/alerts.less index 3a2bb6757cc..2142efd5393 100644 --- a/server/sonar-web/src/main/less/components/messages.less +++ b/server/sonar-web/src/main/less/components/alerts.less @@ -20,33 +20,32 @@ @import (reference) "../variables"; @import (reference) "../mixins"; -.message-notice { - display: block; - padding: 5px 8px; - border: 2px solid @blue; -} -.message-alert { - display: block; - padding: 5px 8px; - border: 2px solid @orange; -} +// Base -.message-error { +.alert { display: block; padding: 5px 8px; - background-color: @red; - color: #fff; + border: 2px solid @secondFontColor; } -.message-notice + .message-notice, -.message-notice + .message-alert, -.message-notice + .message-error, -.message-alert + .message-notice, -.message-alert + .message-alert, -.message-alert + .message-error, -.message-error + .message-notice, -.message-error + .message-alert, -.message-error + .message-error { +.alert + .alert:not(.hidden):not(:empty) { margin-top: 5px; } + +.alert:empty { display: none; } + + +// Color + +.alert-emphasis-variant(@color) { + background-color: @white; + border-color: @color; + color: @color; +} +.alert-danger { .alert-emphasis-variant(@red); } +.alert-warning { .alert-emphasis-variant(@orange); } +.alert-info { .alert-emphasis-variant(@blue); } +.alert-success { .alert-emphasis-variant(@green); } + + diff --git a/server/sonar-web/src/main/less/deprecated.less b/server/sonar-web/src/main/less/deprecated.less index 02bbdf0312f..eb1ad7a0ba2 100644 --- a/server/sonar-web/src/main/less/deprecated.less +++ b/server/sonar-web/src/main/less/deprecated.less @@ -93,37 +93,33 @@ } .warning, .modal-warning { - border: solid 1px #FFD324; - background-color: #FFF6BF; - color: #514721; - margin: 0 0 4px; - padding: 4px; + margin: 0 0 8px; + padding: 5px 8px; + border: 2px solid @orange; + background-color: @white; + color: @orange; } .error, .modal-error { - border: 1px solid red; - background-color: #FF5252; - color: #eee; - margin: 0 0 4px; - padding: 4px; - - a { - color: #eee; - } + margin: 0 0 8px; + padding: 5px 8px; + border: 2px solid @red; + background-color: @white; + color: @red; } .notice, .modal-notice { - border: 1px solid #9c9; - background-color: #e2f9e3; - color: #060; - margin: 0 0 4px; - padding: 4px; + margin: 0 0 8px; + padding: 5px 8px; + border: 2px solid @blue; + background-color: @white; + color: @blue; } .info { - background-color: #CAE3F2; - padding: 5px; - border: 1px solid #4B9FD5; + border: 2px solid @blue; + background-color: @white; + color: @blue; } div.operations { -- 2.39.5