Skip to content

Commit

Permalink
[JENKINS-23891] Redesign of configuration page
Browse files Browse the repository at this point in the history 
- Inline long descriptions changed to help strings (help icon on the right).
  • Loading branch information
@mixalturek
mixalturek committed Jul 23, 2014
1 parent f190752 commit eadb55c
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 43 deletions.
3 changes: 1 addition & 2 deletions src/main/resources/org/jenkinsci/plugins/cppcheck/CppcheckPublisher/config.jelly
View file
Expand Up @@ -5,8 +5,7 @@
<j:set var="config" value="${descriptor.config}"/>
</j:if>

<f:entry title="${%Cppcheck report XMLs}"
description="${%description.pattern('http://ant.apache.org/manual/Types/fileset.html')}">
<f:entry title="${%Cppcheck report XMLs}" field="pattern">
<f:textbox name="cppcheck.pattern" value="${config.pattern}"/>
</f:entry>

Expand Down
7 changes: 0 additions & 7 deletions src/main/resources/org/jenkinsci/plugins/cppcheck/CppcheckPublisher/config.properties
View file

This file was deleted.

12 changes: 12 additions & 0 deletions src/main/resources/org/jenkinsci/plugins/cppcheck/CppcheckPublisher/help-pattern.html
View file
@@ -0,0 +1,12 @@
<p style="margin-top: 0px;">Cppcheck must be executed to generate XML reports for this plugin to function.
<a href="http://ant.apache.org/manual/Types/fileset.html">Fileset
'includes'</a> setting specifies the generated cppcheck XML report files,
such as '**/cppcheck-result-*.xml'. Base directory of the fileset is relative
to the workspace root directory.</p>

<p>If no value is set, then the default '**/cppcheck-result.xml' will be used.
Be sure to never include any non-report files into this pattern.</p>

<p>The plugin is able to work with both XML formats produced by Cppcheck,
but always prefer to use the newer version 2. Cppcheck doesn't report some
issues with the legacy format.</p>
2 changes: 2 additions & 0 deletions src/main/resources/org/jenkinsci/plugins/cppcheck/CppcheckPublisher/help-severity.html
View file
@@ -0,0 +1,2 @@
Determines which severity of errors should be considered when evaluating the
build status and health.
4 changes: 4 additions & 0 deletions src/main/resources/org/jenkinsci/plugins/cppcheck/CppcheckPublisher/help-thresholds.html
View file
@@ -0,0 +1,4 @@
Configure the build status and health. A build is considered as unstable or
failure if the new or total number of errors exceeds the specified thresholds.
The build health is also determined by thresholds. If the actual number of
errors is between the provided thresholds, then the build health is interpolated.
39 changes: 23 additions & 16 deletions src/main/resources/util/thresholds.jelly
View file
Expand Up @@ -12,29 +12,31 @@
</j:if>


<f:entry title="${%Build status}" description="${%description.status}">
<f:entry title="${%Build status thresholds}" field="thresholds">
<table>
<thead>
<tr>
<td></td>
<td width="80">
<img src="${rootURL}/images/16x16/health-80plus.gif" alt="100%"
<img src="${rootURL}/images/16x16/health-80plus.gif" alt="${%Health 100%}"
title="${%description.healthy}"/>
</td>
<td width="80">
<img src="${rootURL}/images/16x16/health-00to19.gif" alt="0%"
<img src="${rootURL}/images/16x16/health-00to19.gif" alt="${%Health 0%}"
title="${%description.unhealthy}"/>
</td>
<td width="80">
<img src="${rootURL}/images/16x16/yellow.gif" alt="100%" title="${%description.threshold}"/>
<img src="${rootURL}/images/16x16/yellow.gif" alt="100%"
title="${%description.threshold}"/>
${%Total}
</td>
<td width="80">
<img src="${rootURL}/images/16x16/yellow.gif" alt="100%" title="${%description.newThreshold}"/>
<img src="${rootURL}/images/16x16/yellow.gif" alt="100%"
title="${%description.newThreshold}"/>
${%New}
</td>
<td width="80">
<img src="${rootURL}/images/16x16/red.gif" alt="100%" title="${%description.failureThreshold}"/>
<img src="${rootURL}/images/16x16/red.gif" alt="100%"
title="${%description.failureThreshold}"/>
${%Total}
</td>
<td width="80">
Expand All @@ -46,7 +48,6 @@
</thead>
<tbody>
<tr>
<td style="vertical-align:middle">${%Thresholds:}</td>
<td>
<f:textbox name="cppcheck.config.configSeverityEvaluation.healthy"
value="${config.configSeverityEvaluation.healthy}"/>
Expand Down Expand Up @@ -77,22 +78,25 @@
</f:entry>


