diff options
3 files changed, 21 insertions, 15 deletions
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 49e14ad7d1b..24295ac0478 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 @@ -51,18 +51,7 @@ <div class="coding-rules-detail-description rule-desc markdown">{{{htmlDesc}}}</div> -{{#if isEditable}} - <div class="coding-rules-detail-description"> - <div class="button-group"> - {{#if isManual}} - <button id="coding-rules-detail-manual-rule-change">{{t 'edit'}}</button> - {{else}} - <button id="coding-rules-detail-custom-rule-change">{{t 'edit'}}</button> - {{/if}} - <button id="coding-rules-detail-rule-delete" class="button-red">{{t 'delete'}}</button> - </div> - </div> -{{else}} +{{#unless isEditable}} {{#unless isManual}} <div class="coding-rules-detail-description coding-rules-detail-description-extra"> <div id="coding-rules-detail-description-extra"> @@ -105,7 +94,7 @@ </div>{{/if}} </div> {{/unless}} -{{/if}} +{{/unless}} {{#if params}} @@ -135,6 +124,19 @@ </div> {{/if}} +{{#if isEditable}} + <div class="coding-rules-detail-description"> + <div class="button-group"> + {{#if isManual}} + <button id="coding-rules-detail-manual-rule-change">{{t 'edit'}}</button> + {{else}} + <button id="coding-rules-detail-custom-rule-change">{{t 'edit'}}</button> + {{/if}} + <button id="coding-rules-detail-rule-delete" class="button-red">{{t 'delete'}}</button> + </div> + </div> +{{/if}} + {{#if isTemplate}} <div class="coding-rules-detail-custom-rules-section"> diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs index 9e48279434d..82c3c09a8fc 100644 --- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs +++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs @@ -35,7 +35,10 @@ </select> </td> </tr> - {{#unless isCustomRule}} + {{#if isCustomRule}} + <tr class="property"> + <td colspan="2">{{t 'coding_rules.custom_rule.activation_notice'}}</td> + {{else}} {{#each params}} <tr class="property"> <th><h3>{{key}}</h3></th> @@ -60,7 +63,7 @@ </td> </tr> {{/each}} - {{/unless}} + {{/if}} </table> </div> diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index ae46cd416a4..a6028bd5417 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -1734,6 +1734,7 @@ coding_rules.create_custom_rule=Create Custom Rule coding_rules.create_manual_rule=Create Manual Rule coding_rules.custom_rule=Custom Rule coding_rules.custom_rule.title=This rule has been created through customization of a rule template +coding_rules.custom_rule.activation_notice=Note: parameters of a custom rule are not customizable on rule activation, only on custom rule edition. coding_rules.custom_rules=Custom Rules coding_rules.delete.custom.confirm=Are you sure you want to delete custom rule "{0}"? coding_rules.delete.manual.confirm=Are you sure you want to delete manual rule "{0}"? |