Refactor templates.

master
Manager Bot 3 years ago
parent 869e188d20
commit 20e0dc3da2
  1. 4
      Web/templates/_base/_svg/checkmark.html.ep
  2. 4
      Web/templates/_base/_svg/chevron.html.ep
  3. 0
      Web/templates/_base/_svg/envelope-open.html.ep
  4. 0
      Web/templates/_base/_svg/envelope.html.ep
  5. 4
      Web/templates/_base/_svg/exclaim.html.ep
  6. 4
      Web/templates/_base/_svg/failed.html.ep
  7. 4
      Web/templates/_base/_svg/loading.html.ep
  8. 4
      Web/templates/_base/jobs/failed.html.ep
  9. 4
      Web/templates/_base/jobs/finished.html.ep
  10. 4
      Web/templates/_base/jobs/milestone.html.ep
  11. 6
      Web/templates/admin/alerts.html.ep

@ -1,5 +1,5 @@
<!-- Start _svg/checkmark.tx --> <!-- Start _base/_svg/checkmark.tx -->
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check-circle-fill" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check-circle-fill" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"/> <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"/>
</svg> </svg>
<!-- End _svg/checkmark.tx --> <!-- End _base/_svg/checkmark.tx -->

Before

Width:  |  Height:  |  Size: 407 B

After

Width:  |  Height:  |  Size: 419 B

@ -1,5 +1,5 @@
<!-- Start _svg/chevron.tx --> <!-- Start _base/_svg/chevron.tx -->
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-down" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-down" viewBox="0 0 16 16">
<path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z"/> <path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z"/>
</svg> </svg>
<!-- End _svg/chevron.tx --> <!-- End _base/_svg/chevron.tx -->

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 365 B

Before

Width:  |  Height:  |  Size: 602 B

After

Width:  |  Height:  |  Size: 602 B

Before

Width:  |  Height:  |  Size: 493 B

After

Width:  |  Height:  |  Size: 493 B

@ -1,5 +1,5 @@
<!-- Start _svg/exclaim.tx --> <!-- Start _base/_svg/exclaim.tx -->
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-exclamation-octagon-fill" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-exclamation-octagon-fill" viewBox="0 0 16 16">
<path d="M11.46.146A.5.5 0 0 0 11.107 0H4.893a.5.5 0 0 0-.353.146L.146 4.54A.5.5 0 0 0 0 4.893v6.214a.5.5 0 0 0 .146.353l4.394 4.394a.5.5 0 0 0 .353.146h6.214a.5.5 0 0 0 .353-.146l4.394-4.394a.5.5 0 0 0 .146-.353V4.893a.5.5 0 0 0-.146-.353L11.46.146zM8 4c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 4.995A.905.905 0 0 1 8 4zm.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/> <path d="M11.46.146A.5.5 0 0 0 11.107 0H4.893a.5.5 0 0 0-.353.146L.146 4.54A.5.5 0 0 0 0 4.893v6.214a.5.5 0 0 0 .146.353l4.394 4.394a.5.5 0 0 0 .353.146h6.214a.5.5 0 0 0 .353-.146l4.394-4.394a.5.5 0 0 0 .146-.353V4.893a.5.5 0 0 0-.146-.353L11.46.146zM8 4c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 4.995A.905.905 0 0 1 8 4zm.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/>
</svg> </svg>
<!-- End _svg/exclaim.tx --> <!-- End _base/_svg/exclaim.tx -->

Before

Width:  |  Height:  |  Size: 592 B

After

Width:  |  Height:  |  Size: 604 B

@ -1,6 +1,6 @@
<!-- Start _svg/failed.tx --> <!-- Start _base/_svg/failed.tx -->
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-circle" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-circle" viewBox="0 0 16 16">
<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 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 d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/> <path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
</svg> </svg>
<!-- End _svg/failed.tx --> <!-- End _base/_svg/failed.tx -->

Before

Width:  |  Height:  |  Size: 486 B

After

Width:  |  Height:  |  Size: 498 B

