adjustments to support bootstrap 5.3 color-scheme; set gentoo config-templates to deprecated as there is no active maintainer for it; remove debian 10 and ubuntu 18.04 as they were deprecated in 2.0.x
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
4
.github/workflows/build-mariadb.yml
vendored
4
.github/workflows/build-mariadb.yml
vendored
@@ -8,8 +8,8 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
php-versions: ['7.4', '8.1']
|
||||
mariadb-version: [10.5, 10.4]
|
||||
php-versions: ['7.4', '8.2']
|
||||
mariadb-version: [10.11, 10.5]
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
|
||||
2
.github/workflows/build-mysql.yml
vendored
2
.github/workflows/build-mysql.yml
vendored
@@ -8,7 +8,7 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
php-versions: ['7.4', '8.1']
|
||||
php-versions: ['7.4', '8.2']
|
||||
mysql-version: [8.0, 5.7]
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<froxlor>
|
||||
<distribution name="Gentoo" version="3.0"
|
||||
defaulteditor="/usr/bin/nano">
|
||||
defaulteditor="/usr/bin/nano" deprecated="true">
|
||||
<!-- OS defaults to be loaded on installation -->
|
||||
<defaults>
|
||||
<default settinggroup="system" varname="nssextrausers" value="1"></default>
|
||||
|
||||
@@ -188,6 +188,10 @@ if (is_array($_themeoptions) && (!array_key_exists('variants', $_themeoptions) |
|
||||
$themevariant = "default";
|
||||
}
|
||||
|
||||
if (array_key_exists('global', $_themeoptions)) {
|
||||
$_themeoptions['variants'][$themevariant] = array_merge_recursive($_themeoptions['variants'][$themevariant], $_themeoptions['global']);
|
||||
}
|
||||
|
||||
// check for custom header-graphic
|
||||
$hl_path = 'templates/' . $theme . '/assets/img';
|
||||
|
||||
@@ -209,8 +213,11 @@ if (Settings::Get('panel.logo_overridecustom') == 0 && file_exists($hl_path . '/
|
||||
}
|
||||
}
|
||||
|
||||
$color_scheme = $_themeoptions['variants'][$themevariant]['color-scheme'] ?? 'auto';
|
||||
|
||||
UI::twig()->addGlobal('header_logo_login', $header_logo_login);
|
||||
UI::twig()->addGlobal('header_logo', $header_logo);
|
||||
UI::twig()->addGlobal('color_scheme', $color_scheme);
|
||||
|
||||
/**
|
||||
* Redirects to index.php (login page) if no session exists
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<html lang="en" data-bs-theme="{{ color_scheme|default("auto") }}">
|
||||
<head>
|
||||
<!-- Required meta tags -->
|
||||
<meta charset="utf-8">
|
||||
|
||||
@@ -1,33 +1,27 @@
|
||||
{
|
||||
"global": {
|
||||
"css": [
|
||||
"custom.css"
|
||||
],
|
||||
"js": [
|
||||
"main.js",
|
||||
"apikey.js"
|
||||
],
|
||||
"img": {
|
||||
"ui": "logo_white.png",
|
||||
"login": "logo.png"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"default": {
|
||||
"img": {
|
||||
"login": "logo.png",
|
||||
"ui": "logo_white.png"
|
||||
},
|
||||
"css": [
|
||||
"main.css",
|
||||
"custom.css"
|
||||
],
|
||||
"js": [
|
||||
"main.js",
|
||||
"apikey.js"
|
||||
],
|
||||
"description": "Default"
|
||||
"color-scheme": "light",
|
||||
"description": "Default (light)"
|
||||
},
|
||||
"dark": {
|
||||
"color-scheme": "dark",
|
||||
"img": {
|
||||
"login": "logo_white.png",
|
||||
"ui": "logo_white.png"
|
||||
"login": "logo_white.png"
|
||||
},
|
||||
"css": [
|
||||
"dark.css",
|
||||
"custom.css"
|
||||
],
|
||||
"js": [
|
||||
"main.js",
|
||||
"apikey.js"
|
||||
],
|
||||
"description": "Darkmode"
|
||||
}
|
||||
},
|
||||
|
||||
@@ -20,9 +20,12 @@
|
||||
<div class="card h-100 mb-3">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">{{ lng('apcuinfo.memnote') }}</h5>
|
||||
<div class="progress position-relative">
|
||||
<div class="progress-bar bg-success" role="progressbar" style="width: {{ apcuinfo.mem_used_percentage }}%" aria-valuenow="{{ apcuinfo.mem_used }}" aria-valuemin="0" aria-valuemax="{{ apcuinfo.mem_avail }}"></div>
|
||||
<small class="justify-content-center d-flex position-absolute w-100 text-dark">{{ apcuinfo.mem_used_percentage }}%</small>
|
||||
<div class="progress position-relative" role="progressbar" aria-valuenow="{{ apcuinfo.mem_used }}"
|
||||
aria-valuemin="0" aria-valuemax="{{ apcuinfo.mem_avail }}">
|
||||
<div class="progress-bar bg-success" style="width: {{ apcuinfo.mem_used_percentage }}%"></div>
|
||||
<small
|
||||
class="justify-content-center d-flex position-absolute w-100 text-dark">{{ apcuinfo.mem_used_percentage }}
|
||||
%</small>
|
||||
</div>
|
||||
</div>
|
||||
<ul class="list-group list-group-flush">
|
||||
@@ -45,10 +48,21 @@
|
||||
<div class="card h-100 mb-3">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">{{ lng('apcuinfo.hitmiss') }}</h5>
|
||||
<div class="progress position-relative">
|
||||
<div class="progress-bar bg-success" role="progressbar" style="width: {{ apcuinfo.num_hits_percentage }}%" aria-valuenow="{{ apcuinfo.num_hits }}" aria-valuemin="0" aria-valuemax="{{ apcuinfo.num_hits_and_misses }}"></div>
|
||||
<div class="progress-bar bg-danger" role="progressbar" style="width: {{ 100 - apcuinfo.num_misses_percentage }}%" aria-valuenow="{{ apcuinfo.num_misses }}" aria-valuemin="0" aria-valuemax="{{ apcuinfo.num_hits_and_misses }}"></div>
|
||||
<small class="justify-content-center d-flex position-absolute w-100 text-dark">{{ apcuinfo.num_hits_percentage }}%</small>
|
||||
<div class="progress-stacked position-relative">
|
||||
<div class="progress" role="progressbar" style="width: {{ apcuinfo.num_hits_percentage }}%"
|
||||
aria-valuenow="{{ apcuinfo.num_hits }}" aria-valuemin="0"
|
||||
aria-valuemax="{{ apcuinfo.num_hits_and_misses }}">
|
||||
<div class="progress-bar bg-success"></div>
|
||||
</div>
|
||||
<div class="progress" role="progressbar"
|
||||
style="width: {{ 100 - apcuinfo.num_misses_percentage }}%"
|
||||
aria-valuenow="{{ apcuinfo.num_misses }}" aria-valuemin="0"
|
||||
aria-valuemax="{{ apcuinfo.num_hits_and_misses }}">
|
||||
<div class="progress-bar bg-danger"></div>
|
||||
</div>
|
||||
<small
|
||||
class="justify-content-center d-flex position-absolute w-100 text-dark">{{ apcuinfo.num_hits_percentage }}
|
||||
%</small>
|
||||
</div>
|
||||
</div>
|
||||
<ul class="list-group list-group-flush">
|
||||
@@ -97,8 +111,13 @@
|
||||
</div>
|
||||
{% if apcuinfo.fragmentation is iterable %}
|
||||
<div class="progress position-relative">
|
||||
<div class="progress-bar bg-success" role="progressbar" style="width: {{ apcuinfo.fragmentation.used_percentage }}%" aria-valuenow="{{ apcuinfo.fragmentation.used_bytes }}" aria-valuemin="0" aria-valuemax="{{ apcuinfo.fragmentation.total_bytes }}"></div>
|
||||
<small class="justify-content-center d-flex position-absolute w-100 text-dark">{{ apcuinfo.fragmentation.used_percentage }}%</small>
|
||||
<div class="progress-bar bg-success" role="progressbar"
|
||||
style="width: {{ apcuinfo.fragmentation.used_percentage }}%"
|
||||
aria-valuenow="{{ apcuinfo.fragmentation.used_bytes }}" aria-valuemin="0"
|
||||
aria-valuemax="{{ apcuinfo.fragmentation.total_bytes }}"></div>
|
||||
<small
|
||||
class="justify-content-center d-flex position-absolute w-100 text-dark">{{ apcuinfo.fragmentation.used_percentage }}
|
||||
%</small>
|
||||
</div>
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item d-flex justify-content-between align-items-center">
|
||||
|
||||
Reference in New Issue
Block a user