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

optical refresh: colors, project overview with tabs

parent 891d819e
No related branches found
No related tags found
No related merge requests found
...@@ -35,23 +35,23 @@ $aConfig = array( ...@@ -35,23 +35,23 @@ $aConfig = array(
'phases' => array( 'phases' => array(
"preview" => array( "preview" => array(
'css' => array( 'css' => array(
'bgdark' => 'background:#89a; color:#f8f8f8;', 'bgdark' => 'background:#50477C; color:#f8f8f8;',
'bglight' => 'background:#e8e8f8; color:#333; background: rgba(180,180,230, 0.3);', 'bglight' => 'background:#f0e8FF; color:#333; background:rgba(210,200,220,0.3); ',
'bgbutton' => 'background:#89a; color:#fcfcfc; border: 1px solid rgba(0,0,0,0.15);', 'bgbutton' => 'background:#50477C; color:#fcfcfc; border: 1px solid rgba(0,0,0,0.15);',
), ),
), ),
"stage" => array( "stage" => array(
'css' => array( 'css' => array(
'bgdark' => 'background:#8aa; color:#f8f8f8;', 'bgdark' => 'background:#3E92CC; color:#f8f8f8;',
'bglight' => 'background:#e4f8f8; color:#333; background: rgba(180,210,210, 0.3);', 'bglight' => 'background:#e0f0FF; color:#333; background:rgba(170,180,220,0.2); ',
'bgbutton' => 'background:#8aa; color:#fcfcfc; border: 1px solid rgba(0,0,0,0.15);', 'bgbutton' => 'background:#3E92CC; color:#fcfcfc; border: 1px solid rgba(0,0,0,0.15);',
), ),
), ),
"live" => array( "live" => array(
'css' => array( 'css' => array(
'bgdark' => 'background:#8a8; color:#f8f8f8;', 'bgdark' => 'background:#F26430; color:#f8f8f8;',
'bglight' => 'background:#e0f8e0; color:#333; background: rgba(180,250,180, 0.3);', 'bglight' => 'background:#FFF0E0; color:#333; background:rgba(240,210,200,0.3); ',
'bgbutton' => 'background:#8a8; color:#fcfcfc; border: 1px solid rgba(0,0,0,0.15);', 'bgbutton' => 'background:F26430; color:#fcfcfc; border: 1px solid rgba(0,0,0,0.15);',
), ),
// wenn deploytimes existiert, dann wird nach dem Deploy das Paket // wenn deploytimes existiert, dann wird nach dem Deploy das Paket
// in einer Queue zurueckgehalten // in einer Queue zurueckgehalten
......
...@@ -2647,7 +2647,8 @@ class project extends base { ...@@ -2647,7 +2647,8 @@ class project extends base {
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: 3px; width:' . (100 / count($this->_aPlaces)) . '%">' . $this->_renderBar($sPhase, $sPlace) . '&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;
$sPhaseImg.=' $sPhaseImg.='
<div class="process ' . $sPhase . '"> <div class="process ' . $sPhase . '">
...@@ -2662,7 +2663,10 @@ class project extends base { ...@@ -2662,7 +2663,10 @@ class project extends base {
<div class="title">' . t("versioncontrol") . '</div> <div class="title">' . t("versioncontrol") . '</div>
<div class="details"> <div class="details">
' . $sRepoBar . '<br> ' . $sRepoBar . '<br>
<!--
<a href="#h3repo" class="scroll-link">' . t("repositoryinfos") . '</a><br> <a href="#h3repo" class="scroll-link">' . t("repositoryinfos") . '</a><br>
-->
' . t("repositoryinfos") . '<br>
<strong> <strong>
' . $this->_aPrjConfig["build"]["type"] . '</strong> ' . preg_replace('/.*\@(.*):.*/', '($1)', $this->_aPrjConfig["build"]["url"]) ' . $this->_aPrjConfig["build"]["type"] . '</strong> ' . preg_replace('/.*\@(.*):.*/', '($1)', $this->_aPrjConfig["build"]["url"])
. ': <strong title="' . t('branch-select') . '">' . count($this->getRemoteBranches()) . '</strong>' . ': <strong title="' . t('branch-select') . '">' . count($this->getRemoteBranches()) . '</strong>'
...@@ -2682,7 +2686,10 @@ class project extends base { ...@@ -2682,7 +2686,10 @@ class project extends base {
<div class="title">' . t("archive") . '</div> <div class="title">' . t("archive") . '</div>
<div class="details"> <div class="details">
' . $sPackagebar . '<br> ' . $sPackagebar . '<br>
<!--
<a href="#h3versions" class="scroll-link">' . t("packages") . '</a><br> <a href="#h3versions" class="scroll-link">' . t("packages") . '</a><br>
-->
' . t("packages") . '<br>
(<strong>' . count($this->_getVersionUsage()) . '</strong>) (<strong>' . count($this->_getVersionUsage()) . '</strong>)
</div> </div>
<div><img src="/deployment/images/process/bg_archive.png" alt="' . t("archive") . '"></div> <div><img src="/deployment/images/process/bg_archive.png" alt="' . t("archive") . '"></div>
...@@ -2698,11 +2705,6 @@ class project extends base { ...@@ -2698,11 +2705,6 @@ class project extends base {
' . ($sPhaseImg ? $sPhaseImg : '<div class="process">' . t("none") . '</div>') . ' ' . ($sPhaseImg ? $sPhaseImg : '<div class="process">' . t("none") . '</div>') . '
</div> </div>
</div> </div>
<div style="clear: both;"></div>
<hr>
<i class="icon icon-user"> </i>
<strong>' . t('contact') . '</strong>: ' . $this->_aPrjConfig['contact'] . '<br><br>
' . $this->renderLink("setup") . '
'; ';
return $sReturn; return $sReturn;
......
...@@ -176,7 +176,7 @@ function getTopArea() { ...@@ -176,7 +176,7 @@ function getTopArea() {
$sWikiBaseUrl = 'https://secure.iml.unibe.ch/wiki/doku.php'; $sWikiBaseUrl = 'https://secure.iml.unibe.ch/wiki/doku.php';
$sReturn = ' $sReturn = '
<span id="top"></span> <span id="top"></span>
<nav class="navbar navbar-default" role="navigation"> <nav class="navbar navbar-inverse" role="navigation">
<div class="container-fluid"> <div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">
......
...@@ -28,7 +28,7 @@ body{padding-top: 0;} ...@@ -28,7 +28,7 @@ body{padding-top: 0;}
.description{font-weight:bold; color:#ccc; font-size: 150%; font-style: italic;} .description{font-weight:bold; color:#ccc; font-size: 150%; font-style: italic;}
.navbar-brand {color:#a33 !important;} .navbar-brand {color:#a33 !important;}
.navbar-inverse .navbar-brand {color:#c88 !important;} .navbar-inverse .navbar-brand {color:#c55 !important;}
#swversion {float: right; right: 0em; position: fixed; #swversion {float: right; right: 0em; position: fixed;
top: 4em; top: 4em;
padding: 0 0.5em; padding: 0 0.5em;
......
...@@ -37,33 +37,48 @@ if (!array_key_exists("prj", $aParams)) { ...@@ -37,33 +37,48 @@ if (!array_key_exists("prj", $aParams)) {
$sListOfBranches.='<li title="'.$aBranch['revision'].'">'.$aBranch['label'] . '</li>'; $sListOfBranches.='<li title="'.$aBranch['revision'].'">'.$aBranch['label'] . '</li>';
} }
$sListOfBranches.='</ol>'; $sListOfBranches.='</ol>';
$sOut = '<h3 id="h3visual">' . t("way-of-packages") . '</h3> $sOut = '
' . $oPrj->renderVisual() . '
<div style="clear: both;"></div>
' . $oPrj->renderLink("setup") . '<br>
<br>
<ul class="nav nav-tabs">
<li class="active"><a href="#tab1" data-toggle="tab">' . t("way-of-packages") . '</a></li>
<li><a href="#tab2" data-toggle="tab">' . t("repositoryinfos") . '</a></li>
<li><a href="#tab3" data-toggle="tab">' . t("packages") . '</a></li>
<li><a href="#tab4" data-toggle="tab">' . t('phases') . '</a></li>
</ul>
<br>
<div class="tab-content">
<div class="tab-pane active" id="tab1">
'
. '<h3 id="h3visual">' . t("way-of-packages") . '</h3>
' . $oPrj->renderVisual() . '
</div>
<div class="tab-pane" id="tab2">
<h3 id="h3repo">' . t("repositoryinfos") . '</h3> <h3 id="h3repo">' . t("repositoryinfos") . '</h3>
<div style="max-width: 40em;"> <div style="max-width: 40em;">
' . $oPrj->renderRepoInfo() . ' ' . $oPrj->renderRepoInfo() . '
' . $sListOfBranches . ' ' . $sListOfBranches . '
' . ($oPrj->canAcceptPhase() ? '<br>'.$oPrj->renderLink("build") : '') . ' ' . ($oPrj->canAcceptPhase() ? '<br>'.$oPrj->renderLink("build") : '') . '
</div> </div>
</div>
<div class="tab-pane" id="tab3">
<h3 id="h3versions">' . t("packages") . '</h3> <h3 id="h3versions">' . t("packages") . '</h3>
' . $oPrj->renderVersionUsage(); ' . $oPrj->renderVersionUsage() .'
</div>
<div class="tab-pane" id="tab4">
if ($oPrj->getActivePhases()) {
$sOut.='
<h3 id="h3phases">' . t("phases") . '</h3> <h3 id="h3phases">' . t("phases") . '</h3>
<p>' . t("page-overview-phase-infos") . '</p> '.($oPrj->getActivePhases()
' . $oPrj->renderPhaseInfo() . ' ? '<p>' . t("page-overview-phase-infos") . '</p>' . $oPrj->renderPhaseInfo()
'; : $oPrj->getBox("info", t("page-overview-no-phase")) .$oPrj->renderLink("setup")
} else { ).'
$sOut.='<h3 id="h3phases">' . t("phases") . '</h3>' </div>
. $oPrj->getBox("info", t("page-overview-no-phase")) . </div>
$oPrj->renderLink("setup"); <div style="clear: both"></div>
}
$sOut .= '<div style="clear: both"></div>
<div id="navbuttom">' . aGotop() . aHome() . '</div>'; <div id="navbuttom">' . aGotop() . aHome() . '</div>';
} }
// //
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment