diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index a27cbb1590c1e73d624ea8e67af2cc87290e5031..f4195d3a862bf73cff014cc21e6a7e9fb5f16ccc 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -2470,11 +2470,14 @@ class project extends base { // $this->_getChecksumDiv($aData["revision"]) } else { if (array_key_exists("error", $aData)) { - $sReturn.= '<div class="error">'; + $sReturn.= '<div class="error1">'; // if ($bLong and true){ // $sReturn.= '<i class="glyphicon glyphicon-exclamation-sign"></i> FEHLER:<br>' . $aData["error"] . ''; // } else { - $sReturn.= '<a href="#" class="info"><i class="glyphicon glyphicon-exclamation-sign"></i> ' . t('error') . ':<span>' . $aData["error"] . '</span></a>'; + $sReturn.='' + // .'<a href="#" class="info"><i class="glyphicon glyphicon-exclamation-sign"></i> ' . t('error') . ':<span>' . $aData["error"] . '</span></a>' + .$this->renderInfoLink(array('error'=>$aData["error"]),array()) + ; // } $sReturn.= '</div>'; } else if (array_key_exists("warning", $aData)) { @@ -2617,7 +2620,7 @@ class project extends base { if (!$sTitle) { $sTitle.=' ' . t('error'); } - $sLinktitle = '<i class="glyphicon glyphicon-exclamation-sign"></i> ' . t('error'); + $sLinktitle = t('error'); $sInfos = $aInfos["error"]; } $sInfos.=$this->_renderHostsData($aInfos); @@ -2627,7 +2630,8 @@ class project extends base { } // render html - $sReturn = '<a href="#" class="infoAsModal" onclick="showIdAsModalMessage($(this).children())">' + $sReturn = '<a href="#" class="infoAsModal btn '.($bIsError ? 'btn-danger': 'btn-default').'" onclick="showIdAsModalMessage($(this).children())">' + // . '<i class="fa fa-info"></i> ' . $sLinktitle . '<span'; if (array_key_exists("hpos", $aOptions)) { @@ -2642,7 +2646,7 @@ class project extends base { $sReturn.=$sInfos . '</span></a>'; if ($bIsError) { - $sReturn = '<div class="error">' . $sReturn . '</div>'; + // $sReturn = '<div class="error">' . $sReturn . '</div>'; } return $sReturn; diff --git a/public_html/deployment/js/functions.js b/public_html/deployment/js/functions.js index 2db54381d7802c376dc32902e6c4cdbc6f768cf4..e6df7b97785f6c964a3d944bf240dfb0c840bc37 100644 --- a/public_html/deployment/js/functions.js +++ b/public_html/deployment/js/functions.js @@ -27,7 +27,10 @@ function showModalMessage(sMessage){ $('#divmodal').show(); } function showIdAsModalMessage(o){ - var sHtml='<a href="#" onclick="hideModalMessage()" class="btn btn-danger" style="float:right"> X </a>' + o.html(); + var sHtml='<a href="#" onclick="hideModalMessage()" class="btn btn-danger" style="float:right"> X </a>' + + o.html() + + '<hr><a href="#" onclick="hideModalMessage()" class="btn btn-primary"> OK </a>' + ; $('#divmodalmessage').html(sHtml); $('#divmodal').show(); }