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

deployment gui - info and error link are buttons now; additional ok button in modal info

parent f7bb641a
No related branches found
No related tags found
No related merge requests found
...@@ -2470,11 +2470,14 @@ class project extends base { ...@@ -2470,11 +2470,14 @@ class project extends base {
// $this->_getChecksumDiv($aData["revision"]) // $this->_getChecksumDiv($aData["revision"])
} else { } else {
if (array_key_exists("error", $aData)) { if (array_key_exists("error", $aData)) {
$sReturn.= '<div class="error">'; $sReturn.= '<div class="error1">';
// if ($bLong and true){ // if ($bLong and true){
// $sReturn.= '<i class="glyphicon glyphicon-exclamation-sign"></i> FEHLER:<br>' . $aData["error"] . ''; // $sReturn.= '<i class="glyphicon glyphicon-exclamation-sign"></i> FEHLER:<br>' . $aData["error"] . '';
// } else { // } 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>'; $sReturn.= '</div>';
} else if (array_key_exists("warning", $aData)) { } else if (array_key_exists("warning", $aData)) {
...@@ -2617,7 +2620,7 @@ class project extends base { ...@@ -2617,7 +2620,7 @@ class project extends base {
if (!$sTitle) { if (!$sTitle) {
$sTitle.=' ' . t('error'); $sTitle.=' ' . t('error');
} }
$sLinktitle = '<i class="glyphicon glyphicon-exclamation-sign"></i> ' . t('error'); $sLinktitle = t('error');
$sInfos = $aInfos["error"]; $sInfos = $aInfos["error"];
} }
$sInfos.=$this->_renderHostsData($aInfos); $sInfos.=$this->_renderHostsData($aInfos);
...@@ -2627,7 +2630,8 @@ class project extends base { ...@@ -2627,7 +2630,8 @@ class project extends base {
} }
// render html // 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 . $sLinktitle
. '<span'; . '<span';
if (array_key_exists("hpos", $aOptions)) { if (array_key_exists("hpos", $aOptions)) {
...@@ -2642,7 +2646,7 @@ class project extends base { ...@@ -2642,7 +2646,7 @@ class project extends base {
$sReturn.=$sInfos . '</span></a>'; $sReturn.=$sInfos . '</span></a>';
if ($bIsError) { if ($bIsError) {
$sReturn = '<div class="error">' . $sReturn . '</div>'; // $sReturn = '<div class="error">' . $sReturn . '</div>';
} }
return $sReturn; return $sReturn;
......
...@@ -27,7 +27,10 @@ function showModalMessage(sMessage){ ...@@ -27,7 +27,10 @@ function showModalMessage(sMessage){
$('#divmodal').show(); $('#divmodal').show();
} }
function showIdAsModalMessage(o){ 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); $('#divmodalmessage').html(sHtml);
$('#divmodal').show(); $('#divmodal').show();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment