From 732f1291ffc36c787ba9baec63193f0930f05c59 Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Wed, 20 Dec 2023 15:10:52 +0100
Subject: [PATCH] fix classes in getLinkButton()
---
.../deployment/classes/htmlguielements.class.php | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/public_html/deployment/classes/htmlguielements.class.php b/public_html/deployment/classes/htmlguielements.class.php
index 99acb2b9..dd40f336 100644
--- a/public_html/deployment/classes/htmlguielements.class.php
+++ b/public_html/deployment/classes/htmlguielements.class.php
@@ -208,6 +208,7 @@ class htmlguielements{
'sign-warning'=>'fa-solid fa-exclamation',
'sign-error'=>'fa-solid fa-bolt',
'sign-ok'=>'fa-solid fa-check',
+ 'sign-success'=>'fa-solid fa-check',
),
);
@@ -380,17 +381,18 @@ class htmlguielements{
$aItem[$sKey]='';
}
}
+
+ if (isset($aItem['type'])){
+ $aItem=$this->_getButtonattributesByType($aItem);
+ unset($aItem['type']);
+ }
// if not class "btn" was added: add "btn"
// if not class "btn-[something]" was added: add "btn-default"
$sClass=$aItem['class'];
$sClass=(strstr($sClass, 'btn-') ? '' : 'btn-default ').$sClass;
$sClass=(strstr($sClass, 'btn ') ? '' : 'btn ').$sClass;
$aItem['class']=$sClass;
-
- if (isset($aItem['type'])){
- $aItem=$this->_getButtonattributesByType($aItem);
- unset($aItem['type']);
- }
+
// $aItem['label'].=' -> '.$sClass;
return $this->getLink($aItem);
}
@@ -413,11 +415,9 @@ class htmlguielements{
"warning" => array("class" => "alert alert-warning", "prefix" => t("warning")),
);
$sClass = "";
- $sPrefix = "";
if (isset($aCfg[$sWarnlevel])) {
$sClass = $aCfg[$sWarnlevel]["class"];
- $sPrefix = $aCfg[$sWarnlevel]["prefix"];
- $sMessage = '<strong>' . $aCfg[$sWarnlevel]["prefix"] . '</strong> ' . $sMessage;
+ $sMessage = '<strong>' . $this->getIcon('sign-'.$sWarnlevel).$aCfg[$sWarnlevel]["prefix"] . '</strong> ' . $sMessage;
}
return '<div'.$this->addAttribute('class', $sClass).'>' . $sMessage . '</div>';
}
--
GitLab