diff --git a/public_html/deployment/classes/project_gui.class.php b/public_html/deployment/classes/project_gui.class.php index 04afc98c81cbc09148ffe28cf8ca91bb3ae2bc1f..446375cbaef77d8ecacbfe2d1e0d4fcf47174752 100644 --- a/public_html/deployment/classes/project_gui.class.php +++ b/public_html/deployment/classes/project_gui.class.php @@ -237,6 +237,11 @@ class projectgui extends project { /** * render html code for info link that shows popup with metadata on mouseover * @param array $aInfos metainfos of the package (from json file) + * one of ok=1|error=message - status key + * date - timestamp of build + * revision - revision + * branch - branch + * message - commit message * @param array $aOptions options * title - tile in popover; default: empty * label - link label; default: empty (results in Infos|ERROR) @@ -274,9 +279,9 @@ class projectgui extends project { $sTitle.=' ' . t('error'); } $sLinktitle = t('error'); - $sInfos = $aInfos["error"]; + $sInfos = $this->_oHtml->getBox('error', '') . '<p>'.$aInfos["error"].'</p>'; } - $sInfos.=$this->_renderHostsData($aInfos); + $sInfos.=$this->_renderHostsData($aInfos, ''); if (array_key_exists("label", $aOptions) && $aOptions["label"]) { $sLinktitle.=$aOptions["label"]; @@ -503,8 +508,8 @@ class projectgui extends project { if (!array_key_exists($sPlace, $this->_aPlaces)) { return false; } - - $sReturn = false; + + $sReturn = ''; $aDataPhase = $this->getPhaseInfos($sPhase); $aData = $aDataPhase[$sPlace]; // foreach($aDataPhase[$sPlace] as $aData) { @@ -577,6 +582,12 @@ class projectgui extends project { break; case "ready2install": + /* + // IDEA: try to install the same phase again. Needs update of method project->deploy() + if ($bActions) { + $sReturn .= ' ' . $this->renderLink("deploy", $sPhase); + } + */ break; case "deployed": @@ -596,8 +607,15 @@ class projectgui extends project { } else if (array_key_exists("warning", $aData)) { $sReturn.= '<div class="warning">'.$this->_oHtml->getIcon('sign-info'). t('warning') . ':<br>' . $aData["warning"] . '</div>'; } else { - return false; - // $sReturn.= t('empty'); + + // OK = 1 ... for the queue we show no hint + return ''; + /* + return $sPlace=='onhold' + ? t('class-project-queue-empty') + : '' + ; + */ } } // if // } // for diff --git a/public_html/deployment/inc_functions.php b/public_html/deployment/inc_functions.php index 782015ecd0badc492ecaa5506e843c3e9a3eadcd..e916cd5ec91120cc62ed598f4e915f6804d744d2 100644 --- a/public_html/deployment/inc_functions.php +++ b/public_html/deployment/inc_functions.php @@ -211,7 +211,7 @@ function getTopNavLeft($aEmbed = []) } $aPrjChildren[] = ['label' => '-']; } - $aPrjChildren[] = ['href' => $sBaseUrl . $sCurrentProject . '/setup/', 'label' => t("menu-project-settings"), 'icon' => $oHtml->getIconClass('setup') , 'class' => ($sCurrentAction === 'setup' ? 'active' : '')]; + $aPrjChildren[] = ['href' => $sBaseUrl . $sCurrentProject . '/setup/', 'label' => t("menu-project-settings"), 'icon' => $oHtml->getIconClass('setup'), 'class' => ($sCurrentAction === 'setup' ? 'active' : '')]; $aPrjChildren[] = ['href' => $sBaseUrl . $sCurrentProject . '/cleanup/', 'label' => t("menu-project-cleanup"), 'icon' => $oHtml->getIconClass('cleanup'), 'class' => ($sCurrentAction === 'cleanup' ? 'active' : '')]; $aPrjChildren[] = ['href' => $sBaseUrl . $sCurrentProject . '/delete/', 'label' => t("menu-project-delete"), 'icon' => $oHtml->getIconClass('delete'), 'class' => ($sCurrentAction === 'delete' ? 'active' : '')]; @@ -283,33 +283,23 @@ function getBreadcrumb($sLinkClass = "") $sReturn = ''; $sNav = ''; $sLabel = ''; - // $sDelim=$oHtml->getIcon('fa-chevron-right'); $sDelim = ' / '; if (array_key_exists("action", $aParams)) { $sLabel .= $oHtml->getIcon($aParams["action"]) . t($aParams["action"]); $sNav .= aHome($sLinkClass); if ($aParams['prj'] === 'all') { - // $sNav .= ' ' . $oHtml->getIcon('fa-chevron-right') . '[ci-GUI]'; } else { $sNav .= ' ' . $sDelim . aPrjHome($sLinkClass); } - $sClass = 'action ' . $aParams["action"]; if (array_key_exists("par3", $aParams)) { $sLabel = $oHtml->getIcon($aParams["par3"]) . $aParams["par3"]; - $sClass = 'action ' . $aParams["action"]; } // $sReturn.='<h2 class="action ' . $aParams["action"] . '">' . $sLabel . '</h2>'; } else if (array_key_exists("prj", $aParams)) { $sNav .= aHome($sLinkClass); - $sClass = 'action prjhome'; - // $sLabel.=$oHtml->getIcon('project').t('project-home'); $sLabel .= aPrjHome($sLinkClass); - // $sReturn.='<h2 class="action prjhome"> Projekt-Home</h2>'; } - // $sReturn.=($sNav ? '<div id="navtop">' . $sNav . ' ' . $sDelim . ' <span class="current">'.$sLabel.'</span></div>':'') - // .'<h2 class="'.$sClass.'"> '.$sLabel.'</h2>' - ; $sReturn .= ($sNav ? '' . $sNav . ' ' . $sDelim . ' <span class="current">' . $sLabel . '</span>' : ''); if ($sLinkClass) { $sReturn = str_replace(['btn-default ', 'btn '], ['', ''], $sReturn);