- cleanup project overview page

- delete project shows a table with versions instead of array dump

config/lang/de.json

@@ -171,7 +171,6 @@
     "page-deploy-info-ignore-deploytime": "Deploy-Zeitfenster ignorieren.<br>Nicht jedes Update muss sauber durchlaufen. Nur aktivieren, wenn einer der Entwickler und/ oder ein Sysadmin zur Hand ist.",
     "page-deploy-buttonlabel": "Auf [%s] ausrollen",
     
-    "page-overview-characteristics": "Steckbrief",
     "page-overview-no-phase": "Es wurde noch keine URL in keiner der Phasen definiert",
     "page-overview-phase-infos": "F&uuml;r dieses Projekt sind folgende Phasen konfiguriert:",
     
@@ -233,7 +232,6 @@
     "queue": "Queue",
     "repositoryinfos": "Quell-Repository",
     "repository-access-browser": "Browserzugriff auf das Repo",
-    "repository-access-ssh": "Zugriff mit SSH-Protokoll auf",
     "repository-url": "URL zum Repository",
     "repository-urlwebgui": "URL zur Web GUI des Repositorys",
     "repository-privkey": "Dateiname zum SSH-Private-Key",

config/lang/en.json

@@ -172,7 +172,6 @@
     "page-deploy-info-ignore-deploytime": "Ignore deploy time window.<br>Not each update mus run successfully. Do not activate this option if no developer and/ or a sysadmin is available.",
     "page-deploy-buttonlabel": "install to [%s]",
 
-    "page-overview-characteristics": "Characteristics",
     "page-overview-no-phase": "This project has no active phase. No url was entered to any phase.",
     "page-overview-phase-infos": "This project has these phases:",
     
@@ -235,7 +234,6 @@
     "queue": "Queue",
     "repositoryinfos": "Sourcecode Repository",
     "repository-access-browser": "Browser access to sources",
-    "repository-access-ssh": "Access with SSH to sources",
     "repository-url": "URL to repository",
     "repository-urlwebgui": "URL zur Web GUI des Repositorys",
     "repository-privkey": "Dateiname zum SSH-Private-Key",

public_html/deployment/classes/project.class.php

@@ -1806,36 +1806,6 @@ class project {
         return '<a href="' . $sLink . '" title="' . $sHint . '" class="btn ' . $sClass . '"><i class="' . $sIconClass . '"></i> ' . $sLabel . '</a>';
     }
 
-    /**
-     * render html for project metadata in the overview 
-     * @return string
-     */
-    public function renderProjektInfos() {
-        $sReturn = false;
-        $sReturn.='<table><tbody>'
-                . '<tr><td>' . t('projectname') . ':</td><td>' . $this->_aPrjConfig['label'] . '</td></tr>'
-                . '<tr><td>' . t('description') . ':</td><td>' . $this->_aPrjConfig['description'] . '</td></tr>'
-                . '<tr><td>' . t('contact') . ':</td><td>' . $this->_aPrjConfig['contact'] . '</td></tr>'
-        ;
-
-        if (array_key_exists("type", $this->_aPrjConfig["build"])) {
-            $sReturn.='<tr><td>' . t('repositoryinfos') . ':</td><td><strong>' . $this->_aPrjConfig["build"]["type"] . '</strong><br>';
-            if (array_key_exists("ssh", $this->_aPrjConfig["build"])) {
-                $sReturn.=t('repository-access-ssh') . '<br><em>' . $this->_aPrjConfig["build"]["ssh"] . '</em><br>';
-            }
-            $sReturn.=t('repository-urlwebgui') . ':<br>';
-            if (array_key_exists("webaccess", $this->_aPrjConfig["build"])) {
-                $sReturn.='<a href="' . $this->_aPrjConfig["build"]["webaccess"] . '">' . $this->_aPrjConfig["build"]["webaccess"] . '</a><br>';
-            } else {
-                $sReturn.=t("unknown") . '<br>';
-            }
-            $sReturn.='</td></tr>';
-        }
-        $sReturn.='</tbody></table><br>' . $this->renderLink("setup");
-
-        return $sReturn;
-    }
-
     /**
      * render html for the project overview; it shows the defined phases for 
      * the project as a table
@@ -2239,8 +2209,12 @@ class project {
                 <div class="title">'.t("phases").'</div>
                 '.($sPhaseImg?$sPhaseImg:'<div class="process">'.t("none").'</div>').'
             </div>
-            <div style="clear: both;"></div>
         </div>
+        <div style="clear: both;"></div>
+        <hr>
+        <i class="icon icon-user"> </i>
+        <strong>' . t('contact') . '</strong>: ' . $this->_aPrjConfig['contact'] . '<br><br>
+            ' . $this->renderLink("setup") . '
         ';
         
         return $sReturn;

public_html/deployment/main.css

@@ -22,9 +22,12 @@ body, label, input, button, select, textarea, p, .btn {
     border-top: 0px solid #ddd;
     margin-top: 5em;
 }
+.navbar {position: fixed; top: 0px; width: 100%; left: 0; }
+.navbar-inner {padding: 0 6em;box-shadow: 0 0 3em #888;}
 #header2{
     background: none;
     padding: 0.5em; margin-bottom: 2em;
+    margin-top: 4em;
 }
 
 
@@ -147,12 +150,6 @@ a.info span span.pre{
 }
 
 
-.infobox{
-    background:#fea; 
-    background: linear-gradient(#fea,#fff8f0,#fea); 
-    background: linear-gradient(#eee,#f8f8f8,#eee); 
-    padding: 1em; border: 2px solid #fff; box-shadow: 0 0 10px #ccc;
-}
 .warning{background: #fe8;}
 .error{background: #fcc;}
 .ok{background: #cfc;}
@@ -197,7 +194,7 @@ input[type="radio"]:checked+label, input[type="checkbox"]:checked+label{
 }
 
 /* ----- visualized process ----- */
