diff --git a/public_html/deployment/classes/actionlog.class.php b/public_html/deployment/classes/actionlog.class.php index bc677cfea1a1ade93ca354582a9a1a7c66495d83..75f09df0aa4cd4a29d58fbc6be556088b8c07882 100644 --- a/public_html/deployment/classes/actionlog.class.php +++ b/public_html/deployment/classes/actionlog.class.php @@ -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 diff --git a/public_html/deployment/index.php b/public_html/deployment/index.php index 9d0cb73571dc27e1345eaa84facd990ec9861a35..25133e446d180b23dc677de1313c548067a8d8b8 100644 --- a/public_html/deployment/index.php +++ b/public_html/deployment/index.php @@ -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 = ' diff --git a/public_html/deployment/main.css b/public_html/deployment/main.css index 29c3acef92d959bec29871242b635470aee6f733..d1fd611b92a3878bee2aefffef6ac91a266c489b 100644 --- a/public_html/deployment/main.css +++ b/public_html/deployment/main.css @@ -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{ @@ -190,4 +202,6 @@ input[type="radio"]:checked+label, input[type="checkbox"]:checked+label{ .loglevel-info{} .loglevel-warning{ background: #fea;} .loglevel-error{ background: #fcc;} -.loglevel-success{ color: #080;} \ No newline at end of file +.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 diff --git a/public_html/deployment/pages/act_accept.php b/public_html/deployment/pages/act_accept.php index cd41e4fa0be922f30e786f6df47676082df762be..830940ce4547746cdad2341e5d426570e0aad560 100644 --- a/public_html/deployment/pages/act_accept.php +++ b/public_html/deployment/pages/act_accept.php @@ -96,7 +96,7 @@ if (array_key_exists("confirm", $aParams)) { } } -$sOut.= '<hr>' . aPrjHome(); +$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>'; // -- Ausgabe echo $sOut; diff --git a/public_html/deployment/pages/act_build.php b/public_html/deployment/pages/act_build.php index 5517c24e33f6c804eb4fcd42e1010ebc231dcb5d..3a71c418a2b5bb98d63a3a17bc1f8e449008fa8e 100644 --- a/public_html/deployment/pages/act_build.php +++ b/public_html/deployment/pages/act_build.php @@ -161,7 +161,7 @@ if (!array_key_exists("confirm", $aParams)) { </script>'; } -$sOut.='<hr>' . aPrjHome(); +$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>'; // -- Ausgabe echo $sOut; diff --git a/public_html/deployment/pages/act_cleanup.php b/public_html/deployment/pages/act_cleanup.php index 2a84487b8df406809d3c442dce5ef4e9bad8bc6a..873cf54ef0f9c2a4d7309eec5e50236e1a07d0b2 100644 --- a/public_html/deployment/pages/act_cleanup.php +++ b/public_html/deployment/pages/act_cleanup.php @@ -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; diff --git a/public_html/deployment/pages/act_delete.php b/public_html/deployment/pages/act_delete.php index 1a7024a60933c219198db95428843e71b65ba1f0..00575134fb7107f9973f46819434f9573b252857 100644 --- a/public_html/deployment/pages/act_delete.php +++ b/public_html/deployment/pages/act_delete.php @@ -99,7 +99,7 @@ if (!array_key_exists("confirm", $aParams)) { } } -$sOut .= '<hr>' . $sHome; +$sOut.= '<div id="navbuttom">' . $sHome . '</div>'; // -- Ausgabe echo $sOut; diff --git a/public_html/deployment/pages/act_deploy.php b/public_html/deployment/pages/act_deploy.php index 2a31ae44f2c4d5d22b8d16b54093f2d9fde3a39f..31911a4e909fa794a5beebf17540bccbd870893b 100644 --- a/public_html/deployment/pages/act_deploy.php +++ b/public_html/deployment/pages/act_deploy.php @@ -82,7 +82,7 @@ if (array_key_exists("confirm", $aParams)) { } } -$sOut.='<hr>' . aPrjHome(); +$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>'; // -- Ausgabe echo $sOut; diff --git a/public_html/deployment/pages/act_overview.php b/public_html/deployment/pages/act_overview.php index 2310dc4640d64c56761b5849f9b9e67e1c11c753..b69b3ba210a40c360ea863418d50037d835cbb59 100644 --- a/public_html/deployment/pages/act_overview.php +++ b/public_html/deployment/pages/act_overview.php @@ -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; diff --git a/public_html/deployment/pages/act_phase.php b/public_html/deployment/pages/act_phase.php index 1df3f4251632469eb9051b5100fdf52077a164b8..fea59649d48411505f38cf2783d0c77a053b774a 100644 --- a/public_html/deployment/pages/act_phase.php +++ b/public_html/deployment/pages/act_phase.php @@ -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; diff --git a/public_html/deployment/pages/act_rollback.php b/public_html/deployment/pages/act_rollback.php index 55cedbdd74ac58f3524928549b483671bd2a97d5..a2e53adacff6632ac430cfbfa742055dd5e563be 100644 --- a/public_html/deployment/pages/act_rollback.php +++ b/public_html/deployment/pages/act_rollback.php @@ -111,7 +111,7 @@ if (array_key_exists("confirm", $aParams)) { } -$sOut.= '<hr>' . aPrjHome(); +$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>'; // -- Ausgabe diff --git a/public_html/deployment/pages/act_setup.php b/public_html/deployment/pages/act_setup.php index d6ddadfdca0f420f1a7ad695e010006285b5311d..3ef21ed1fca05666e3d865daa713d6a9795aece3 100644 --- a/public_html/deployment/pages/act_setup.php +++ b/public_html/deployment/pages/act_setup.php @@ -135,7 +135,7 @@ if ($aParams["prj"] == "all") { $sOut.=$oPrj->renderProjectSetup(); } -$sOut.='<hr>' . aPrjHome(); +$sOut.= '<div id="navbuttom">' . aPrjHome() . '</div>'; // -- Ausgabe echo $sOut;