Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare layout for DataTables 2.0.0 #1696

Merged
merged 1 commit into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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"/>
Expand All @@ -34,14 +34,21 @@
</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"/>
</bs:card>

</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>
Expand Down
18 changes: 5 additions & 13 deletions plugin/src/main/resources/issues/property.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -64,7 +57,6 @@
</tbody>
</table>
</div>
</div>
</j:if>

</j:jelly>