Component Viewer: add options

diff --git a/sonar-server/src/main/coffee/component-viewer/header.coffee b/sonar-server/src/main/coffee/component-viewer/header.coffee
new file mode 100644 (file)
index 0000000..0e2dbd7
--- /dev/null
+++ b/sonar-server/src/main/coffee/component-viewer/header.coffee
@@ -0,0 +1,29 @@
+define [
+  'backbone.marionette'
+  'templates/component-viewer'
+], (
+  Marionette
+  Templates
+) ->
+
+  $ = jQuery
+
+
+  class HeaderView extends Marionette.ItemView
+    template: Templates['header']
+
+
+    events:
+      'click [data-option=coverage]': 'toggleCoverage'
+
+
+    onRender: ->
+      @delegateEvents()
+
+
+    toggleCoverage: (e) ->
+      el = $(e.currentTarget)
+      active = el.is '.active'
+      el.toggleClass 'active'
+      if active then @options.main.hideCoverage() else @options.main.showCoverage()
+

diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee
index e89ff2ac96f7844832ccf3cfa6be444e38bf42d1..3eef7c58c28596476cae2da436159460aaed327e 100644 (file)
--- a/sonar-server/src/main/coffee/component-viewer/main.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/main.coffee
@@ -2,11 +2,13 @@ define [
   'backbone'
   'backbone.marionette'
   'templates/component-viewer'
+  'component-viewer/header'
   'component-viewer/source'
 ], (
   Backbone
   Marionette
   Templates
+  HeaderView
   SourceView
 ) ->
 
