Skip to content

Commit

Permalink
Some styling adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
@austinwbest
austinwbest committed Dec 29, 2024
1 parent 524819e commit f7636c8
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 43 deletions.
39 changes: 21 additions & 18 deletions root/app/www/public/ajax/containers.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,17 @@
}
}
?>
<div class="bg-secondary rounded p-4">
<div class="row">
<?php if ($pullsNotice) { ?>
<div class="col-sm-12">
<div class="rounded m-2 p-2" style="background-color: var(--primary);">
There is currently no pull data available to show the Updates state. If the Updates column is set to Ignore then no checks will be made for that container. If you want current data, please set all the Update Options to Check for updates or Auto update and click save at the bottom. Once that is done you can click the check all and select Update: Check or Pull from the list. This will take a minute or two as it has to check every image.
</div>
</div>
<?php } ?>
<div class="bg-secondary rounded p-4 mb-2" style="height:65px;">
<div class="row" style="z-index:998; width:80% !important; position:fixed; top:100px;">
<div class="col-sm-12">
<div id="container-control-buttons" class="text-center" style="z-index:9999; width:80% !important; position:fixed;">
<div id="container-control-buttons" class="text-center bg-secondary">
<div class="btn-group" role="group">
<button type="button" class="btn btn-outline-light bg-secondary" onclick="massApplyContainerTrigger(false, 4)"><i class="fas fa-cloud-download-alt fa-xs me-1"></i> Pull</button>
<button type="button" class="btn btn-outline-light bg-secondary" onclick="massApplyContainerTrigger(false, 2)"><i class="fas fa-sync-alt fa-xs me-1"></i> Restart</button>
<button type="button" class="btn btn-outline-light bg-secondary" onclick="massApplyContainerTrigger(false, 1)"><i class="fas fa-play fa-xs me-1"></i> Start</button>
<button type="button" class="btn btn-outline-light bg-secondary" onclick="massApplyContainerTrigger(false, 3)"><i class="fas fa-power-off fa-xs me-1"></i> Stop</button>
<button type="button" class="btn btn-outline-warning bg-secondary" onclick="massApplyContainerTrigger(false, 13)"><i class="fas fa-skull-crossbones fa-xs me-1"></i> Kill</button>
</div>
<div class="btn-group" role="group">
<button type="button" class="btn btn-outline-danger bg-secondary" onclick="massApplyContainerTrigger(false, 9)"><i class="far fa-trash-alt fa-xs me-1"></i> Remove</button>
<button type="button" class="btn btn-outline-light bg-secondary" onclick="massApplyContainerTrigger(false, 4)"><i class="fas fa-cloud-download-alt fa-xs me-1"></i><span class="container-control-button-label text-light"> Pull</span></button>
<button type="button" class="btn btn-outline-light bg-secondary" onclick="massApplyContainerTrigger(false, 2)"><i class="fas fa-sync-alt fa-xs me-1"></i><span class="container-control-button-label text-light"> Restart</span></button>
<button type="button" class="btn btn-outline-light bg-secondary" onclick="massApplyContainerTrigger(false, 1)"><i class="fas fa-play fa-xs me-1"></i><span class="container-control-button-label text-light"> Start</span></button>
<button type="button" class="btn btn-outline-light bg-secondary" onclick="massApplyContainerTrigger(false, 3)"><i class="fas fa-power-off fa-xs me-1"></i><span class="container-control-button-label text-light"> Stop</span></button>
<button type="button" class="btn btn-outline-warning bg-secondary" onclick="massApplyContainerTrigger(false, 13)"><i class="fas fa-skull-crossbones fa-xs me-1"></i><span class="container-control-button-label text-warning"> Kill</span></button>
<button type="button" class="btn btn-outline-danger bg-secondary" onclick="massApplyContainerTrigger(false, 9)"><i class="far fa-trash-alt fa-xs me-1"></i><span class="container-control-button-label text-danger"> Remove</span></button>
</div>
<div class="btn-group" role="group">
<button type="button" class="btn btn-outline-info bg-secondary disabled">Updates:</button>
Expand All @@ -60,6 +51,18 @@
</div>
</div>
</div>
</div>
</div>