-.visualprocess{float: left; padding: 1em; box-shadow: 0 0 2em #ddd;}
+.visualprocess{float: left; padding: 1em; box-shadow: 0 0 0em #ddd;}
 .visualprocess .process{float:left; text-align: center; padding: 0 0 5px; min-height: 220px; }
 .visualprocess .process.phases{border-left: 2px dashed #ddd; padding-left: 1em;}
 .visualprocess .process img{}

public_html/deployment/pages/act_delete.php

@@ -25,10 +25,9 @@ if (!array_key_exists("confirm", $aParams)) {
 
     // ----- form to confirm deletion
 
-    $sOut .= '<p>' . t('page-delete-project-introtext') . '<br><br>'
-            // Hinweise
-            . t("page-cleanup-info-archives-left") . ':</p>'
-            . '<pre>' . print_r($oPrj->getVersions(), true) . '</pre>';
+    $sOut .= '<p>' . t('page-delete-project-introtext') . '</p>'
+            . $oPrj->renderVersionUsage() . '<br><br>';
+
 
     $i = 0;
     $aForms = array(

public_html/deployment/pages/act_overview.php

@@ -9,26 +9,28 @@
  * for a single project
 
   ---------------------------------------------------------------------
+  2014-04-24  Axel <axel.hahn@iml.unibe.ch>  new visual; sortorder in 
+              project overview
   2013-11-08  Axel <axel.hahn@iml.unibe.ch>
   ###################################################################### */
 
 
 if (!array_key_exists("prj", $aParams)) {
 
+    // ----------------------------------------------------------------------
     // overview over all projects
+    // ----------------------------------------------------------------------
     require_once("./classes/projectlist.class.php");
     $oPrjList = new projectlist();
-
     $sOut = $oPrjList->renderOverview();
 } else {
+    
+    // ----------------------------------------------------------------------
+    // overview of a single project
+    // ----------------------------------------------------------------------
     require_once("./classes/project.class.php");
     $oPrj = new project($aParams["prj"]);
     $sOut = '
-        <div class="infobox" style="float: right;">
-            <h3>' . t("page-overview-characteristics") . '</h3>
-            ' . $oPrj->renderProjektInfos() . '
-        </div>
-        
         ' . $oPrj->renderVisual() . '
         <div style="clear: both;"></div><br><br><br>
         
@@ -38,27 +40,24 @@ if (!array_key_exists("prj", $aParams)) {
             ' . $oPrj->renderRepoInfo() . '
             ' . ($oPrj->canAcceptPhase() ? $oPrj->renderLink("build") : '') . '<br>
             </div>
-        ';
+        <br><br>
+        
+        <h3 id="h3versions">' . t("packages") . '</h3>
+        ' . $oPrj->renderVersionUsage() . '<br><br>';
 
     if ($oPrj->getActivePhases()) {
         $sOut.='
-            <br><br>
             <h3 id="h3phases">' . t("phases") . '</h3>
                 <p>' . t("page-overview-phase-infos") . '</p>
                 ' . $oPrj->renderPhaseInfo() . '<br>
-                
             <br><br>
-
             ';
-        
     } 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>
-            <h3 id="h3versions">' . t("packages") . '</h3>
-                ' . $oPrj->renderVersionUsage() . '        
             <div id="navbuttom">' . aHome() . '</div>';
 }
 //