Skip to content

Migrate all attachment templates from Bootstrap 3 to Bootstrap 5.3.1 #6451

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.

Sign up for GitHub

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

Draft
Copilot wants to merge 3 commits into
base: master
Choose a base branch
from
+60 −396
Draft

Migrate all attachment templates from Bootstrap 3 to Bootstrap 5.3.1 #6451

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80f92b7
Initial plan
Copilot Feb 17, 2026
c656447
Migrate all attachment templates from Bootstrap 3 to Bootstrap 5.3.1
Copilot Feb 17, 2026
7050d5c
Remove unused Bootstrap 3.4.1 and bootstrap-toggle 2.2.2 webjars
Copilot Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vividus-extension-selenium/src/main/resources/templates/shadow-code.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>Application source code</title>
<link rel="stylesheet" href="../../styles.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/5.2.3/css/bootstrap.min.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/5.3.1/css/bootstrap.min.css"/>
</head>
<body>
<style>
Expand Down
2 changes: 1 addition & 1 deletion vividus-extension-selenium/src/main/resources/templates/source-code.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>Application source code</title>
<link rel="stylesheet" href="../../styles.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/3.4.1/css/bootstrap.min.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/5.3.1/css/bootstrap.min.css"/>
</head>
<body>
<style>
Expand Down
28 changes: 15 additions & 13 deletions vividus-extension-visual-testing/src/main/resources/base-report.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<meta charset="utf-8">
<title>Visual tests result table</title>
<link rel="stylesheet" href="../../styles.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/3.4.1/css/bootstrap.min.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap-toggle/2.2.2/css/bootstrap-toggle.min.css">
<link rel="stylesheet" href="../../webjars/bootstrap/5.3.1/css/bootstrap.min.css"/>
<link rel="stylesheet" href="../../webjars/vividus/style.css"/>
</head>
<body>
Expand All @@ -27,16 +26,17 @@
<#if compare>
<div class="col-md">
<#if hasBaseline>
<label class="checkbox-inline">
<input id="diffCheckBox" type="checkbox" data-toggle="toggle" data-on="Diff" data-off="Checkpoint" data-onstyle="danger" data-offstyle="success">
</label>
<div class="form-check form-switch form-check-inline">
<input class="form-check-input" type="checkbox" role="switch" id="diffCheckBox">
<label class="form-check-label" for="diffCheckBox" id="diffCheckBoxLabel">Checkpoint</label>
</div>
</#if>
<@custom_controls />
</div>
<div class="col-md-6">
<p>Baseline</p>
<#if hasBaseline>
<img class="img-responsive" src="data:image/png;base64,${freemarkerMethodCompressImage(result.baseline)}" />
<img class="img-fluid" src="data:image/png;base64,${freemarkerMethodCompressImage(result.baseline)}" />
<#else>
<span>No baseline image</span>
</#if>
Expand All @@ -45,13 +45,13 @@
<p>Checkpoint</p>
<#if hasBaseline>
<#if result.diff?hasContent>
<img id="diff" class="img-responsive" src="data:image/png;base64,${freemarkerMethodCompressImage(result.diff)}" />
<img id="diff" class="img-fluid" src="data:image/png;base64,${freemarkerMethodCompressImage(result.diff)}" />
<#else>
<span>No diff image</span>
</#if>
</#if>
<#if result.checkpoint?hasContent>
<img id="checkpoint" class="img-responsive" src="data:image/png;base64,${freemarkerMethodCompressImage(result.checkpoint)}" />
<img id="checkpoint" class="img-fluid" src="data:image/png;base64,${freemarkerMethodCompressImage(result.checkpoint)}" />
<#else>
<span>No checkpoint image</span>
</#if>
Expand All @@ -61,7 +61,7 @@
<p>Baseline</p>
<@custom_controls />
<#if result.checkpoint?hasContent>
<img id="checkpoint" class="img-responsive" src="data:image/png;base64,${freemarkerMethodCompressImage(result.checkpoint)}" />
<img id="checkpoint" class="img-fluid" src="data:image/png;base64,${freemarkerMethodCompressImage(result.checkpoint)}" />
<#else>
<span>No checkpoint image</span>
</#if>
Expand All @@ -70,25 +70,27 @@
</div>

<script src="../../webjars/jquery/3.6.4/jquery.min.js"></script>
<script src="../../webjars/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<script src="../../webjars/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js"></script>
<script src="../../webjars/bootstrap/5.3.1/js/bootstrap.min.js"></script>
<#if compare>
<script type="text/javascript">
$(document).ready(function(){
var diffImage = $("#diff");
var checkpointImage = $("#checkpoint");
var label = $("#diffCheckBoxLabel");
checkpointImage.show();
diffImage.hide();
$("#diffCheckBox").change(function(){
if($(this).is(":checked"))
{
diffImage.show();
checkpointImage.hide()
checkpointImage.hide();
label.text("Diff");
}
else
{
diffImage.hide();
checkpointImage.show()
checkpointImage.show();
label.text("Checkpoint");
}
});
});
Expand Down
4 changes: 2 additions & 2 deletions vividus-plugin-applitools/src/main/resources/applitools-visual-comparison.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
<#macro custom_controls>
<#if result.stepUrl?hasContent>
<a href="${result.stepUrl}" target="_blank" class="btn btn-info applitools" role="button">Step editor
<span class="glyphicon glyphicon-wrench"></span>
<span class="fa fa-wrench"></span>
</a>
</#if>
<#if result.batchUrl?hasContent>
<a href="${result.batchUrl}" target="_blank" class="btn btn-info applitools" role="button">Batch
<span class="glyphicon glyphicon-eye-open"></span>
<span class="fa fa-eye"></span>
</a>
</#if>
</#macro>
Expand Down
3 changes: 1 addition & 2 deletions vividus-plugin-applitools/src/main/resources/ufg-applitools-visual-comparison.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<title>Visual tests result table</title>
<link rel="stylesheet" href="../../styles.css"/>
<link rel="stylesheet" href="../../webjars/vividus/style.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/3.4.1/css/bootstrap.min.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap-toggle/2.2.2/css/bootstrap-toggle.min.css">
<link rel="stylesheet" href="../../webjars/bootstrap/5.3.1/css/bootstrap.min.css"/>
<style>
tbody:hover {
background-color: #f5f5f5
Expand Down
40 changes: 20 additions & 20 deletions vividus-plugin-db/src/main/resources/data-sources-statistics.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,65 +6,65 @@
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
<link rel="icon" href="img/favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="../../styles.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/3.4.1/css/bootstrap.min.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/5.3.1/css/bootstrap.min.css"/>
</head>
<body>
<style>
pre {
white-space: pre-wrap;
word-break: normal;
}
a[data-toggle='collapse'] {
a[data-bs-toggle='collapse'] {
display: inline-block;
width: 100%;
height: 100%;
}
.toggleable:hover {
cursor: pointer;
}
.panel-heading a:after {
.card-header a:after {
font-family:'FontAwesome';
content:"\F103";
float: right;
color: grey;
}
.panel-heading a.collapsed:after {
.card-header a.collapsed:after {
content:"\F101";
}
</style>

<#outputformat "HTML">
<#assign left = statistics.left>
<#assign right = statistics.right>
<div class="panel-group" id="accordion">
<div class="accordion" id="accordion">
<#if left.query?has_content>
<div class="panel panel-info">
<div class="panel-heading">
<h4 class="panel-title toggleable">
<a data-toggle="collapse" data-target="#collapse-left-sql" href="#collapse-left-sql" class="collapsed">Left query</a>
<div class="card border-info">
<div class="card-header">
<h4 class="card-title toggleable">
<a data-bs-toggle="collapse" data-bs-target="#collapse-left-sql" href="#collapse-left-sql" class="collapsed">Left query</a>
</h4>
</div>
<div id="collapse-left-sql" class="panel-collapse collapse">
<div id="collapse-left-sql" class="collapse">
<pre><code class="sql">${left.query}</code></pre>
</div>
</div>
</#if>

<#if right.query?has_content>
<div class="panel panel-info">
<div class="panel-heading">
<h4 class="panel-title toggleable">
<a data-toggle="collapse" data-target="#collapse-right-sql" href="#collapse-right-sql" class="collapsed">Right query</a>
<div class="card border-info">
<div class="card-header">
<h4 class="card-title toggleable">
<a data-bs-toggle="collapse" data-bs-target="#collapse-right-sql" href="#collapse-right-sql" class="collapsed">Right query</a>
</h4>
</div>
<div id="collapse-right-sql" class="panel-collapse collapse">
<div id="collapse-right-sql" class="collapse">
<pre><code class="sql">${right.query}</code></pre>
</div>
</div>
</#if>

<div class="panel panel-default">
<div class="panel-body">
<div class="card">
<div class="card-body">
<table class="table table-bordered table-stripped table-hover">
<thead>
<tr>
Expand Down Expand Up @@ -102,10 +102,10 @@
</div>
<div class="container-fluid">
<div class="row">
<div class="col-xs-6">
<div class="col-6">
<h4 style='text-align: center'>Total unique rows: ${statistics.totalRows}</h4>
</div>
<div class="col-xs-6">
<div class="col-6">
<h4 style='text-align: center'>Counts difference: ${(left.rowsQuantity - right.rowsQuantity)?abs}</h4>
</div>
</div>
Expand All @@ -118,7 +118,7 @@
</#outputformat>

<script src="../../webjars/jquery/3.6.4/jquery.min.js"></script>
<script src="../../webjars/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<script src="../../webjars/bootstrap/5.3.1/js/bootstrap.min.js"></script>
<script src="../../webjars/highlight.js/11.7.0/highlight.min.js"></script>
<script src="../../webjars/chart.js/3.2.1/chart.min.js"></script>
<script type="text/javascript">
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/resources/org/vividus/http/steps/attachment/http-resources-validation-results.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8">
<title>HTTP resources validation results</title>
<link rel="stylesheet" href="../../styles.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/3.4.1/css/bootstrap.min.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/5.3.1/css/bootstrap.min.css"/>
</head>
<body>
<style>
Expand Down Expand Up @@ -39,7 +39,7 @@
}
</style>

<table class="table table-hover table-bordered table-condensed fixedHeader">
<table class="table table-hover table-bordered table-sm fixedHeader">
<thead>
<tr>
<th/>
Expand Down Expand Up @@ -71,6 +71,6 @@
</#list>
</tbody>
</table>
<script src="../../webjars/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<script src="../../webjars/bootstrap/5.3.1/js/bootstrap.min.js"></script>
</body>
</html>
10 changes: 5 additions & 5 deletions ...src/main/resources/org/vividus/http/steps/attachment/resources-response-body-fragment.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<#if result.responseBody??>
<#assign hash = result.hashCode()?c>
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal_${hash}">
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#modal_${hash}">
Show HTTP response
</button>
<div class="modal fade" id="modal_${hash}" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
<div class="modal-dialog modal-lg" role="document">
<div class="modal fade" id="modal_${hash}" tabindex="-1" aria-labelledby="modalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="modalLabel">Response body</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<pre><code id="pretty-code" class="html"><#outputformat "HTML">${result.responseBody}</#outputformat></code></pre>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions ...s-plugin-web-app-to-rest-api/src/main/resources/org/vividus/integration/steps/cookies.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8">
<title>Cookies table</title>
<link rel="stylesheet" href="../../styles.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/3.4.1/css/bootstrap.min.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/5.3.1/css/bootstrap.min.css"/>
</head>
<body>
<style>
Expand All @@ -27,7 +27,7 @@
}
</style>

<table class="table table-hover table-bordered table-condensed fixedHeader">
<table class="table table-hover table-bordered table-sm fixedHeader">
<thead>
<tr>
<th style="width: 10%">Name</th>
Expand Down Expand Up @@ -59,6 +59,6 @@
</#list>
</tbody>
</table>
<script src="../../webjars/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<script src="../../webjars/bootstrap/5.3.1/js/bootstrap.min.js"></script>
</body>
</html>
6 changes: 3 additions & 3 deletions vividus-plugin-web-app-to-rest-api/src/main/resources/resources-validation-result.ftlh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8">
<title>Resources check result table</title>
<link rel="stylesheet" href="../../styles.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/3.4.1/css/bootstrap.min.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/5.3.1/css/bootstrap.min.css"/>
</head>
<body>
<style>
Expand Down Expand Up @@ -43,7 +43,7 @@
}
</style>

<table class="table table-hover table-bordered table-condensed fixedHeader">
<table class="table table-hover table-bordered table-sm fixedHeader">
<thead>
<tr>
<th/>
Expand Down Expand Up @@ -97,6 +97,6 @@
</#list>
</tbody>
</table>
<script src="../../webjars/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<script src="../../webjars/bootstrap/5.3.1/js/bootstrap.min.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion ...eb-app/src/main/resources/org/vividus/steps/ui/web/js-console-validation-result-table.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="utf-8">
<title>JS error result table</title>
<link rel="stylesheet" href="../../styles.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/3.4.1/css/bootstrap.min.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/5.3.1/css/bootstrap.min.css"/>
</head>
<body>
<style>
Expand Down
6 changes: 3 additions & 3 deletions vividus-reporter/src/main/resources/templates/maps-comparison-table.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<meta charset="utf-8">
<title>Analytics result table</title>
<link rel="stylesheet" href="../../styles.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/3.4.1/css/bootstrap.min.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/5.3.1/css/bootstrap.min.css"/>
</head>
<body>
<style>
Expand Down Expand Up @@ -78,7 +78,7 @@
}
</style>

