- Auslesen der Version

- Projektuebersicht mit Kachelansicht

public_html/deployment/act_build.php

@@ -90,7 +90,7 @@ if (array_key_exists("confirm", $aParams)) {
 }
 
 
-$sOut.='<hr>' . aPrjHome();
+$sOut.='<hr>' . aHome() .' '. aPrjHome();
 
 
 // -- Ausgabe

public_html/deployment/classes/projectlist.class.php

@@ -52,7 +52,8 @@ class projectlist {
      * @return string
      */
     public function renderOverview() {
-        $sOut = '';
+        $sOut = '';  // table
+        $sOut2 = ''; // tiles
         $oPrj = false;
         $sTrClass="trproject";
         $sColClass="tdphase";
@@ -78,23 +79,30 @@ class projectlist {
                 $sOutPhases.=$oPrj->renderAllPhaseDetails($sPhase,true,false);
             }
 
+            $sOut2 .= '<div class="'.$sPrj.' '.$sTrClass.' prjbox" >'
+                    . '<strong>'
+                    . '<a href="/deployment/'.$sPrj.'/" ><i class=" icon-book"></i> '.$oPrj->getLabel().'</a>'
+                    . '</strong><br>'
+                    . $oPrj->getDescription()
+                    . '<br><br>';
+            
             // render output
             $sOut.='
-                <tr class="'.$sPrj.' '.$sTrClass.'">
+                <tr class="'.$sPrj.' '.$sTrClass.'" onclick="location.href=\'/deployment/'.$sPrj.'/\'">
                     <td class="prj">
                         <strong>
-                            '.$oPrj->renderLink("overview").'
+                            <a href="/deployment/'.$sPrj.'/" ><i class=" icon-book"></i> '.$oPrj->getLabel().'</a>
                         </strong><br>
-                        <!-- <a href="/deployment/'.$sPrj.'/" class="btn "><i class=" icon-book"></i> '.$oPrj->getLabel().'</a>-->
-                        
                         ' . $oPrj->getDescription() . '</td><td class="prj">';
             if ($oPrj->canAcceptPhase()){
                 $sOut .=$oPrj->renderLink("build");
+                $sOut2.=$oPrj->renderLink("build");
                 // $sOut.='<a href="/deployment/'.$sPrj.'/build/" class="btn '.$sNext.'"><i class=" icon-forward"></i> Build f&uuml;r ['.$sNext.']</a><br>';
             }
             $sOut.='</td>
                 ' . $sOutPhases . '
                 </tr>';
+            $sOut2.='</div>';
         }
         if ($sOut) {
             $sRowHead1='';
@@ -127,8 +135,26 @@ class projectlist {
                         });
 
                     }
+                    
+                    function setview(sMode){
+                        $(\'.view\').hide(); 
+                        $(\'.view\'+sMode).show();
+                        localStorage.setItem("mode", sMode);
+                        return false;
+                    }
+                    
+                    function setDefaultView(){
+                        var sMode=localStorage.getItem("mode");
+                        if (sMode)setview(sMode);
+                    }
                 </script>
                 <div class="filterbar">
+                
+                    <a href="#" class="view viewextended" onclick="setview(\'simple\');"><i class="icon-th-large"></i> zur einfachen Ansicht</a>
+                    <a href="#" class="view viewsimple" onclick="setview(\'extended\');" ><i class="icon-th-list"></i> zur erweiterten Ansicht</a>
+                    |
+
+                    <i class="icon-filter"></i>
                     Freitext-Filter (Regex):
                     <input type="text" id="efilter" name="efilter"
                         style="width: 150px;"
@@ -136,6 +162,7 @@ class projectlist {
                         onKeypress="filterTable(); "
                         onKeyup="filterTable(); "
                         >
+                    <span class="view viewextended">
                     &nbsp;&nbsp;&nbsp;
                     Projekt-Filter: 
                     <select id="prjfilter" onchange="filterOverviewTable(); return false;">
@@ -146,9 +173,17 @@ class projectlist {
                     <select id="phasefilter" onchange="filterOverviewTable(); return false;">
                         '.$sPhaseFilter.'
                     </select>
+                    </span>
+                </div>
+
+
+                <div class="view viewsimple">
+                    '.$sOut2.'
+                    <div style="clear: both;"></div>
+                    <br>
                 </div>
 
-		<table class="table" id="tbloverview">
+		<table class="table view viewextended" id="tbloverview">
 			<thead>
 				<tr>
 					<th class="prj" rowspan="2">Projekt<br><br></th>
@@ -160,7 +195,8 @@ class projectlist {
                                 </tr>
 			</thead>
 			<tbody>
-		' . $sOut . '</tbody></table>';
+		' . $sOut . '</tbody></table>'
+                    . '<script>setDefaultView();</script>';
         } else {
             $sOut ='<strong>Hinweis</strong><br>'
                     . 'Es wurde noch kein Projekt eingerichtet.<br><br>'

public_html/deployment/inc_functions.php

@@ -95,20 +95,28 @@ function getTopArea() {
     require_once("./classes/projectlist.class.php");
 
     $oPrjList = new projectlist();
-    /*
     $sMyPhase = "[phase]";
-      $sMyRev="...";
+    $sMyRev = " [no rev] ";
     $sJsonfile = $_SERVER["DOCUMENT_ROOT"] . "ci-webgui.json";
     if (file_exists($sJsonfile)) {
         $aJson = json_decode(file_get_contents($sJsonfile), true);
-      if (array_key_exists("revision", $aJson)) $sMyRev=$aJson["revision"];
+        if (array_key_exists("revision", $aJson))
+            $sMyRev = $aJson["revision"];
+    }
+    $sPhase = '(unknown)';
+    $aPhases = array(
+        'dev.ci.iml.unibe.ch' => array('phase' => 'dev',),
+        'aum-cba02.unibe.ch' => array('phase' => 'preview',),
+        'ci.iml.unibe.ch' => array('phase' => 'live',),
+    );
+    if (array_key_exists($_SERVER["SERVER_NAME"], $aPhases)) {
+        $sPhase = $aPhases[$_SERVER["SERVER_NAME"]]["phase"];
     }
-     * 
-     */
     $sBaseUrl = '/deployment/';
     $sWikiBaseUrl = 'https://secure.iml.unibe.ch/wiki/doku.php';
     $sReturn = '
         <div class="navbar">
+          <span class="version ' . $sPhase . '">' . $sPhase . ' . ' . $sMyRev . '</span>
           <div class="navbar-inner">
             <span class="brand">IML Deployment GUI</span>
             <ul class="nav">

public_html/deployment/main.css

@@ -28,6 +28,11 @@ body, label, input, button, select, textarea, p, .btn {
 }
 .description{font-weight:bold; color:#ccc; font-size: 150%; font-style: italic;}
 .navbar .brand {color:#a33;}
+.navbar .version {float: right; position: absolute; top: 20px; right: 0;padding: 0 1em; 
+         transform: rotate(5deg);
+         -webkit-transform: rotate(5deg);
+         opacity: 0.9;
+}
 #content{
     margin-top: 2em;
     border-left: 0px solid #ccc;
@@ -69,6 +74,13 @@ ul li {
     margin-bottom: 3px;
 }
 
+.prjbox{
+    float: left; width: 17%; margin: 0 1em 1em 0;padding: 1em;height: 12em;
+    background:#f8f8f8; 
+}
+.prjbox:hover{background:#eee; box-shadow: none;}
+.viewextended{display: none;}
+
 thead{font-size: 130%;}
 
 #tbloverview th{}
@@ -84,6 +96,7 @@ tr:hover{background:#ddd; background: linear-gradient(#ddd,#eee,#ddd);}
 td.preview{background:#f4f8ff; color:#333; background: rgba(210,220,255, 0.4);}
 td.stage{background:#f4ffff; color:#333; background: rgba(180,230,230, 0.4);}
 td.live{background:#f0fff0; color:#333;  background: rgba(180,255,180, 0.4);}
+.dev{background:#ccc;}
 .preview{background:#ccf;}
 .stage{background:#cff;}
 .live{background:#cfc;}