<f:entry title="${%severity.evaluation}" description="${%description.limit}">
<f:entry title="${%severity.evaluation}" field="severity">

<f:checkbox name="${id}.config.configSeverityEvaluation.severityError"
checked="${config.configSeverityEvaluation.severityError}" id="thresholdLimit.severityError"/>
checked="${config.configSeverityEvaluation.severityError}"
id="thresholdLimit.severityError"/>
<st:nbsp/>
<label for="thresholdLimit.severityError">${%Error}</label>
<st:nbsp/>

<f:checkbox name="${id}.config.configSeverityEvaluation.severityWarning"
checked="${config.configSeverityEvaluation.severityWarning}" id="thresholdLimit.severityWarning"/>
checked="${config.configSeverityEvaluation.severityWarning}"
id="thresholdLimit.severityWarning"/>
<st:nbsp/>
<label for="thresholdLimit.severityWarning">${%Warning}</label>
<st:nbsp/>

<f:checkbox name="${id}.config.configSeverityEvaluation.severityStyle"
checked="${config.configSeverityEvaluation.severityStyle}" id="thresholdLimit.severityStyle"/>
checked="${config.configSeverityEvaluation.severityStyle}"
id="thresholdLimit.severityStyle"/>
<st:nbsp/>
<label for="thresholdLimit.severityStyle">${%Style}</label>
<st:nbsp/>
Expand Down Expand Up @@ -127,18 +131,20 @@

</f:entry>

<f:entry title="${%graph.configuration}" description="${%graph.description}">
<f:entry title="${%graph.configuration}">

<table>
<tr>
<td>
<label for="configGraph.xSize">${%Chart Width}</label>
<f:textbox name="${id}.config.configGraph.xSize" value="${config.configGraph.xSize}"
<f:textbox name="${id}.config.configGraph.xSize"
value="${config.configGraph.xSize}"
id="configGraph.xSize"/>
</td>
<td>
<label for="configGraph.xSize">${%Chart Height}</label>
<f:textbox name="${id}.config.configGraph.ySize" value="${config.configGraph.ySize}"
<f:textbox name="${id}.config.configGraph.ySize"
value="${config.configGraph.ySize}"
id="configGraph.ySize"/>
</td>
<td colspan="2">
Expand All @@ -148,7 +154,8 @@
<tr>
<td>
<f:checkbox name="${id}.config.configGraph.displayAllErrors"
checked="${config.configGraph.displayAllErrors}" id="configGraph.displayAllErrors"/>
checked="${config.configGraph.displayAllErrors}"
id="configGraph.displayAllErrors"/>
<st:nbsp/>
<label for="configGraph.displayAllErrors">${%Display all errors}</label>
<st:nbsp/>
Expand Down
18 changes: 0 additions & 18 deletions src/main/resources/util/thresholds.properties
View file
Expand Up @@ -13,24 +13,6 @@ description.newFailureThreshold=If the number of new errors exceeds this thresho
description.healthy=Report health as 100% when the number of errors is less than this value.
description.unhealthy=Report health as 0% when the number of errors is greater than this value.

description.status=Configure the build status and health. A build is considered as unstable or failure \
if the new or total number of errors exceeds the specified thresholds. \
The build health is also determined by thresholds. If the actual number of errors is between \
the provided thresholds, then the build health is interpolated.



description.limit=Determines which severity of errors should be considered when evaluating the build status and health.


severity.evaluation=Severity evaluation

graph.configuration=Graph configuration
graph.description=Check severity category to display in the graph







0 comments on commit eadb55c

Please sign in to comment.