diff --git a/public_html/deployment/classes/actionlog.class.php b/public_html/deployment/classes/actionlog.class.php
index 2a3318953b48f5c6cfeefba14be7f2d64130e0c4..d0a386bc3fce13ef7c949254df71b3fb5cedd3c6 100644
--- a/public_html/deployment/classes/actionlog.class.php
+++ b/public_html/deployment/classes/actionlog.class.php
@@ -245,11 +245,6 @@ class Actionlog {
if ($bIsFullsearch){
- $aForms["filter"]["form"]['label'] = array(
- 'type' => 'markup',
- 'value' => '<h3>' . t("class-actionlog-title") . ' :: '.t("class-actionlog-filter").'</h3>',
- );
-
// --- list of all projects in log
$sSql='SELECT DISTINCT(project) from `logs` order by project asc';
$aForms["filter"]["form"]['selectproject'] = array(
@@ -286,7 +281,7 @@ class Actionlog {
);
$aForms["filter"]["form"]['line'] = array(
'type' => 'markup',
- 'value' => '<hr>',
+ 'value' => '</div><div><hr>',
);
@@ -320,6 +315,7 @@ class Actionlog {
$aForms["filter"]["form"]['btnalllogs'] = array(
'type' => 'button',
'value' => t('show all'),
+ 'class' => 'btn btn-secondary btnlogs',
'href'=>'/deployment/all/setup/actionlog/',
'onclick'=>'location.href=\'/deployment/all/setup/actionlog/\'; return false;',
);
@@ -329,7 +325,9 @@ class Actionlog {
$oForm = new formgen($aForms);
- $sReturn = '<div id="divActionlogs">'.$oForm->renderHtml("filter").'
+ $sReturn = ''
+ . ($bIsFullsearch ? t("class-actionlog-title") . ' :: '.t("class-actionlog-filter") : '')
+ .'<div id="divActionlogs">'.$oForm->renderHtml("filter").'
<div style="clear: both; margin-bottom: 1em;"></div>
<div id="tableLogactions"></div>
<!--
@@ -352,7 +350,7 @@ class Actionlog {
$sReturn= '<strong>'
. '<button onclick="setLogVisibility(\'block\');" id="btnShowLogs" class="btn btn-secondary btnLogs"><i class="fa-solid fa-chevron-right"></i> </button>'
. '<button onclick="setLogVisibility(\'none\');" id="btnHideLogs" class="btn btn-secondary btnLogs"><i class="fa-solid fa-chevron-down"></i> </button>'
- . ' ' . t("class-actionlog-title")
+ . ' ' . t("class-actionlog-title") .(isset($aFilter["project"]) ? ' ['.$aFilter["project"].'] ' : '')
. '</strong>'
. $sReturn.'
diff --git a/public_html/deployment/classes/project_gui.class.php b/public_html/deployment/classes/project_gui.class.php
index fa90b2e8b352a30e3be7c494326e0a5d661ee5a3..15c1e8458d14ceb0b62773742fb29fc00691d787 100644
--- a/public_html/deployment/classes/project_gui.class.php
+++ b/public_html/deployment/classes/project_gui.class.php
@@ -370,15 +370,9 @@ class projectgui extends project {
// $sClass = $sPhase;
$sIconClass = (array_key_exists($sFunction, $aLinkdata)) ? $aLinkdata[$sFunction]['icon'] : $aLinkdata['default']['icon'];
- $sHint = (
- array_key_exists($sFunction, $aLinkdata) && array_key_exists("hint", $aLinkdata[$sFunction])
- ) ? $aLinkdata[$sFunction]['hint'] : "";
- $sLabel = (
- array_key_exists($sFunction, $aLinkdata) && array_key_exists("label", $aLinkdata[$sFunction])
- ) ? $aLinkdata[$sFunction]['label'] : $sFunction;
- $sClass = (
- array_key_exists($sFunction, $aLinkdata) && array_key_exists("class", $aLinkdata[$sFunction])
- ) ? $aLinkdata[$sFunction]['class'] : '';
+ $sHint = isset($aLinkdata[$sFunction]['hint']) ? $aLinkdata[$sFunction]['hint'] : "";
+ $sLabel = isset($aLinkdata[$sFunction]['label']) ? $aLinkdata[$sFunction]['label'] : $sFunction;
+ $sClass = isset($aLinkdata[$sFunction]['class']) ? $aLinkdata[$sFunction]['class'] : '';
if ($sRole) {
$sClass .= " role role" . $sRole;
}
diff --git a/public_html/deployment/inc_functions.php b/public_html/deployment/inc_functions.php
index 480b89852293d028f9a879849f75fe0d4d25a184..ac094fee8c99c0b92fdb46189ad81027639ec266 100644
--- a/public_html/deployment/inc_functions.php
+++ b/public_html/deployment/inc_functions.php
@@ -135,6 +135,7 @@ function aHome($sClass = "btn btn-default") {
return $oHtml->getLinkButton(array(
'href'=>'/deployment/?',
'icon'=>'overview',
+ 'class'=>$sClass,
'label'=>t("menu-overview"),
));
}
@@ -158,6 +159,7 @@ function aPrjHome($sClass = "btn btn-default") {
return $oHtml->getLinkButton(array(
'href'=>'/deployment/' . $aParams["prj"] . '/',
'icon'=>'project',
+ 'class'=>$sClass,
'label'=>$oPrj->getLabel(),
));
}
@@ -173,6 +175,7 @@ function aGoback($sClass = "btn btn-default") {
'onclick'=>'history.back();',
'title'=>t("back"),
'icon'=>'back',
+ 'class'=>$sClass,
'label'=>t("back")
));
}
@@ -592,20 +595,21 @@ function getTopArea($aEmbed=[]) {
* @global type $aParams
* @return string
*/
-function getBreadcrumb() {
+function getBreadcrumb($sLinkClass="") {
global $aParams, $oHtml;
$sReturn = '';
$sNav = '';
$sLabel = '';
// $sDelim=$oHtml->getIcon('fa-chevron-right');
- $sDelim=' <i class="fa-solid fa-chevron-right"></i> ';
+
+ $sDelim=' / ';
if (array_key_exists("action", $aParams)) {
$sLabel .= $oHtml->getIcon($aParams["action"]).t($aParams["action"]);
- $sNav .= aHome();
+ $sNav .= aHome($sLinkClass);
if ($aParams['prj']==='all'){
// $sNav .= ' ' . $oHtml->getIcon('fa-chevron-right') . '[ci-GUI]';
} else {
- $sNav .= ' ' . $sDelim . aPrjHome();
+ $sNav .= ' ' . $sDelim . aPrjHome($sLinkClass);
}
$sClass='action '.$aParams["action"];
if (array_key_exists("par3", $aParams)) {
@@ -614,14 +618,16 @@ function getBreadcrumb() {
}
// $sReturn.='<h2 class="action ' . $aParams["action"] . '">' . $sLabel . '</h2>';
} else if (array_key_exists("prj", $aParams)) {
- $sNav .= aHome();
+ $sNav .= aHome($sLinkClass);
$sClass='action prjhome';
- $sLabel.=$oHtml->getIcon('project').t('project-home');
+ // $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>':'')
+ // $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>':'');
return $sReturn;
}
diff --git a/public_html/deployment/index.php b/public_html/deployment/index.php
index 985c5b87eedeb0175b30fc55d3274ab81680c480..ed0b89c5ebe2787583fc70288116dd31aec5a9d7 100644
--- a/public_html/deployment/index.php
+++ b/public_html/deployment/index.php
@@ -167,7 +167,17 @@ $aReplace=include("./ui/page_replacements.php");
$aFilter['project']=$sPrj;
}
$oLog=new Actionlog($sPrj);
- $BODY.='<div class="logs">' . $oLog->renderLogs($aFilter).'</div>';
+ $sLogOutput=$oLog->renderLogs($aFilter);
+ $BODY.=($sLogOutput > ' '
+ ? $renderAdminLTE->getCard([
+ 'type'=>'gray',
+ 'variant'=>'outline',
+ 'text'=>$sLogOutput
+ ])
+ : ''
+ )
+ ;
+
}
$oCLog->add("adding actionlog.class done");
} else {
@@ -253,7 +263,7 @@ if(!file_exists($sIncfile)){
$aReplace['{{PAGE_BODY}}']=$BODY;
$aReplace['{{PAGE_BODY}}']=$BODY;
$aReplace['{{PAGE_HEADER_LEFT}}']='<h2>'.$TITLE.'</h2>';
-$aReplace['{{PAGE_HEADER_RIGHT}}']='TODO: small breadcrumb';
+$aReplace['{{PAGE_HEADER_RIGHT}}']=getBreadcrumb("link");
$sTemplate=file_get_contents('ui/page.tpl.php');
echo $renderAdminLTE->render($sTemplate,$aReplace);
diff --git a/public_html/deployment/pages/act_accept.php b/public_html/deployment/pages/act_accept.php
index 4770c7f5cee1f38152389e57592117580a3f0878..679fd0852a4dd6e39f772ec89dc426e8f9aea4df 100644
--- a/public_html/deployment/pages/act_accept.php
+++ b/public_html/deployment/pages/act_accept.php
@@ -94,6 +94,17 @@ if (array_key_exists("confirm", $aParams)) {
</fieldset>
</form>
';
+ $BODY=
+ $renderAdminLTE->addRow(
+ $renderAdminLTE->addCol(
+ $renderAdminLTE->getCard([
+ 'type'=>'success',
+ 'variant'=>'outline',
+ 'text'=>$sOut,
+ ]), 12
+ )
+ );
+
}
}
}
diff --git a/public_html/deployment/pages/act_build.php b/public_html/deployment/pages/act_build.php
index b801a8a24a180cddfa05f4b4f751d04ddba71985..0e2c001716903dc09da8262b45daaeea31d2f9fb 100644
--- a/public_html/deployment/pages/act_build.php
+++ b/public_html/deployment/pages/act_build.php
@@ -61,7 +61,7 @@ if (!array_key_exists("confirm", $aParams)) {
<table>
<thead>
<tr>
- <th class="versioncontrol" colspan="2">' . $oHtml->getIcon('repository').t("versioncontrol") . '<br></th>
+ <th class="versioncontrol" colspan="3">' . $oHtml->getIcon('repository').t("versioncontrol") . '<br></th>
<th> </th>
<th class="' . $sNext . '" colspan="2">' . $oHtml->getIcon('phase').$sNext . '</th>
</tr>
@@ -78,7 +78,8 @@ if (!array_key_exists("confirm", $aParams)) {
</fieldset>
</form>
- </td>
+ </td>
+ <td> </td>
<td class="">
' . $oPrj->renderRepoInfo() . '
</td>
@@ -115,6 +116,17 @@ if (!array_key_exists("confirm", $aParams)) {
</form>
';
}
+ $BODY=
+ $renderAdminLTE->addRow(
+ $renderAdminLTE->addCol(
+ $renderAdminLTE->getCard([
+ 'type'=>'success',
+ 'variant'=>'outline',
+ 'text'=>$sOut,
+ ]), 12
+ )
+ );
+
} else {
// ------------------------------------------------------------
// start new build
diff --git a/public_html/deployment/pages/act_deploy.php b/public_html/deployment/pages/act_deploy.php
index b138fa5b69c266bd6d89d3c204c87f5ab461d126..6d0b5df987273d439330e6d61427509d389c2eb4 100644
--- a/public_html/deployment/pages/act_deploy.php
+++ b/public_html/deployment/pages/act_deploy.php
@@ -85,6 +85,18 @@ if (array_key_exists("confirm", $aParams)) {
);
$oForm = new formgen($aForms);
$sOut .= $oForm->renderHtml("deploy");
+
+ $BODY=
+ $renderAdminLTE->addRow(
+ $renderAdminLTE->addCol(
+ $renderAdminLTE->getCard([
+ 'type'=>'success',
+ 'variant'=>'outline',
+ 'text'=>$sOut,
+ ]), 12
+ )
+ );
+
}
} else {
$sOut.=$oHtml->getBox("error", t("error-no-phase"));
diff --git a/public_html/deployment/pages/act_overview.php b/public_html/deployment/pages/act_overview.php
index b496ec573886c6fe0bab206512161c93ec93cb23..c6d2b6af39f6a72f82f25530ba2ebfa638667119 100644
--- a/public_html/deployment/pages/act_overview.php
+++ b/public_html/deployment/pages/act_overview.php
@@ -49,6 +49,7 @@ if (!array_key_exists("prj", $aParams)) {
// . 'age: ' . .'<br>'
. $oPrj->getBuildErrorContent($sErrorfile);
}
+ /*
$sBuildErrorContent.=$oHtml->getNav(array(
'options' => array(
'type'=>'pills',
@@ -56,6 +57,8 @@ if (!array_key_exists("prj", $aParams)) {
),
'tabs'=>$aTabdata)
);
+ */
+ $sBuildErrorContent.=$renderAdminLTE->getTabbedContent(['tabs'=>$aTabdata]);
} else {
$sBuildErrorContent=$oHtml->getBox('info', t('build-failes-none'));
}
@@ -73,8 +76,6 @@ if (!array_key_exists("prj", $aParams)) {
$sOut = '
- ' . $oPrj->renderLink("setup") . '<br>
- <br>
'.$renderAdminLTE->getTabbedContent([
'tabs'=>[
$oHtml->getIcon('workflow') . t("way-of-packages")
@@ -101,12 +102,35 @@ if (!array_key_exists("prj", $aParams)) {
. t("page-overview-phase-infos")
. '</p>'
. $oPrj->renderPhaseInfo()
- : $oHtml->getBox("info", t("page-overview-no-phase")) .$oPrj->renderLink("setup")
+ : $oHtml->getBox("info", t("page-overview-no-phase"))
)
]
])
;
+ $BODY=
+ $renderAdminLTE->addRow(
+ $renderAdminLTE->addCol(
+ $renderAdminLTE->getCard([
+ 'type'=>'gray',
+ 'variant'=>'outline',
+ 'text'=>$sOut,
+ ]), 10
+ )
+ . $renderAdminLTE->addCol(
+ $renderAdminLTE->getCard([
+ 'type'=>'gray',
+ 'type'=>'gray',
+ 'variant'=>'outline',
+ 'title'=> t('overview-actions-title'),
+ 'text'=> ''
+ . t('overview-actions-hint').'<br>'
+ . '<div class="btn-group w-100">'.$oPrj->renderLink("setup").'</div><br><br>'
+ .($oPrj->canAcceptPhase() ? '<div class="btn-group w-100">'.$oPrj->renderLink("build").'</div><br><br>' : '')
+ ]), 2
+ )
+
+ );
// $sOut.='<div id="navbuttom">' . aGotop() . aHome() . '</div>';
}
//
diff --git a/public_html/deployment/pages/act_setup.php b/public_html/deployment/pages/act_setup.php
index 38f6837c649356c3417955a7a5db8d643800ccae..e3c8df850e66fa64b8d44bbbe47e96d8d5cf2f32 100644
--- a/public_html/deployment/pages/act_setup.php
+++ b/public_html/deployment/pages/act_setup.php
@@ -208,6 +208,17 @@ if ($aParams["prj"] == "all") {
$sOut.=$oHtml->getBox("error", $sError);
}
$sOut.=$oPrj->renderNewProject();
+ $BODY=
+ $renderAdminLTE->addRow(
+ $renderAdminLTE->addCol(
+ $renderAdminLTE->getCard([
+ 'type'=>'primary',
+ 'variant'=>'outline',
+ 'text'=>$sOut,
+ ]), 12
+ )
+ );
+
}
// ------------------------------------------------------------
// users and roles
@@ -350,6 +361,17 @@ if ($aParams["prj"] == "all") {
}
$sErrors=$oPrj->renderErrorBoxes();
$sOut.= $sErrors ? $sErrors : $oPrj->renderProjectSetup();
+ $BODY=
+ $renderAdminLTE->addRow(
+ $renderAdminLTE->addCol(
+ $renderAdminLTE->getCard([
+ 'type'=>'primary',
+ 'variant'=>'outline',
+ 'text'=>$sOut,
+ ]), 12
+ )
+ );
+
}
// $sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';