aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-10-31 14:47:47 +0100
committerStas Vilchik <vilchiks@gmail.com>2014-10-31 16:50:42 +0100
commit13e78a45526d1afee791801bcb22d9a266fcdb0e (patch)
tree1fe8cf8c0abac9b1f9c8402e1a65bfbd66b03b7e
parent1dad573b3ab8094ac31a1158773ba150a2525422 (diff)
downloadsonarqube-13e78a45526d1afee791801bcb22d9a266fcdb0e.tar.gz
sonarqube-13e78a45526d1afee791801bcb22d9a266fcdb0e.zip
SONAR-5718 UI improvements
-rw-r--r--server/sonar-web/src/main/coffee/common/processes.coffee3
-rw-r--r--server/sonar-web/src/main/coffee/issues/controller.coffee5
-rw-r--r--server/sonar-web/src/main/hbs/issues/facets/issues-assignee-facet.hbs6
-rw-r--r--server/sonar-web/src/main/hbs/issues/facets/issues-base-facet.hbs2
-rw-r--r--server/sonar-web/src/main/hbs/issues/facets/issues-project-facet.hbs2
-rw-r--r--server/sonar-web/src/main/hbs/issues/facets/issues-reporter-facet.hbs2
-rw-r--r--server/sonar-web/src/main/hbs/issues/facets/issues-resolution-facet.hbs6
-rw-r--r--server/sonar-web/src/main/hbs/issues/facets/issues-rule-facet.hbs2
-rw-r--r--server/sonar-web/src/main/hbs/issues/facets/issues-severity-facet.hbs2
-rw-r--r--server/sonar-web/src/main/hbs/issues/facets/issues-status-facet.hbs2
-rw-r--r--server/sonar-web/src/main/less/issues.less13
-rw-r--r--sonar-core/src/main/resources/org/sonar/l10n/core.properties2
12 files changed, 27 insertions, 20 deletions
diff --git a/server/sonar-web/src/main/coffee/common/processes.coffee b/server/sonar-web/src/main/coffee/common/processes.coffee
index 74257fd7482..3e63cf83e06 100644
--- a/server/sonar-web/src/main/coffee/common/processes.coffee
+++ b/server/sonar-web/src/main/coffee/common/processes.coffee
@@ -3,6 +3,7 @@ $ = jQuery
process = {}
process.queue = {}
process.timeout = 300
+process.fadeTimeout = 100
_.extend process,
@@ -29,7 +30,7 @@ _.extend process,
spinner.prop 'id', id
spinner.text t 'process.still_working'
spinner.appendTo $('body')
- setTimeout (-> spinner.addClass 'shown'), 100
+ setTimeout (-> spinner.addClass 'shown'), @fadeTimeout
removeSpinner: (uid) ->
diff --git a/server/sonar-web/src/main/coffee/issues/controller.coffee b/server/sonar-web/src/main/coffee/issues/controller.coffee
index e0db4b8dcda..58263c8dc02 100644
--- a/server/sonar-web/src/main/coffee/issues/controller.coffee
+++ b/server/sonar-web/src/main/coffee/issues/controller.coffee
@@ -98,7 +98,10 @@ define [
if facet.has('values') || FACETS_FROM_SERVER.indexOf(id) == -1
facet.set enabled: true
else
- @requestFacet(id).done => facet.set enabled: true
+ p = window.process.addBackgroundProcess()
+ @requestFacet(id).done =>
+ facet.set enabled: true
+ window.process.finishBackgroundProcess p
disableFacet: (id) ->
diff --git a/server/sonar-web/src/main/hbs/issues/facets/issues-assignee-facet.hbs b/server/sonar-web/src/main/hbs/issues/facets/issues-assignee-facet.hbs
index 8065434d283..aae74814a2c 100644
--- a/server/sonar-web/src/main/hbs/issues/facets/issues-assignee-facet.hbs
+++ b/server/sonar-web/src/main/hbs/issues/facets/issues-assignee-facet.hbs
@@ -8,12 +8,12 @@
{{#each values}}
{{#eq val ''}}
{{! unassigned }}
- <a class="facet issues-facet js-issues-facet" data-unassigned>
- <span class="facet-name">Unassigned</span>
+ <a class="facet issues-facet js-issues-facet" data-unassigned title="{{t 'unassigned'}}">
+ <span class="facet-name">{{t 'unassigned'}}</span>
<span class="facet-stat">{{count}}</span>
</a>
{{else}}
- <a class="facet issues-facet js-issues-facet" data-value="{{val}}">
+ <a class="facet issues-facet js-issues-facet" data-value="{{val}}" title="{{label}}">
<span class="facet-name">{{label}}</span>
<span class="facet-stat">{{count}}</span>
</a>
diff --git a/server/sonar-web/src/main/hbs/issues/facets/issues-base-facet.hbs b/server/sonar-web/src/main/hbs/issues/facets/issues-base-facet.hbs
index 0c2bf496a7a..4fd48a68f4e 100644
--- a/server/sonar-web/src/main/hbs/issues/facets/issues-base-facet.hbs
+++ b/server/sonar-web/src/main/hbs/issues/facets/issues-base-facet.hbs
@@ -2,7 +2,7 @@
<div class="issues-facet-list">
{{#each values}}
- <a class="facet issues-facet js-issues-facet" data-value="{{val}}">
+ <a class="facet issues-facet js-issues-facet" data-value="{{val}}" title="{{default label val}}">
<span class="facet-name">{{default label val}}</span>
<span class="facet-stat">{{count}}</span>
</a>
diff --git a/server/sonar-web/src/main/hbs/issues/facets/issues-project-facet.hbs b/server/sonar-web/src/main/hbs/issues/facets/issues-project-facet.hbs
index af181c52f8b..b82e9329b37 100644
--- a/server/sonar-web/src/main/hbs/issues/facets/issues-project-facet.hbs
+++ b/server/sonar-web/src/main/hbs/issues/facets/issues-project-facet.hbs
@@ -6,7 +6,7 @@
</div>
{{#each values}}
- <a class="facet issues-facet js-issues-facet" data-value="{{val}}">
+ <a class="facet issues-facet js-issues-facet" data-value="{{val}}" title="{{default label val}}">
<span class="facet-name">{{default label val}}</span>
<span class="facet-stat">{{count}}</span>
</a>
diff --git a/server/sonar-web/src/main/hbs/issues/facets/issues-reporter-facet.hbs b/server/sonar-web/src/main/hbs/issues/facets/issues-reporter-facet.hbs
index af181c52f8b..b82e9329b37 100644
--- a/server/sonar-web/src/main/hbs/issues/facets/issues-reporter-facet.hbs
+++ b/server/sonar-web/src/main/hbs/issues/facets/issues-reporter-facet.hbs
@@ -6,7 +6,7 @@
</div>
{{#each values}}
- <a class="facet issues-facet js-issues-facet" data-value="{{val}}">
+ <a class="facet issues-facet js-issues-facet" data-value="{{val}}" title="{{default label val}}">
<span class="facet-name">{{default label val}}</span>
<span class="facet-stat">{{count}}</span>
</a>
diff --git a/server/sonar-web/src/main/hbs/issues/facets/issues-resolution-facet.hbs b/server/sonar-web/src/main/hbs/issues/facets/issues-resolution-facet.hbs
index 2268710a51a..1eb34815a92 100644
--- a/server/sonar-web/src/main/hbs/issues/facets/issues-resolution-facet.hbs
+++ b/server/sonar-web/src/main/hbs/issues/facets/issues-resolution-facet.hbs
@@ -4,12 +4,12 @@
{{#each values}}
{{#eq val ''}}
{{! unresolved }}
- <a class="facet issues-facet issues-facet-half js-issues-facet" data-unresolved>
- <span class="facet-name">Unresolved</span>
+ <a class="facet issues-facet issues-facet-half js-issues-facet" data-unresolved title="{{t 'unresolved'}}">
+ <span class="facet-name">{{t 'unresolved'}}</span>
<span class="facet-stat">{{count}}</span>
</a>
{{else}}
- <a class="facet issues-facet issues-facet-half js-issues-facet" data-value="{{val}}">
+ <a class="facet issues-facet issues-facet-half js-issues-facet" data-value="{{val}}" title="{{t 'issue.resolution' val}}">
<span class="facet-name">{{t 'issue.resolution' val}}</span>
<span class="facet-stat">{{count}}</span>
</a>
diff --git a/server/sonar-web/src/main/hbs/issues/facets/issues-rule-facet.hbs b/server/sonar-web/src/main/hbs/issues/facets/issues-rule-facet.hbs
index af181c52f8b..b82e9329b37 100644
--- a/server/sonar-web/src/main/hbs/issues/facets/issues-rule-facet.hbs
+++ b/server/sonar-web/src/main/hbs/issues/facets/issues-rule-facet.hbs
@@ -6,7 +6,7 @@
</div>
{{#each values}}
- <a class="facet issues-facet js-issues-facet" data-value="{{val}}">
+ <a class="facet issues-facet js-issues-facet" data-value="{{val}}" title="{{default label val}}">
<span class="facet-name">{{default label val}}</span>
<span class="facet-stat">{{count}}</span>
</a>
diff --git a/server/sonar-web/src/main/hbs/issues/facets/issues-severity-facet.hbs b/server/sonar-web/src/main/hbs/issues/facets/issues-severity-facet.hbs
index 66deef1086e..062e275abb4 100644
--- a/server/sonar-web/src/main/hbs/issues/facets/issues-severity-facet.hbs
+++ b/server/sonar-web/src/main/hbs/issues/facets/issues-severity-facet.hbs
@@ -2,7 +2,7 @@
<div class="issues-facet-list">
{{#each values}}
- <a class="facet issues-facet issues-facet-half js-issues-facet" data-value="{{val}}">
+ <a class="facet issues-facet issues-facet-half js-issues-facet" data-value="{{val}}" title="{{t 'severity' val}}">
<span class="facet-name">{{severityIcon val}} {{t 'severity' val}}</span>
<span class="facet-stat">{{count}}</span>
</a>
diff --git a/server/sonar-web/src/main/hbs/issues/facets/issues-status-facet.hbs b/server/sonar-web/src/main/hbs/issues/facets/issues-status-facet.hbs
index 800b7cdb679..02cc4482eec 100644
--- a/server/sonar-web/src/main/hbs/issues/facets/issues-status-facet.hbs
+++ b/server/sonar-web/src/main/hbs/issues/facets/issues-status-facet.hbs
@@ -2,7 +2,7 @@
<div class="issues-facet-list">
{{#each values}}
- <a class="facet issues-facet issues-facet-half js-issues-facet" data-value="{{val}}">
+ <a class="facet issues-facet issues-facet-half js-issues-facet" data-value="{{val}}" title="{{t 'issue.status' val}}">
<span class="facet-name">{{statusIcon val}} {{t 'issue.status' val}}</span>
<span class="facet-stat">{{count}}</span>
</a>
diff --git a/server/sonar-web/src/main/less/issues.less b/server/sonar-web/src/main/less/issues.less
index a2437f077a6..fd48b50411a 100644
--- a/server/sonar-web/src/main/less/issues.less
+++ b/server/sonar-web/src/main/less/issues.less
@@ -68,8 +68,8 @@
.issues-facet {
position: relative;
- width: @sideWidth - 22px;
- margin: 0 22px 1px 0;
+ width: 100%;
+ margin: 0 0 1px 0;
border-color: transparent;
.box-sizing(border-box);
background-color: @barBackgroundColor;
@@ -104,7 +104,11 @@
}
.issues-facet-half {
- width: @sideWidth / 2 - 22px;
+ width: 45%;
+
+ &:nth-child(odd) {
+ margin-right: 10%;
+ }
}
.issues-facet-header {
@@ -116,7 +120,7 @@
}
.issues-facet-list {
- margin: 0 -22px 0 0;
+ margin: 0 0 0 0;
padding: 0 10px 10px;
font-size: 0;
}
@@ -127,7 +131,6 @@
}
.issues-facet-custom-value {
- margin-right: 22px;
padding: 0 0 5px;
font-size: @baseFontSize;
}
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 64609e256f8..44beb0db519 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -775,7 +775,7 @@ issues.facet.componentRootUuids=Project
issues.facet.statuses=Status
issues.facet.actionPlans=Action Plan
issues.facet.assignees=Assignee
-issues.facet.componentUuids=Component
+issues.facet.componentUuids=File
issues.facet.rules=Rule
issues.facet.resolutions=Resolution
issues.facet.languages=Language