<table class="table table-hover table-bordered table-condensed">
<table class="table table-hover table-bordered table-sm">
<a class="floating" id="expander" href="#">
<i class="fa fa-plus icon"></i>
</a>
Expand Down Expand Up @@ -138,7 +138,7 @@
</tbody>
</table>
<script src="../../webjars/jquery/3.6.4/jquery.min.js"></script>
<script src="../../webjars/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<script src="../../webjars/bootstrap/5.3.1/js/bootstrap.min.js"></script>
<script type="text/javascript">
$(document).ready(function()
{
Expand Down
4 changes: 2 additions & 2 deletions vividus/src/main/resources/templates/archive-entries-result-table.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<head>
<meta charset="utf-8">
<title>Archive entries</title>
<link rel="stylesheet" href="../../webjars/bootstrap/3.4.1/css/bootstrap.min.css"/>
<link rel="stylesheet" href="../../webjars/bootstrap/5.3.1/css/bootstrap.min.css"/>
</head>
<body>
<style>
Expand All @@ -28,7 +28,7 @@
</style>

<#if entryNames?has_content>
<table class="table table-hover table-bordered table-condensed fixedHeader">
<table class="table table-hover table-bordered table-sm fixedHeader">
<thead>
<tr>
<th>
Expand Down
Loading