@@ -22,46 +24,70 @@ define [
 
 
     regions:
+      headerRegion: '.component-viewer-header'
       sourceRegion: '.component-viewer-source'
 
 
     initialize: ->
+      @component = new Backbone.Model()
+      @headerView = new HeaderView model: @component, main: @
+
       @source = new Backbone.Model()
-      @sourceView = new SourceView model: @source
+      @sourceView = new SourceView model: @source, main: @
 
 
     onRender: ->
+      @headerRegion.show @headerView
       @sourceRegion.show @sourceView
 
 
+    requestComponent: (key, metrics) ->
+      $.get API_RESOURCES, resource: key, metrics: metrics, (data) =>
+        @component.set data[0]
+
+
     requestSource: (key) ->
       $.get API_SOURCES, resource: key, (data) =>
-        @source.set { source:  data[0] }, { silent: true }
+        @source.set source: data[0]
 
 
-    requestCoverage: (key) ->
-      metrics = 'coverage_line_hits_data,covered_conditions_by_line,conditions_by_line'
-
-      toObj = (data) ->
+    extractCoverage: (data) ->
+      toObj = (d) ->
         q = {}
-        data.split(';').forEach (item) ->
+        d.split(';').forEach (item) ->
           tokens = item.split '='
           q[tokens[0]] = tokens[1]
         q
 
-
-      $.get API_RESOURCES, resource: key, metrics: metrics, (data) =>
-        msr = data[0].msr
-        coverage = toObj _.findWhere(msr, key: 'coverage_line_hits_data').data
-        coverageConditions = toObj _.findWhere(msr, key: 'covered_conditions_by_line').data
-        conditions = toObj _.findWhere(msr, key: 'conditions_by_line').data
-        @source.set {
-          coverage: coverage,
-          coverageConditions: coverageConditions
-          conditions: conditions
-        }, { silent: true }
+      msr = data[0].msr
+      coverage = toObj _.findWhere(msr, key: 'coverage_line_hits_data').data
+      coverageConditions = toObj _.findWhere(msr, key: 'covered_conditions_by_line').data
+      conditions = toObj _.findWhere(msr, key: 'conditions_by_line').data
+      @source.set
+        coverage: coverage
+        coverageConditions: coverageConditions
+        conditions: conditions
 
 
     open: (key) ->
-      $.when(@requestSource(key), @requestCoverage(key)).done =>
-        @sourceView.render()
\ No newline at end of file
+      @key = key
+      @sourceView.showSpinner()
+      source = @requestSource key
+      component = @requestComponent key
+      $.when(source, component).done =>
+        @render()
+        @hideCoverage()
+
+
+    showCoverage: ->
+      unless @source.has 'coverage'
+        metrics = 'coverage_line_hits_data,covered_conditions_by_line,conditions_by_line'
+        @requestComponent(@key, metrics).done (data) =>
+          @extractCoverage data
+          @sourceView.render()
+      else
+        @sourceView.render()
+
+
+    hideCoverage: ->
+      @sourceView.hideCoverage()
\ No newline at end of file

diff --git a/sonar-server/src/main/coffee/component-viewer/source.coffee b/sonar-server/src/main/coffee/component-viewer/source.coffee
index b6c25ba860d151c47da3466063549504fe494be7..ae09ad178376573eb93837363f9c3c936b04dcfd 100644 (file)
--- a/sonar-server/src/main/coffee/component-viewer/source.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/source.coffee
@@ -11,8 +11,12 @@ define [
     template: Templates['source']
 
 
-    modelEvents:
-      'change': 'render'
+    showSpinner: ->
+      @$el.html '<div style="padding: 10px;"><i class="spinner"></i></div>'
+
+
+    hideCoverage: ->
+      @$('.coverage').hide()
 
 
     serializeData: ->
@@ -31,7 +35,6 @@ define [
           lineCoverageConditionsStatus = 'orange' if lineCoverageConditions > 0 && lineCoverageConditions < lineConditions
           lineCoverageConditionsStatus = 'green' if lineCoverageConditions == lineConditions
 
-
         lineNumber: line
         code: code
         coverage: lineCoverage

diff --git a/sonar-server/src/main/hbs/component-viewer/header.hbs b/sonar-server/src/main/hbs/component-viewer/header.hbs
new file mode 100644 (file)
index 0000000..454b851
--- /dev/null
+++ b/sonar-server/src/main/hbs/component-viewer/header.hbs
@@ -0,0 +1,7 @@
+<h3 class="component-viewer-component">{{name}}</h3>
+
+<div class="component-viewer-options button-group">
+  <button data-option="issues"><i class="icon-issue"></i>&nbsp;&nbsp;Issues</button>
+  <button data-option="coverage"><i class="icon-coverage"></i>&nbsp;&nbsp;Coverage</button>
+  <button data-option="duplications"><i class="icon-duplications"></i>&nbsp;&nbsp;Duplications</button>
+</div>
\ No newline at end of file

diff --git a/sonar-server/src/main/hbs/component-viewer/layout.hbs b/sonar-server/src/main/hbs/component-viewer/layout.hbs
index 27a90824099cfaa25d32927f9f2f90651859e663..78b06dad14738b3dac2ce16b8188403f3c8c0359 100644 (file)
--- a/sonar-server/src/main/hbs/component-viewer/layout.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/layout.hbs
@@ -1 +1,2 @@
+<div class="component-viewer-header"></div>
 <div class="component-viewer-source"></div>
\ No newline at end of file

diff --git a/sonar-server/src/main/less/component-viewer.less b/sonar-server/src/main/less/component-viewer.less
index 7bfd425373f662cfd678e81208df4b3a52f2de8e..e6700dac01a02aaada6076d82f5965da13cc73da 100644 (file)
--- a/sonar-server/src/main/less/component-viewer.less
+++ b/sonar-server/src/main/less/component-viewer.less
@@ -5,6 +5,29 @@
 .component-viewer {
   width: 100%;
   min-width: 600px;
+  border: 1px solid @barBorderColor;
+}
+
+
+.component-viewer-header {
+  height: 40px;
+  padding: 0 10px;
+  border-bottom: 1px solid @barBorderColor;
+  background-color: @barBackgroundColor;
+}
+
+
+.component-viewer-component {
+  float: left;
+  line-height: 40px;
+  font-weight: bold;
+}
+
+
+.component-viewer-options {
+  float: right;
+  line-height: 1;
+  padding-top: 9px;
 }
 
 

diff --git a/sonar-server/src/main/less/icons.less b/sonar-server/src/main/less/icons.less
index 0042c5b31fef9defa9e74b108d4f070061115919..c2a8a7024c8c091f2c314df1756ab0c584e52e89 100644 (file)
--- a/sonar-server/src/main/less/icons.less
+++ b/sonar-server/src/main/less/icons.less
@@ -411,6 +411,14 @@ a[class^="icon-"], a[class*=" icon-"] {
   color: @darkGrey;
   font-size: @iconFontSize;
 }
+.icon-coverage:before {
+  content: "\f091";
+  font-size: @iconSmallFontSize;
+}
+.icon-duplications:before {
+  content: "\f0c5";
+  font-size: @iconSmallFontSize;
+}
 
 
 /*

diff --git a/sonar-server/src/main/less/ui.less b/sonar-server/src/main/less/ui.less
index 47468a8a12a1db5af4fcf2b9162b3714a7f529f6..9d904c6aeaa1deebd86a055be73fe5b483760f34 100644 (file)
--- a/sonar-server/src/main/less/ui.less
+++ b/sonar-server/src/main/less/ui.less
@@ -61,7 +61,7 @@ input[type=button] {
     color: #fff;
   }
 
-  &:active {
+  &:active, &.active {
     border-color: #2790c0;
     background: #78bdea;
     color: #fff;

diff --git a/sonar-server/src/main/webapp/fonts/sonar.eot b/sonar-server/src/main/webapp/fonts/sonar.eot
index c1f7f3604c07da2932998b35c42eb8d41f902c47..0ac2e08c0dc6b532de69f887a1f7ca986a8a9e90 100755 (executable)
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 a42e8c967205bbdc18f6a9336fd76d86d41fd0e5..a0159d70fe40fd31bdeee9359f4c8a754ab10ed1 100755 (executable)
--- a/sonar-server/src/main/webapp/fonts/sonar.svg
+++ b/sonar-server/src/main/webapp/fonts/sonar.svg
@@ -19,10 +19,11 @@
 <glyph unicode="&#xe60a;" d="M512.062 450.682c-58.209 0-112.935 22.668-154.095 63.829s-63.828 95.885-63.828 154.095c0 58.209 22.667 112.934 63.828 154.095 41.16 41.16 95.886 63.828 154.095 63.828 58.209 0 112.935-22.668 154.095-63.828 41.161-41.161 63.829-95.886 63.829-154.095 0-58.209-22.669-112.935-63.829-154.095-41.16-41.161-95.886-63.829-154.095-63.829zM512.062 813.388c-79.833 0-144.783-64.95-144.783-144.783s64.95-144.783 144.783-144.783c79.834 0 144.783 64.95 144.783 144.783s-64.949 144.783-144.783 144.783zM731.53 410.515c7.853-0.992 15.082-2.788 21.607-5.372 10.466-4.146 18.715-9.187 25.218-15.409 8.144-7.794 15.685-17.75 22.414-29.588 7.745-13.627 13.969-27.712 18.497-41.864 5.088-15.9 9.399-33.608 12.814-52.63 3.517-19.594 5.88-37.903 7.024-54.417 1.21-17.476 1.824-35.677 1.826-54.092 0-33.359-10.849-47.546-19.008-55.314-8.812-8.391-24.665-19.545-60.424-19.545h-499.427c-14.509 0-27.166 1.898-37.618 5.643-8.85 3.171-16.31 7.719-22.807 13.904-8.159 7.768-19.006 21.952-19.006 55.312 0 18.42 0.614 36.617 1.825 54.087 1.145 16.521 3.509 34.831 7.025 54.422 3.414 19.020 7.725 36.727 12.813 52.63 4.529 14.152 10.752 28.237 18.496 41.861 6.731 11.841 14.273 21.797 22.416 29.591 6.502 6.224 14.75 11.264 25.216 15.408 6.526 2.585 13.756 4.38 21.609 5.373 12.564-8.182 26.819-17.364 42.379-27.3 21.285-13.593 46.987-25.165 78.58-35.381 32.496-10.506 65.732-15.832 98.786-15.832 33.053 0 66.289 5.326 98.788 15.834 31.59 10.214 57.292 21.786 78.573 35.376 15.547 9.927 29.801 19.109 42.384 27.303zM716.356 484.572c-3.429 0-11.429-4.096-24-12.286s-26.762-17.334-42.571-27.429c-15.81-10.096-36.381-19.238-61.714-27.43-25.334-8.19-50.763-12.286-76.286-12.286-25.524 0-50.953 4.096-76.286 12.286-25.333 8.191-45.905 17.334-61.714 27.43-15.81 10.095-30 19.238-42.571 27.429s-20.571 12.286-24 12.286c-23.238-0.001-44.477-3.811-63.714-11.43-19.237-7.618-35.523-17.809-48.857-30.57-13.334-12.762-25.143-28.191-35.429-46.286-10.285-18.096-18.476-36.667-24.571-55.714-6.095-19.048-11.143-39.714-15.143-62s-6.667-43.048-8-62.286-2-38.952-2-59.144c0-45.714 13.905-81.81 41.714-108.285 27.81-26.477 64.762-39.715 110.857-39.715h499.429c46.096 0 83.048 13.237 110.857 39.715 27.809 26.477 41.714 62.571 41.714 108.285h-0.001c-0.001 20.191-0.668 39.906-2 59.144-1.333 19.237-4 39.999-8 62.286-4.001 22.286-9.049 42.953-15.144 62s-14.285 37.618-24.57 55.714c-10.286 18.096-22.096 33.524-35.43 46.286-13.333 12.761-29.619 22.951-48.856 30.57-19.238 7.621-40.476 11.43-63.714 11.43v0z" />
 <glyph unicode="&#xf000;" d="M438.857 886.857q119.429 0 220.286-58.857t159.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.286 58.857 220.286 159.714 159.714 220.286 58.857zM512 174.286v108.571q0 8-5.143 13.429t-12.571 5.429h-109.714q-7.429 0-13.143-5.714t-5.714-13.143v-108.571q0-7.429 5.714-13.143t13.143-5.714h109.714q7.429 0 12.571 5.429t5.143 13.429zM510.857 370.857l10.286 354.857q0 6.857-5.714 10.286-5.714 4.571-13.714 4.571h-125.714q-8 0-13.714-4.571-5.714-3.429-5.714-10.286l9.714-354.857q0-5.714 5.714-10t13.714-4.286h105.714q8 0 13.429 4.286t6 10z" />
 <glyph unicode="&#xf001;" d="M733.714 448.571q0 15.429-10.286 25.714l-258.857 258.857q-10.286 10.286-25.714 10.286t-25.714-10.286l-258.857-258.857q-10.286-10.286-10.286-25.714t10.286-25.714l52-52q10.286-10.286 25.714-10.286t25.714 10.286l108 108v-286.857q0-14.857 10.857-25.714t25.714-10.857h73.143q14.857 0 25.714 10.857t10.857 25.714v286.857l108-108q10.857-10.857 25.714-10.857t25.714 10.857l52 52q10.286 10.286 10.286 25.714zM877.714 448q0-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="&#xf002;" d="M665.714 309.143l58.286 58.286q10.857 10.857 10.857 25.714t-10.857 25.714l-259.429 259.429q-10.857 10.857-25.714 10.857t-25.714-10.857l-259.429-259.429q-10.857-10.857-10.857-25.714t10.857-25.714l58.286-58.286q10.857-10.857 25.714-10.857t25.714 10.857l175.429 175.429 175.429-175.429q10.857-10.857 25.714-10.857t25.714 10.857zM877.714 448q0-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="&#xf003;" d="M464.571 217.714l259.429 259.429q10.857 10.857 10.857 25.714t-10.857 25.714l-58.286 58.286q-10.857 10.857-25.714 10.857t-25.714-10.857l-175.429-175.429-175.429 175.429q-10.857 10.857-25.714 10.857t-25.714-10.857l-58.286-58.286q-10.857-10.857-10.857-25.714t10.857-25.714l259.429-259.429q10.857-10.857 25.714-10.857t25.714 10.857zM877.714 448q0-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="&#xf002;" d="M658.286 484.571q0 105.714-75.143 180.857t-180.857 75.143-180.857-75.143-75.143-180.857 75.143-180.857 180.857-75.143 180.857 75.143 75.143 180.857zM950.857 9.143q0-29.714-21.714-51.429t-51.429-21.714q-30.857 0-51.429 21.714l-196 195.429q-102.286-70.857-228-70.857-81.714 0-156.286 31.714t-128.571 85.714-85.714 128.571-31.714 156.286 31.714 156.286 85.714 128.571 128.571 85.714 156.286 31.714 156.286-31.714 128.571-85.714 85.714-128.571 31.714-156.286q0-125.714-70.857-228l196-196q21.143-21.143 21.143-51.429z" horiz-adv-x="951" />
+<glyph unicode="&#xf003;" d="M665.714 309.143l58.286 58.286q10.857 10.857 10.857 25.714t-10.857 25.714l-259.429 259.429q-10.857 10.857-25.714 10.857t-25.714-10.857l-259.429-259.429q-10.857-10.857-10.857-25.714t10.857-25.714l58.286-58.286q10.857-10.857 25.714-10.857t25.714 10.857l175.429 175.429 175.429-175.429q10.857-10.857 25.714-10.857t25.714 10.857zM877.714 448q0-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="&#xf004;" d="M733.714 447.429q0 15.429-10.286 25.714l-52 52q-10.286 10.286-25.714 10.286t-25.714-10.286l-108-108v286.857q0 14.857-10.857 25.714t-25.714 10.857h-73.143q-14.857 0-25.714-10.857t-10.857-25.714v-286.857l-108 108q-10.857 10.857-25.714 10.857t-25.714-10.857l-52-52q-10.286-10.286-10.286-25.714t10.286-25.714l258.857-258.857q10.286-10.286 25.714-10.286t25.714 10.286l258.857 258.857q10.286 10.286 10.286 25.714zM877.714 448q0-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="&#xf005;" d="M950.857 590.286q0-12.571-14.857-27.429l-207.429-202.286 49.143-285.714q0.571-4 0.571-11.429 0-12-6-20.286t-17.429-8.286q-10.857 0-22.857 6.857l-256.571 134.857-256.571-134.857q-12.571-6.857-22.857-6.857-12 0-18 8.286t-6 20.286q0 3.429 1.143 11.429l49.143 285.714-208 202.286q-14.286 15.429-14.286 27.429 0 21.143 32 26.286l286.857 41.714 128.571 260q10.857 23.429 28 23.429t28-23.429l128.571-260 286.857-41.714q32-5.143 32-26.286z" horiz-adv-x="951" />
+<glyph unicode="&#xf006;" d="M464.571 217.714l259.429 259.429q10.857 10.857 10.857 25.714t-10.857 25.714l-58.286 58.286q-10.857 10.857-25.714 10.857t-25.714-10.857l-175.429-175.429-175.429 175.429q-10.857 10.857-25.714 10.857t-25.714-10.857l-58.286-58.286q-10.857-10.857-10.857-25.714t10.857-25.714l259.429-259.429q10.857-10.857 25.714-10.857t25.714 10.857zM877.714 448q0-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="&#xf00c;" d="M954.857 636.571q0-22.857-16-38.857l-491.429-491.429q-16-16-38.857-16t-38.857 16l-284.571 284.571q-16 16-16 38.857t16 38.857l77.714 77.714q16 16 38.857 16t38.857-16l168-168.571 374.857 375.429q16 16 38.857 16t38.857-16l77.714-77.714q16-16 16-38.857z" />
 <glyph unicode="&#xf00d;" d="M741.714 204.571q0-22.857-16-38.857l-77.714-77.714q-16-16-38.857-16t-38.857 16l-168 168-168-168q-16-16-38.857-16t-38.857 16l-77.714 77.714q-16 16-16 38.857t16 38.857l168 168-168 168q-16 16-16 38.857t16 38.857l77.714 77.714q16 16 38.857 16t38.857-16l168-168 168 168q16 16 38.857 16t38.857-16l77.714-77.714q16-16 16-38.857t-16-38.857l-168-168 168-168q16-16 16-38.857z" horiz-adv-x="805" />
 <glyph unicode="&#xf010;" d="M438.857 758.857q-84.571 0-156-41.714t-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 156-41.714 156-113.143 113.143-156 41.714zM877.714 448q0-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" />
@@ -50,6 +51,7 @@
 <glyph unicode="&#xf067;" d="M804.571 539.429v-109.714q0-22.857-16-38.857t-38.857-16h-237.714v-237.714q0-22.857-16-38.857t-38.857-16h-109.714q-22.857 0-38.857 16t-16 38.857v237.714h-237.714q-22.857 0-38.857 16t-16 38.857v109.714q0 22.857 16 38.857t38.857 16h237.714v237.714q0 22.857 16 38.857t38.857 16h109.714q22.857 0 38.857-16t16-38.857v-237.714h237.714q22.857 0 38.857-16t16-38.857z" horiz-adv-x="805" />
 <glyph unicode="&#xf075;" d="M1024 448q0-99.429-68.571-183.714t-186.286-133.143-257.143-48.857q-40 0-82.857 4.571-113.143-100-262.857-138.286-28-8-65.143-12.571-9.714-1.143-17.429 5.143t-10 16.571v0.571q-1.714 2.286-0.286 6.857t1.143 5.714 2.571 5.429l3.429 5.143t4 4.857 4.571 5.143q4 4.571 17.714 19.714t19.714 21.714 17.714 22.571 18.571 29.143 15.429 33.714 14.857 43.429q-89.714 50.857-141.429 125.714t-51.714 160.571q0 74.286 40.571 142t109.143 116.857 163.429 78 198.857 28.857q139.429 0 257.143-48.857t186.286-133.143 68.571-183.714z" />
 <glyph unicode="&#xf085;" d="M512 448q0 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.429zM950.857 155.429q0 29.714-21.714 51.429t-51.429 21.714-51.429-21.714-21.714-51.429q0-30.286 21.429-51.714t51.714-21.429 51.714 21.429 21.429 51.714zM950.857 740.571q0 29.714-21.714 51.429t-51.429 21.714-51.429-21.714-21.714-51.429q0-30.286 21.429-51.714t51.714-21.429 51.714 21.429 21.429 51.714zM731.429 500v-105.714q0-5.714-4-11.143t-9.143-6l-88.571-13.714q-6.286-20-18.286-43.429 19.429-27.429 51.429-65.714 4-5.714 4-11.429 0-6.857-4-10.857-13.143-17.143-47.143-51.143t-44.857-34q-6.286 0-12 4l-65.714 51.429q-21.143-10.857-44-17.714-6.286-61.714-13.143-88.571-4-13.714-17.143-13.714h-106.286q-6.286 0-11.429 4.286t-5.714 10l-13.143 87.429q-19.429 5.714-42.857 17.714l-67.429-50.857q-4-4-11.429-4-6.286 0-12 4.571-82.286 76-82.286 91.429 0 5.143 4 10.857 5.714 8 23.429 30.286t26.857 34.857q-13.143 25.143-20 46.857l-86.857 13.714q-5.714 0.571-9.714 5.429t-4 11.143v105.714q0 5.714 4 11.143t9.143 6l88.571 13.714q6.286 20 18.286 43.429-19.429 27.429-51.429 65.714-4 6.286-4 11.429 0 6.857 4 11.429 12.571 17.143 46.857 50.857t45.143 33.714q6.286 0 12-4l65.714-51.429q19.429 10.286 44 18.286 6.286 61.714 13.143 88 4 13.714 17.143 13.714h106.286q6.286 0 11.429-4.286t5.714-10l13.143-87.429q19.429-5.714 42.857-17.714l67.429 50.857q4.571 4 11.429 4 6.286 0 12-4.571 82.286-76 82.286-91.429 0-5.143-4-10.857-6.857-9.143-24-30.857t-25.714-34.286q13.143-27.429 19.429-46.857l86.857-13.143q5.714-1.143 9.714-6t4-11.143zM1097.143 195.429v-80q0-9.143-85.143-17.714-6.857-15.429-17.143-29.714 29.143-64.571 29.143-78.857 0-2.286-2.286-4-69.714-40.571-70.857-40.571-4.571 0-26.286 26.857t-29.714 38.857q-11.429-1.143-17.143-1.143t-17.143 1.143q-8-12-29.714-38.857t-26.286-26.857q-1.143 0-70.857 40.571-2.286 1.714-2.286 4 0 14.286 29.143 78.857-10.286 14.286-17.143 29.714-85.143 8.571-85.143 17.714v80q0 9.143 85.143 17.714 7.429 16.571 17.143 29.714-29.143 64.571-29.143 78.857 0 2.286 2.286 4 2.286 1.143 20 11.429t33.714 19.429 17.143 9.143q4.571 0 26.286-26.571t29.714-38.571q11.429 1.143 17.143 1.143t17.143-1.143q29.143 40.571 52.571 64l3.429 1.143q2.286 0 70.857-40 2.286-1.714 2.286-4 0-14.286-29.143-78.857 9.714-13.143 17.143-29.714 85.143-8.571 85.143-17.714zM1097.143 780.571v-80q0-9.143-85.143-17.714-6.857-15.429-17.143-29.714 29.143-64.571 29.143-78.857 0-2.286-2.286-4-69.714-40.571-70.857-40.571-4.571 0-26.286 26.857t-29.714 38.857q-11.429-1.143-17.143-1.143t-17.143 1.143q-8-12-29.714-38.857t-26.286-26.857q-1.143 0-70.857 40.571-2.286 1.714-2.286 4 0 14.286 29.143 78.857-10.286 14.286-17.143 29.714-85.143 8.571-85.143 17.714v80q0 9.143 85.143 17.714 7.429 16.571 17.143 29.714-29.143 64.571-29.143 78.857 0 2.286 2.286 4 2.286 1.143 20 11.429t33.714 19.429 17.143 9.143q4.571 0 26.286-26.571t29.714-38.571q11.429 1.143 17.143 1.143t17.143-1.143q29.143 40.571 52.571 64l3.429 1.143q2.286 0 70.857-40 2.286-1.714 2.286-4 0-14.286-29.143-78.857 9.714-13.143 17.143-29.714 85.143-8.571 85.143-17.714z" horiz-adv-x="1097" />
+<glyph unicode="&#xf091;" d="M261.714 455.429q-42.286 92.571-42.286 212h-146.286v-54.857q0-44.571 54-92.571t134.571-64.571zM877.714 612.571v54.857h-146.286q0-119.429-42.286-212 80.571 16.571 134.571 64.571t54 92.571zM950.857 685.714v-73.143q0-40.571-23.714-81.714t-64-74.286-98.857-55.714-123.143-25.429q-24-30.857-54.286-54.286-21.714-19.429-30-41.429t-8.286-51.143q0-30.857 17.429-52t55.714-21.143q42.857 0 76.286-26t33.429-65.429v-36.571q0-8-5.143-13.143t-13.143-5.143h-475.429q-8 0-13.143 5.143t-5.143 13.143v36.571q0 39.429 33.429 65.429t76.286 26q38.286 0 55.714 21.143t17.429 52q0 29.143-8.286 51.143t-30 41.429q-30.286 23.429-54.286 54.286-64.571 2.857-123.143 25.429t-98.857 55.714-64 74.286-23.714 81.714v73.143q0 22.857 16 38.857t38.857 16h164.571v54.857q0 37.714 26.857 64.571t64.571 26.857h329.143q37.714 0 64.571-26.857t26.857-64.571v-54.857h164.571q22.857 0 38.857-16t16-38.857z" horiz-adv-x="951" />
 <glyph unicode="&#xf0c1;" d="M832 265.143q0 22.857-16 38.857l-118.857 118.857q-16 16-38.857 16-24 0-41.143-18.286 1.714-1.714 10.857-10.571t12.286-12.286 8.571-10.857 7.429-14.571 2-15.714q0-22.857-16-38.857t-38.857-16q-8.571 0-15.714 2t-14.571 7.429-10.857 8.571-12.286 12.286-10.571 10.857q-18.857-17.714-18.857-41.714 0-22.857 16-38.857l117.714-118.286q15.429-15.429 38.857-15.429 22.857 0 38.857 14.857l84 83.429q16 16 16 38.286zM430.286 668q0 22.857-16 38.857l-117.714 118.286q-16 16-38.857 16-22.286 0-38.857-15.429l-84-83.429q-16-16-16-38.286 0-22.857 16-38.857l118.857-118.857q15.429-15.429 38.857-15.429 24 0 41.143 17.714-1.714 1.714-10.857 10.571t-12.286 12.286-8.571 10.857-7.429 14.571-2 15.714q0 22.857 16 38.857t38.857 16q8.571 0 15.714-2t14.571-7.429 10.857-8.571 12.286-12.286 10.571-10.857q18.857 17.714 18.857 41.714zM941.714 265.143q0-68.571-48.571-116l-84-83.429q-47.429-47.429-116-47.429-69.143 0-116.571 48.571l-117.714 118.286q-47.429 47.429-47.429 116 0 70.286 50.286 119.429l-50.286 50.286q-49.143-50.286-118.857-50.286-68.571 0-116.571 48l-118.857 118.857q-48 48-48 116.571t48.571 116l84 83.429q47.429 47.429 116 47.429 69.143 0 116.571-48.571l117.714-118.286q47.429-47.429 47.429-116 0-70.286-50.286-119.429l50.286-50.286q49.143 50.286 118.857 50.286 68.571 0 116.571-48l118.857-118.857q48-48 48-116.571z" horiz-adv-x="951" />
 <glyph unicode="&#xf0c5;" d="M969.143 740.571q22.857 0 38.857-16t16-38.857v-694.857q0-22.857-16-38.857t-38.857-16h-548.571q-22.857 0-38.857 16t-16 38.857v164.571h-310.857q-22.857 0-38.857 16t-16 38.857v384q0 22.857 11.429 50.286t27.429 43.429l233.143 233.143q16 16 43.429 27.429t50.286 11.429h237.714q22.857 0 38.857-16t16-38.857v-187.429q38.857 22.857 73.143 22.857h237.714zM658.286 618.857l-170.857-170.857h170.857v170.857zM292.571 838.286l-170.857-170.857h170.857v170.857zM404.571 468.571l180.571 180.571v237.714h-219.429v-237.714q0-22.857-16-38.857t-38.857-16h-237.714v-365.714h292.571v146.286q0 22.857 11.429 50.286t27.429 43.429zM950.857 9.143v658.286h-219.429v-237.714q0-22.857-16-38.857t-38.857-16h-237.714v-365.714h512z" />
 <glyph unicode="&#xf0d7;" d="M585.143 557.714q0-14.857-10.857-25.714l-256-256q-10.857-10.857-25.714-10.857t-25.714 10.857l-256 256q-10.857 10.857-10.857 25.714t10.857 25.714 25.714 10.857h512q14.857 0 25.714-10.857t10.857-25.714z" horiz-adv-x="585" />

diff --git a/sonar-server/src/main/webapp/fonts/sonar.ttf b/sonar-server/src/main/webapp/fonts/sonar.ttf
index d53c071c5f3537fae1ff7f34de0ac2ef905afda1..cca0a5f69b2fe5b8916b4137fb50f5f049ca346a 100755 (executable)
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 5d296e17d1a5c55a8a56a2c6fe928624260faded..2f3a11d0bb9277a7661883606d3f57a4c2d27477 100755 (executable)
Binary files a/sonar-server/src/main/webapp/fonts/sonar.woff and b/sonar-server/src/main/webapp/fonts/sonar.woff differ