SONAR-5007 Small details UI improvements

diff --git a/sonar-server/src/main/coffee/coding-rules/mockjax.coffee b/sonar-server/src/main/coffee/coding-rules/mockjax.coffee
index 2163fac2a64d843c14cf8f07086192d13783fcc8..9c56fe6319e7cfc7d1a9591ce34718158d057e3d 100644 (file)
--- a/sonar-server/src/main/coffee/coding-rules/mockjax.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/mockjax.coffee
@@ -126,6 +126,7 @@ define ['jquery.mockjax'], ->
         'coding_rules.key': 'Key:'
         'coding_rules.new_search': 'New Search'
         'coding_rules.no_results': 'No Coding Rules'
+        'coding_rules.no_tags': 'No tags'
         'coding_rules.order': 'Order'
         'coding_rules.ordered_by': 'Ordered By'
         'coding_rules.original': 'Original:'
@@ -213,7 +214,6 @@ define ['jquery.mockjax'], ->
       codingrule:
         name: 'Array designators "[]" should be located after the type in method signatures'
         language: 'Java'
-        tags: ['bug', 'comment', 'java8']
         creationDate: '2013-10-15'
         fCreationDate: 'Oct 15, 2013'
         status: 'DEPRECATED'

diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
index 4cf361c7a5cfe46b7ed92c5e02cdc33dbd95f246..7f215ff536a68fa4ab451931f6c7224d9fbccb76 100644 (file)
--- a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
@@ -27,7 +27,7 @@ define [
 
       descriptionExtra: '#coding-rules-detail-description-extra'
       extendDescriptionLink: '#coding-rules-detail-extend-description'
-      extendDescriptionForm: '#coding-rules-detail-extend-description-form'
+      extendDescriptionForm: '.coding-rules-detail-extend-description-form'
       extendDescriptionSubmit: '#coding-rules-detail-extend-description-submit'
       extendDescriptionText: '#coding-rules-detail-extend-description-text'
       extendDescriptionSpinner: '#coding-rules-detail-extend-description-spinner'
@@ -70,6 +70,7 @@ define [
     changeTags: ->
       @ui.tagsEdit.show()
       @ui.tagsList.hide()
+      @ui.tagInput.select2 'open'
 
 
     editDone: ->
@@ -80,7 +81,10 @@ define [
         url: "#{baseUrl}/api/codingrules/set_tags"
         data: tags: tags
       .done =>
-          @model.set 'tags', tags.split ','
+          if tags.length > 0
+            @model.set 'tags', tags.split ','
+          else
+            @model.unset 'tags'
           @render()
 
 

diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs
index 4b36a41182b2e3ecb5d0e308f1963a7c9cc7c078..744df724ad167daa785cf9a059f3d0c6d81e1e8f 100644 (file)
--- a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs
+++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs
@@ -67,10 +67,10 @@
   {{/notEq}}
   <li class="coding-rules-detail-property coding-rules-detail-tag-list coding-rules-detail-tags-change">
     <i class="icon-tags"></i>
-    <span>{{join tags ', '}}</span>
+    <span>{{#if tags}}{{join tags ', '}}{{else}}{{t 'coding_rules.no_tags'}}{{/if}}</span>
   </li>
   <li class="coding-rules-detail-property coding-rules-detail-tag-edit">
-    <input class="coding-rules-detail-tag-input" type="text" value="{{join tags ','}}">
+    <input class="coding-rules-detail-tag-input" type="text" value="{{#if tags}}{{join tags ','}}{{/if}}">
 
     <div class="button-group">
       <button class="coding-rules-detail-tag-edit-done">{{t 'done'}}</button>
@@ -93,8 +93,8 @@
     </div>
   </div>
 
-  <div id="coding-rules-detail-extend-description-form" class="admin">
-    <table class="width100 table">
+  <div class="coding-rules-detail-extend-description-form">
+    <table class="width100">
       <tbody>
       <tr>
         <td class="width100" colspan="2">
@@ -104,7 +104,9 @@
       </tr>
       <tr>
         <td>
-          <button id="coding-rules-detail-extend-description-submit">{{t 'coding_rules.extend_description'}}</button>
+          <div class="button-group">
+            <button id="coding-rules-detail-extend-description-submit">{{t 'coding_rules.extend_description'}}</button>
+          </div>
           <a id="coding-rules-detail-extend-description-cancel" class="action">{{t 'cancel'}}</a>
         </td>
         <td class="right">

diff --git a/sonar-server/src/main/less/coding-rules.less b/sonar-server/src/main/less/coding-rules.less
index fb84e4f37816251445f65f7fa259caacd1c0251a..e9fd8c87f4f09ab58520f831685b0e54a4b9ed41 100644 (file)
--- a/sonar-server/src/main/less/coding-rules.less
+++ b/sonar-server/src/main/less/coding-rules.less
@@ -109,6 +109,10 @@
   margin-top: -@navigatorPadding;
 }
 
+.coding-rules-detail-extend-description-form {
+  margin: @navigatorPadding 0;
+}
+
 .coding-rules-detail-parameters {
   margin: @navigatorPadding 0 @navigatorPadding * 2;
 }

diff --git a/sonar-server/src/main/less/icons.less b/sonar-server/src/main/less/icons.less
index 5c8bc983bd16471feb1bba769b035239c72cbe4e..93b03374d0cf064c14cf3ecd91e13842dc4e4af5 100644 (file)
--- a/sonar-server/src/main/less/icons.less
+++ b/sonar-server/src/main/less/icons.less
@@ -277,6 +277,9 @@ a[class^="icon-"], a[class*=" icon-"] {
 .icon-plus:before {
   content: "\f067";
 }
+.icon-link:before {
+  content: "\f127";
+}
 
 
 /*

diff --git a/sonar-server/src/main/webapp/fonts/sonar.eot b/sonar-server/src/main/webapp/fonts/sonar.eot
index c282cf88ce0018975cc7951882ab89bad73194a9..c1161fd61782d2db8385cd1f86f9dffdc01fc706 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 b14a53ca799d95c457f1a63ac75d9a342414c16b..3aef4fe91b511210454224628538add0b058cb7a 100755 (executable)
--- a/sonar-server/src/main/webapp/fonts/sonar.svg
+++ b/sonar-server/src/main/webapp/fonts/sonar.svg
@@ -54,4 +54,5 @@
 <glyph unicode="&#xf119;" d="M648 236.381q4.571-14.286-2.286-27.714t-21.143-18-28 2.286-18.286 21.714q-14.286 45.714-52.857 74t-86.571 28.286-86.571-28.286-52.857-74q-4.571-14.857-18-21.714t-27.714-2.286q-14.857 4.571-21.714 18t-2.286 27.714q21.143 69.143 78.857 111.429t130.286 42.286 130.286-42.286 78.857-111.429zM365.714 572.953q0-30.286-21.429-51.714t-51.714-21.429-51.714 21.429-21.429 51.714 21.429 51.714 51.714 21.429 51.714-21.429 21.429-51.714zM658.286 572.953q0-30.286-21.429-51.714t-51.714-21.429-51.714 21.429-21.429 51.714 21.429 51.714 51.714 21.429 51.714-21.429 21.429-51.714zM804.571 426.667q0 74.286-29.143 142t-78 116.571-116.571 78-142 29.143-142-29.143-116.571-78-78-116.571-29.143-142 29.143-142 78-116.571 116.571-78 142-29.143 142 29.143 116.571 78 78 116.571 29.143 142zM877.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="&#xf11a;" d="M658.286 316.953q0-14.857-10.857-25.714t-25.714-10.857h-365.714q-14.857 0-25.714 10.857t-10.857 25.714 10.857 25.714 25.714 10.857h365.714q14.857 0 25.714-10.857t10.857-25.714zM365.714 572.953q0-30.286-21.429-51.714t-51.714-21.429-51.714 21.429-21.429 51.714 21.429 51.714 51.714 21.429 51.714-21.429 21.429-51.714zM658.286 572.953q0-30.286-21.429-51.714t-51.714-21.429-51.714 21.429-21.429 51.714 21.429 51.714 51.714 21.429 51.714-21.429 21.429-51.714zM804.571 426.667q0 74.286-29.143 142t-78 116.571-116.571 78-142 29.143-142-29.143-116.571-78-78-116.571-29.143-142 29.143-142 78-116.571 116.571-78 142-29.143 142 29.143 116.571 78 78 116.571 29.143 142zM877.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="&#xf126;" d="M164.571 97.524q0 22.857-16 38.857t-38.857 16-38.857-16-16-38.857 16-38.857 38.857-16 38.857 16 16 38.857zM164.571 755.81q0 22.857-16 38.857t-38.857 16-38.857-16-16-38.857 16-38.857 38.857-16 38.857 16 16 38.857zM530.286 682.667q0 22.857-16 38.857t-38.857 16-38.857-16-16-38.857 16-38.857 38.857-16 38.857 16 16 38.857zM585.143 682.667q0-29.714-14.857-55.143t-40-39.714q-1.143-164-129.143-236.571-38.857-21.714-116-46.286-73.143-22.857-96.857-40.571t-23.714-57.143v-14.857q25.143-14.286 40-39.714t14.857-55.143q0-45.714-32-77.714t-77.714-32-77.714 32-32 77.714q0 29.714 14.857 55.143t40 39.714v468.571q-25.143 14.286-40 39.714t-14.857 55.143q0 45.714 32 77.714t77.714 32 77.714-32 32-77.714q0-29.714-14.857-55.143t-40-39.714v-284q30.857 14.857 88 32.571 31.429 9.714 50 16.857t40.286 17.714 33.714 22.571 23.143 29.143 16 39.714 4.857 52.286q-25.143 14.286-40 39.714t-14.857 55.143q0 45.714 32 77.714t77.714 32 77.714-32 32-77.714z" horiz-adv-x="585" />
+<glyph unicode="&#xf127;" d="M250.857 212.381l-146.286-146.286q-5.714-5.143-13.143-5.143-6.857 0-13.143 5.143-5.143 5.714-5.143 13.143t5.143 13.143l146.286 146.286q5.714 5.143 13.143 5.143t13.143-5.143q5.143-5.714 5.143-13.143t-5.143-13.143zM347.429 188.953v-182.857q0-8-5.143-13.143t-13.143-5.143-13.143 5.143-5.143 13.143v182.857q0 8 5.143 13.143t13.143 5.143 13.143-5.143 5.143-13.143zM219.429 316.953q0-8-5.143-13.143t-13.143-5.143h-182.857q-8 0-13.143 5.143t-5.143 13.143 5.143 13.143 13.143 5.143h182.857q8 0 13.143-5.143t5.143-13.143zM941.714 243.81q0-68.571-48.571-116l-84-83.429q-47.429-47.429-116-47.429-69.143 0-116.571 48.571l-190.857 191.429q-12 12-24 32l136.571 10.286 156-156.571q15.429-15.429 38.857-15.714t38.857 15.143l84 83.429q16 16 16 38.286 0 22.857-16 38.857l-156.571 157.143 10.286 136.571q20-12 32-24l192-192q48-49.143 48-116.571zM589.143 657.524l-136.571-10.286-156 156.571q-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.857l156.571-156.571-10.286-137.143q-20 12-32 24l-192 192q-48 49.143-48 116.571 0 68.571 48.571 116l84 83.429q47.429 47.429 116 47.429 69.143 0 116.571-48.571l190.857-191.429q12-12 24-32zM950.857 609.524q0-8-5.143-13.143t-13.143-5.143h-182.857q-8 0-13.143 5.143t-5.143 13.143 5.143 13.143 13.143 5.143h182.857q8 0 13.143-5.143t5.143-13.143zM640 920.381v-182.857q0-8-5.143-13.143t-13.143-5.143-13.143 5.143-5.143 13.143v182.857q0 8 5.143 13.143t13.143 5.143 13.143-5.143 5.143-13.143zM872.571 834.096l-146.286-146.286q-6.286-5.143-13.143-5.143t-13.143 5.143q-5.143 5.714-5.143 13.143t5.143 13.143l146.286 146.286q5.714 5.143 13.143 5.143t13.143-5.143q5.143-5.714 5.143-13.143t-5.143-13.143z" horiz-adv-x="951" />
 </font></defs></svg>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/fonts/sonar.ttf b/sonar-server/src/main/webapp/fonts/sonar.ttf
index 8952f5faf62346db781db930767da236c7b209fa..c2f9a5acb6785c5daf84c77ee5caf5be48176928 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 e79f3d02df89c99606eccfed0126208cccc3d169..6b3f1dcb3e82ef6a9a4d9ca1b4486de4211c748d 100755 (executable)
Binary files a/sonar-server/src/main/webapp/fonts/sonar.woff and b/sonar-server/src/main/webapp/fonts/sonar.woff differ