SONAR-5368 Replace popup with inline help (a la quality gate)

diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-debt-popup-view.coffee b/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-debt-popup-view.coffee
deleted file mode 100644 (file)
index c8882d8..0000000
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-debt-popup-view.coffee
+++ /dev/null
@@ -1,16 +0,0 @@
-define [
-  'backbone.marionette'
-  'templates/coding-rules'
-  'common/popup'
-], (
-  Marionette
-  Templates
-  Popup
-) ->
-
-  class CodingRulesDebtPopupView extends Popup
-    template: Templates['coding-rules-debt-popup']
-
-    serializeData: ->
-      _.extend super,
-        subcharacteristic: @options.app.getSubcharacteristicName(@model.get 'debtSubChar')

diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee b/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
index 8fad4213258f3008705fe9f5d0b6889e00648176..32dc626580185ff062b75f17467d931612286d58 100644 (file)
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
@@ -6,7 +6,6 @@ define [
   'coding-rules/views/coding-rules-detail-custom-rules-view'
   'coding-rules/views/coding-rules-detail-custom-rule-view'
   'coding-rules/views/coding-rules-parameter-popup-view'
-  'coding-rules/views/coding-rules-debt-popup-view'
   'templates/coding-rules'
 ], (
   Backbone
@@ -16,7 +15,6 @@ define [
   CodingRulesDetailCustomRulesView
   CodingRulesDetailCustomRuleView
   CodingRulesParameterPopupView
-  CodingRulesDebtPopupView
   Templates
 ) ->
 
@@ -38,6 +36,9 @@ define [
       tagsEditDone: '.coding-rules-detail-tag-edit-done'
       tagsList: '.coding-rules-detail-tag-list'
 
+      subcharacteristic: '.coding-rules-subcharacteristic'
+      subcharacteristicMore: '.coding-rules-subcharacteristic-more'
+
       descriptionExtra: '#coding-rules-detail-description-extra'
       extendDescriptionLink: '#coding-rules-detail-extend-description'
       extendDescriptionForm: '.coding-rules-detail-extend-description-form'
@@ -74,7 +75,7 @@ define [
       'click @ui.deleteCustomRule': 'deleteRule'
 
       'click .coding-rules-detail-parameter-details': 'showParamPopup'
-      'click .coding-rules-subcharacteristic': 'showDebtPopup'
+      'click .coding-rules-subcharacteristic': 'toggleDebtInfo'
 
     initialize: (options) ->
       super options
@@ -185,14 +186,8 @@ define [
       false
 
 
-    showDebtPopup: (e) ->
-      e.stopPropagation()
-      jQuery('body').click()
-      popup = new CodingRulesDebtPopupView
-        model: @model
-        app: @options.app
-        triggerEl: jQuery(e.currentTarget)
-      popup.render()
+    toggleDebtInfo: (e) ->
+      @ui.subcharacteristicMore.toggle()
       false
 
 

diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-debt-popup.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-debt-popup.hbs
deleted file mode 100644 (file)
index 845cc10..0000000
--- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-debt-popup.hbs
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="coding-rules-parameter-full-description bubble-popup-container">
-  <div class="bubble-popup-title">{{t 'widget.rules.technical_debt'}}</div>
-
-  <ul class="bubble-popup-list">
-    {{#if debtChar}}
-    <li>
-      <h3>{{t 'coding_rules.filters.characteristic'}}</h3>
-      {{subcharacteristic}}
-    </li>
-    {{/if}}
-
-    {{#if debtRemFnType}}
-    <li>
-      <h3>{{t 'coding_rules.remediation_function'}}</h3>
-      {{t 'coding_rules.remediation_function' debtRemFnType}}
-    </li>
-    {{/if}}
-    {{#if debtRemFnCoeff}}
-    <li>
-      <h3>{{t 'coding_rules.remediation_function.coeff'}}</h3>
-      {{debtRemFnCoeff}}
-    </li>
-    {{/if}}
-    {{#if debtRemFnOffset}}
-    <li>
-      <h3>{{t 'coding_rules.remediation_function.offset'}}</h3>
-      {{debtRemFnOffset}}
-    </li>
-    {{/if}}
-</div>
-
-<div class="bubble-popup-arrow"></div>

diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-detail.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-detail.hbs
index 1762144fc35c23229bcd51386b913e35f8700242..9c99ffa04caffd61b1d51bdc625e1c28cd3ad588 100644 (file)
--- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-detail.hbs
+++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-detail.hbs
@@ -34,7 +34,9 @@
   </li>{{/if}}
 
   {{#if subcharacteristic}}
-    <li class="coding-rules-detail-property">{{subcharacteristic}} <a href="#" class="coding-rules-subcharacteristic">{{t 'more'}}</a></li>
+    <li class="coding-rules-detail-property">
+      <a class="link-action coding-rules-subcharacteristic">{{subcharacteristic}}</a>
+    </li>
   {{/if}}
   <li class="coding-rules-detail-property">{{t 'coding_rules.available_since'}} {{d createdAt}}</li>
   <li class="coding-rules-detail-property">{{repository}}{{#unless isManual}} ({{language}}){{/unless}}</li>
@@ -49,6 +51,31 @@
   {{/if}}
 </ul>
 
+{{#if subcharacteristic}}
+<div class="coding-rules-subcharacteristic-more inline-help">
+  <ul>
+    {{#if debtRemFnType}}
+    <li>
+      <h3>{{t 'coding_rules.remediation_function'}}</h3>
+      {{t 'coding_rules.remediation_function' debtRemFnType}}
+    </li>
+    {{/if}}
+    {{#if debtRemFnCoeff}}
+    <li>
+      <h3>{{t 'coding_rules.remediation_function.coeff'}}</h3>
+      {{debtRemFnCoeff}}
+    </li>
+    {{/if}}
+    {{#if debtRemFnOffset}}
+    <li>
+      <h3>{{t 'coding_rules.remediation_function.offset'}}</h3>
+      {{debtRemFnOffset}}
+    </li>
+    {{/if}}
+  </ul>
+</div>
+{{/if}}
+
 <div class="coding-rules-detail-description rule-desc markdown">{{{htmlDesc}}}</div>
 
 {{#if isEditable}}

diff --git a/server/sonar-web/src/main/less/coding-rules.less b/server/sonar-web/src/main/less/coding-rules.less
index 58fabb28ce0a9a94192b17cf1300a597615ae11a..7d8923a9dac4ae3e29fa7953e7983d02faa77556 100644 (file)
--- a/server/sonar-web/src/main/less/coding-rules.less
+++ b/server/sonar-web/src/main/less/coding-rules.less
@@ -368,3 +368,7 @@ textarea.coding-rules-markdown-description {
 .coding-rules-detail-custom-rule-name {
   font-weight: bold;
 }
+
+.coding-rules-subcharacteristic-more {
+  display: none;
+}