From f716511a5de14720f700e73d21fb490678b64c33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <โinfo@veliti.nlโ>
Date: Mon, 31 Mar 2025 10:52:15 +0200
Subject: [PATCH] CMXX - Bugfix equipments
---
api/v2/get/equipments.php | 3 +-
login.php | 11 ++-
reset.php | 11 ++-
style/admin.css | 182 ++++++++++++++++++++------------------
style/admin_login.css | 3 +-
style/admin_reset.css | 3 +-
6 files changed, 111 insertions(+), 102 deletions(-)
diff --git a/api/v2/get/equipments.php b/api/v2/get/equipments.php
index 2cd7d14..9b0005d 100644
--- a/api/v2/get/equipments.php
+++ b/api/v2/get/equipments.php
@@ -4,7 +4,6 @@ defined($security_key) or exit;
//------------------------------------------
// Equipments
//------------------------------------------
-
//Connect to DB
$pdo = dbConnect($dbname);
@@ -15,7 +14,7 @@ $partner = json_decode($partnerhierarchy);
if (empty($partner->soldto) || $partner->soldto == ''){$soldto_search = '%';} else {$soldto_search = '-%';}
//default whereclause
-list($whereclause,$condition) = getWhereclause('',$permission,$partner,'get');
+list($whereclause,$condition) = getWhereclause('equipment',$permission,$partner,'get');
//------------------------------------------
//NEW ARRAY
diff --git a/login.php b/login.php
index 58ba849..db6244f 100644
--- a/login.php
+++ b/login.php
@@ -195,12 +195,11 @@ echo'
'.site_title.'
๐
-
diff --git a/reset.php b/reset.php
index 954290a..2f7ad21 100644
--- a/reset.php
+++ b/reset.php
@@ -249,12 +249,11 @@ echo'
'.site_title.'
๐
-
-
-
-
-
-
+ ';
+ foreach ($supportedLanguages as $language){
+ echo ' ';
+ }
+ echo'
diff --git a/style/admin.css b/style/admin.css
index 691f249..fabf786 100644
--- a/style/admin.css
+++ b/style/admin.css
@@ -1,3 +1,17 @@
+:root {
+ --color-white: #ffffff;
+ --color-light-green: #2FAC66;
+ --color-green: #005655;
+ --color-red: #a75151;
+ --text-color: #555555;
+ --text-color-accent: #4a5361;
+ --text-color-accent-2:#606c7e;
+ --error-background: #f3c3c3;
+ --color-indicator-1: #13b368;
+ --color-indicator-2: #bd4141;
+ --color-indicator-3:#81848a;
+}
+
* {
box-sizing: border-box;
font-family: -apple-system, BlinkMacSystemFont, "segoe ui", roboto, oxygen, ubuntu, cantarell, "fira sans", "droid sans", "helvetica neue", Arial, sans-serif;
@@ -11,13 +25,13 @@ html {
body {
position: relative;
min-height: 100%;
- color: #555555;
- background-color: #fff;
+ color: var(--text-color);
+ background-color: var(--color-white);
margin: 0;
}
h1, h2, h3, h4, h5 {
- color: #4a5361;
+ color: var(--text-color-accent);
margin: 0;
padding: 0;
}
@@ -31,13 +45,13 @@ header {
z-index: 999;
width: 100%;
height: 55px;
- background-color: #F8f9fa;
+ background-color: var(--color-white);
box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.15);
}
header a {
display: inline-flex;
- color: #4a5361;
+ color: var(--text-color-accent);
height: 100%;
text-decoration: none;
justify-content: center;
@@ -50,7 +64,7 @@ header a i {
}
header a:hover, header a:active {
- color: #606c7e;
+ color: var(--text-color-accent-2);
}
header .space-between {
@@ -59,7 +73,7 @@ header .space-between {
header .dropdown {
display: inline-flex;
- color: #4a5361;
+ color: var(--text-color-accent);
height: 100%;
cursor: pointer;
justify-content: center;
@@ -72,7 +86,7 @@ header .dropdown i {
}
header .dropdown:hover, header .dropdown:active {
- color: #606c7e;
+ color: var(--text-color-accent-2);
}
header .dropdown .list {
@@ -81,7 +95,7 @@ header .dropdown .list {
top: 100%;
right: 0;
width: 150px;
- background-color: #fff;
+ background-color: var(--color-white);
border-top: 1px solid #eee;
box-shadow: 0px 2px 2px 1px rgba(0, 0, 0, 0.05);
}
@@ -111,7 +125,7 @@ aside {
width: 260px;
display: flex;
flex-flow: column;
- background-color: #F8f9fa;
+ background-color: var(--color-white);
overflow-y: auto;
}
@@ -127,7 +141,7 @@ aside > a {
font-size: 14px;
font-weight: 600;
text-decoration: none;
- color: #afb1b5;
+ color: var( --text-color-accent-2);
padding: 15px 20px;
}
@@ -137,8 +151,8 @@ aside > a i {
}
aside > a:hover, aside > a.selected {
- background-color: #005655;
- color: #fff;
+ background-color: var(--color-green);
+ color: var(--color-white);
padding: 15px 17px;
border-radius: 5px;
}
@@ -158,13 +172,13 @@ aside > a .note {
aside .sub {
display: none;
flex-flow: column;
- background-color: #F8f9fa;
+ background-color: var(--color-white);
padding: 13px 0;
}
aside .sub a {
font-size: 14px;
- color: #afb1b5;
+ color: var( --text-color-accent-2);
text-decoration: none;
padding: 4px 20px;
}
@@ -176,7 +190,7 @@ aside .sub a span {
}
aside .sub a:hover, aside .sub a.selected {
- color: #2a374a;
+ color: var(--text-color);
}
aside .footer {
@@ -185,13 +199,13 @@ aside .footer {
margin-top: auto;
padding: 15px;
font-size: 14px;
- color: #afb1b5;
+ color: var( --text-color-accent-2);
}
aside .footer a {
text-decoration: none;
font-size: 14px;
- color: #afb1b5;
+ color: var( --text-color-accent-2);
padding-bottom: 2px;
}
@@ -251,8 +265,8 @@ main .content-title .title i {
display: inline-flex;
justify-content: center;
align-items: center;
- background-color: #005655;
- color: #fff;
+ background-color: var(--color-green);
+ color: var(--color-white);
width: 52px;
height: 42px;
border-radius: 4px;
@@ -270,7 +284,7 @@ main .content-title .title h2 {
main .content-title .title p {
margin: 0;
font-size: 14px;
- color: #99999a;
+ color: var( --text-color-accent-2);
font-weight: 500;
}
@@ -311,13 +325,13 @@ main .msg.success i {
}
main .msg.error {
- background-color: #f3c3c3;
- border-left: 4px solid #a75151;
- color: #a75151;
+ background-color: var(--error-background);
+ border-left: 4px solid var(--text-red);
+ color: var(--text-red);
}
main .msg.error i {
- color: #a75151;
+ color: var(--text-red);
}
main .content-header {
@@ -388,7 +402,7 @@ main .content-header .filters {
main .content-header .filters a {
text-decoration: none;
font-weight: 600;
- color: #4a5361;
+ color: var(--text-color-accent);
white-space: nowrap;
}
@@ -402,7 +416,7 @@ main .content-header .filters .list {
width: 180px;
flex-flow: column;
position: absolute;
- background-color: #fff;
+ background-color: var(--color-white);
padding: 10px;
box-shadow: 0px 0px 5px 1px rgba(0, 0, 0, 0.1);
}
@@ -427,7 +441,7 @@ main .content-header .filters .list select {
main .content-header .filters .list button {
background: #4a79b4;
border: 0;
- color: #FFFFFF;
+ color: var(--color-white);
padding: 5px 0;
font-size: 12px;
font-weight: 600;
@@ -452,7 +466,7 @@ main .content-header .sort {
main .content-header .sort a {
text-decoration: none;
font-weight: 600;
- color: #4a5361;
+ color: var(--text-color-accent);
white-space: nowrap;
}
@@ -466,7 +480,7 @@ main .content-header .sort .list {
width: 180px;
flex-flow: column;
position: absolute;
- background-color: #fff;
+ background-color: var(--color-white);
padding: 10px;
box-shadow: 0px 0px 5px 1px rgba(0, 0, 0, 0.1);
}
@@ -491,7 +505,7 @@ main .content-header .sort .list select {
main .content-header .sort .list button {
background: #4a79b4;
border: 0;
- color: #FFFFFF;
+ color: var(--color-white);
padding: 5px 0;
font-size: 12px;
font-weight: 600;
@@ -505,7 +519,7 @@ main .content-header .sort .list button:hover {
}
main .content-block {
- background-color: #fff;
+ background-color: var(--color-white);
margin-top: 25px;
padding: 15px;
box-shadow: 0px 0px 5px 1px rgba(0, 0, 0, 0.03);
@@ -532,8 +546,8 @@ main .content-block .block-header i {
justify-content: center;
align-items: center;
border-radius: 50%;
- background-color: #005655;
- color: #fff;
+ background-color: var(--color-green);
+ color: var(--color-white);
margin-right: 10px;
}
@@ -582,8 +596,8 @@ main .tabs a:hover {
}
main .tabs a.active {
- color: #4a5361;
- background-color: #fff;
+ color: var(--text-color-accent);
+ background-color: var(--color-white);
}
main .tabs ~ .content-block {
@@ -623,8 +637,8 @@ main .dashboard .stat > i {
height: 40px;
width: 40px;
border-radius: 5px;
- background-color: #005655;
- color: #fff;
+ background-color: var(--color-green);
+ color: var(--color-white);
}
main .dashboard .stat .data {
@@ -775,7 +789,7 @@ main .form .multiselect .list {
top: 100%;
width: 100%;
flex-flow: column;
- background-color: #fff;
+ background-color: var(--color-white);
box-shadow: 0px 0px 5px 1px rgba(0, 0, 0, 0.1);
max-height: 100px;
overflow-y: auto;
@@ -819,7 +833,7 @@ main .pagination a {
background-color: #758497;
font-size: 14px;
font-weight: 600;
- color: #fff;
+ color: var(--color-white);
border-radius: 4px;
padding: 7px 10px;
}
@@ -1015,54 +1029,54 @@ main .manage-order-table .delete-item:hover {
.table table tbody .status {
padding: 4px 7px;
border-radius: 4px;
- background-color: #81848a;
+ background-color: var(--color-indicator-3);
font-weight: 500;
font-size: 12px;
- color: #fff;
+ color: var(--color-white);
}
.table table tbody .status.enabled {
padding: 4px 7px;
border-radius: 4px;
- background-color: #13b368;
+ background-color: var(--color-indicator-1);
font-weight: 500;
font-size: 12px;
- color: #fff;
+ color: var(--color-white);
}
.table table tbody .status.disabled {
padding: 4px 7px;
border-radius: 4px;
- background-color: #bd4141;
+ background-color: var(--color-indicator-2);
font-weight: 500;
font-size: 12px;
- color: #fff;
+ color: var(--color-white);
}
.status {
padding: 4px 7px;
border-radius: 4px;
- background-color: #81848a;
+ background-color: var(--color-indicator-3);
font-weight: 500;
font-size: 12px;
- color: #fff;
+ color: var(--color-white);
}
.status.enabled {
- background-color: #13b368;
+ background-color: var(--color-indicator-1);
}
.status.disabled {
- background-color: #bd4141;
+ background-color: var(--color-indicator-2);
}
.status.id4 {
- background-color: #13b368;
+ background-color: var(--color-indicator-1);
}
.status.id3 {
-background-color: #13b368;
+background-color: var(--color-indicator-1);
}
.status.id2 {
@@ -1080,23 +1094,23 @@ background-color: #13b368;
background-color: #eb8a0d;
}
.table table tbody .status.warranty {
- background-color: #13b368;
+ background-color: var(--color-indicator-1);
}
.table table tbody .status.service{
- background-color: #13b368;
+ background-color: var(--color-indicator-1);
}
.table table tbody .status.firmware_recent{
- background-color: #13b368;
+ background-color: var(--color-indicator-1);
}
.status.id5 {
- background-color: #bd4141;
+ background-color: var(--color-indicator-2);
}
.table table tbody .status.id4, .table table tbody .status.id3, .table table tbody .status.warranty {
- background-color: #13b368;
+ background-color: var(--color-indicator-1);
}
.table table tbody .status.id2 {
@@ -1104,7 +1118,7 @@ background-color: #13b368;
}
.table table tbody .status.id5{
- background-color: #bd4141;
+ background-color: var(--color-indicator-2);
}
.product-media-tab, .product-options-tab, .product-downloads-tab {
@@ -1245,8 +1259,8 @@ background-color: #13b368;
appearance: none;
cursor: pointer;
border: 0;
- background: #005655;
- color: #FFFFFF;
+ background: var(--color-green);
+ color: var(--color-white);
padding: 0 14px;
font-size: 14px;
font-weight: 600;
@@ -1265,7 +1279,7 @@ background-color: #13b368;
cursor: pointer;
border: 0;
background: #bed4ea;
- color: #FFFFFF;
+ color: var(--color-white);
padding: 0px 10px;
font-size: 14px;
font-weight: 600;
@@ -1278,8 +1292,8 @@ background-color: #13b368;
a.btn:after{
content: ' ';
display: inline-block;
- border-bottom: 1px solid #fff;
- border-right: 1px solid #fff;
+ border-bottom: 1px solid var(--color-white);
+ border-right: 1px solid var(--color-white);
height: 8px;
width: 8px;
transform: rotate(-45deg);
@@ -1389,7 +1403,7 @@ a.btn_link:after{
.dialog .content {
transform: scale(0.5);
- background-color: #fff;
+ background-color: var(--color-white);
box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.03);
width: 400px;
}
@@ -1412,7 +1426,7 @@ a.btn_link:after{
}
.dialog .content .heading span:hover {
- color: #606c7e;
+ color: var(--text-color-accent-2);
}
.dialog .content .footer {
@@ -1482,7 +1496,7 @@ a.btn_link:after{
font-weight: 900;
bottom: 0;
right: 0;
- color: #fff;
+ color: var(--color-white);
background-color: #237fe8;
font-size: 12px;
padding: 4px 4px 1px 4px;
@@ -1555,7 +1569,7 @@ a.btn_link:after{
.media-library-modal .media .list::-webkit-scrollbar, .media-library-modal .media .details::-webkit-scrollbar {
width: 6px;
- background: #fff;
+ background: var(--color-white);
}
.media-library-modal .media .list::-webkit-scrollbar-thumb, .media-library-modal .media .details::-webkit-scrollbar-thumb {
@@ -2359,7 +2373,7 @@ a.btn_link:after{
#tableView thead {
background-color: #ffd717;
- color: #005655;
+ color: var(--color-green);
}
#tableView thead td {
@@ -2373,7 +2387,7 @@ a.btn_link:after{
border-style: hidden;
margin: auto;
margin-top: 10px;
- background-color: #fff;
+ background-color: var(--color-white);
}
#content {
@@ -2459,7 +2473,7 @@ input[type='file'] {
.recentlyadded .products .product .name, main .products .products-wrapper .product .name {
display: block;
- color: #555555;
+ color: var(--text-color);
font-size: 12px;
text-align: center;
}
@@ -2481,7 +2495,7 @@ input[type='file'] {
padding: 5px;
margin-left: 15px;
border: 1px solid #d5d5d5;
- color: #555555;
+ color: var(--text-color);
border-radius: 4px;
font-size: 10px;
}
@@ -2493,10 +2507,10 @@ input[type='file'] {
.product_category_nav a {
white-space: nowrap;
text-decoration: none;
- color: #fff;
+ color: var(--color-white);
padding: 5px 5px;
margin: 5px;
- border: 1px solid #555555;
+ border: 1px solid var(--text-color);
border-radius: 5px;
display: block;
float: left;
@@ -2526,7 +2540,7 @@ input[type='file'] {
th a {
text-decoration: none;
- color: #555555;
+ color: var(--text-color);
text-transform: capitalize;
}
@@ -2542,13 +2556,13 @@ input[type='file'] {
display:table-cell;
vertical-align:bottom;
height:100px;
- color: #005655;
+ color: var(--color-green);
}
.chart span{
margin:0 1em;
display: block;
- background-color: #2FAC66;
+ background-color: var(--color-light-green);
animation: draw 1s ease-in-out;
border-radius: 3px;
}
@@ -2558,7 +2572,7 @@ input[type='file'] {
left:0;right:0;top:100%;
padding:5px;
display:block;
- color: #005655;
+ color: var(--color-green);
text-align:center;
content:attr(title);
word-wrap: break-word;
@@ -2571,7 +2585,7 @@ input[type='file'] {
border-radius: 5px;
border-style: hidden;
margin: auto;
- background-color: #fff;
+ background-color: var(--color-white);
margin-top: 20px;
}
@@ -2584,8 +2598,8 @@ input[type='file'] {
}
.servicereport thead {
- background-color: #2fac66;
- color: #fff;
+ background-color: var(--color-light-green);
+ color: var(--color-white);
}
.servicereport td {
@@ -2649,7 +2663,7 @@ input[type='file'] {
.service_summary__title {
background-color: #035754;
- color: #fff;
+ color: var(--color-white);
font-weight: bold;
padding: 5px 15px;
}
@@ -2657,14 +2671,14 @@ input[type='file'] {
.service_notes {
margin: 15px 15px 0 15px;
padding: 15px;
- background-color: #fff;
+ background-color: var(--color-white);
color: #035754;
}
h4.label {
padding: 5px 15px;
background-color: #035754;
- color: #fff;
+ color: var(--color-white);
margin-top: 20px;
margin-bottom: 20px;
}
@@ -2850,7 +2864,7 @@ main .recentlyadded .products .product img, main .products .products-wrapper .pr
main .products .product .name, main .products .products-wrapper .product .name {
display: block;
- color: #555555;
+ color: var(--text-color);
padding: 20px 0 2px 0;
text-align: center;
font-family: 'gerb';
diff --git a/style/admin_login.css b/style/admin_login.css
index 2b0e576..45cff5e 100644
--- a/style/admin_login.css
+++ b/style/admin_login.css
@@ -66,7 +66,6 @@ body {
background-image: url(/assets/images/emergencyplug-auto-in-licht.jpg);
background-position: center center;
background-size: 100% 100%;
- min-height: 100vh;
background-repeat: no-repeat;
}
@@ -195,7 +194,7 @@ body {
.login-container {
flex-direction: column;
height: auto;
- max-width: 500px;
+ max-width: 1000px;
}
.login-form, .login-visual {
diff --git a/style/admin_reset.css b/style/admin_reset.css
index 2b0e576..45cff5e 100644
--- a/style/admin_reset.css
+++ b/style/admin_reset.css
@@ -66,7 +66,6 @@ body {
background-image: url(/assets/images/emergencyplug-auto-in-licht.jpg);
background-position: center center;
background-size: 100% 100%;
- min-height: 100vh;
background-repeat: no-repeat;
}
@@ -195,7 +194,7 @@ body {
.login-container {
flex-direction: column;
height: auto;
- max-width: 500px;
+ max-width: 1000px;
}
.login-form, .login-visual {