Skip to content
Snippets Groups Projects
Commit 23f04ba0 authored by hahn's avatar hahn
Browse files

- use formgen.class.php on deploy-page

- update footer area (back to home, Logs)
- warning boxes
parent ebfe8550
No related branches found
No related tags found
No related merge requests found
......@@ -189,10 +189,12 @@ class Actionlog {
<table class="table">' . $sReturn . '</table>';
}
$sReturn = '<h3>'
$sReturn = '<strong>'
. '<button onclick="setLogVisibility(\'block\');" id="btnShowLogs" class="btnLogs"><b class="icon-chevron-right"></b> </button>'
. '<button onclick="setLogVisibility(\'none\');" id="btnHideLogs" class="btnLogs"><b class="icon-chevron-down"></b> </button>'
. ' ' . t("class-actionlog-title") . '</h3>'
. ' ' . t("class-actionlog-title")
. '</strong>'
. '<div id="divActionlogs">'
. '<p>' . t("class-actionlog-filter") . ': ' . print_r($aFilter, true) . ')</p>'
. $sReturn
......
......@@ -62,7 +62,7 @@ require_once("./classes/actionlog.class.php");
$oLog=new Actionlog($sPrj);
$aFilter=array('limit'=>'0, 10');
if ($sPrj && $sPrj!="all")$aFilter['project']=$sPrj;
$sPhpOut.='<br><hr>' . $oLog->renderLogs($aFilter);
$sPhpOut.='<div class="logs">' . $oLog->renderLogs($aFilter).'</div>';
$sPhpOut = '
......
......@@ -50,8 +50,14 @@ body, label, input, button, select, textarea, p, .btn {
box-shadow: 0 0 50px #ddd;
}
div#navbuttom{
background: #f8f8f8;
background: linear-gradient(#fff, #f8f8f8, #fff);
margin-top: 4em; padding: 1em 0;
border-top: 2px dotted #ccc;}
h1{font-size: 250%; margin: 0;}
h2{font-size: 16px; margin: 0;}
h2{}
/* actions */
h2.action{
......@@ -71,8 +77,8 @@ h2.deploy{background-image: url("/deployment/images/nuvola64x64/apps/iconthemes.
h2.prjhome{background-image: url("/deployment/images/nuvola64x64/apps/kdict.png");}
h2.phase{background-image: url("/deployment/images/nuvola64x64/apps/kreversi.png");}
h2.setup{background-image: url("/deployment/images/nuvola64x64/apps/kcmsystem.png");}
h3{}
h4{}
h3{color:#444;}
h4{color:#666;}
#imgtop{float:left; margin: 0 20px 40px 0;}
pre{line-height: 1.2em; padding: 5px;}
......@@ -153,6 +159,12 @@ a.info span span.pre{
.error{background: #fcc;}
.ok{background: #cfc;}
/* -- bootstrap warning boxes not readable --*/
.alert-block {
background-color: #fea;
color: #653;
}
.center{text-align: center;}
.inactive{color:#999; font-style: italic;}
.versioninfo{
......@@ -191,3 +203,5 @@ input[type="radio"]:checked+label, input[type="checkbox"]:checked+label{
.loglevel-warning{ background: #fea;}
.loglevel-error{ background: #fcc;}
.loglevel-success{ color: #080;}
div.logs{ background: #f8f8f8; border-top: 1px solid #eee; margin-top: 1em; padding: 0.5em 0;}
\ No newline at end of file
......@@ -96,7 +96,7 @@ if (array_key_exists("confirm", $aParams)) {
}
}
$sOut.= '<hr>' . aPrjHome();
$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
echo $sOut;
......
......@@ -161,7 +161,7 @@ if (!array_key_exists("confirm", $aParams)) {
</script>';
}
$sOut.='<hr>' . aPrjHome();
$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
echo $sOut;
......
......@@ -28,7 +28,7 @@ $sOut = '
<h3>' . t("dir-builds") . ': ' . $aConfig['buildDir'] . '/[project]/</h3>
' . t("page-cleanup-info-builds-left") . ':<br>
<pre>' . print_r($oPrj->cleanupBuilds(), true) . '</pre>
<hr>' . aPrjHome();
<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
echo $sOut;
......
......@@ -99,7 +99,7 @@ if (!array_key_exists("confirm", $aParams)) {
}
}
$sOut .= '<hr>' . $sHome;
$sOut.= '<div id="navbuttom">' . $sHome . '</div>';
// -- Ausgabe
echo $sOut;
......@@ -82,7 +82,7 @@ if (array_key_exists("confirm", $aParams)) {
}
}
$sOut.='<hr>' . aPrjHome();
$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
echo $sOut;
......
......@@ -53,7 +53,8 @@ if (!array_key_exists("prj", $aParams)) {
.$oPrj->getBox("info", t("page-overview-no-phase")) .
$oPrj->renderLink("setup");
}
$sOut .= '<div style="clear: both"></div><hr>' . aHome();
$sOut .= '<div style="clear: both"></div>
<div id="navbuttom">' . aPrjHome() . '</div>';
}
//
echo $sOut;
......
......@@ -53,7 +53,7 @@ if ($sPhase) {
$sOut.=$oPrj->getBox("error", t("error-no-phase"));
}
$sOut.= '<hr>' . aPrjHome();
$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
echo $sOut;
......
......@@ -111,7 +111,7 @@ if (array_key_exists("confirm", $aParams)) {
}
$sOut.= '<hr>' . aPrjHome();
$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
......
......@@ -135,7 +135,7 @@ if ($aParams["prj"] == "all") {
$sOut.=$oPrj->renderProjectSetup();
}
$sOut.='<hr>' . aPrjHome();
$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>';
// -- Ausgabe
echo $sOut;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment