From: Stas Vilchik Date: Mon, 3 Mar 2014 10:20:58 +0000 (+0100) Subject: SONAR-5107 New icons for alert levels X-Git-Tag: 4.3~615 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bdc91376c90b2dad4f3ad22179d480768d615dbd;p=sonarqube.git SONAR-5107 New icons for alert levels --- diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_edit.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_edit.html.erb index 366f0d61a4f..6a2b2deaf0d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_edit.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_edit.html.erb @@ -17,11 +17,11 @@ - <%= image_tag 'levels/warn.png', :alt => message('alerts.warning_tooltip') %> + <%= value_field(alert, alert.value_warning, 'alert[value_warning]') %> <%= alert.metric.suffix if alert.metric %> - <%= image_tag 'levels/error.png', :alt => message('alerts.error_tooltip') %> + <%= value_field(alert, alert.value_error, 'alert[value_error]') %> <%= alert.metric.suffix if alert.metric %> @@ -49,4 +49,4 @@ minimumResultsForSearch: 10, width: '150px' }); - \ No newline at end of file + diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb index 5ae9067b67d..c35a911b889 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb @@ -32,14 +32,14 @@ - <%= image_tag 'levels/warn.png', :alt => message('alerts.warning_tooltip') %> + <%= value_field(@alert, '', 'alert[value_warning]') %> <%= @alert.metric.suffix if @alert.metric %>
<%= message('alerts.warning_threshold') -%> - <%= image_tag 'levels/error.png', :alt => message('alerts.error_tooltip') %> + <%= value_field(@alert, '', 'alert[value_error]') %> <%= @alert.metric.suffix if @alert.metric %>
<%= message('alerts.error_threshold') -%> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_show.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_show.html.erb index 5e4a58b2750..508d255e552 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_show.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_show.html.erb @@ -11,13 +11,13 @@ <% if alert.metric && !alert.value_warning.blank? %> - <%= image_tag 'levels/warn.png', :alt => message('alerts.warning_tooltip') %> + <%= alert.value_warning %> <%= alert.metric.suffix if alert.metric %> <% end %> <% if alert.metric && !alert.value_error.blank? %> - <%= image_tag 'levels/error.png', :alt => message('alerts.error_tooltip') %> + <%= alert.value_error %> <%= alert.metric.suffix %> <% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb index ddd2c3ba4ca..b1820af3a4a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb @@ -42,9 +42,9 @@ -<%= image_tag 'levels/ok.png' %> <%= message('alerts.notes.ok') -%> -<%= image_tag 'levels/warn.png' %> <%= message('alerts.notes.warn') -%> -<%= image_tag 'levels/error.png' %> <%= message('alerts.notes.error') -%> + <%= message('alerts.notes.ok') -%> + <%= message('alerts.notes.warn') -%> + <%= message('alerts.notes.error') -%> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_condition_template.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_condition_template.hbs.erb index 4b747169c62..fde10d5a050 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_condition_template.hbs.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_condition_template.hbs.erb @@ -16,11 +16,11 @@ - <%= image_tag 'levels/warn.png', :alt => message('alerts.warning_tooltip') %> + - <%= image_tag 'levels/error.png', :alt => message('alerts.error_tooltip') %> + diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_conditions_template.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_conditions_template.hbs.erb index b3a3ae04cf3..cb7fb61d9a4 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_conditions_template.hbs.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_conditions_template.hbs.erb @@ -15,15 +15,15 @@ - <%= image_tag 'levels/ok.png' %> + <%= message('alerts.notes.ok') -%> - <%= image_tag 'levels/warn.png' %> + <%= message('alerts.notes.warn') -%> - <%= image_tag 'levels/error.png' %> + <%= message('alerts.notes.error') -%> diff --git a/sonar-server/src/main/webapp/fonts/sonar.eot b/sonar-server/src/main/webapp/fonts/sonar.eot index 7b2fd967917..6c78bb318dc 100755 Binary files a/sonar-server/src/main/webapp/fonts/sonar.eot and b/sonar-server/src/main/webapp/fonts/sonar.eot differ diff --git a/sonar-server/src/main/webapp/fonts/sonar.svg b/sonar-server/src/main/webapp/fonts/sonar.svg index bcba80b8b1c..1ca6d69a9eb 100755 --- a/sonar-server/src/main/webapp/fonts/sonar.svg +++ b/sonar-server/src/main/webapp/fonts/sonar.svg @@ -21,6 +21,8 @@ + + diff --git a/sonar-server/src/main/webapp/fonts/sonar.ttf b/sonar-server/src/main/webapp/fonts/sonar.ttf index bb2fb013728..9a92996ee1c 100755 Binary files a/sonar-server/src/main/webapp/fonts/sonar.ttf and b/sonar-server/src/main/webapp/fonts/sonar.ttf differ diff --git a/sonar-server/src/main/webapp/fonts/sonar.woff b/sonar-server/src/main/webapp/fonts/sonar.woff index 66d945cc0a3..3a1a7f10bc6 100755 Binary files a/sonar-server/src/main/webapp/fonts/sonar.woff and b/sonar-server/src/main/webapp/fonts/sonar.woff differ diff --git a/sonar-server/src/main/webapp/images/levels/error.png b/sonar-server/src/main/webapp/images/levels/error.png index 0da4d846a66..2fa166bac53 100644 Binary files a/sonar-server/src/main/webapp/images/levels/error.png and b/sonar-server/src/main/webapp/images/levels/error.png differ diff --git a/sonar-server/src/main/webapp/images/levels/none.png b/sonar-server/src/main/webapp/images/levels/none.png index 6e871b22585..bc3a606c0ad 100644 Binary files a/sonar-server/src/main/webapp/images/levels/none.png and b/sonar-server/src/main/webapp/images/levels/none.png differ diff --git a/sonar-server/src/main/webapp/images/levels/notforie6/error.png b/sonar-server/src/main/webapp/images/levels/notforie6/error.png index 6e195cf3919..2fa166bac53 100644 Binary files a/sonar-server/src/main/webapp/images/levels/notforie6/error.png and b/sonar-server/src/main/webapp/images/levels/notforie6/error.png differ diff --git a/sonar-server/src/main/webapp/images/levels/notforie6/none.png b/sonar-server/src/main/webapp/images/levels/notforie6/none.png index 34c0de006c3..bc3a606c0ad 100644 Binary files a/sonar-server/src/main/webapp/images/levels/notforie6/none.png and b/sonar-server/src/main/webapp/images/levels/notforie6/none.png differ diff --git a/sonar-server/src/main/webapp/images/levels/notforie6/ok.png b/sonar-server/src/main/webapp/images/levels/notforie6/ok.png index 1faba7e79cc..e4b83bfbe5c 100644 Binary files a/sonar-server/src/main/webapp/images/levels/notforie6/ok.png and b/sonar-server/src/main/webapp/images/levels/notforie6/ok.png differ diff --git a/sonar-server/src/main/webapp/images/levels/notforie6/warn.png b/sonar-server/src/main/webapp/images/levels/notforie6/warn.png index f00e4264181..67bb75632fc 100644 Binary files a/sonar-server/src/main/webapp/images/levels/notforie6/warn.png and b/sonar-server/src/main/webapp/images/levels/notforie6/warn.png differ diff --git a/sonar-server/src/main/webapp/images/levels/ok.png b/sonar-server/src/main/webapp/images/levels/ok.png index fb454cefd5c..e4b83bfbe5c 100644 Binary files a/sonar-server/src/main/webapp/images/levels/ok.png and b/sonar-server/src/main/webapp/images/levels/ok.png differ diff --git a/sonar-server/src/main/webapp/images/levels/warn.png b/sonar-server/src/main/webapp/images/levels/warn.png index a3dfc6806a3..67bb75632fc 100644 Binary files a/sonar-server/src/main/webapp/images/levels/warn.png and b/sonar-server/src/main/webapp/images/levels/warn.png differ diff --git a/sonar-server/src/main/webapp/stylesheets/icons.css b/sonar-server/src/main/webapp/stylesheets/icons.css index 3176fd8391e..ef97ea32ba3 100644 --- a/sonar-server/src/main/webapp/stylesheets/icons.css +++ b/sonar-server/src/main/webapp/stylesheets/icons.css @@ -126,6 +126,29 @@ color: #444444; font-size: 14px; } +/* + * Alert + */ +.icon-alert-ok:before { + content: "\f013"; + color: #85bb43; + font-size: 16px; +} +.icon-alert-warn:before { + content: "\f000"; + color: #ff9900; + font-size: 16px; +} +.icon-alert-error:before { + content: "\f057"; + color: #d4333f; + font-size: 16px; +} +.icon-alert-none:before { + content: "\f059"; + color: #4b9fd5; + font-size: 16px; +} /* * Common */ diff --git a/sonar-server/src/main/webapp/stylesheets/icons.less b/sonar-server/src/main/webapp/stylesheets/icons.less index d47295b7598..fee73754306 100644 --- a/sonar-server/src/main/webapp/stylesheets/icons.less +++ b/sonar-server/src/main/webapp/stylesheets/icons.less @@ -131,6 +131,32 @@ } +/* + * Alert + */ + +.icon-alert-ok:before { + content: "\f013"; + color: @green; + font-size: @iconFontSize + 2px; +} +.icon-alert-warn:before { + content: "\f000"; + color: @orange; + font-size: @iconFontSize + 2px; +} +.icon-alert-error:before { + content: "\f057"; + color: @red; + font-size: @iconFontSize + 2px; +} +.icon-alert-none:before { + content: "\f059"; + color: @blue; + font-size: @iconFontSize + 2px; +} + + /* * Common */ diff --git a/sonar-server/src/main/webapp/stylesheets/variables.less b/sonar-server/src/main/webapp/stylesheets/variables.less index b500bd544e3..95cedc2ef2b 100644 --- a/sonar-server/src/main/webapp/stylesheets/variables.less +++ b/sonar-server/src/main/webapp/stylesheets/variables.less @@ -21,6 +21,7 @@ @red: #d4333f; @green: #85bb43; @yellow: #fede06; +@orange: #f90; @highlighted: @blue;