]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-5107 New icons for alert levels
authorStas Vilchik <vilchiks@gmail.com>
Mon, 3 Mar 2014 10:20:58 +0000 (11:20 +0100)
committerStas Vilchik <vilchiks@gmail.com>
Mon, 3 Mar 2014 10:21:04 +0000 (11:21 +0100)
21 files changed:
sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_edit.html.erb
sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_new.html.erb
sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_show.html.erb
sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb
sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_condition_template.hbs.erb
sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_conditions_template.hbs.erb
sonar-server/src/main/webapp/fonts/sonar.eot
sonar-server/src/main/webapp/fonts/sonar.svg
sonar-server/src/main/webapp/fonts/sonar.ttf
sonar-server/src/main/webapp/fonts/sonar.woff
sonar-server/src/main/webapp/images/levels/error.png
sonar-server/src/main/webapp/images/levels/none.png
sonar-server/src/main/webapp/images/levels/notforie6/error.png
sonar-server/src/main/webapp/images/levels/notforie6/none.png
sonar-server/src/main/webapp/images/levels/notforie6/ok.png
sonar-server/src/main/webapp/images/levels/notforie6/warn.png
sonar-server/src/main/webapp/images/levels/ok.png
sonar-server/src/main/webapp/images/levels/warn.png
sonar-server/src/main/webapp/stylesheets/icons.css
sonar-server/src/main/webapp/stylesheets/icons.less
sonar-server/src/main/webapp/stylesheets/variables.less

index 366f0d61a4f9dab7221a6a6c192fd221a1207280..6a2b2deaf0d66913a06e2510e216ff6562e345e4 100644 (file)
     </select>
   </td>
   <td width="15%" align="left">
-    <%= image_tag 'levels/warn.png', :alt => message('alerts.warning_tooltip') %>
+    <i class="icon-alert-warn" title="<%= message('alerts.warning_tooltip') -%>"></i>
     <%= value_field(alert, alert.value_warning, 'alert[value_warning]') %> <%= alert.metric.suffix if alert.metric %>
   </td>
   <td width="15%" align="left">
-    <%= image_tag 'levels/error.png', :alt => message('alerts.error_tooltip') %>
+    <i class="icon-alert-error" title="<%= message('alerts.error_tooltip') -%>"></i>
     <%= value_field(alert, alert.value_error, 'alert[value_error]') %> <%= alert.metric.suffix if alert.metric %>
   </td>
   <td width="120px" nowrap>
@@ -49,4 +49,4 @@
     minimumResultsForSearch: 10,
     width: '150px'
   });
-</script>
\ No newline at end of file
+</script>
index 5ae9067b67de82a1dbb039f815a7f31bfde0f8be..c35a911b889a314771b35bdaa08bb4b1a60c0439 100644 (file)
   </td>
 
   <td width="15%" valign="top" class="alert_fields">
-    <%= image_tag 'levels/warn.png', :alt => message('alerts.warning_tooltip') %>
+    <i class="icon-alert-warn" title="<%= message('alerts.warning_tooltip') -%>"></i>
     <%= value_field(@alert, '', 'alert[value_warning]') %>
     <%= @alert.metric.suffix if @alert.metric %><br/>
     <span class="note"><%= message('alerts.warning_threshold') -%></span>
   </td>
 
   <td width="15%" valign="top" class="alert_fields">
-    <%= image_tag 'levels/error.png', :alt => message('alerts.error_tooltip') %>
+    <i class="icon-alert-error" title="<%= message('alerts.error_tooltip') -%>"></i>
     <%= value_field(@alert, '', 'alert[value_error]') %>
     <%= @alert.metric.suffix if @alert.metric %><br/>
     <span class="note"><%= message('alerts.error_threshold') -%></span>
index 5e4a58b27504d8f006d0a0823bd1bf312de71885..508d255e5522849594d4d02e28802035dc3ea45d 100644 (file)
   </td>
   <td width="20%">
     <% if alert.metric && !alert.value_warning.blank? %>
