Skip to content
Snippets Groups Projects
Commit 0f37d646 authored by Axel Hahn's avatar Axel Hahn
Browse files

- compact overview page

parent a199ba73
Branches
No related tags found
No related merge requests found
......@@ -186,7 +186,6 @@ class project {
ob_implicit_flush(true);
}
// ob_end_flush();
// stderr ausgeben
$sCommand.=' 2>&1';
$sReturn.="[" . date("H:i:s d.m.Y") . "] ";
......@@ -619,7 +618,6 @@ class project {
}
return $this->_oVcs->cleanupCache($iAge);
}
}
/**
......@@ -870,8 +868,6 @@ class project {
return false;
}
/**
* get list of remote branches and tags
* @param type $sActiveBranchname
......@@ -2032,7 +2028,7 @@ class project {
'hint' => sprintf(t("accept-hint"), $sPhase, $sNext),
'label' => t('accept'),
),
'build' => array('icon' => 'glyphicon glyphicon-forward', 'class' => $sFirst,
'build' => array('icon' => 'glyphicon glyphicon-equalizer', 'class' => $sFirst,
'hint' => sprintf(t("build-hint"), $sFirst),
'label' => t('build'),
),
......@@ -2156,8 +2152,9 @@ class project {
// TODO: getChecksumDiv anhand der Repo-Versionsnummer - dann kann man beim build auch die Farbe mit dem Repo HEAD vergleichen
$sReturn .= '
' . $this->_renderBar($sPhase, $sPlace) . '
<i class="glyphicon glyphicon-calendar"></i> ' . t('build-from') . ' ' . date("d.m.Y H:i:s", strtotime($aData["date"]));
<i class="glyphicon glyphicon-calendar"></i> ' . date("d.m.Y H:i", strtotime($aData["date"]));
if ($bLong) {
// long display of the revision
$sJsonUrl = $this->_getInfofile($sPhase, $sPlace);
$sReturn.='<br>
<i class="glyphicon glyphicon-bookmark"></i> ' . t('branch') . ': ' . $aData["branch"] . '<br>
......@@ -2174,7 +2171,8 @@ class project {
}
$sReturn.=' ' . $this->renderInfoLink(
$aData, array(
$aData,
array(
'title' => $this->getLabel() . " :: $sPhase :: $sPlace",
'more' => $sMore,
)
......@@ -2191,7 +2189,7 @@ class project {
. '<br>';
}
if ($bActions) {
$sReturn .= $this->renderLink("deploy", $sPhase);
$sReturn .= ' '.$this->renderLink("deploy", $sPhase);
}
}
break;
......@@ -2201,7 +2199,7 @@ class project {
case "deployed":
if ($bActions && $this->canAcceptPhase($sPhase)) {
$sReturn .= $this->renderLink("accept", $sPhase);
$sReturn .= ' '.$this->renderLink("accept", $sPhase);
}
break;
default:
......@@ -2226,7 +2224,7 @@ class project {
}
/**
* render html for a row with td for all places
* render html for a row with td for all places (first row)
* @param string $sPhase phase (just needed for coloring)
* @return string
*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment