aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-11-26 09:22:22 +0100
committerStas Vilchik <vilchiks@gmail.com>2014-11-26 09:22:28 +0100
commita672bfc7fed81d83170b28b9e392f80d378288c1 (patch)
tree72bfd187fbdf25f25bb5c44085ad9895a791dfd1
parente94e094fb15e94c9a82f62fc57f998f77ae2a81e (diff)
downloadsonarqube-a672bfc7fed81d83170b28b9e392f80d378288c1.tar.gz
sonarqube-a672bfc7fed81d83170b28b9e392f80d378288c1.zip
SONAR-5872 Apply feedback
-rw-r--r--server/sonar-web/src/main/coffee/issues/component-viewer/issue-view.coffee2
-rw-r--r--server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee22
-rw-r--r--server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee2
-rw-r--r--server/sonar-web/src/main/hbs/issues/issues-component-viewer.hbs7
-rw-r--r--server/sonar-web/src/main/less/components/issues.less4
5 files changed, 21 insertions, 16 deletions
diff --git a/server/sonar-web/src/main/coffee/issues/component-viewer/issue-view.coffee b/server/sonar-web/src/main/coffee/issues/component-viewer/issue-view.coffee
index da845fc1e45..98ccbd4a428 100644
--- a/server/sonar-web/src/main/coffee/issues/component-viewer/issue-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/component-viewer/issue-view.coffee
@@ -9,7 +9,7 @@ define [
onRender: ->
super
@$el.removeClass 'issue-navigate-right'
- @$el.addClass 'issue-navigate-left'
+
serializeData: ->
_.extend super,
diff --git a/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee b/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee
index d3f4f7db946..738826ecc0e 100644
--- a/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee
+++ b/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee
@@ -173,18 +173,16 @@ define [
row = @$("[data-line-number=#{line}]")
issueView = new IssueView app: @options.app, model: issue
@issueViews.push issueView
- if line == 0
- issueView.render().$el.insertBefore @$('.issues-workspace-component-viewer-code')
- else
- showBox = Math.abs(issue.get('index') - @model.get('issueIndex')) < ISSUES_LIMIT / 2
- @hiddenIssues = true unless showBox
- if showBox && row.length > 0
- line = row.find '.line'
- line.addClass 'has-issues'
- issues = line.find '.issue-list'
- if issues.length == 0
- issues = $('<div class="issue-list"></div>').appendTo line
- issueView.render().$el.appendTo issues
+ showBox = Math.abs(issue.get('index') - @model.get('issueIndex')) < ISSUES_LIMIT / 2
+ @hiddenIssues = true unless showBox
+ if showBox && row.length > 0
+ row.removeClass 'hidden'
+ line = row.find '.line'
+ line.addClass 'has-issues'
+ issues = line.find '.issue-list'
+ if issues.length == 0
+ issues = $('<div class="issue-list"></div>').appendTo line
+ issueView.render().$el.appendTo issues
select: ->
diff --git a/server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee b/server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee
index 18dc459b6e5..e0fd474ce63 100644
--- a/server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee
@@ -12,7 +12,7 @@ define [
$ = jQuery
- TOP_OFFSET = 38
+ TOP_OFFSET = 72
BOTTOM_OFFSET = 10
diff --git a/server/sonar-web/src/main/hbs/issues/issues-component-viewer.hbs b/server/sonar-web/src/main/hbs/issues/issues-component-viewer.hbs
index 719702ccc03..0471c49cedc 100644
--- a/server/sonar-web/src/main/hbs/issues/issues-component-viewer.hbs
+++ b/server/sonar-web/src/main/hbs/issues/issues-component-viewer.hbs
@@ -4,6 +4,13 @@
{{/if}}
<table class="code">
+ <tr class="row hidden" data-line-number="0">
+ <td class="stat">&nbsp;</td>
+ {{#if hasSCM}}
+ <td class="stat scm">&nbsp;</td>
+ {{/if}}
+ <td class="line"></td>
+ </tr>
{{#each source}}
<tr class="row" data-line-number="{{line}}">
<td class="stat">{{line}}</td>
diff --git a/server/sonar-web/src/main/less/components/issues.less b/server/sonar-web/src/main/less/components/issues.less
index 88eedfd015c..a709e9ab9a8 100644
--- a/server/sonar-web/src/main/less/components/issues.less
+++ b/server/sonar-web/src/main/less/components/issues.less
@@ -4,8 +4,8 @@
@leftPadding: 10px;
@rightPadding: 10px;
-@topPadding: 5px;
-@bottomPadding: 5px;
+@topPadding: 8px;
+@bottomPadding: 8px;
.issue-list {