-      <%= image_tag 'levels/warn.png', :alt => message('alerts.warning_tooltip') %>
+      <i class="icon-alert-warn" title="<%= message('alerts.warning_tooltip') -%>"></i>
       <%= alert.value_warning %> <%= alert.metric.suffix if alert.metric %>
     <% end %>
   </td>
   <td width="20%">
     <% if alert.metric && !alert.value_error.blank? %>
-      <%= image_tag 'levels/error.png', :alt => message('alerts.error_tooltip') %>
+      <i class="icon-alert-error" title="<%= message('alerts.error_tooltip') -%>"></i>
       <%= alert.value_error %> <%= alert.metric.suffix %>
     <% end %>
   </td>
index ddd2c3ba4cab453efc89d70339553e75a9c33a4c..b1820af3a4ad9c8ba4290cae44119d287822530f 100644 (file)
@@ -42,9 +42,9 @@
 <tr><th colspan="3"></th></tr>
 </thead>
 <tbody>
-<tr class="even"><td><%= image_tag 'levels/ok.png' %></td><td> <%= message('alerts.notes.ok') -%></td></tr>
-<tr class="odd"><td><%= image_tag 'levels/warn.png' %></td><td> <%= message('alerts.notes.warn') -%></td></tr>
-<tr class="even"><td><%= image_tag 'levels/error.png' %></td><td> <%= message('alerts.notes.error') -%></td></tr>
+<tr class="even"><td><i class="icon-alert-ok"></i></td><td> <%= message('alerts.notes.ok') -%></td></tr>
+<tr class="odd"><td><i class="icon-alert-warn"></i></td><td> <%= message('alerts.notes.warn') -%></td></tr>
+<tr class="even"><td><i class="icon-alert-error"></i></td><td> <%= message('alerts.notes.error') -%></td></tr>
 </tbody>
 </table>
 </div>
index 4b747169c6209c7d60506f8a419a255a96aa316e..fde10d5a0501a9ba38ac8b8f8675597c34ab61bc 100644 (file)
     </select>
   </td>
   <td width="15%">
-    <%= image_tag 'levels/warn.png', :alt => message('alerts.warning_tooltip') %>
+    <i class="icon-alert-warn" title="<%= message('alerts.warn_tooltip') -%>"></i>
     <input name="warning" type="text" value="{{warning}}">
   </td>
   <td width="15%">
-    <%= image_tag 'levels/error.png', :alt => message('alerts.error_tooltip') %>
+    <i class="icon-alert-error" title="<%= message('alerts.error_tooltip') -%>"></i>
     <input name="error" type="text" value="{{error}}">
   </td>
   <td class="quality-gate-condition-actions" width="120px" nowrap>
index b3a3ae04cf3d04e102a689248f0c51de587107fd..cb7fb61d9a4de7a0dcaea3d939a0f0143e2d3967 100644 (file)
         </thead>
         <tbody>
         <tr class="even">
-          <td><%= image_tag 'levels/ok.png' %></td>
+          <td><i class="icon-alert-ok"></i></td>
           <td><%= message('alerts.notes.ok') -%></td>
         </tr>
         <tr class="odd">
-          <td><%= image_tag 'levels/warn.png' %></td>
+          <td><i class="icon-alert-warn"></i></td>
           <td><%= message('alerts.notes.warn') -%></td>
         </tr>
         <tr class="even">
-          <td><%= image_tag 'levels/error.png' %></td>
+          <td><i class="icon-alert-error"></i></td>
           <td><%= message('alerts.notes.error') -%></td>
         </tr>
         </tbody>
