diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index 8c4b9de357d1a854525e9810c174c23489b920db..29d02658dd53a1e658bc5881c346bf6d71563584 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -2430,7 +2430,9 @@ class project extends base { } } else { if ($sPlace == "deployed" && array_key_exists("url", $this->_aPrjConfig["phases"][$sPhase])) { - $sMore = '<i class="glyphicon glyphicon-globe"></i> ' . t('url') . ': ' . $this->_aPrjConfig["phases"][$sPhase]["url"] . '<br>'; + $sMore = '<i class="glyphicon glyphicon-globe"></i> ' + . t('url') + . ': <a href="' . $this->_aPrjConfig["phases"][$sPhase]["url"] . '">' . $this->_aPrjConfig["phases"][$sPhase]["url"] . '</a><br>'; } $sReturn.=' ' . $this->renderInfoLink( @@ -2574,7 +2576,7 @@ class project extends base { */ public function _renderRevision($sRevision){ $sUrl=str_replace('/tree/master','',$this->_aPrjConfig["build"]["webaccess"]).'/commit/'.$sRevision; - // return '<a href="'.$sUrl.'">'.$sRevision.'</a>'; + return '<a href="'.$sUrl.'">'.$sRevision.'</a>'; return $sUrl; } @@ -2623,10 +2625,11 @@ class project extends base { } // render html - $sReturn = '<a href="#" class="infoAsModal btn '.($bIsError ? 'btn-danger': 'btn-default').'" onclick="showIdAsModalMessage($(this).children())">' + $sId='info'.md5($sInfos); + $sReturn = '<a href="#" class="infoAsModal btn '.($bIsError ? 'btn-danger': 'btn-default').'" onclick="showIdAsModalMessage(\''.$sId.'\')">' // . '<i class="fa fa-info"></i> ' . $sLinktitle - . '<span'; + . '</a><div id="'.$sId.'" style="display: none;" '; if (array_key_exists("hpos", $aOptions)) { $sReturn.=' class="' . $aOptions["hpos"] . '"'; } @@ -2636,7 +2639,7 @@ class project extends base { $sReturn.='<span class="title">' . $sTitle . '</span><br><br>'; } - $sReturn.=$sInfos . '</span></a>'; + $sReturn.=$sInfos . '</div>'; if ($bIsError) { // $sReturn = '<div class="error">' . $sReturn . '</div>'; diff --git a/public_html/deployment/js/functions.js b/public_html/deployment/js/functions.js index e6df7b97785f6c964a3d944bf240dfb0c840bc37..ff3ecd67c8891512b2dbacef6838af1adea3712f 100644 --- a/public_html/deployment/js/functions.js +++ b/public_html/deployment/js/functions.js @@ -26,14 +26,16 @@ function showModalMessage(sMessage){ $('#divmodalmessage').html(sMessage); $('#divmodal').show(); } -function showIdAsModalMessage(o){ +function showIdAsModalMessage(sId){ + var o=$('#'+sId); 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(); -} + return false; +} function hideModalMessage(){ $('#divmodal').hide();