diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-04-08 14:13:10 +0200 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2015-04-08 14:27:22 +0200 |
| commit | 94532b34aa649733d0a38d3aabe6e23ee7cfceaf (patch) | |
| tree | c09a3d292faa8655a99879d855e420c88854c264 /server/sonar-web/src/main/hbs | |
| parent | 315d615fe166dcae24500983e77ead9ebdb8ea99 (diff) | |
| download | sonarqube-94532b34aa649733d0a38d3aabe6e23ee7cfceaf.tar.gz sonarqube-94532b34aa649733d0a38d3aabe6e23ee7cfceaf.zip | |
SONAR-6331 apply feedback
Diffstat (limited to 'server/sonar-web/src/main/hbs')
8 files changed, 108 insertions, 71 deletions
diff --git a/server/sonar-web/src/main/hbs/overview/_overview-gate-condition.hbs b/server/sonar-web/src/main/hbs/overview/_overview-gate-condition.hbs new file mode 100644 index 00000000000..c3c278b9fd9 --- /dev/null +++ b/server/sonar-web/src/main/hbs/overview/_overview-gate-condition.hbs @@ -0,0 +1,15 @@ +<li class="overview-gate-condition spacer-bottom text-ellipsis"> + <i class="{{alertIconClass level}}"></i> + {{#canHaveDrilldownUrl metric period}} + <a href="{{urlForDrilldown ../../componentKey metric period periodDate}}" + class="overview-status overview-status-{{level}}" + title="{{#notEq level 'OK'}}{{t 'quality_gates.operator' op 'short'}} {{/notEq}}{{#eq level 'ERROR'}}{{formatMeasure error type}}{{/eq}}{{#eq level 'WARN'}}{{formatMeasure warning type}}{{/eq}}" + data-toggle="tooltip" data-placement="bottom">{{formatMeasure actual type}}</a> + {{else}} + <span class="overview-status overview-status-{{level}}" + title="{{#notEq level 'OK'}}{{t 'quality_gates.operator' op 'short'}} {{/notEq}}{{#eq level 'ERROR'}}{{formatMeasure error type}}{{/eq}}{{#eq level 'WARN'}}{{formatMeasure warning type}}{{/eq}}" + data-toggle="tooltip" data-placement="bottom">{{formatMeasure actual type}}</span> + {{/canHaveDrilldownUrl}} + <span class="note text-lowercase" style="padding-top: 4px;">{{t 'metric' metric 'name'}}</span> + <span class="note text-lowercase">{{default periodName period}}</span> +</li> diff --git a/server/sonar-web/src/main/hbs/overview/overview-coverage.hbs b/server/sonar-web/src/main/hbs/overview/overview-coverage.hbs index bdca7c4d95b..ce3d7a41109 100644 --- a/server/sonar-web/src/main/hbs/overview/overview-coverage.hbs +++ b/server/sonar-web/src/main/hbs/overview/overview-coverage.hbs @@ -1,26 +1,25 @@ +<header class="overview-card-header page-header"> + <h2 class="page-title">{{t 'overview.testing'}}</h2> +</header> + <div class="overview-highlight"> - <h6 class="note">{{t 'overview.coverage'}}</h6> + <h6 class="note">{{t 'metric.coverage.name'}}</h6> <div class="overview-main-measure"> {{#notNull coverage}} - <a href="{{urlForDrilldown componentKey 'overall_coverage'}}">{{formatMeasure coverage 'PERCENT'}}</a> + <a href="{{urlForDrilldown componentKey 'coverage'}}">{{formatMeasure coverage 'PERCENT'}}</a> {{else}} – {{/notNull}} </div> - {{#notNull coverage3}} - <div class="spacer-top"> - <span class="overview-measure {{#gt coverage3 0}}text-success{{/gt}}{{#lt coverage3 0}}text-danger{{/lt}}">{{formatMeasureVariation coverage3 'PERCENT'}}</span> - <span class="note">{{period3Name}}</span> - </div> - {{/notNull}} {{#notNull newCoverage3}} - <div class="spacer-top"> - <a class="overview-measure spacer-top" href="{{urlForDrilldown componentKey 'new_overall_coverage' 3}}">{{formatMeasure newCoverage3 'PERCENT'}}</a> - <span class="note">on new code</span> - </div> + <h6 class="note">{{period3Name}}</h6> + <a class="overview-measure spacer-top" + href="{{urlForDrilldown componentKey 'new_coverage' 3}}">{{formatMeasure newCoverage3 'PERCENT'}}</a> + <span class="note">{{t 'overview.on_new_code'}}</span> {{/notNull}} </div> <div class="overview-trend"> - <div class="overview-sparkline" id="overview-coverage-trend" data-width="300" data-height="50" data-color="#f3ca8e" data-type="PERCENT"></div> + <div class="overview-sparkline" id="overview-coverage-trend" data-height="120" data-color="#f3ca8e" + data-type="PERCENT"></div> </div> diff --git a/server/sonar-web/src/main/hbs/overview/overview-debt.hbs b/server/sonar-web/src/main/hbs/overview/overview-debt.hbs new file mode 100644 index 00000000000..6c4e6445de6 --- /dev/null +++ b/server/sonar-web/src/main/hbs/overview/overview-debt.hbs @@ -0,0 +1,21 @@ +<header class="overview-card-header page-header"> + <h2 class="page-title">{{t 'overview.debt'}}</h2> +</header> + +<div class="overview-highlight"> + <h6 class="note">{{t 'metric.sqale_index.name'}}</h6> + <div class="overview-main-measure"> + <a href="{{urlForDrilldown componentKey 'sqale_index'}}">{{formatMeasure debt 'WORK_DUR'}}</a> + </div> + {{#notNull issues3}} + <h6 class="note">{{period3Name}}</h6> + <a href="{{urlForDrilldown componentKey 'new_technical_debt'}}" + class="overview-measure {{#gt newDebt 0}}text-danger{{else}}text-success{{/gt}}">{{formatMeasure newDebt 'WORK_DUR'}}</a> + <span class="note">{{t 'overview.new'}}</span> + {{/notNull}} +</div> + +<div class="overview-trend"> + <div class="overview-sparkline" id="overview-debt-trend" data-height="120" data-color="#f3ca8e" + data-type="WORK_DUR"></div> +</div> diff --git a/server/sonar-web/src/main/hbs/overview/overview-duplications.hbs b/server/sonar-web/src/main/hbs/overview/overview-duplications.hbs index 68b7ecf1748..6c675595748 100644 --- a/server/sonar-web/src/main/hbs/overview/overview-duplications.hbs +++ b/server/sonar-web/src/main/hbs/overview/overview-duplications.hbs @@ -1,19 +1,22 @@ +<header class="overview-card-header page-header"> + <h2 class="page-title">{{t 'overview.duplications'}}</h2> +</header> + <div class="overview-highlight"> - <h6 class="note">{{t 'overview.duplications'}}</h6> + <h6 class="note">{{t 'metric.duplicated_lines_density.short_name'}}</h6> <div class="overview-main-measure"> <a href="{{urlForDrilldown componentKey 'duplicated_lines_density'}}"> {{formatMeasure duplications 'PERCENT'}} </a> </div> {{#notNull duplications3}} - <div class="spacer-top"> - <a class="overview-measure {{#gt duplications3 0}}text-danger{{/gt}}{{#lt duplications3 0}}text-success{{/lt}}" - href="{{urlForDrilldown componentKey 'duplicated_lines_density' 3}}">{{formatMeasureVariation duplications3 'PERCENT'}}</a> - <span class="note">{{period3Name}}</span> - </div> + <h6 class="note">{{period3Name}}</h6> + <a class="overview-measure {{#gt duplications3 0}}text-danger{{/gt}}{{#lt duplications3 0}}text-success{{/lt}}" + href="{{urlForDrilldown componentKey 'duplicated_lines_density' 3}}">{{formatMeasureVariation duplications3 'PERCENT'}}</a> {{/notNull}} </div> <div class="overview-trend"> - <div class="overview-sparkline" id="overview-duplications-trend" data-width="300" data-height="50" data-color="#f3ca8e" data-type="PERCENT"></div> + <div class="overview-sparkline" id="overview-duplications-trend" data-height="120" data-color="#f3ca8e" + data-type="PERCENT"></div> </div> diff --git a/server/sonar-web/src/main/hbs/overview/overview-gate.hbs b/server/sonar-web/src/main/hbs/overview/overview-gate.hbs index a43f972baac..a354e431b1e 100644 --- a/server/sonar-web/src/main/hbs/overview/overview-gate.hbs +++ b/server/sonar-web/src/main/hbs/overview/overview-gate.hbs @@ -1,22 +1,22 @@ -<div class="text-center"> - {{#notEmpty gateConditions}} - <ul class="list-inline spacer-top" style="display: inline-block;"> - {{#each gateConditions}} - <li> - {{#canHaveDrilldownUrl metric period}} - <a href="{{urlForDrilldown ../../componentKey metric period periodDate}}" - class="overview-status overview-status-{{level}}" - title="{{#notEq level 'OK'}}{{t 'quality_gates.operator' op 'short'}} {{/notEq}}{{#eq level 'ERROR'}}{{formatMeasure error type}}{{/eq}}{{#eq level 'WARN'}}{{formatMeasure warning type}}{{/eq}}" - data-toggle="tooltip" data-placement="bottom">{{formatMeasure actual type}}</a> - {{else}} - <span class="overview-status overview-status-{{level}}" - title="{{#notEq level 'OK'}}{{t 'quality_gates.operator' op 'short'}} {{/notEq}}{{#eq level 'ERROR'}}{{formatMeasure error type}}{{/eq}}{{#eq level 'WARN'}}{{formatMeasure warning type}}{{/eq}}" - data-toggle="tooltip" data-placement="bottom">{{formatMeasure actual type}}</span> - {{/canHaveDrilldownUrl}} - <p class="note text-lowercase" style="padding-top: 4px;">{{t 'metric' metric 'name'}}</p> - <p class="note">{{default periodName period}}</p> - </li> - {{/each}} - </ul> - {{/notEmpty}} -</div> +<header class="overview-card-header page-header"> + <h2 class="page-title">{{t 'overview.gate'}}</h2> +</header> + +{{#notEmpty gateConditions}} + <div class="columns"> + <div class="column-half"> + <ul> + {{#eachEven gateConditions}} + {{> '_overview-gate-condition'}} + {{/eachEven}} + </ul> + </div> + <div class="column-half"> + <ul> + {{#eachOdd gateConditions}} + {{> '_overview-gate-condition'}} + {{/eachOdd}} + </ul> + </div> + </div> +{{/notEmpty}} diff --git a/server/sonar-web/src/main/hbs/overview/overview-issues.hbs b/server/sonar-web/src/main/hbs/overview/overview-issues.hbs index ddc1ebdc350..09940d8cc95 100644 --- a/server/sonar-web/src/main/hbs/overview/overview-issues.hbs +++ b/server/sonar-web/src/main/hbs/overview/overview-issues.hbs @@ -1,24 +1,21 @@ +<header class="overview-card-header page-header"> + <h2 class="page-title">{{t 'overview.issues'}}</h2> +</header> + <div class="overview-highlight"> <h6 class="note">{{t 'overview.issues'}}</h6> <div class="overview-main-measure"> - <a href="{{urlForIssuesOverview componentKey}}">{{formatMeasure issues 'INT'}}</a> - </div> - <div class="spacer-top"> - {{#notNull sqaleRating}} - <a class="overview-measure" href="{{urlForDrilldown componentKey 'sqale_rating'}}"><span class="rating rating-{{formatMeasure sqaleRating 'RATING'}}">{{formatMeasure sqaleRating 'RATING'}}</span></a> - {{/notNull}} - - <a class="overview-measure" href="{{urlForDrilldown componentKey 'sqale_index'}}">{{formatMeasure debt 'WORK_DUR'}}</a> + <a href="{{urlForIssuesOverview componentKey}}">{{formatMeasure issues 'SHORT_INT'}}</a> </div> {{#notNull issues3}} - <div class="spacer-top"> - <a href="{{urlForIssuesOverview componentKey period3Date}}" - class="overview-measure {{#gt issues3 0}}text-danger{{else}}text-success{{/gt}}">{{formatMeasureVariation issues3 'INT'}}</a> - <span class="note">new {{period3Name}}</span> - </div> + <h6 class="note">{{period3Name}}</h6> + <a href="{{urlForIssuesOverview componentKey period3Date}}" + class="overview-measure {{#gt issues3 0}}text-danger{{else}}text-success{{/gt}}">{{formatMeasure issues3 'INT'}}</a> + <span class="note">{{t 'overview.new'}}</span> {{/notNull}} </div> <div class="overview-trend"> - <div class="overview-sparkline" id="overview-issues-trend" data-width="300" data-height="50" data-color="#f3ca8e" data-type="INT"></div> + <div class="overview-sparkline" id="overview-issues-trend" data-height="120" data-color="#f3ca8e" + data-type="SHORT_INT"></div> </div> diff --git a/server/sonar-web/src/main/hbs/overview/overview-main-layout.hbs b/server/sonar-web/src/main/hbs/overview/overview-main-layout.hbs index 8ce2a7d4e4f..827246359f9 100644 --- a/server/sonar-web/src/main/hbs/overview/overview-main-layout.hbs +++ b/server/sonar-web/src/main/hbs/overview/overview-main-layout.hbs @@ -1,18 +1,12 @@ -<div class="overview-card overview-gate" id="overview-gate"></div> - -<div class="overview-container columns"> - <div class="column-half"> - <div class="overview-card" id="overview-size"></div> - </div> +<div class="columns"> <div class="column-half"> + <div class="overview-card overview-gate" id="overview-gate"></div> <div class="overview-card" id="overview-issues"></div> + <div class="overview-card" id="overview-debt"></div> </div> -</div> -<div class="overview-container columns"> <div class="column-half"> + <div class="overview-card" id="overview-size"></div> <div class="overview-card" id="overview-coverage"></div> - </div> - <div class="column-half"> <div class="overview-card" id="overview-duplications"></div> </div> </div> diff --git a/server/sonar-web/src/main/hbs/overview/overview-size.hbs b/server/sonar-web/src/main/hbs/overview/overview-size.hbs index b06b14ed706..907e4727c9f 100644 --- a/server/sonar-web/src/main/hbs/overview/overview-size.hbs +++ b/server/sonar-web/src/main/hbs/overview/overview-size.hbs @@ -1,16 +1,24 @@ +<header class="overview-card-header page-header"> + <h2 class="page-title">{{t 'overview.size'}}</h2> +</header> + <div class="overview-highlight"> - <h6 class="note">{{t 'overview.lines_of_code'}}</h6> + <h6 class="note">{{t 'metric.ncloc.name'}}</h6> <div class="overview-main-measure"> - <a href="{{urlForDrilldown componentKey 'ncloc'}}">{{formatMeasure ncloc 'INT'}}</a> + <a href="{{urlForDrilldown componentKey 'ncloc'}}">{{formatMeasure ncloc 'SHORT_INT'}}</a> </div> + {{#notNull ncloc3}} <div class="spacer-top"> - <span class="overview-measure">{{formatMeasureVariation ncloc3 'INT'}}</span> - <span class="note">{{period3Name}}</span> + <h6 class="note">{{period3Name}}</h6> + <span class="overview-measure">{{formatMeasureVariation ncloc3 'SHORT_INT'}}</span> </div> {{/notNull}} </div> <div class="overview-trend"> - <div class="overview-sparkline" id="overview-size-trend" data-width="300" data-height="50" data-color="#f3ca8e" data-type="INT"></div> + <div class="overview-sparkline" id="overview-size-trend" data-height="120" data-color="#f3ca8e" + data-type="SHORT_INT"></div> </div> + + |