From c078ea9cec74906a2fff75ba14eac4010e63828a Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Thu, 29 Jan 2015 14:54:57 +0100 Subject: [PATCH] fix issue box overlapping --- server/sonar-web/src/main/hbs/issue/issue.hbs | 246 +++++++++--------- .../src/main/less/components/issues.less | 5 + 2 files changed, 130 insertions(+), 121 deletions(-) diff --git a/server/sonar-web/src/main/hbs/issue/issue.hbs b/server/sonar-web/src/main/hbs/issue/issue.hbs index 2eedfcdcc52..922130e53dc 100644 --- a/server/sonar-web/src/main/hbs/issue/issue.hbs +++ b/server/sonar-web/src/main/hbs/issue/issue.hbs @@ -1,146 +1,150 @@ - - - - - - - - -
-
{{message}} {{t 'rule'}}
- 		-
- {{#if debt}} +
+ + + + + + + +
+
{{message}}{{message}} {{t 'rule'}}
+ 		+
+ {{#if debt}} +
+ {{t 'issue.debt'}} {{debt}} +
+ {{/if}} +
- {{t 'issue.debt'}} {{debt}} + + {{fromNow creationDate}}  +
- {{/if}} -
- - {{fromNow creationDate}}  - + {{#if line}} +
+ L{{line}} +
+ {{/if}} + +
+ +
+
- {{#if line}} + + + - -
+
- L{{line}} + {{#inArray actions "set_severity"}} + + {{severity severity}}  + + {{else}} + {{severity severity}} + {{/inArray}}
- {{/if}} -
- -
-
-
- - - - -
- {{#inArray actions "plan"}} - - {{#if actionPlan}}{{default actionPlanName actionPlan}}{{else}}{{t 'issue.unplanned'}}{{/if}}  +
+ +
-
-
- {{#inArray actions "set_severity"}} - - {{severity severity}}  - - {{else}} - {{severity severity}} +
+ {{#notEmpty transitions}} + + {{statusHelper status resolution}}  + + {{else}} + {{statusHelper status resolution}} + {{/notEmpty}} +
+ +
+ {{#inArray actions "assign"}} + + {{#if assignee}}{{default assigneeName assignee}}{{else}}{{t 'unassigned'}}{{/if}}  + + {{else}} + {{#if assignee}}{{default assigneeName assignee}}{{else}}{{t 'unassigned'}}{{/if}} + {{/inArray}} +
+ + {{#inArray actions "assign_to_me"}} + {{/inArray}} -
-
- {{#notEmpty transitions}} - - {{statusHelper status resolution}}  - - {{else}} - {{statusHelper status resolution}} - {{/notEmpty}} -
+
+ {{#inArray actions "plan"}} + + {{#if actionPlan}}{{default actionPlanName actionPlan}}{{else}}{{t 'issue.unplanned'}}{{/if}}  + + {{else}} + {{#if actionPlan}}{{default actionPlanName actionPlan}}{{else}}{{t 'issue.unplanned'}}{{/if}} + {{/inArray}} +
-
- {{#inArray actions "assign"}} - - {{#if assignee}}{{default assigneeName assignee}}{{else}}{{t 'unassigned'}}{{/if}}  - - {{else}} - {{#if assignee}}{{default assigneeName assignee}}{{else}}{{t 'unassigned'}}{{/if}} + {{#inArray actions "comment"}} +
+ {{t 'issue.comment.formlink' }} +
{{/inArray}} -
- {{#inArray actions "assign_to_me"}} - - {{/inArray}} + {{#ifHasExtraActions actions}} +
+ + {{t 'more'}}  + +
+ {{/ifHasExtraActions}} +
+ 		+
+ {{#inArray actions "set_tags"}} + + +  {{#if tags}}{{join tags ', '}}{{else}}{{t 'issue.no_tag'}}{{/if}} +   {{else}} - {{#if actionPlan}}{{default actionPlanName actionPlan}}{{else}}{{t 'issue.unplanned'}}{{/if}} + +  {{#if tags}}{{join tags ', '}}{{else}}{{t 'issue.no_tag'}}{{/if}} + {{/inArray}}
+
- {{#inArray actions "comment"}} -
- {{t 'issue.comment.formlink' }} + {{#notEmpty comments}} +
+ {{#each comments}} +
+
 {{userName}}
- {{/inArray}} - - {{#ifHasExtraActions actions}} -
- - {{t 'more'}}  - +
{{{show html htmlText}}}
+
({{fromNow createdAt}})
+
+ {{#if updatable}} + {{t 'edit'}}  + {{t 'delete'}} + {{/if}}
- {{/ifHasExtraActions}} -
-
-
- {{#inArray actions "set_tags"}} - - -  {{#if tags}}{{join tags ', '}}{{else}}{{t 'issue.no_tag'}}{{/if}} -   - - {{else}} - -  {{#if tags}}{{join tags ', '}}{{else}}{{t 'issue.no_tag'}}{{/if}} - - {{/inArray}} -
-
- -{{#notEmpty comments}} -
- {{#each comments}} -
-
 {{userName}} -
-
{{{show html htmlText}}}
-
({{fromNow createdAt}})
-
- {{#if updatable}} - {{t 'edit'}}  - {{t 'delete'}} - {{/if}}
-
- {{/each}} -
-{{/notEmpty}} + {{/each}} + + {{/notEmpty}} + + diff --git a/server/sonar-web/src/main/less/components/issues.less b/server/sonar-web/src/main/less/components/issues.less index 8a3d2422246..674d2daa53b 100644 --- a/server/sonar-web/src/main/less/components/issues.less +++ b/server/sonar-web/src/main/less/components/issues.less @@ -39,6 +39,11 @@ border-top-color: transparent; } +.issue-inner { + overflow-x: auto; + overflow-y: hidden; +} + .issue-table { width: 100%; -- 2.39.5