index 7b2fd967917b41ab02f6aeb19abd95ce7245d90f..6c78bb318dca2e22e6b4a4944b74336476a29916 100755 (executable)
Binary files a/sonar-server/src/main/webapp/fonts/sonar.eot and b/sonar-server/src/main/webapp/fonts/sonar.eot differ
index bcba80b8b1c03a40e83cbdba793069662e578ead..1ca6d69a9eb69c72120a1b2123ac99011ee88c01 100755 (executable)
@@ -21,6 +21,8 @@
 <glyph unicode="&#xf015;" d="M585.143 426.667q0 60.571-42.857 103.429t-103.429 42.857-103.429-42.857-42.857-103.429 42.857-103.429 103.429-42.857 103.429 42.857 42.857 103.429zM877.714 488.953v-126.857q0-6.857-4.571-13.143t-11.429-7.429l-105.714-16q-10.857-30.857-22.286-52 20-28.571 61.143-78.857 5.714-6.857 5.714-14.286t-5.143-13.143q-15.429-21.143-56.571-61.714t-53.714-40.571q-6.857 0-14.857 5.143l-78.857 61.714q-25.143-13.143-52-21.714-9.143-77.714-16.571-106.286-4-16-20.571-16h-126.857q-8 0-14 4.857t-6.571 12.286l-16 105.143q-28 9.143-51.429 21.143l-80.571-61.143q-5.714-5.143-14.286-5.143-8 0-14.286 6.286-72 65.143-94.286 96-4 5.714-4 13.143 0 6.857 4.571 13.143 8.571 12 29.143 38t30.857 40.286q-15.429 28.571-23.429 56.571l-104.571 15.429q-7.429 1.143-12 7.143t-4.571 13.429v126.857q0 6.857 4.571 13.143t10.857 7.429l106.286 16q8 26.286 22.286 52.571-22.857 32.571-61.143 78.857-5.714 6.857-5.714 13.714 0 5.714 5.143 13.143 14.857 20.571 56.286 61.429t54 40.857q7.429 0 14.857-5.714l78.857-61.143q25.143 13.143 52 21.714 9.143 77.714 16.571 106.286 4 16 20.571 16h126.857q8 0 14-4.857t6.571-12.286l16-105.143q28-9.143 51.429-21.143l81.143 61.143q5.143 5.143 13.714 5.143 7.429 0 14.286-5.714 73.714-68 94.286-97.143 4-4.571 4-12.571 0-6.857-4.571-13.143-8.571-12-29.143-38t-30.857-40.286q14.857-28.571 23.429-56l104.571-16q7.429-1.143 12-7.143t4.571-13.429z" />
 <glyph unicode="&#xf039;" d="M1024 170.667v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-950.857q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h950.857q14.857 0 25.714-10.857t10.857-25.714zM1024 390.096v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-950.857q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h950.857q14.857 0 25.714-10.857t10.857-25.714zM1024 609.524v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-950.857q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h950.857q14.857 0 25.714-10.857t10.857-25.714zM1024 828.953v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-950.857q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h950.857q14.857 0 25.714-10.857t10.857-25.714z" />
 <glyph unicode="&#xf046;" d="M804.571 407.238v-181.714q0-68-48.286-116.286t-116.286-48.286h-475.429q-68 0-116.286 48.286t-48.286 116.286v475.429q0 68 48.286 116.286t116.286 48.286h475.429q36 0 66.857-14.286 8.571-4 10.286-13.143 1.714-9.714-5.143-16.571l-28-28q-5.714-5.714-13.143-5.714-1.714 0-5.143 1.143-13.143 3.429-25.714 3.429h-475.429q-37.714 0-64.571-26.857t-26.857-64.571v-475.429q0-37.714 26.857-64.571t64.571-26.857h475.429q37.714 0 64.571 26.857t26.857 64.571v145.143q0 7.429 5.143 12.571l36.571 36.571q5.714 5.714 13.143 5.714 3.429 0 6.857-1.714 11.429-4.571 11.429-16.571zM936.571 686.667l-465.143-465.143q-13.714-13.714-32.571-13.714t-32.571 13.714l-245.714 245.714q-13.714 13.714-13.714 32.571t13.714 32.571l62.857 62.857q13.714 13.714 32.571 13.714t32.571-13.714l150.286-150.286 369.714 369.714q13.714 13.714 32.571 13.714t32.571-13.714l62.857-62.857q13.714-13.714 13.714-32.571t-13.714-32.571z" horiz-adv-x="951" />
