- overview - add headline;

- / redirects to /deployment/
- login page redirects to last page before login

config/lang/de.json

@@ -282,6 +282,7 @@
     "versioncontrol": "Versionskontrolle",
     "versions": "Versionen",
     "warning": "WARNUNG",
+    "way-of-packages": "Weg der Pakete",
     
     "onhold": "Queue",
     "ready2install" : "Puppet",

config/lang/en.json

@@ -284,6 +284,7 @@
     "versioncontrol": "Version control",
     "versions": "Versions",
     "warning": "WARNING",
+    "way-of-packages": "Weg der Pakete",
     
     "onhold": "Queue",
     "ready2install" : "Puppet",

public_html/deployment/index.php

@@ -102,7 +102,7 @@ $sPhpOut = '
         ' . $sPhpOut . '
     </div>
     <div id="footer">
-        IML Deployment &copy; ' . date("Y") . ' <a href="https://gitlab.iml.unibe.ch/admins/imldeployment/tree/master" target="_blank">Institut f&uuml;r medizinische Lehre; Universit&auml;t Bern</a>
+        IML Deployment &copy; 2015-' . date("Y") . ' <a href="https://gitlab.iml.unibe.ch/admins/imldeployment/tree/master" target="_blank">Institut f&uuml;r medizinische Lehre; Universit&auml;t Bern</a>
     </div>
     '.$oCLog->render();
 

public_html/deployment/pages/act_login.php

@@ -33,7 +33,13 @@ if (!$oUser->getUsername() && array_key_exists('user', $aParams)) {
 
     // if user is logged in and credentials were sent: reload to remove post vars
     if ($oUser->getUsername() && array_key_exists('user', $aParams)) {
-        header('Location: ?');
+        if (array_key_exists("goback", $_SESSION)){
+            $sUrl=$_SESSION["goback"];
+            unset($_SESSION["goback"]);
+        } else {
+            $sUrl='?';
+        }
+        header("location: $sUrl");
     }
 
 // ----------------------------------------------------------------------
@@ -57,10 +63,19 @@ if ($oUser->getUsername()) {
                 . ' ' . aPrjHome() . ' '
                 . '<a href="?logoff=1" class="btn btn-default btn-danger"><span class="glyphicon glyphicon-off"></span> ' . t('logoff') . '</a>'
             
-                . '<br><br>INFO: <pre style="">roles:<br>' . print_r($oUser->getUserPermission(), true) . '</pre>'
+                // . '<br><br>INFO: <pre style="">roles:<br>' . print_r($oUser->getUserPermission(), true) . '</pre>'
             . '</p>'
             . '</div>';
 } else {
+    if (!array_key_exists("goback", $_SESSION) || true){
+        $sUrlback=$_SERVER["HTTP_REFERER"];
+        if(
+           strpos($sUrlback, $_SERVER["SERVER_NAME"])>0
+           && !strpos($sUrlback, '/all/login/')
+        ){
+            $_SESSION["goback"]=$sUrlback;
+        }
+    }
     $i = 0;
     require_once ("./classes/formgen.class.php");
 

public_html/deployment/pages/act_overview.php

@@ -37,36 +37,34 @@ if (!array_key_exists("prj", $aParams)) {
         $sListOfBranches.='<li title="'.$aBranch['revision'].'">'.$aBranch['label'] . '</li>';
     }
     $sListOfBranches.='</ol>';
-    $sOut = '
-        ' . $oPrj->renderVisual() . '
-        <div style="clear: both;"></div>
-        
+    $sOut = '<h3 id="h3visual">' . t("way-of-packages") . '</h3>
+            ' . $oPrj->renderVisual() . '
+            <div style="clear: both;"></div>
 
-        <h3 id="h3repo">' . t("repositoryinfos") . '</h3>
-            <div style="max-width: 40em;">
-            ' . $oPrj->renderRepoInfo() . '
-            ' . $sListOfBranches . '
-            ' . ($oPrj->canAcceptPhase() ? '<br>'.$oPrj->renderLink("build") : '') . '
-            </div>
-        
-        <h3 id="h3versions">' . t("packages") . '</h3>
-        ' . $oPrj->renderVersionUsage();
 
-    if ($oPrj->getActivePhases()) {
-        $sOut.='
-            <h3 id="h3phases">' . t("phases") . '</h3>
-                <p>' . t("page-overview-phase-infos") . '</p>
-                ' . $oPrj->renderPhaseInfo() . '
-            ';
-    } else {
-        $sOut.='<h3 id="h3phases">' . t("phases") . '</h3>'
-                . $oPrj->getBox("info", t("page-overview-no-phase")) .
-                $oPrj->renderLink("setup");
-    }
-    $sOut .= '<div style="clear: both"></div>
-            <div id="navbuttom">' . aGotop() . aHome() . '</div>';
+            <h3 id="h3repo">' . t("repositoryinfos") . '</h3>
+                <div style="max-width: 40em;">
+                ' . $oPrj->renderRepoInfo() . '
+                ' . $sListOfBranches . '
+                ' . ($oPrj->canAcceptPhase() ? '<br>'.$oPrj->renderLink("build") : '') . '
+                </div>
+
+            <h3 id="h3versions">' . t("packages") . '</h3>
+            ' . $oPrj->renderVersionUsage();
+
+        if ($oPrj->getActivePhases()) {
+            $sOut.='
+                <h3 id="h3phases">' . t("phases") . '</h3>
+                    <p>' . t("page-overview-phase-infos") . '</p>
+                    ' . $oPrj->renderPhaseInfo() . '
+                ';
+        } else {
+            $sOut.='<h3 id="h3phases">' . t("phases") . '</h3>'
+                    . $oPrj->getBox("info", t("page-overview-no-phase")) .
+                    $oPrj->renderLink("setup");
+        }
+        $sOut .= '<div style="clear: both"></div>
+        <div id="navbuttom">' . aGotop() . aHome() . '</div>';
 }
 // 
-echo $sOut;
-?>
-
+echo $sOut;
\ No newline at end of file

public_html/index.php

 <?php
-    echo '<h1>' . php_uname("n") . '</h1><hr>';
+    header("location: /deployment/");
+    // echo '<h1>' . php_uname("n") . '</h1><hr>';
 ?>
 
 <a href="http://www.iml.unibe.ch/">IML Startseite</a> |