diff options
Diffstat (limited to 'server')
5 files changed, 64 insertions, 10 deletions
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 new file mode 100644 index 00000000000..c8882d87fb4 --- /dev/null +++ b/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-debt-popup-view.coffee @@ -0,0 +1,16 @@ +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 cb31e14f672..dd9bdd55412 100644 --- 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,6 +6,7 @@ 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 @@ -15,6 +16,7 @@ define [ CodingRulesDetailCustomRulesView CodingRulesDetailCustomRuleView CodingRulesParameterPopupView + CodingRulesDebtPopupView Templates ) -> @@ -37,7 +39,6 @@ define [ 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' @@ -74,8 +75,8 @@ define [ 'click @ui.changeManualRule': 'changeManualRule' 'click @ui.deleteCustomRule': 'deleteRule' - 'click .coding-rules-subcharacteristic': 'toggleDebtInfo' 'click .coding-rules-detail-parameter-name': 'toggleParameterDescription' + 'click .coding-rules-subcharacteristic': 'showDebtPopup' initialize: (options) -> super options @@ -173,15 +174,21 @@ define [ @ui.extendDescriptionSpinner.hide() - toggleDebtInfo: (e) -> - @ui.subcharacteristicMore.toggle() - false - - toggleParameterDescription: (e) -> jQuery(e.currentTarget).next('.coding-rules-detail-parameter-description').toggle(); + showDebtPopup: (e) -> + e.stopPropagation() + jQuery('body').click() + popup = new CodingRulesDebtPopupView + model: @model + app: @options.app + triggerEl: jQuery(e.currentTarget) + popup.render() + false + + hideContext: -> @contextRegion.reset() @$(@contextRegion.el).hide() 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 new file mode 100644 index 00000000000..42decbd26d0 --- /dev/null +++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-debt-popup.hbs @@ -0,0 +1,23 @@ +<div class="coding-rules-debt-popup bubble-popup-container"> + <ul class="bubble-popup-list"> + {{#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 7f65d83a2af..f839bb8963c 100644 --- 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,9 +34,7 @@ </li>{{/if}} {{#if subcharacteristic}} - <li class="coding-rules-detail-property"> - <a class="link-action coding-rules-subcharacteristic">{{subcharacteristic}}</a> - </li> + <li class="coding-rules-detail-property coding-rules-subcharacteristic">{{subcharacteristic}}</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> diff --git a/server/sonar-web/src/main/less/coding-rules.less b/server/sonar-web/src/main/less/coding-rules.less index 060f0f1e1e1..bacf9217e72 100644 --- a/server/sonar-web/src/main/less/coding-rules.less +++ b/server/sonar-web/src/main/less/coding-rules.less @@ -161,6 +161,16 @@ .select2-search-field { line-height: 1; } } +.coding-rules-subcharacteristic { + cursor: pointer; +} + +.coding-rules-debt-popup { + h3 { + display: inline + } +} + .coding-rules-detail-tag + .coding-rules-detail-tag { margin-left: @navigatorPadding; } |