+<glyph unicode="&#xf057;" d="M656.571 297.524q0 14.857-10.857 25.714l-103.429 103.429 103.429 103.429q10.857 10.857 10.857 25.714 0 15.429-10.857 26.286l-51.429 51.429q-10.857 10.857-26.286 10.857-14.857 0-25.714-10.857l-103.429-103.429-103.429 103.429q-10.857 10.857-25.714 10.857-15.429 0-26.286-10.857l-51.429-51.429q-10.857-10.857-10.857-26.286 0-14.857 10.857-25.714l103.429-103.429-103.429-103.429q-10.857-10.857-10.857-25.714 0-15.429 10.857-26.286l51.429-51.429q10.857-10.857 26.286-10.857 14.857 0 25.714 10.857l103.429 103.429 103.429-103.429q10.857-10.857 25.714-10.857 15.429 0 26.286 10.857l51.429 51.429q10.857 10.857 10.857 26.286zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" />
+<glyph unicode="&#xf059;" d="M512 152.381v109.714q0 8-5.143 13.143t-13.143 5.143h-109.714q-8 0-13.143-5.143t-5.143-13.143v-109.714q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143zM658.286 536.381q0 50.286-31.714 93.143t-79.143 66.286-97.143 23.429q-138.857 0-212-121.714-8.571-13.714 4.571-24l75.429-57.143q4-3.429 10.857-3.429 9.143 0 14.286 6.857 30.286 38.857 49.143 52.571 19.429 13.714 49.143 13.714 27.429 0 48.857-14.857t21.429-33.714q0-21.714-11.429-34.857t-38.857-25.714q-36-16-66-49.429t-30-71.714v-20.571q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143q0 10.857 12.286 28.286t31.143 28.286q18.286 10.286 28 16.286t26.286 20 25.429 27.429 16 34.571 7.143 46.286zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" />
 <glyph unicode="&#xf05c;" d="M626.857 322.096l-83.429-83.429q-5.714-5.714-13.143-5.714t-13.143 5.714l-78.286 78.286-78.286-78.286q-5.714-5.714-13.143-5.714t-13.143 5.714l-83.429 83.429q-5.714 5.714-5.714 13.143t5.714 13.143l78.286 78.286-78.286 78.286q-5.714 5.714-5.714 13.143t5.714 13.143l83.429 83.429q5.714 5.714 13.143 5.714t13.143-5.714l78.286-78.286 78.286 78.286q5.714 5.714 13.143 5.714t13.143-5.714l83.429-83.429q5.714-5.714 5.714-13.143t-5.714-13.143l-78.286-78.286 78.286-78.286q5.714-5.714 5.714-13.143t-5.714-13.143zM749.714 426.667q0 84.571-41.714 156t-113.143 113.143-156 41.714-156-41.714-113.143-113.143-41.714-156 41.714-156 113.143-113.143 156-41.714 156 41.714 113.143 113.143 41.714 156zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" />
 <glyph unicode="&#xf05d;" d="M669.143 474.096l-241.143-241.143q-10.857-10.857-25.714-10.857t-25.714 10.857l-168 168q-10.857 10.857-10.857 25.714t10.857 25.714l58.286 58.286q10.857 10.857 25.714 10.857t25.714-10.857l84-84 157.143 157.143q10.857 10.857 25.714 10.857t25.714-10.857l58.286-58.286q10.857-10.857 10.857-25.714t-10.857-25.714zM749.714 426.667q0 84.571-41.714 156t-113.143 113.143-156 41.714-156-41.714-113.143-113.143-41.714-156 41.714-156 113.143-113.143 156-41.714 156 41.714 113.143 113.143 41.714 156zM877.714 426.667q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" />
 <glyph unicode="&#xf05e;" d="M749.714 428.381q0 92-49.714 168.571l-430.857-430.286q78.286-50.857 169.714-50.857 63.429 0 120.857 24.857t99.143 66.571 66.286 99.714 24.571 121.429zM178.857 257.524l431.429 430.857q-77.143 52-171.429 52-84.571 0-156-41.714t-113.143-113.714-41.714-156.571q0-92.571 50.857-170.857zM877.714 428.381q0-89.714-34.857-171.429t-93.429-140.571-140-93.714-170.571-34.857-170.571 34.857-140 93.714-93.429 140.571-34.857 171.429 34.857 171.143 93.429 140.286 140 93.714 170.571 34.857 170.571-34.857 140-93.714 93.429-140.286 34.857-171.143z" />
