Skip to content

Commit

Permalink
fix: fix/improve html table
Browse files Browse the repository at this point in the history 
Add missing html table description and headers
  • Loading branch information
@dfranco
dfranco committed Dec 27, 2023
1 parent 6196128 commit 9d1c4f7
Show file tree
Hide file tree
Showing 10 changed files with 73 additions and 46 deletions.
27 changes: 15 additions & 12 deletions application/views/templates/pages/backupjob-report.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,21 @@

<div class="table-responsive">
<table class="table table-condensed table-hover table-striped table-bordered text-center">
<tr>
<th class="text-center">{{ 'Job Id'|trans }}</th>
<th class="text-center">{{ 'Status'|trans }}</th>
<th class="text-center">{{ 'Level'|trans }}</th>
<th class="text-right">{{ 'Files'|trans }}</th>
<th class="text-right">{{ 'Bytes'|trans }}</th>
<th class="text-center">{{ 'Start time'|trans }}</th>
<th class="text-center">{{ 'End time'|trans }}</th>
<th class="text-center">{{ 'Elapsed time'|trans }}</th>
<th class="text-rightr">{{ 'Speed'|trans }}</th>
<th class="text-center">{{ 'Compression'|trans }}</th>
</tr>
<caption>{{ 'Last backup jobs'|trans }}</caption>
<thead>
<tr>
<th class="text-center">{{ 'Job Id'|trans }}</th>
<th class="text-center">{{ 'Status'|trans }}</th>
<th class="text-center">{{ 'Level'|trans }}</th>
<th class="text-right">{{ 'Files'|trans }}</th>
<th class="text-right">{{ 'Bytes'|trans }}</th>
<th class="text-center">{{ 'Start time'|trans }}</th>
<th class="text-center">{{ 'End time'|trans }}</th>
<th class="text-center">{{ 'Elapsed time'|trans }}</th>
<th class="text-rightr">{{ 'Speed'|trans }}</th>
<th class="text-center">{{ 'Compression'|trans }}</th>
</tr>
</thead>
{% for job in jobs %}
<tr>
<td>{{ job.jobid }}</td>
Expand Down
21 changes: 12 additions & 9 deletions application/views/templates/pages/client-report.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,18 @@
<h4>{{ 'Last good backup job'|trans }}</h4>
<div class="table-responsive">
<table class="table table-bordered table-condensed table-striped text-center">
<tr>
<th class="text-center">{{ 'Name'|trans }}</th>
<th class="text-center">{{ 'Job Id'|trans }}</th>
<th class="text-center">{{ 'Level'|trans }}</th>
<th class="text-center">{{ 'End time'|trans }}</th>
<th class="text-right">{{ 'Bytes'|trans }}</th>
<th class="text-right">{{ 'Files'|trans }}</th>
<th class="text-center">{{ 'Status'|trans }}</th>
</tr>
<caption>{{ 'Last good backup job'|trans }}</caption>
<thead>
<tr>
<th class="text-center">{{ 'Name'|trans }}</th>
<th class="text-center">{{ 'Job Id'|trans }}</th>
<th class="text-center">{{ 'Level'|trans }}</th>
<th class="text-center">{{ 'End time'|trans }}</th>
<th class="text-right">{{ 'Bytes'|trans }}</th>
<th class="text-right">{{ 'Files'|trans }}</th>
<th class="text-center">{{ 'Status'|trans }}</th>
</tr>
</thead>
{% for job in backup_jobs %}
<tr>
<td>{{ job.name }}</td>
Expand Down
19 changes: 14 additions & 5 deletions application/views/templates/pages/dashboard.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
{{ last_jobs_chart|raw }}

