Skip to content

Commit afd5b4e

Browse files
authored
Merge pull request #56 from farodin91/use-new-table-style
2 parents 8ba44ab + 541e6bc commit afd5b4e

File tree

2 files changed

+29
-17
lines changed

2 files changed

+29
-17
lines changed

src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/directories.jelly

+12-6
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,31 @@
2929
<l:breadcrumb title="${%Disk usage}" href="./directories"/>
3030
<st:include page="sidepanel.jelly" />
3131
<l:main-panel>
32-
<h1>${%Disk usage}</h1>
32+
<div class="jenkins-app-bar">
33+
<div class="jenkins-app-bar__content">
34+
<h1>
35+
${%Disk usage}
36+
</h1>
37+
</div>
38+
</div>
3339
<st:include page="message.jelly" />
3440
<l:tabBar>
3541
<l:tab name="${%Jobs}" href="."/>
3642
<l:tab name="${%Directories}" active="true" href="./directories"/>
3743
</l:tabBar>
38-
<table class="sortable pane bigtable">
44+
<table class="jenkins-table sortable">
3945
<thead>
4046
<tr>
41-
<th class="pane-header" initialSortDir="down">${%Item name}</th>
42-
<th class="pane-header" style="text-align: right">${%Disk usage} (kB)</th>
47+
<th initialSortDir="down">${%Item name}</th>
48+
<th style="text-align: right">${%Disk usage} (kB)</th>
4349
</tr>
4450
</thead>
4551
<tbody>
4652
<j:forEach var="e" items="${it.directoriesUsages}">
4753
<j:if test="${e.usage != 0}">
4854
<tr>
49-
<td class="pane">${e.displayName}</td>
50-
<td class="pane" style="text-align: right">
55+
<td>${e.displayName}</td>
56+
<td style="text-align: right">
5157
<j:choose>
5258
<j:when test="${e.usage > 0}">${e.usage}</j:when>
5359
<j:otherwise>N/A</j:otherwise>

src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/index.jelly

+17-11
Original file line numberDiff line numberDiff line change
@@ -29,42 +29,48 @@
2929
<l:breadcrumb title="${%Disk usage}" href="."/>
3030
<st:include page="sidepanel.jelly" />
3131
<l:main-panel>
32-
<h1>${%Disk usage}</h1>
32+
<div class="jenkins-app-bar">
33+
<div class="jenkins-app-bar__content">
34+
<h1>
35+
${%Disk usage}
36+
</h1>
37+
</div>
38+
</div>
3339
<st:include page="message.jelly" />
3440
<l:tabBar>
3541
<l:tab name="${%Jobs}" active="true" href="."/>
3642
<l:tab name="${%Directories}" href="./directories"/>
3743
</l:tabBar>
38-
<table class="sortable pane bigtable">
44+
<table class="jenkins-table sortable">
3945
<thead>
4046
<tr>
41-
<th class="pane-header" initialSortDir="down">${%Item name}</th>
42-
<th class="pane-header" style="text-align: right">${%Disk usage} (kB)</th>
43-
<th class="pane-header" style="text-align: right">${%Action}</th>
47+
<th initialSortDir="down">${%Item name}</th>
48+
<th style="text-align: right" >${%Disk usage} (kB)</th>
49+
<th class="jenkins-table__cell--tight" data-sort-disable="true">${%Action}</th>
4450
</tr>
4551
</thead>
4652
<tbody>
4753
<j:forEach var="e" items="${it.jobsUsages}">
4854
<j:if test="${e.usage != 0}">
4955
<tr>
50-
<td class="pane">
51-
<a href="${rootURL}/${e.url}" class="model-link inside">${e.displayName}</a>
56+
<td>
57+
<a href="${rootURL}/${e.url}" class="jenkins-table__link model-link inside">${e.displayName}</a>
5258
</td>
53-
<td class="pane" style="text-align: right">
59+
<td style="text-align: right">
5460
<j:choose>
5561
<j:when test="${e.usage > 0}">${e.usage}</j:when>
5662
<j:otherwise>N/A</j:otherwise>
5763
</j:choose>
5864
</td>
59-
<td class="pane" style="text-align: right">
60-
<s:link href="clean/?job=${e.fullName}" post="true">run cleanup</s:link>
65+
<td>
66+
<s:link href="clean/?job=${e.fullName}" post="true" clazz="jenkins-table__link">cleanup</s:link>
6167
</td>
6268
</tr>
6369
</j:if>
6470
</j:forEach>
6571
</tbody>
6672
</table>
67-
<div style="padding:10px; margin-top: 10px; border: solid 1px #000">
73+
<div style="padding:10px; margin-top: 10px;">
6874
<h4>Background</h4>
6975
<p>
7076
Large amounts of disk are typically consumed by a job's build history as each entry in the build history will have an archived

0 commit comments

Comments
 (0)