Merge branch '6567-add-groupname' into 'master'

add group name in overview

See merge request !58

public_html/deployment/classes/projectlist.class.php

@@ -127,7 +127,6 @@ class projectlist extends base{
                         'id'=>$sPrjGroup,
                         'count'=>1
                     ];
-                    // $sPrjGroupFilter.='<option value="' . $sPrjGroup . '">' . $oPrj->getProjectGroupLabel() . '</option>';
                 } else {
                     $aPrjGroups[$sPrjLabel]['count']++;
                 }
@@ -136,6 +135,7 @@ class projectlist extends base{
 
             $sErrors.=$oPrj->renderErrorBoxes();
 
+            /*
             $sOut2 .= '<div class="' . $sClasses . ' prjbox"><div class="title">'
                     .$oHtml->getLink(array(
                         'href'=>'#',
@@ -145,6 +145,7 @@ class projectlist extends base{
                         'icon'=>'filter',
                         'label'=>t("overview-filter")
                     ))
+                    . '<span class="float-right">'.$sPrjGroup.' </span>'
                     .'<strong>'
                     .$oHtml->getLink(array(
                         'href'=>'/deployment/' . $sPrj . '/',
@@ -160,6 +161,8 @@ class projectlist extends base{
                     . $oPrj->getDescription()
                     . '<br>'
                     . '';
+            */
+
 
             // render output
             $sOut.='
@@ -167,6 +170,7 @@ class projectlist extends base{
                     . 'ondblclick="location.href=\'/deployment/' . $sPrj . '/\'" '
                     . 'title="'.sprintf(t("overview-hint-dblclick"),$sPrj).'">
                     <td class="prj">
+                        <span class="float-right">'.$sPrjGroup.'</span>
                         <strong>'
                         .$oHtml->getLink(array(
                             'href'=>'/deployment/' . $sPrj . '/',
@@ -192,13 +196,13 @@ class projectlist extends base{
                     . '<td class="prj">';
             if ($oPrj->canAcceptPhase()) {
                 $sOut .=$oPrj->renderLink("build");
-                $sOut2.=$oPrj->renderLink("build");
+                // $sOut2.=$oPrj->renderLink("build");
                 // $sOut.='<a href="/deployment/'.$sPrj.'/build/" class="btn btn-default '.$sNext.'"><i class=" icon-forward"></i> Build f&uuml;r ['.$sNext.']</a><br>';
             }
             $sOut.='</td>
                 ' . $sOutPhases . '
                 </tr>';
-            $sOut2.=$sOutPhases2 . '</div></div>';
+            // $sOut2.=$sOutPhases2 . '</div></div>';
         }
         if ($sOut) {
             $sRowHead1 = '';
@@ -538,13 +542,17 @@ class projectlist extends base{
                 </div>
                 <br>
 
-                '.$sErrors.'
+                '.$sErrors
                 
+                /*
+                .'
                 <div class="view viewsimple">
                     ' . $sOut2 . '
                     <div style="clear: both;"></div>
                     <br>
-                </div>
+                </div>'
+                */
+                .'
 
 		<table class="table view viewextended" id="tbloverview">
 			<thead>