<table class="table table-condensed">
<caption>Jobs status overview</caption>
<thead>
<tr>
<th colspan="2"></th>
</tr>
</thead>
<tr>
<td><h5>{{ 'Running jobs'|trans }}</h5></td>
<td class="text-center">
Expand Down Expand Up @@ -315,11 +321,14 @@
</div>
<div class="card-body">
<table class="table table-condensed table-striped">
<tr>
<th>{{ 'Job name'|trans }}</th>
<th class="text-right">{{ 'Bytes'|trans }}</th>
<th class="text-right">{{ 'Files'|trans }}</th>
</tr>
<caption>{{ 'Biggest backup jobs'|trans }}</caption>
<thead>
<tr>
<th>{{ 'Job name'|trans }}</th>
<th class="text-right">{{ 'Bytes'|trans }}</th>
<th class="text-right">{{ 'Files'|trans }}</th>
</tr>
</thead>
{% for job in biggestjobs %}
<tr>
<td>
Expand Down
12 changes: 7 additions & 5 deletions application/views/templates/pages/jobfiles.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@
<div class="col-md-12">
<div class="table-responsive">
<table class="table table-condensed table-hover table-striped table-bordered text-center">
<tr>
<th class="text-center">{{ 'File Index'|trans }}</th>
<th class="text-center">{{ 'Filename'|trans }}</th>

</tr>
<caption>Job file(s) list</caption>
<thead>
<tr>
<th class="text-center">{{ 'File Index'|trans }}</th>
<th class="text-center">{{ 'Filename'|trans }}</th>
</tr>
</thead>
{% for file in job_files %}
<tr>
<td>#{{ file.fileindex }}</td>
Expand Down
11 changes: 7 additions & 4 deletions application/views/templates/pages/joblogs.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,13 @@
<div class="col-9">
<div class="table-responsive">
<table class="table table-hover table-striped table-condensed table-bordered">
<tr>
<th class="text-center">{{ 'Time'|trans }}</th>
<th class="text-center">{{ 'Event'|trans }}</th>
</tr>
<caption>Job event(s) list</caption>
<thead>
<tr>
<th class="text-center">{{ 'Time'|trans }}</th>
<th class="text-center">{{ 'Event'|trans }}</th>
</tr>
</thead>
{% for log in joblogs %}
<tr>
<td class="text-center">{{ log.getTime() }}</td>
Expand Down
1 change: 1 addition & 0 deletions application/views/templates/pages/jobs.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
<div class="col-xs-12 col-sm-9 col-sm-pull-3 col-lg-10 col-lg-pull-2">
<div class="table-responsive">
<table class="table table-condensed table-striped text-center">
<caption>Job(s) list</caption>
<thead>
<tr>
<th class="text-center">{{ 'Status'|trans }}</th>
Expand Down
13 changes: 7 additions & 6 deletions application/views/templates/pages/pools.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
<div class="col-xs-12">
<div class="table-responsive">
<table class="table table-condensed table-striped paginate">
<caption>Pool(s) list</caption>
<thead>
<tr>
<th class="text-center">{{ 'Pool name'|trans }}</th>
<th class="text-center">{{ 'Volume count'|trans }}</th>
<th class="text-center">{{ 'Total bytes'|trans }}</th>
<th class="text-center">{{ 'Volumes'|trans }}</th>
</tr>
<tr>
<th class="text-center">{{ 'Pool name'|trans }}</th>
<th class="text-center">{{ 'Volume count'|trans }}</th>
<th class="text-center">{{ 'Total bytes'|trans }}</th>
<th class="text-center">{{ 'Volumes'|trans }}</th>
</tr>
</thead>
{% for pool in pools %}
<tr>
Expand Down
13 changes: 8 additions & 5 deletions application/views/templates/pages/test.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
</div>

<table class="table table-striped">
<tr>
<th class="text-center">Status</th>
<th class="text-center">Component</th>
<th class="text-center">Description</th>
</tr>
<caption>List of verified requirements</caption>
<thead>
<tr>
<th class="text-center">Status</th>
<th class="text-center">Component</th>
<th class="text-center">Description</th>
</tr>
</thead>
{% for check in checks %}
<tr>
<td class="text-center"><span class="{{ check.check_result }}"></span></td>
Expand Down
1 change: 1 addition & 0 deletions application/views/templates/pages/volume.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<div class="card-body">
<div class="table-responsive">
<table class="table table-condensed table-striped text-center">
<caption>Job(s) list for this volume</caption>
<thead>
<tr>
<th class="text-center">{{ 'Job ID'|trans }}</th>
Expand Down
1 change: 1 addition & 0 deletions application/views/templates/pages/volumes.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<div class="col-10">
<div class="table-responsive">
<table class="table table-condensed table-striped text-center">
<caption>Volume(s) list</caption>
<thead>
<tr>
<th class="text-center">{{ 'Volume name'|trans }}</th>
Expand Down

0 comments on commit 9d1c4f7

Please sign in to comment.