@ -1,6 +1,6 @@
<!-- Start _svg/loading.tx --> <!-- Start _base/_svg/loading.tx -->
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-repeat" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-repeat" viewBox="0 0 16 16">
<path d="M11.534 7h3.932a.25.25 0 0 1 .192.41l-1.966 2.36a.25.25 0 0 1-.384 0l-1.966-2.36a.25.25 0 0 1 .192-.41zm-11 2h3.932a.25.25 0 0 0 .192-.41L2.692 6.23a.25.25 0 0 0-.384 0L.342 8.59A.25.25 0 0 0 .534 9z"/> <path d="M11.534 7h3.932a.25.25 0 0 1 .192.41l-1.966 2.36a.25.25 0 0 1-.384 0l-1.966-2.36a.25.25 0 0 1 .192-.41zm-11 2h3.932a.25.25 0 0 0 .192-.41L2.692 6.23a.25.25 0 0 0-.384 0L.342 8.59A.25.25 0 0 0 .534 9z"/>
<path fill-rule="evenodd" d="M8 3c-1.552 0-2.94.707-3.857 1.818a.5.5 0 1 1-.771-.636A6.002 6.002 0 0 1 13.917 7H12.9A5.002 5.002 0 0 0 8 3zM3.1 9a5.002 5.002 0 0 0 8.757 2.182.5.5 0 1 1 .771.636A6.002 6.002 0 0 1 2.083 9H3.1z"/> <path fill-rule="evenodd" d="M8 3c-1.552 0-2.94.707-3.857 1.818a.5.5 0 1 1-.771-.636A6.002 6.002 0 0 1 13.917 7H12.9A5.002 5.002 0 0 0 8 3zM3.1 9a5.002 5.002 0 0 0 8.757 2.182.5.5 0 1 1 .771.636A6.002 6.002 0 0 1 2.083 9H3.1z"/>
</svg> </svg>
<!-- End _svg/loading.tx --> <!-- End _base/_svg/loading.tx -->

Before

Width:  |  Height:  |  Size: 647 B

After

Width:  |  Height:  |  Size: 659 B

@ -1,10 +1,10 @@
<div class="card mt-4"> <div class="card mt-4">
<div class="card-header alert-warning"> <div class="card-header alert-warning">
%= include '_svg/failed' %= include '_base/_svg/failed'
Job <%= $job->{id} %>/<%= $job->{task} %> failed. (Queued: <%= $date %>) Job <%= $job->{id} %>/<%= $job->{task} %> failed. (Queued: <%= $date %>)
<button class="btn" data-bs-toggle="collapse" data-bs-target="#job_window_<%= $job->{id} %>"> <button class="btn" data-bs-toggle="collapse" data-bs-target="#job_window_<%= $job->{id} %>">
%= include '_svg/chevron' %= include '_base/_svg/chevron'
</button> </button>
</div> </div>
<div id="job_window_<%= $job->{id} %>" class="card-body <%= $index == 1 ? '' : 'collapse' %>"> <div id="job_window_<%= $job->{id} %>" class="card-body <%= $index == 1 ? '' : 'collapse' %>">

@ -1,12 +1,12 @@
<div class="card mt-4"> <div class="card mt-4">
<div class="card-header alert-success"> <div class="card-header alert-success">
%= include '_svg/checkmark' %= include '_base/_svg/checkmark'
Job <%= $job->{id} %>/<%= $job->{task} %> completed successfully. (Queued: <%= $date %>) Job <%= $job->{id} %>/<%= $job->{task} %> completed successfully. (Queued: <%= $date %>)
<button class="btn" data-bs-toggle="collapse" data-bs-target="#job_window_<%= $job->{id} %>"> <button class="btn" data-bs-toggle="collapse" data-bs-target="#job_window_<%= $job->{id} %>">
%= include '_svg/chevron' %= include '_base/_svg/chevron'
</button> </button>
</div> </div>

@ -3,10 +3,10 @@
<div class="card-header"> <div class="card-header">
% if ( $milestone->{is_complete} && $milestone->{is_complete} == 1 ) { % if ( $milestone->{is_complete} && $milestone->{is_complete} == 1 ) {
<span class="text-success" > <span class="text-success" >
%= include '_svg/checkmark' %= include '_base/_svg/checkmark'
</span> </span>
% } else { % } else {
%= include '_svg/loading' %= include '_base/_svg/loading'
% } % }
<%= $milestone->{text} %> <%= $milestone->{text} %>
</div> </div>

@ -8,15 +8,15 @@
<div class="card mt-4"> <div class="card mt-4">
<div class="card-header alert-primary"> <div class="card-header alert-primary">
% if ( $alert->is_read == 1 ) { % if ( $alert->is_read == 1 ) {
%= include '_svg/envelope-open' %= include '_base/_svg/envelope-open'
% } else { % } else {
%= include '_svg/envelope' %= include '_base/_svg/envelope'
% } % }
Message from <span class="fw-bold"><%= $alert->source %></span> on <%= $alert->created_at->strftime( "%F %T" ) %> Message from <span class="fw-bold"><%= $alert->source %></span> on <%= $alert->created_at->strftime( "%F %T" ) %>
<button class="btn" data-bs-toggle="collapse" data-bs-target="#alert_window_<%= $alert->id %>"> <button class="btn" data-bs-toggle="collapse" data-bs-target="#alert_window_<%= $alert->id %>">
%= include '_svg/chevron' %= include '_base/_svg/chevron'
</button> </button>
</div> </div>
<div id="alert_window_<%= $alert->id %>" class="card-body <%= $alert->is_read == 1 ? 'collapse' : '' %>"> <div id="alert_window_<%= $alert->id %>" class="card-body <%= $alert->is_read == 1 ? 'collapse' : '' %>">

Loading…
Cancel
Save