From df3bae09458c32905b6a6735384ec1dd952ec164 Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Mon, 20 Nov 2023 14:37:09 +0100
Subject: [PATCH] update pages
---
public_html/deployment/pages/act_accept.php | 2 +-
public_html/deployment/pages/act_build.php | 2 +-
public_html/deployment/pages/act_cleanup.php | 4 ++--
public_html/deployment/pages/act_delete.php | 2 +-
public_html/deployment/pages/act_deploy.php | 2 +-
public_html/deployment/pages/act_overview.php | 7 +++++--
public_html/deployment/pages/act_phase.php | 2 +-
public_html/deployment/pages/act_rollback.php | 2 +-
public_html/deployment/pages/act_setup.php | 13 ++++++++-----
9 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/public_html/deployment/pages/act_accept.php b/public_html/deployment/pages/act_accept.php
index 974e87fa..4770c7f5 100644
--- a/public_html/deployment/pages/act_accept.php
+++ b/public_html/deployment/pages/act_accept.php
@@ -98,7 +98,7 @@ if (array_key_exists("confirm", $aParams)) {
}
}
-$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
+// $sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
echo $sOut;
diff --git a/public_html/deployment/pages/act_build.php b/public_html/deployment/pages/act_build.php
index 51898dbd..b801a8a2 100644
--- a/public_html/deployment/pages/act_build.php
+++ b/public_html/deployment/pages/act_build.php
@@ -197,7 +197,7 @@ if (!array_key_exists("confirm", $aParams)) {
</script>';
}
-$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
+// $sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
echo $sOut;
diff --git a/public_html/deployment/pages/act_cleanup.php b/public_html/deployment/pages/act_cleanup.php
index f0259a03..33d53bff 100644
--- a/public_html/deployment/pages/act_cleanup.php
+++ b/public_html/deployment/pages/act_cleanup.php
@@ -31,8 +31,8 @@ $sOut = '
<h3>'.t("dir-cache").'</h3>
<pre>' . $oPrj->cleanupVcsCache() . '</pre>
-
- <div id="navbuttom">' . aPrjHome() . '</div>';
+';
+// $sOut.='<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
echo $sOut;
diff --git a/public_html/deployment/pages/act_delete.php b/public_html/deployment/pages/act_delete.php
index a156e9fb..cbd4d97c 100644
--- a/public_html/deployment/pages/act_delete.php
+++ b/public_html/deployment/pages/act_delete.php
@@ -99,7 +99,7 @@ if (!array_key_exists("confirm", $aParams)) {
}
}
-$sOut.= '<div id="navbuttom">' . $sHome . '</div>';
+// $sOut.= '<div id="navbuttom">' . $sHome . '</div>';
// -- Ausgabe
echo $sOut;
diff --git a/public_html/deployment/pages/act_deploy.php b/public_html/deployment/pages/act_deploy.php
index 77f9b747..b138fa5b 100644
--- a/public_html/deployment/pages/act_deploy.php
+++ b/public_html/deployment/pages/act_deploy.php
@@ -91,7 +91,7 @@ if (array_key_exists("confirm", $aParams)) {
}
}
-$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
+// $sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
echo $sOut;
diff --git a/public_html/deployment/pages/act_overview.php b/public_html/deployment/pages/act_overview.php
index 13481bbb..b496ec57 100644
--- a/public_html/deployment/pages/act_overview.php
+++ b/public_html/deployment/pages/act_overview.php
@@ -80,6 +80,7 @@ if (!array_key_exists("prj", $aParams)) {
$oHtml->getIcon('workflow') . t("way-of-packages")
=> $oPrj->renderVisual() . ''
,
+ /*
$oHtml->getIcon('repository') . t("repositoryinfos") . ($iCountOfBranches ? ' <span class="badge badge-secondary">'.$iCountOfBranches.'</span>' : '' )
=> '<br>'
.($oPrj->canAcceptPhase() ? $oPrj->renderLink("build").'<br><br>' : '')
@@ -87,6 +88,7 @@ if (!array_key_exists("prj", $aParams)) {
// . $oPrj->renderSelectRemoteBranches()
. $sListOfBranches
,
+ */
$oHtml->getIcon('sign-error') . t("build-failes") . ($iCountOfBuildErrors ? ' <span class="badge badge-danger">'.$iCountOfBuildErrors.'</span>' : '' )
=> '<br>'.$sBuildErrorContent
,
@@ -103,8 +105,9 @@ if (!array_key_exists("prj", $aParams)) {
)
]
])
- .'
- <div id="navbuttom">' . aGotop() . aHome() . '</div>';
+ ;
+
+ // $sOut.='<div id="navbuttom">' . aGotop() . aHome() . '</div>';
}
//
echo $sOut;
diff --git a/public_html/deployment/pages/act_phase.php b/public_html/deployment/pages/act_phase.php
index 62a5538e..718c9a80 100644
--- a/public_html/deployment/pages/act_phase.php
+++ b/public_html/deployment/pages/act_phase.php
@@ -263,7 +263,7 @@ if ($sPhase) {
$sOut.=$oHtml->getBox("error", t("error-no-phase"));
}
-$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
+// $sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
echo $sOut;
diff --git a/public_html/deployment/pages/act_rollback.php b/public_html/deployment/pages/act_rollback.php
index 3c55fe10..e61539d8 100644
--- a/public_html/deployment/pages/act_rollback.php
+++ b/public_html/deployment/pages/act_rollback.php
@@ -111,7 +111,7 @@ if (array_key_exists("confirm", $aParams)) {
}
-$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
+// $sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
diff --git a/public_html/deployment/pages/act_setup.php b/public_html/deployment/pages/act_setup.php
index 29ceba9d..38f6837c 100644
--- a/public_html/deployment/pages/act_setup.php
+++ b/public_html/deployment/pages/act_setup.php
@@ -95,6 +95,8 @@ if ($aParams["prj"] == "all") {
$aTmp=$aConfig;
$aTmp=ArrayReplace($aTmp, "password", $sFakePassword);
$aTmp=ArrayReplace($aTmp, "PwLdapUser", $sFakePassword);
+ $TITLE=t('menu-settings');
+
$sOut.= '<pre>'.print_r($aTmp, 1).'</pre>';
// print_r($aConfig);
@@ -194,8 +196,8 @@ if ($aParams["prj"] == "all") {
// setup a new project
// ------------------------------------------------------------
if ($aParams["par3"]=="new") {
- $sOut.='<h2>'.t("page-setup-info-new-project").'</h2>'
- . '<p>'.t("page-setup-info-new-project-introtext").'</p><hr>';
+ $TITLE=t("menu-new-project");
+ $sOut.= '<p>'.t("page-setup-info-new-project-introtext").'</p><hr>';
$oPrj = new projectgui();
if (array_key_exists("setupaction", $aParams) && $aParams["setupaction"] == "create") {
@@ -248,8 +250,8 @@ if ($aParams["prj"] == "all") {
// check lang-texts
// ------------------------------------------------------------
if ($aParams["par3"]=="checklang") {
- $sOut.='<h2>'.t("page-setup-info-check-lang").'</h2>'
- .'<p>'.t("page-setup-info-check-lang-intro").'</p>';
+ $TITLE=t("menu-checklang");
+ $sOut.='<p>'.t("page-setup-info-check-lang-intro").'</p>';
// $sOut.=print_r($aConfig, true);
$aTmp=array();
$aLangs=array();
@@ -301,6 +303,7 @@ if ($aParams["prj"] == "all") {
// ------------------------------------------------------------
if ($aParams["par3"]=="actionlog") {
// $oPrj = new project();
+ $TITLE=t("menu-logs");
require_once("./classes/actionlog.class.php");
$oLog=new Actionlog('');
@@ -348,7 +351,7 @@ if ($aParams["prj"] == "all") {
$sErrors=$oPrj->renderErrorBoxes();
$sOut.= $sErrors ? $sErrors : $oPrj->renderProjectSetup();
}
-$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
+// $sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
echo $sOut;
--
GitLab