From 34ee31a5aee2f18f109564c48fc06ea5d7f56be5 Mon Sep 17 00:00:00 2001
From: Ulli Hafner <ullrich.hafner@gmail.com>
Date: Wed, 28 Feb 2024 21:21:41 +0100
Subject: [PATCH] Update layout for DataTables 2.0.0.

---
 .../core/model/FixedWarningsDetail/index.jelly |  2 +-
 .../core/model/IssuesDetail/filled.jelly       | 13 ++++++++++---
 .../src/main/resources/issues/property.jelly   | 18 +++++-------------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/FixedWarningsDetail/index.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/FixedWarningsDetail/index.jelly
index 7ec563d87d..37195ef226 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/FixedWarningsDetail/index.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/FixedWarningsDetail/index.jelly
@@ -14,7 +14,7 @@
       <bs:card title="${it.displayName}" fontAwesomeIcon="award">
 
         <div class="table-responsive">
-          <table class="table table-hover table-striped display" id="fixed">
+          <table class="table table-hover display" id="fixed">
             <thead>
               <tr>
                 <th>${%File}</th>
diff --git a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
index 7f71ecdb2d..673e631b8d 100644
--- a/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
+++ b/plugin/src/main/resources/io/jenkins/plugins/analysis/core/model/IssuesDetail/filled.jelly
@@ -4,7 +4,7 @@
   <div class="row py-3 flex-nowrap">
 
     <!-- A carousel with all pie charts on small screens -->
-    <div class="col-xs-12 col-sm-6 col-md-5 col-lg-4 d-none d-block d-sm-block d-xl-none d-xxl-none">
+    <div class="col-xs-12 col-sm-6 col-md-5 col-lg-4 col-xl-3 d-none d-block d-sm-block d-xxl-none">
 
       <bs:card title="${%Overview}" fontAwesomeIcon="bell">
         <bs:carousel id="overview-carousel">
@@ -25,7 +25,7 @@
     </div>
 
     <!-- A single trend chart with the severities pie chart on large screens -->
-    <div class="col-xl-3 col-xxl-2 d-none d-xl-block">
+    <div class="col-xxl-2 d-none d-xxl-block">
 
       <bs:card title="${%Severities Distribution}" fontAwesomeIcon="chart-pie">
         <c:pie-chart id="severities-solo" model="${it.severityModel}" height="256" enableLinks="true"/>
@@ -34,7 +34,7 @@
     </div>
 
     <!-- A single trend chart with the reference pie chart on large screens -->
-    <div class="col-xl-3 col-xxl-2 d-none d-xl-block">
+    <div class="col-xxl-2 d-none d-xxl-block">
 
       <bs:card title="${%Reference Comparison}" fontAwesomeIcon="bell">
         <c:pie-chart id="trend-solo" model="${it.trendModel}" height="256" enableLinks="true"/>
@@ -42,6 +42,13 @@
 
     </div>
 
+    <!-- A single trend chart with the modified vs. unchanged chart on large screens -->
+    <div class="col-xxl-2 d-none d-xxl-block">
+      <bs:card title="${%Modified vs. Unchanged}" fontAwesomeIcon="file-pen">
+        <c:pie-chart id="modified-solo" model="${it.modifiedModel}" height="256" enableLinks="true"/>
+      </bs:card>
+    </div>
+
     <div class="col">
       <issues:history/>
     </div>
diff --git a/plugin/src/main/resources/issues/property.jelly b/plugin/src/main/resources/issues/property.jelly
index 161abbfb6b..709c2fb433 100644
--- a/plugin/src/main/resources/issues/property.jelly
+++ b/plugin/src/main/resources/issues/property.jelly
@@ -18,20 +18,13 @@
     <div role="tabpanel" id="${property}Content" class="tab-pane fade" aria-labelledby="${property}Content-tab">
       <j:set var="l" value="${it.tabLabelProvider}"/>
       <j:set var="t" value="${it.getDetails(property)}"/>
-      <div class="table-responsive">
-        <table class="table table-hover table-striped display property-table" id="${property}" isLoaded="true">
-          <colgroup>
-            <col class="col-width-5"/>
-            <col class="col-width-1 text-end"/>
-            <col class="col-width-1 text-end" />
-            <col class="col-width-5"/>
-          </colgroup>
+        <table class="table table-hover display property-table" id="${property}" isLoaded="true" style="width: 100%;">
           <thead>
             <tr>
-              <th>${name}</th>
-              <th class="text-end">${%Total}</th>
-              <th class="text-end">${%New}</th>
-              <th class="no-sort">${%Distribution}</th>
+              <th class="col-width-3">${name}</th>
+              <th class="col-width-1 text-end">${%Total}</th>
+              <th class="col-width-1 text-end">${%New}</th>
+              <th class="col-width-5 no-sort">${%Distribution}</th>
             </tr>
           </thead>
           <tbody>
@@ -64,7 +57,6 @@
           </tbody>
         </table>
       </div>
-    </div>
   </j:if>
 
 </j:jelly>