Merge pull request #98 from jenkinsci/new-files-filter-styling

Restyle the tables and inline the new files filter.
jenkinsci · Mar 7, 2024 · 7cabc2c · 7cabc2c
2 parents 89bf3c3 + bfc55cf
commit 7cabc2c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -142,6 +142,7 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>data-tables-api</artifactId>
+      <version>2.0.1-1</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>

diff --git a/plugin/src/main/resources/coverage/coverage-table.jelly b/plugin/src/main/resources/coverage/coverage-table.jelly
@@ -24,18 +24,20 @@
       <j:when test="${it.hasSourceCode()}">
         <div class="col-12 d-xxl-none">
           <bs:card title="${title}" symbol="${symbol}" class="flex-fill h-100" >
-            <j:if test="${showChangedToggle}">
-              <f:toggleSwitch id="changed-${id + '-table'}" title="${%changed.files}" />
-            </j:if>
-            <dt:table model="${it.getTableModel(id + '-table')}"/>
+            <dt:table model="${it.getTableModel(id + '-table')}">
+              <j:if test="${showChangedToggle}">
+                <f:toggleSwitch id="changed-${id + '-table'}" title="${%changed.files}" />
+              </j:if>
+            </dt:table>
           </bs:card>
         </div>
         <div class="col-xxl-6 d-none d-xxl-block">
           <bs:card title="${title}" symbol="${symbol}" class="flex-fill h-100">
-            <j:if test="${showChangedToggle}">
-              <f:toggleSwitch id="changed-${id + '-table-inline'}" title="${%changed.files}" />
-            </j:if>
-            <dt:table model="${it.getTableModel(id + '-table-inline')}"/>
+            <dt:table model="${it.getTableModel(id + '-table-inline')}">
+              <j:if test="${showChangedToggle}">
+                <f:toggleSwitch id="changed-${id + '-table-inline'}" title="${%changed.files}" />
+              </j:if>
+            </dt:table>
           </bs:card>
         </div>
         <div class="col-xxl-6 d-none d-xxl-block">
@@ -66,11 +68,12 @@
       </j:when>
       <j:otherwise>
         <div class="col-12">
-          <j:if test="${showChangedToggle}">
-            <f:toggleSwitch id="changed-${id + '-table'}" title="${%changed.files}" />
-          </j:if>
           <bs:card title="${title}" symbol="${symbol}" class="flex-fill h-100">
-            <dt:table model="${it.getTableModel(id + '-table')}"/>
+            <dt:table model="${it.getTableModel(id + '-table')}">
+              <j:if test="${showChangedToggle}">
+                <f:toggleSwitch id="changed-${id + '-table'}" title="${%changed.files}"/>
+              </j:if>
+            </dt:table>
           </bs:card>
         </div>