diff options
| author | Jenkins CI <ci@sonarsource.com> | 2014-10-28 08:01:29 +0100 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2014-10-28 08:01:29 +0100 |
| commit | ca4e2d0015daa12a7b55b02cbcc6e8de00e4ba9f (patch) | |
| tree | 6fde64fe09187435ba48aaedacec6007ae580d7d /server/sonar-web | |
| parent | 9c3b7aaf5ea2f9451ab01368f946b8671f00991d (diff) | |
| parent | 8ce43df60ac508adcb6536d23554e21dc9394f07 (diff) | |
| download | sonarqube-ca4e2d0015daa12a7b55b02cbcc6e8de00e4ba9f.tar.gz sonarqube-ca4e2d0015daa12a7b55b02cbcc6e8de00e4ba9f.zip | |
Automatic merge from branch-4.5
* origin/branch-4.5:
SONAR-5790 Incorrect source link on the design page
SONAR-5788 DSM table doesn't correctly wrap values
Diffstat (limited to 'server/sonar-web')
| -rw-r--r-- | server/sonar-web/src/main/hbs/design/dsm-info.hbs | 4 | ||||
| -rw-r--r-- | server/sonar-web/src/main/less/dsm.less | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/server/sonar-web/src/main/hbs/design/dsm-info.hbs b/server/sonar-web/src/main/hbs/design/dsm-info.hbs index 5ae952f06c0..32bc514f9f9 100644 --- a/server/sonar-web/src/main/hbs/design/dsm-info.hbs +++ b/server/sonar-web/src/main/hbs/design/dsm-info.hbs @@ -12,7 +12,7 @@ <td {{#if changed}}class="changed"{{/if}}> {{#if changed}} {{qualifierIcon fq}} - <a href="/dashboard/index/{{fk}}">{{fn}}</a> + <a href="{{dashboardUrl fk}}">{{fn}}</a> {{/if}} </td> <td {{#if changed}}class="changed"{{/if}}> @@ -22,7 +22,7 @@ </td> <td {{#if changed}}class="changed"{{/if}}> {{qualifierIcon tq}} - <a href="/dashboard/index/{{tk}}"> {{tn}} </a> + <a href="{{dashboardUrl tk}}"> {{tn}} </a> </td> </tr> {{/eachChanged}} diff --git a/server/sonar-web/src/main/less/dsm.less b/server/sonar-web/src/main/less/dsm.less index 3090de47e53..dfad4b98a07 100644 --- a/server/sonar-web/src/main/less/dsm.less +++ b/server/sonar-web/src/main/less/dsm.less @@ -52,6 +52,7 @@ border-right: 2px solid darken(@barBorderColor, 8%) !important; color: @baseFontColor; cursor: pointer; + white-space: nowrap; .link-no-underline; .trans(background-color); @@ -64,6 +65,7 @@ .box-sizing(border-box); text-align: center; cursor: pointer; + white-space: nowrap; .trans(background-color); } |