<div class="bg-secondary rounded p-4">
<div class="row">
<?php if ($pullsNotice) { ?>
<div class="col-sm-12">
<div class="rounded m-2 p-2" style="background-color: var(--primary);">
There is currently no pull data available to show the Updates state. If the Updates column is set to Ignore then no checks will be made for that container. If you want current data, please set all the Update Options to Check for updates or Auto update and click save at the bottom. Once that is done you can click the check all and select Update: Check or Pull from the list. This will take a minute or two as it has to check every image.
</div>
</div>
<?php } ?>
<div class="col-sm-12">
<div class="text-end mb-2">
<span class="small-text text-muted">
Expand Down
48 changes: 24 additions & 24 deletions root/app/www/public/ajax/overview.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,51 +220,51 @@
<div class="row">
<div class="col-sm-12">
<div class="row bg-secondary rounded p-4">
<div class="col-sm-12 col-lg-4" style="cursor:pointer;" onclick="initPage('containers')">
<div class="col-12 col-lg-4" style="cursor:pointer;" onclick="initPage('containers')">
<div class="row">
<div class="col-sm-12 col-lg-3 text-center">
<div class="col-12 col-lg-3 text-center">
<span class="h4 text-primary">Status</span>
</div>
<div class="col-sm-12 col-lg-3 h5">
<span class="badge bg-success w-100">Running: <?= $running ?></span>
<div class="col-4 col-lg-3 h5">
<span class="badge bg-success">Running: <?= $running ?></span>
</div>
<div class="col-sm-12 col-lg-3 h5">
<span class="badge bg-warning w-100">Stopped: <?= $stopped ?></span>
<div class="col-4 col-lg-3 h5">
<span class="badge bg-warning">Stopped: <?= $stopped ?></span>
</div>
<div class="col-sm-12 col-lg-3 h5">
<span class="badge bg-light w-100">Total: <?= $running + $stopped ?></span>
<div class="col-4 col-lg-3 h5">
<span class="badge bg-light">Total: <?= $running + $stopped ?></span>
</div>
</div>
</div>
<div class="col-sm-12 col-lg-4" style="cursor:pointer;" onclick="initPage('containers')">
<div class="col-12 col-lg-4" style="cursor:pointer;" onclick="initPage('containers')">
<div class="row">
<div class="col-sm-12 col-lg-3 text-center">
<div class="col-12 col-lg-3 text-center">
<span class="h4 text-primary">Health</span>
</div>
<div class="col-sm-12 col-lg-3 h5">
<span class="badge bg-success w-100">Healthy: <?= $healthy ?></span>
<div class="col-4 col-lg-3 h5">
<span class="badge bg-success">Healthy: <?= $healthy ?></span>
</div>
<div class="col-sm-12 col-lg-3 h5">
<span class="badge bg-warning w-100">Unhealthy: <?= $unhealthy ?></span>
<div class="col-4 col-lg-3 h5">
<span class="badge bg-warning">Unhealthy: <?= $unhealthy ?></span>
</div>
<div class="col-sm-12 col-lg-3 h5">
<span class="badge bg-light w-100">Unknown: <?= $unknownhealth ?></span>
<div class="col-4 col-lg-3 h5">
<span class="badge bg-light">Unknown: <?= $unknownhealth ?></span>
</div>
</div>
</div>
<div class="col-sm-12 col-lg-4" style="cursor:pointer;" onclick="openUpdateOptions()">
<div class="col-12 col-lg-4" style="cursor:pointer;" onclick="openUpdateOptions()">
<div class="row">
<div class="col-sm-12 col-lg-3 text-center">
<div class="col-12 col-lg-3 text-center">
<span class="h4 text-primary">Updates</span>
</div>
<div class="col-sm-12 col-lg-3 h5">
<span class="badge bg-success w-100">Updated: <?= $updated ?></span>
<div class="col-4 col-lg-3 h5">
<span class="badge bg-success">Updated: <?= $updated ?></span>
</div>
<div class="col-sm-12 col-lg-3 h5">
<span class="badge bg-warning w-100">Outdated: <?= $outdated ?></span>
<div class="col-4 col-lg-3 h5">
<span class="badge bg-warning">Outdated: <?= $outdated ?></span>
</div>
<div class="col-sm-12 col-lg-3 h5">
<span class="badge bg-light w-100">Unchecked: <?= ($running + $stopped) - ($updated + $outdated) ?></span>
<div class="col-4 col-lg-3 h5">
<span class="badge bg-light">Unchecked: <?= ($running + $stopped) - ($updated + $outdated) ?></span>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion root/app/www/public/includes/header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<a href="index.php" class="navbar-brand mx-4">
<h3 class="text-primary mb-0"><?= APP_NAME ?></h3>
</a>
<div class="mb-4 w-100" align="center"><div id="activeInstanceContainer"><?= $serverList ?></div></div>
<div class="mt-3 mb-4 w-100" align="center"><div id="activeInstanceContainer"><?= $serverList ?></div></div>
<?php if ($_SESSION['authenticated']) { ?>
<div class="navbar-nav w-100">
<a id="menu-overview" onclick="initPage('overview')" style="cursor: pointer;" class="nav-item nav-link active"><i class="fas fa-heartbeat me-2"></i>Overview</a>
Expand Down
1 change: 1 addition & 0 deletions root/app/www/public/js/common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ function initPage(page)
if (page == 'containers') {
if (smScreen) {
$('#container-control-buttons').prop('style', '');
$('.container-control-button-label').remove();
}

$('#sse-timer').html(sseCountdown);
Expand Down

0 comments on commit f7636c8

Please sign in to comment.