index bb2fb013728500b32d41b671c1f440ea26f017df..9a92996ee1cba56c5bceb2855f14b949bee62926 100755 (executable)
Binary files a/sonar-server/src/main/webapp/fonts/sonar.ttf and b/sonar-server/src/main/webapp/fonts/sonar.ttf differ
index 66d945cc0a3a3338d976b5adb2ef42fac8e24c53..3a1a7f10bc635d22ca3d40232acae289d3e044a2 100755 (executable)
Binary files a/sonar-server/src/main/webapp/fonts/sonar.woff and b/sonar-server/src/main/webapp/fonts/sonar.woff differ
index 0da4d846a66613b0df41c36f9e1850637241bb10..2fa166bac53018ac05e1baf44de820bd16027a62 100644 (file)
Binary files a/sonar-server/src/main/webapp/images/levels/error.png and b/sonar-server/src/main/webapp/images/levels/error.png differ
index 6e871b2258524822a7c476a12ee6c4efa8633962..bc3a606c0ad938fa16cd86aaa4b8394463679ae0 100644 (file)
Binary files a/sonar-server/src/main/webapp/images/levels/none.png and b/sonar-server/src/main/webapp/images/levels/none.png differ
index 6e195cf3919a8b243df22293d681ad88574bdf7b..2fa166bac53018ac05e1baf44de820bd16027a62 100644 (file)
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
index 34c0de006c3fe00bad9b73994d946351b3279657..bc3a606c0ad938fa16cd86aaa4b8394463679ae0 100644 (file)
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
index 1faba7e79ccb81769bad74e1f0802610114b2dcb..e4b83bfbe5c9117a7eaa9f0d45c9897980c1e255 100644 (file)
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
index f00e4264181b956aee36c2d0193594bec7ae12ef..67bb75632fcef1f188a47f488edb0b2ece0fbbad 100644 (file)
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
index fb454cefd5c44a9990ec5004ecc7d76b4dc94b39..e4b83bfbe5c9117a7eaa9f0d45c9897980c1e255 100644 (file)
Binary files a/sonar-server/src/main/webapp/images/levels/ok.png and b/sonar-server/src/main/webapp/images/levels/ok.png differ
index a3dfc6806a3d2530b51cb3c5613a2c3e99a3f210..67bb75632fcef1f188a47f488edb0b2ece0fbbad 100644 (file)
Binary files a/sonar-server/src/main/webapp/images/levels/warn.png and b/sonar-server/src/main/webapp/images/levels/warn.png differ
index 3176fd8391e5f2545d0dd4b7d63c02abbd242496..ef97ea32ba33f51759c89613008f86ca66dc987c 100644 (file)
   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
  */
index d47295b75989c06635d23a6fd01545dd3a7ef1bf..fee737543064ad03202126462790361043f4288e 100644 (file)
 }
 
 
+/*
+ * 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
  */
index b500bd544e3bc5464e1afe4d2a93b20ed134e533..95cedc2ef2bcccde77be57392742e3a6a0d7e5c0 100644 (file)
@@ -21,6 +21,7 @@
 @red: #d4333f;
 @green: #85bb43;
 @yellow: #fede06;
+@orange: #f90;
 
 @highlighted: @blue;