Merge branch 'branch-5.0'

Conflicts:
	server/sonar-web/src/main/hbs/issue/issue-rule.hbs

diff --cc server/sonar-web/src/main/hbs/issue/issue-rule.hbs
index deb4a080cf33c14ba9f4f5dc646e3e7b3df1a613,d613e6834edbd336320221e01f4ead367dd2ca5d..7d2348469bde919a6f9caaaaf8d09cb8e98cfde8
--- 1/server/sonar-web/src/main/hbs/issue/issue-rule.hbs
--- 2/server/sonar-web/src/main/hbs/issue/issue-rule.hbs
+++ b/server/sonar-web/src/main/hbs/issue/issue-rule.hbs
@@@ -1,27 -1,30 +1,32 @@@
 -<h3 class="coding-rules-detail-header">
 -  {{name}}
 -  <a class="coding-rules-detail-permalink" target="_blank" href="{{permalink}}">
 -    <i class="icon-link"></i> {{t 'coding_rules.permalink'}}
 -  </a>
 -</h3>
 +<div class="modal-container">
 +  <h3 class="coding-rules-detail-header">
 +    {{name}}
 +    <a class="coding-rules-detail-permalink" target="_blank" href="{{permalink}}">
 +      <i class="icon-link"></i> {{t 'coding_rules.permalink'}}
 +    </a>
 +  </h3>
  
 -<span class="subtitle">{{key}}</span>
 +  <span class="subtitle">{{key}}</span>
  
 -<ul class="coding-rules-detail-properties">
 -  <li class="coding-rules-detail-property coding-rules-detail-tag-list">
 -    <i class="icon-tags"></i>
 -    <span>{{#if allTags}}{{join allTags ', '}}{{else}}{{t 'coding_rules.no_tags'}}{{/if}}</span>
 -  </li>
 -  {{#if debtCharName}}
 -    <li class="coding-rules-detail-property">{{debtCharName}}{{#if debtSubCharName}} > {{debtSubCharName}}{{/if}}</li>
 -  {{/if}}
 -</ul>
 +  <ul class="coding-rules-detail-properties">
 +    <li class="coding-rules-detail-property coding-rules-detail-tag-list">
 +      <i class="icon-tags"></i>
 +      <span>{{#if allTags}}{{join allTags ', '}}{{else}}{{t 'coding_rules.no_tags'}}{{/if}}</span>
 +    </li>
 +    {{#if debtCharName}}
 +      <li class="coding-rules-detail-property">{{debtCharName}}{{#if debtSubCharName}} > {{debtSubCharName}}{{/if}}</li>
 +    {{/if}}
 +  </ul>
  
- 
 -<div class="coding-rules-detail-description rule-desc markdown">{{{htmlDesc}}}</div>
 +  <div class="coding-rules-detail-description rule-desc markdown">{{{htmlDesc}}}</div>
+ 
 -{{#if htmlNote}}
 -  <div id="coding-rules-detail-description-extra">
 -    <div class="rule-desc markdown">{{{htmlNote}}}</div>
 -  </div>
 -{{/if}}
++  {{#if htmlNote}}
++    <div id="coding-rules-detail-description-extra">
++      <div class="rule-desc markdown">{{{htmlNote}}}</div>
++    </div>
++  {{/if}}
 +</div>
  
  <div class="modal-foot">
 -  <a class="overlay-popup-close" title="{{t 'close'}}">{{t 'close'}}</a>
 +  <a class="js-modal-close" title="{{t 'close'}}">{{t 'close'}}</a>
  </div>

diff --cc server/sonar-web/src/main/less/components/issues.less
Simple merge