Skip to content
Snippets Groups Projects
Commit 87421e97 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

update server project overview

parent 1aea7057
No related branches found
No related tags found
1 merge request!62V2.0
...@@ -40,7 +40,7 @@ class projectgui extends project { ...@@ -40,7 +40,7 @@ class projectgui extends project {
* @param string $sContent optional: text to show * @param string $sContent optional: text to show
* @return string * @return string
*/ */
private function _getChecksumDiv($sText, $sContent='') { private function _getChecksumDiv($sText, $sContent='', $sBarHeight='3px') {
if ($sText){ if ($sText){
// color ranges in decimal values for RGB from ... to // color ranges in decimal values for RGB from ... to
...@@ -72,7 +72,7 @@ class projectgui extends project { ...@@ -72,7 +72,7 @@ class projectgui extends project {
} else { } else {
$sColor = "color: #888; background: #ccc;"; $sColor = "color: #888; background: #ccc;";
} }
return '<div style="' . $sColor . ' border-top: 3px solid;">'.($sContent ? $sContent : ' ').'</div>'; return '<div style="' . $sColor . ' border-top: '.$sBarHeight.' solid;">'.($sContent ? $sContent : ' ').'</div>';
} }
...@@ -82,13 +82,13 @@ class projectgui extends project { ...@@ -82,13 +82,13 @@ class projectgui extends project {
* @param string $sPlace place in the given phase * @param string $sPlace place in the given phase
* @return string * @return string
*/ */
private function _renderBar($sPhase, $sPlace) { private function _renderBar($sPhase, $sPlace, $sBarHeight='3px') {
$aDataPhase = $this->getPhaseInfos($sPhase); $aDataPhase = $this->getPhaseInfos($sPhase);
$aData = $aDataPhase[$sPlace]; $aData = $aDataPhase[$sPlace];
if (!array_key_exists("revision", $aData)) { if (!array_key_exists("revision", $aData)) {
return false; return false;
} }
return $this->_getChecksumDiv($aData["revision"]); return $this->_getChecksumDiv($aData["revision"], '', $sBarHeight);
} }
private function _renderHostsData($aData) { private function _renderHostsData($aData) {
...@@ -1618,6 +1618,8 @@ class projectgui extends project { ...@@ -1618,6 +1618,8 @@ class projectgui extends project {
*/ */
public function renderVisual() { public function renderVisual() {
$sReturn = ''; $sReturn = '';
$sBarHeightBg = '1.0em';
$sBarHeight = '0.8em';
$sContinue = '<span style="font-size: 300%; color:#ace;">&raquo;&raquo;</span><br>'; $sContinue = '<span style="font-size: 300%; color:#ace;">&raquo;&raquo;</span><br>';
$aBranches=$this->getRemoteBranches(); $aBranches=$this->getRemoteBranches();
...@@ -1640,8 +1642,8 @@ class projectgui extends project { ...@@ -1640,8 +1642,8 @@ class projectgui extends project {
$sPackagebar = ''; $sPackagebar = '';
$aVersions = $this->_getVersionUsage(); $aVersions = $this->_getVersionUsage();
foreach ($aVersions as $sVersion => $aData) { foreach ($aVersions as $sVersion => $aData) {
$sBar = $aData["info"]["revision"] ? $this->_getChecksumDiv($aData["info"]["revision"]) : ''; $sBar = $aData["info"]["revision"] ? $this->_getChecksumDiv($aData["info"]["revision"], '' , $sBarHeight) : '';
$sPackagebar.='<span title="' . $sVersion . '" style="float: left; background:#eee; height: 3px; width:' . (100 / count($aVersions)) . '%">' . $sBar . '&nbsp;</span>'; $sPackagebar.='<span title="' . $sVersion . '" style="float: left; background:#eee; height: '.$sBarHeightBg.'; width:' . (100 / count($aVersions)) . '%">' . $sBar . '&nbsp;</span>';
} }
$sPhaseImg = ''; $sPhaseImg = '';
...@@ -1658,7 +1660,7 @@ class projectgui extends project { ...@@ -1658,7 +1660,7 @@ class projectgui extends project {
$sFullbar = ''; $sFullbar = '';
foreach (array_keys($this->_aPlaces) as $sPlace) { foreach (array_keys($this->_aPlaces) as $sPlace) {
$sFullbar.='<span title="' . $this->_aPlaces[$sPlace] . '" style="float: left; background:#eee; height: 3px; width:' . (100 / count($this->_aPlaces)) . '%">' . $this->_renderBar($sPhase, $sPlace) . '&nbsp;</span>'; $sFullbar.='<span title="' . $this->_aPlaces[$sPlace] . '" style="float: left; background:#eee; height: '.$sBarHeightBg.'; width:' . (100 / count($this->_aPlaces)) . '%">' . $this->_renderBar($sPhase, $sPlace, $sBarHeight) . '&nbsp;</span>';
} }
// $sDetail = $sFullbar . '<br><a href="#h3phases" class="scroll-link">' . $sPhase . '</a>'; // $sDetail = $sFullbar . '<br><a href="#h3phases" class="scroll-link">' . $sPhase . '</a>';
$sDetail = $sFullbar . '<br>' . $sPhase; $sDetail = $sFullbar . '<br>' . $sPhase;
......
...@@ -629,6 +629,7 @@ input[type="checkbox"]:checked+label { ...@@ -629,6 +629,7 @@ input[type="checkbox"]:checked+label {
float: left; float: left;
text-align: center; text-align: center;
padding: 0 0 5px; padding: 0 0 5px;
min-width: 5em;
} }
.visualprocess .process.box { .visualprocess .process.box {
...@@ -650,7 +651,7 @@ input[type="checkbox"]:checked+label { ...@@ -650,7 +651,7 @@ input[type="checkbox"]:checked+label {
color: #aaa; color: #aaa;
} }
.visualprocess .process .details {} .visualprocess .process .details span {border-right: 3px solid #fff;}
/* ----- replacemets with templates ----- */ /* ----- replacemets with templates ----- */
span.replace { span.replace {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment