Merge branch 'task-1726-gitssh-extensions' into 'master'

Task 1726 gitssh extensions

See merge request !69

public_html/deployment/classes/project.class.php

@@ -2766,22 +2766,18 @@ class project extends base {
               $sAgeClass="last1h";
               }
              */
-            $sReturn .= 
-                    // $this->_renderBar($sPhase, $sPlace) 
-                    $this->_getChecksumDiv(
-                            $aData["revision"], 
-                            $oHtml->getIconByType('calendar') .' ' . date($sDateFormat, $oPkgDate)
-                    )
-                    // . $oHtml->getIconByType('calendar') .' ' . date($sDateFormat, $oPkgDate)
-                    ;
 
             if ($bLong) {
                 // long display of the revision
                 // $sJsonUrl = $this->_getInfofile($sPhase, $sPlace);
-                $sReturn.='<br>'
+                    $sReturn .=$this->_getChecksumDiv(
+                        $aData["revision"], 
+                        $oHtml->getIconByType('calendar') .' ' . date($sDateFormat, $oPkgDate)
                         . $oHtml->getIconByType('branch') . t('branch') . ': ' . $aData["branch"] . '<br>'
                         . $oHtml->getIconByType('revision') . t('revision') . ': ' . $this->_renderRevision($aData["revision"]) . '<br>'
-                        . $oHtml->getIconByType('comment') . t('commitmessage') . ':<br><pre>' . strip_tags($aData["message"], '<br>') . '</pre>'
+                        . $oHtml->getIconByType('comment') . t('commitmessage') . ':<br>'
+                    )
+                    . '<pre>' . strip_tags($aData["message"], '<br>') . '</pre>'
                 // . '<i class="glyphicon glyphicon-globe"></i> ' . t('url') . ': <a href="' . $sJsonUrl . '">' . $sJsonUrl . '</a><br>'
                 ;
                 if ($sPlace == "deployed" && array_key_exists("url", $this->_aPrjConfig["phases"][$sPhase])) {
@@ -2789,6 +2785,10 @@ class project extends base {
                     $sReturn.=$oHtml->getIconByType('link-extern') . ' '. t('url') . ': <a href="' . $sUrl . '">' . $sUrl . '</a><br>';
                 }
             } else {
+                $sReturn .= $this->_getChecksumDiv(
+                            $aData["revision"], 
+                            $oHtml->getIconByType('calendar') .' ' . date($sDateFormat, $oPkgDate)
+                    );
                 if ($sPlace == "deployed" && array_key_exists("url", $this->_aPrjConfig["phases"][$sPhase])) {
                     $sMore = $oHtml->getIconByType('link-extern').' '
                             . t('url')
@@ -2880,14 +2880,21 @@ class project extends base {
 
         $aRows = array();
         $sLastPlace = '';
+        
         foreach (array_keys($this->_aPlaces) as $sPlace) {
             $aRows[$sPlace] = $this->renderPhaseDetail($sPhase, $sPlace, $bActions, $bLong);
-            if ($sLastPlace && array_key_exists("version", $this->_aData["phases"][$sPhase][$sLastPlace]) && array_key_exists("version", $this->_aData["phases"][$sPhase][$sPlace]) && $this->_aData["phases"][$sPhase][$sLastPlace]["version"] == $this->_aData["phases"][$sPhase][$sPlace]["version"] && !$bLong
+            
+            // generate ">>" sign for lastly generated td
+            if ($sLastPlace && array_key_exists("version", $this->_aData["phases"][$sPhase][$sLastPlace]) 
+                    && array_key_exists("version", $this->_aData["phases"][$sPhase][$sPlace]) 
+                    && $this->_aData["phases"][$sPhase][$sLastPlace]["version"] == $this->_aData["phases"][$sPhase][$sPlace]["version"] 
+                    && !$bLong
             ) {
                 $aRows[$sLastPlace] = $this->_renderBar($sPhase, $sPlace) . "&raquo;";
             }
             $sLastPlace = $sPlace;
         }
+        
         foreach (array_keys($this->_aPlaces) as $sPlace) {
             $sRow2.='<td class=" td-phase-'.$sPhase.' td-place-'.$sPlace.' td' . $this->_aConfig["id"] . '">' . $aRows[$sPlace] . '</td>';
         }
@@ -2907,8 +2914,9 @@ class project extends base {
                 $aRepodata = $this->getRepoRevision();
                 if (array_key_exists("revision", $aRepodata)) {
                     $sReturn.=$this->_getChecksumDiv($aRepodata["revision"],
-                        '<i class="glyphicon glyphicon-bookmark"></i> ' . t('branch') . ': ' . (array_key_exists("branch", $aRepodata) ? $aRepodata["branch"] : '-') . '<br>'
-                        .'<i class="glyphicon glyphicon-tag"></i> ' . t('revision') . ': ' . $aRepodata["revision"] . '<br>'
+                        $oHtml->getIconByType('branch') . t('branch') . ': ' . (array_key_exists("branch", $aRepodata) ? $aRepodata["branch"] : '-') . '<br>'
+                        . $oHtml->getIconByType('revision') . t('revision') . ': ' . $this->_renderRevision($aRepodata["revision"]) . '<br>'
+                        . $oHtml->getIconByType('comment') . t('commitmessage') . ':<br>'
                         )
                         ."<pre>" . strip_tags($aRepodata["message"], '<br>') . "</pre>";
                 } else {