Skip to content
Snippets Groups Projects
Commit 732f1291 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

fix classes in getLinkButton()

parent 9fa2c6a7
No related branches found
No related tags found
1 merge request!62V2.0
...@@ -208,6 +208,7 @@ class htmlguielements{ ...@@ -208,6 +208,7 @@ class htmlguielements{
'sign-warning'=>'fa-solid fa-exclamation', 'sign-warning'=>'fa-solid fa-exclamation',
'sign-error'=>'fa-solid fa-bolt', 'sign-error'=>'fa-solid fa-bolt',
'sign-ok'=>'fa-solid fa-check', 'sign-ok'=>'fa-solid fa-check',
'sign-success'=>'fa-solid fa-check',
), ),
); );
...@@ -380,17 +381,18 @@ class htmlguielements{ ...@@ -380,17 +381,18 @@ class htmlguielements{
$aItem[$sKey]=''; $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" was added: add "btn"
// if not class "btn-[something]" was added: add "btn-default" // if not class "btn-[something]" was added: add "btn-default"
$sClass=$aItem['class']; $sClass=$aItem['class'];
$sClass=(strstr($sClass, 'btn-') ? '' : 'btn-default ').$sClass; $sClass=(strstr($sClass, 'btn-') ? '' : 'btn-default ').$sClass;
$sClass=(strstr($sClass, 'btn ') ? '' : 'btn ').$sClass; $sClass=(strstr($sClass, 'btn ') ? '' : 'btn ').$sClass;
$aItem['class']=$sClass; $aItem['class']=$sClass;
if (isset($aItem['type'])){
$aItem=$this->_getButtonattributesByType($aItem);
unset($aItem['type']);
}
// $aItem['label'].=' -> '.$sClass; // $aItem['label'].=' -> '.$sClass;
return $this->getLink($aItem); return $this->getLink($aItem);
} }
...@@ -413,11 +415,9 @@ class htmlguielements{ ...@@ -413,11 +415,9 @@ class htmlguielements{
"warning" => array("class" => "alert alert-warning", "prefix" => t("warning")), "warning" => array("class" => "alert alert-warning", "prefix" => t("warning")),
); );
$sClass = ""; $sClass = "";
$sPrefix = "";
if (isset($aCfg[$sWarnlevel])) { if (isset($aCfg[$sWarnlevel])) {
$sClass = $aCfg[$sWarnlevel]["class"]; $sClass = $aCfg[$sWarnlevel]["class"];
$sPrefix = $aCfg[$sWarnlevel]["prefix"]; $sMessage = '<strong>' . $this->getIcon('sign-'.$sWarnlevel).$aCfg[$sWarnlevel]["prefix"] . '</strong> ' . $sMessage;
$sMessage = '<strong>' . $aCfg[$sWarnlevel]["prefix"] . '</strong> ' . $sMessage;
} }
return '<div'.$this->addAttribute('class', $sClass).'>' . $sMessage . '</div>'; return '<div'.$this->addAttribute('class', $sClass).'>' . $sMessage . '</div>';
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment