From 5cd21cf536e05c777086238b1345f1e089895d9f Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Mon, 1 Jun 2015 16:47:05 +0200 Subject: [PATCH] fix quality flaws --- .../issues/templates/_issues-filter-name.hbs | 10 +-- .../templates/facets/_issues-facet-header.hbs | 6 +- .../facets/issues-action-plan-facet.hbs | 18 ++--- .../facets/issues-assignee-facet.hbs | 28 ++++---- .../templates/facets/issues-base-facet.hbs | 10 +-- .../templates/facets/issues-context-facet.hbs | 2 +- .../facets/issues-creation-date-facet.hbs | 40 +++++------ .../facets/issues-custom-values-facet.hbs | 14 ++-- .../templates/facets/issues-file-facet.hbs | 10 +-- .../facets/issues-issue-key-facet.hbs | 8 +-- .../facets/issues-resolution-facet.hbs | 22 +++--- .../facets/issues-severity-facet.hbs | 12 ++-- .../templates/facets/issues-status-facet.hbs | 12 ++-- .../apps/issues/templates/issues-filters.hbs | 30 ++++---- .../templates/issues-issue-filter-form.hbs | 54 +++++++------- .../issues/templates/issues-issue-filter.hbs | 6 +- .../apps/issues/templates/issues-layout.hbs | 16 ++--- .../templates/issues-workspace-header.hbs | 28 ++++---- .../templates/issues-workspace-home.hbs | 72 +++++++++---------- .../issues-workspace-list-component.hbs | 12 ++-- .../templates/issues-workspace-list.hbs | 6 +- 21 files changed, 208 insertions(+), 208 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/issues/templates/_issues-filter-name.hbs b/server/sonar-web/src/main/js/apps/issues/templates/_issues-filter-name.hbs index 22b760eac1a..ced19a7a44e 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/_issues-filter-name.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/_issues-filter-name.hbs @@ -1,18 +1,18 @@ {{#if filter.name}} {{filter.name}} - + {{#unless filter.shared}} - [{{t 'issue_filter.private'}}] + [{{t "issue_filter.private"}}] {{else}} {{#eq filter.user currentUser}} - [{{t 'issue_filter.shared_with_all_users'}}] + [{{t "issue_filter.shared_with_all_users"}}] {{else}} {{#if filter.user}} - [{{t 'issue_filter.shared'}}] + [{{t "issue_filter.shared"}}] {{/if}} {{/eq}} {{/unless}} {{else}} - {{t 'issues'}} + {{t "issues"}} {{/if}} diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/_issues-facet-header.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/_issues-facet-header.hbs index 8e012d1fd67..64237bc0e79 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/facets/_issues-facet-header.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/_issues-facet-header.hbs @@ -1,4 +1,4 @@ - - - {{t 'issues.facet' property}} + + + {{t "issues.facet" property}} diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-action-plan-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-action-plan-facet.hbs index e934608d214..fa6295586c8 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-action-plan-facet.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-action-plan-facet.hbs @@ -1,17 +1,17 @@ -{{> '_issues-facet-header'}} +{{> "_issues-facet-header"}} -
+
{{#each values}} - {{#eq val ''}} + {{#eq val ""}} {{! unplanned }} - - {{t 'issue.unplanned'}} - {{numberShort count}} + + {{t "issue.unplanned"}} + {{numberShort count}} {{else}} - - {{label}} - {{numberShort count}} + + {{label}} + {{numberShort count}} {{/eq}} {{/each}} diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-assignee-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-assignee-facet.hbs index 44d4b341f72..f3dcb4584d0 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-assignee-facet.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-assignee-facet.hbs @@ -1,30 +1,30 @@ -{{> '_issues-facet-header'}} +{{> "_issues-facet-header"}} -
+
{{#notNull myIssues}} - - {{t 'me'}} - {{myIssues}} + + {{t "me"}} + {{myIssues}}
{{/notNull}} {{#each values}} - {{#eq val ''}} + {{#eq val ""}} {{! unassigned }} - - {{t 'unassigned'}} - {{numberShort count}} + + {{t "unassigned"}} + {{numberShort count}} {{else}} - - {{label}} - {{numberShort count}} + + {{label}} + {{numberShort count}} {{/eq}} {{/each}} -
- +
+
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-base-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-base-facet.hbs index d8b5f0b0179..61781221ddc 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-base-facet.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-base-facet.hbs @@ -1,10 +1,10 @@ -{{> '_issues-facet-header'}} +{{> "_issues-facet-header"}} -
+
{{#each values}} - - {{default label val}} - {{numberShort count}} + + {{default label val}} + {{numberShort count}} {{/each}}
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-context-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-context-facet.hbs index 5c570f8718c..9f981c07c1a 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-context-facet.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-context-facet.hbs @@ -1,3 +1,3 @@ -
+
Issues of    {{qualifierIcon state.contextComponentQualifier}} {{state.contextComponentName}}
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-creation-date-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-creation-date-facet.hbs index 9003a170522..a119faca85d 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-creation-date-facet.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-creation-date-facet.hbs @@ -1,32 +1,32 @@ -{{> '_issues-facet-header'}} +{{> "_issues-facet-header"}} {{#if createdAt}} - -
+ +
{{dt createdAt}} ({{fromNow createdAt}})
{{else}} -
-
-
- - {{#if periodStart}}{{d periodStart}}{{else}}Past{{/if}}  +
+
+
+ + {{#if periodStart}}{{d periodStart}}{{else}}Past{{/if}}  - - {{#if periodEnd}}{{d periodEnd}}{{else}}Now{{/if}}  + + {{#if periodEnd}}{{d periodEnd}}{{else}}Now{{/if}}  - - + +
-
- {{t 'issues.facet.createdAt.or'}} - {{t 'issues.facet.createdAt.all'}} - {{t 'issues.facet.createdAt.last_week'}} - {{t 'issues.facet.createdAt.last_month'}} - {{t 'issues.facet.createdAt.last_year'}} +
+ {{t "issues.facet.createdAt.or"}} + {{t "issues.facet.createdAt.all"}} + {{t "issues.facet.createdAt.last_week"}} + {{t "issues.facet.createdAt.last_month"}} + {{t "issues.facet.createdAt.last_year"}}
{{/if}} diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-custom-values-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-custom-values-facet.hbs index 30372e84ae0..9f7f60d7fed 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-custom-values-facet.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-custom-values-facet.hbs @@ -1,14 +1,14 @@ -{{> '_issues-facet-header'}} +{{> "_issues-facet-header"}} -
+
{{#each values}} - - {{default label val}} - {{numberShort count}} + + {{default label val}} + {{numberShort count}} {{/each}} -
- +
+
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-file-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-file-facet.hbs index c070fb7785a..32cd2fe2c27 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-file-facet.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-file-facet.hbs @@ -1,10 +1,10 @@ -{{> '_issues-facet-header'}} +{{> "_issues-facet-header"}} -
+
{{#each values}} - - {{default label val}} - {{numberShort count}} + + {{default label val}} + {{numberShort count}} {{/each}}
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-issue-key-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-issue-key-facet.hbs index 540e9a00014..28ae140f75b 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-issue-key-facet.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-issue-key-facet.hbs @@ -1,7 +1,7 @@ -{{> '_issues-facet-header'}} +{{> "_issues-facet-header"}} -
-
- {{issues}} +
+
+ {{issues}}
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-resolution-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-resolution-facet.hbs index 6fb81c5548f..166b052f75f 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-resolution-facet.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-resolution-facet.hbs @@ -1,19 +1,19 @@ -{{> '_issues-facet-header'}} +{{> "_issues-facet-header"}} -
+
{{#each values}} - {{#eq val ''}} + {{#eq val ""}} {{! unresolved }} - - {{t 'unresolved'}} - {{numberShort count}} + + {{t "unresolved"}} + {{numberShort count}} {{else}} - - {{t 'issue.resolution' val}} - {{numberShort count}} + + {{t "issue.resolution" val}} + {{numberShort count}} {{/eq}} {{/each}} diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-severity-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-severity-facet.hbs index 92ff7b52444..0d60fda358f 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-severity-facet.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-severity-facet.hbs @@ -1,11 +1,11 @@ -{{> '_issues-facet-header'}} +{{> "_issues-facet-header"}} -
+
{{#each values}} - - {{severityIcon val}} {{t 'severity' val}} - {{numberShort count}} + + {{severityIcon val}} {{t "severity" val}} + {{numberShort count}} {{/each}}
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-status-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-status-facet.hbs index 55a78a63bf1..8b74908d3cb 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-status-facet.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-status-facet.hbs @@ -1,11 +1,11 @@ -{{> '_issues-facet-header'}} +{{> "_issues-facet-header"}} -
+
{{#each values}} - - {{statusIcon val}} {{t 'issue.status' val}} - {{numberShort count}} + + {{statusIcon val}} {{t "issue.status" val}} + {{numberShort count}} {{/each}}
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/issues-filters.hbs b/server/sonar-web/src/main/js/apps/issues/templates/issues-filters.hbs index e010deb9a0e..3feab6a89a5 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/issues-filters.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/issues-filters.hbs @@ -1,53 +1,53 @@ -

+

{{#if state.canManageFilters}} - - {{> '_issues-filter-name'}} + + {{> "_issues-filter-name"}} -
    + {{#if filter.description}} -
    {{filter.description}}
    +
    {{filter.description}}
    {{/if}} {{else}} - {{t 'issues'}} + {{t "issues"}} {{/if}}

-
-
+
+
{{#if state.canManageFilters}} {{#if filter.canModify}} {{#if state.changed}} - + {{/if}} {{/if}} {{#unless filter.id}} - + {{/unless}} {{#if filter.id}} {{#unless state.changed}} - + {{/unless}} {{/if}} {{#if filter.canModify}} {{#if filter.id}} - + {{/if}} {{/if}} {{/if}} diff --git a/server/sonar-web/src/main/js/apps/issues/templates/issues-issue-filter-form.hbs b/server/sonar-web/src/main/js/apps/issues/templates/issues-issue-filter-form.hbs index 1954f67f62d..b0505212688 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/issues-issue-filter-form.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/issues-issue-filter-form.hbs @@ -1,71 +1,71 @@ -
{{t 'issue.filter_similar_issues'}}
+
{{t "issue.filter_similar_issues"}}
-
- - {{severityIcon severity}} {{t 'severity' severity}} +
+ + {{severityIcon severity}} {{t "severity" severity}} - - {{statusIcon status}} {{t 'issue.status' status}} + + {{statusIcon status}} {{t "issue.status" status}} {{#if resolution}} - - {{t 'issue.resolution' resolution}} + + {{t "issue.resolution" resolution}} {{else}} - - {{t 'unresolved'}} + + {{t "unresolved"}} {{/if}} {{#if assignee}} - - {{t 'assigned_to'}} {{assigneeName}} + + {{t "assigned_to"}} {{assigneeName}} {{else}} - - {{t 'unassigned'}} + + {{t "unassigned"}} {{/if}} {{#if actionPlan}} - - {{t 'issue.planned_for'}} {{actionPlanName}} + + {{t "issue.planned_for"}} {{actionPlanName}} {{else}} - - {{t 'issue.unplanned'}} + + {{t "issue.unplanned"}} {{/if}}
- + {{limitString ruleName}} {{#each tags}} - -  {{this}} + +  {{this}} {{/each}}
- - {{qualifierIcon 'TRK'}} {{projectLongName}} + + {{qualifierIcon "TRK"}} {{projectLongName}} {{#if subProject}} - - {{qualifierIcon 'BRC'}} {{subProjectLongName}} + + {{qualifierIcon "BRC"}} {{subProjectLongName}} {{/if}} - + {{qualifierIcon componentQualifier}} {{fileFromPath componentLongName}}
-
+
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/issues-issue-filter.hbs b/server/sonar-web/src/main/js/apps/issues/templates/issues-issue-filter.hbs index 3ab307c3958..875bc3bc4a5 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/issues-issue-filter.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/issues-issue-filter.hbs @@ -1,5 +1,5 @@ -
- -   +
+ +  
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/issues-layout.hbs b/server/sonar-web/src/main/js/apps/issues/templates/issues-layout.hbs index cd434ab2340..5a61d1f66bf 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/issues-layout.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/issues-layout.hbs @@ -1,11 +1,11 @@ -
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-header.hbs b/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-header.hbs index 2c7d2d6e3ee..2def6f9aacc 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-header.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-header.hbs @@ -1,11 +1,11 @@ -
+
{{#if state.component}} - {{t 'issues.return_to_list'}}    + {{t "issues.return_to_list"}}    {{#with state.component}} - {{qualifierIcon 'TRK'}} {{projectName}} + {{qualifierIcon "TRK"}} {{projectName}}    - {{qualifierIcon qualifier}} {{name}} + {{qualifierIcon qualifier}} {{name}} {{/with}} {{else}}   @@ -13,25 +13,25 @@
-
+
{{#notNull state.total}} -
+
{{#gt state.total 0}} - - {{sum state.selectedIndex 1}} / {{state.total}} - + + {{sum state.selectedIndex 1}} / {{state.total}} + {{else}} - 0 / 0 + 0 / 0 {{/gt}}
{{/notNull}} -
- - +
+ + {{#if state.canBulkChange}} - + {{/if}}
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-home.hbs b/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-home.hbs index 374dad390b7..6c903b7faf9 100644 --- a/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-home.hbs +++ b/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-home.hbs @@ -1,72 +1,72 @@ -
-
-
-

{{t 'issues.home.recent_issues'}}

-

({{t 'issues.home.over_last_week'}})

+
+
+
+

{{t "issues.home.recent_issues"}}

+

({{t "issues.home.over_last_week"}})

-
-

{{t 'issues.home.projects'}}

- +
+

{{t "issues.home.projects"}}

+
{{#each projects}} - - + + {{/each}}
{{qualifierIcon 'TRK'}} {{label}}+{{numberShort count}}{{qualifierIcon "TRK"}} {{label}}+{{numberShort count}}
-

{{t 'issues.home.authors'}}

- +

{{t "issues.home.authors"}}

+
{{#each authors}} - - + + {{/each}}
{{val}}+{{numberShort count}}{{val}}+{{numberShort count}}
-

{{t 'issues.home.tags'}}

-
    +

    {{t "issues.home.tags"}}

    +
{{#if user}} -
-

{{t 'issues.home.my_recent_issues'}}

-

({{t 'issues.home.over_last_week'}})

+
+

{{t "issues.home.my_recent_issues"}}

+

({{t "issues.home.over_last_week"}})

-
+
{{#notEmpty myProjects}} -

{{t 'issues.home.projects'}}

- +

{{t "issues.home.projects"}}

+
{{#each myProjects}} - - + + {{/each}}
{{qualifierIcon 'TRK'}} {{label}}+{{numberShort count}}{{qualifierIcon "TRK"}} {{label}}+{{numberShort count}}
{{/notEmpty}} {{#notEmpty myTags}} -

{{t 'issues.home.tags'}}

-