Skip to content

Commit 1e41c43

Browse files
bpamiribpamiri
committed
Add branding to the Docker Test UI
1 parent 084caca commit 1e41c43

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

‎docker/testui/favicon.ico‎

15 KB
Binary file not shown.

‎docker/testui/index.html‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6-
<link rel="icon" href="https://cfwheels.org/favicon.ico">
7-
<title>CFWheels Test UI</title>
6+
<link rel="icon" href="/favicon.ico">
7+
<title>Wheels Test UI</title>
88
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
99
</head>
1010
<body>
1111
<noscript><strong>We're sorry but test-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript>
1212
<div>
1313
<nav class="navbar navbar-light bg-light navbar-expand-sm">
1414
<button type="button" class="navbar-toggler collapsed" style="overflow-anchor: none;"><span class="navbar-toggler-icon"></span></button>
15-
<div class="navbar-brand">CFWheels</div>
15+
<a class="navbar-brand" href="#">
16+
<img src="wheels_logo.png" width="200" alt="">
17+
</a>
1618
<div class="navbar-collapse collapse" style="display: none;">
1719
<ul class="navbar-nav">
18-
<li class="navbar-text">Test Suite</li>
20+
<li class="navbar-text">Wheels Framework Test Suite</li>
1921
</ul>
2022
</div>
2123
</nav>
@@ -28,7 +30,7 @@
2830
<div class="card-header">Run Tests:</div>
2931
<div class="list-group" id="test-section">
3032
</div>
31-
33+
3234
<!-- Execution Order -->
3335
<fieldset class="form-group m-3">
3436
<legend tabindex="-1" class="bv-no-focus-ring col-form-label pt-0">Execution Order</legend>
@@ -45,7 +47,7 @@
4547
</div>
4648
</div>
4749
</fieldset>
48-
50+
4951
</div>
5052
<div class="card mt-3">
5153
<!--Server Section-->
@@ -124,17 +126,17 @@ <h6>Results</h6>
124126
let testSection = document.getElementById('test-section');
125127
let requestStatus = document.getElementsByClassName('request-status');
126128
let requestList = [];
127-
129+
128130
window.onload = function(){
129131
//Tests Section
130132
let arrayTests = [];
131133
let tempTests;
132134

133-
for(let i = 0; i < testsuites.length; i++){
135+
for(let i = 0; i < testsuites.length; i++){
134136
tempTests = `<button title="Add Test to Queue" type="button" class="test list-group-item list-group-item-action"><svg viewBox="0 0 16 16" width="1em" height="1em" focusable="false" role="img" aria-label="plus circle" xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi-plus-circle b-icon bi"><g><path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"></path><path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"></path></g></svg> ${testsuites[i].displayname} </button>`;
135137
arrayTests.push(tempTests);
136138
}
137-
139+
138140
arrayTests = arrayTests.join('');
139141
testSection.innerHTML = arrayTests;
140142

@@ -147,14 +149,14 @@ <h6>Results</h6>
147149
tempServer = `<a title="Open Server in New Window" href="${servers[i].server}" target="_blank" class="list-group-item list-group-item-action"> ${servers[i].servername} <svg viewBox="0 0 16 16" width="1em" height="1em" focusable="false" role="img" aria-label="box arrow up right" xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi-box-arrow-up-right b-icon bi"><g><path fill-rule="evenodd" d="M8.636 3.5a.5.5 0 0 0-.5-.5H1.5A1.5 1.5 0 0 0 0 4.5v10A1.5 1.5 0 0 0 1.5 16h10a1.5 1.5 0 0 0 1.5-1.5V7.864a.5.5 0 0 0-1 0V14.5a.5.5 0 0 1-.5.5h-10a.5.5 0 0 1-.5-.5v-10a.5.5 0 0 1 .5-.5h6.636a.5.5 0 0 0 .5-.5z"></path><path fill-rule="evenodd" d="M16 .5a.5.5 0 0 0-.5-.5h-5a.5.5 0 0 0 0 1h3.793L6.146 9.146a.5.5 0 1 0 .708.708L15 1.707V5.5a.5.5 0 0 0 1 0v-5z"></path></g></svg></a>`;
148150
arrayServers.push(tempServer);
149151
}
150-
152+
151153
arrayServers = arrayServers.join('');
152154
serverSection.innerHTML = arrayServers;
153-
155+
154156
//Select Test
155157
const tests = document.getElementsByClassName('test');
156158
const queueSection = document.getElementById('queue-section');
157-
159+
158160
for(let i = 0; i < tests.length; i++){
159161
tests[i].addEventListener('click',function(){
160162
clearSection(queueSection);
@@ -186,7 +188,7 @@ <h6>Results</h6>
186188
for(let i = 0; i < requestList.length; i++){
187189
let currentServer = servers.find((server) => server.servername === requestList[i].trim().split(':')[0]);
188190
let currentDatabase = databases.find((database) => database.databasename === requestList[i].trim().split(':')[1].trim());
189-
191+
190192
requestUrl = `${currentServer.server}/wheels/testbox?format=json&sort=${execOrder}&db=${currentDatabase.database}`;
191193
clearSection(document.getElementById('console-section'));
192194
document.getElementById('console-section').insertAdjacentHTML('beforeend', `<div class="row p-1"><div class="col-md-1"><span class="badge badge-info">${gettime()}</span></div><div class="col-md-11 text-left">Test Started -${requestList[i]}</div></div>`);
@@ -213,7 +215,7 @@ <h6>Results</h6>
213215
document.getElementById('clear-queue').disabled = '';
214216
}
215217
})
216-
218+
217219
//API call
218220
async function API_call(requestUrl, request_server, requestStatus,spinner,index){
219221
try{
@@ -350,4 +352,4 @@ <h6>Results</h6>
350352
}
351353
}
352354
</script>
353-
</html>
355+
</html>

‎docker/testui/wheels_logo.png‎

31.1 KB
Loading

0 commit comments

Comments
 (0)