diff --git a/public_html/deployment/classes/classinfos.class.php b/public_html/deployment/classes/classinfos.class.php
index 1b3c8258c03e5890c5c10030a7e8eefda1dcc81f..26ca2b02c38792f8725cd64eef766a45fdea73c9 100644
--- a/public_html/deployment/classes/classinfos.class.php
+++ b/public_html/deployment/classes/classinfos.class.php
@@ -193,7 +193,7 @@ class classinfos {
}
// $sHtml.='</td><td>';
$sHtml.=$this->getComment($oMethod);
- $sHtml.='</td></tr>';
+ $sHtml.='<br></td></tr>';
}
$sHtml.='</table>';
$sHtml.='</div>';
diff --git a/public_html/deployment/classes/html.tpl.php b/public_html/deployment/classes/html.tpl.php
index 8914bacce4d7bf6f8b1130669fb5dff80170b27a..fea951ef5ec029266bfd3fdc7df76d6398c9c4e1 100644
--- a/public_html/deployment/classes/html.tpl.php
+++ b/public_html/deployment/classes/html.tpl.php
@@ -12,164 +12,12 @@
<meta http-equiv="cleartype" content="on">
-->
- <!-- Le styles -->
<link href="/deployment/bootstrap/css/bootstrap.css" rel="stylesheet">
- <link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.21/themes/black-tie/jquery-ui.css" rel="stylesheet">
- <link href="/deployment/bootstrap/css/jquery.tocify.css" rel="stylesheet">
- <link href="/deployment/bootstrap/css/prettify.css" type="text/css" rel="stylesheet" />
<link href="/deployment/bootstrap/css/styles.css" type="text/css" rel="stylesheet" />
+ <script src="/deployment/bootstrap/js/jquery-1.8.0.min.js"></script>
- <style>
-
- @media (max-width: 767px) {
- #toc {
- position: relative;
- width: 100%;
- margin: 0px 0px 20px 0px;
- }
- }
-
- body{padding-top: 0;}
- body, label, input, button, select, textarea, p, .btn {
- font-size: 12px;
- }
-
- #header,#footer{
- background:#eee; background: linear-gradient(#fff,#eee);
- padding: 1em; font-size: 300%;
- color:#a33;
- text-shadow: 1px 1px 0 #fff, 10px 10px 10px #aaa;
- border-bottom: 2px solid #ccc;
- }
- #footer{
- background: none;
- /* background: linear-gradient(#fff,#eee,#fff); */
- font-size: 100%;
- color:#a33;
- text-align: right;
- text-shadow: 1px 1px 0 #fff, 3px 3px 3px #aaa;
- border: 0px solid #ccc;
- border-top: 0px solid #ddd;
- margin-top: 5em;
- }
- #header2{
- background: none;
- padding: 0.5em; margin-bottom: 2em;
- }
- .description{font-weight:bold; color:#ccc; font-size: 150%; font-style: italic;}
- .navbar .brand {color:#a33;}
- #content{
- margin-top: 2em;
- border-left: 0px solid #ccc;
- padding: 1em;
- box-shadow: 0 0 50px #ddd;
- }
-
- h1{font-size: 250%; margin: 0;}
- h2{font-size: 16px; margin: 0;}
-
- /* actions */
- h2.action{
- background: #e8f0f8 url("/deployment/images/nuvola64x64/apps/aktion.png") 10px 10px no-repeat;
- background-repeat: no-repeat;
- box-shadow: 0 30px 50px #fff inset;
- padding: 20px 0 0 90px;
- height: 70px;
- margin: 0 0 1em 0;
- font-size: 250%; color: #abc; text-shadow: -1px -1px 0 #789, 1px 1px 1px #fff;
- border-bottom: 2px solid;
- }
- h2.accept{background-image: url("/deployment/images/nuvola64x64/apps/korganizer.png");}
- h2.build{background-image: url("/deployment/images/nuvola64x64/apps/kthememgr.png");}
- h2.cleanup{background-image: url("/deployment/images/nuvola64x64/apps/kasteroids.png");}
- h2.deploy{background-image: url("/deployment/images/nuvola64x64/apps/iconthemes.png");}
- 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{font-size: 14px; margin: 0;}
- #imgtop{float:left; margin: 0 20px 40px 0;}
- pre{line-height: 1.2em; padding: 5px;}
- pre.cli{ color:#555;}
- pre.clistrong{color: #000;}
- td{vertical-align: top; border-left: 1px solid #fff;}
- ul {}
- ul li {
- margin-bottom: 3px;
- }
-
- thead{font-size: 130%;}
-
- #tbloverview th{}
- #tbloverview td{}
- th.prj{background:#f8f8f8;}
- th.versioncontrol{background: #ccc;}
- th.preview{background:#358; color:#eee;}
- th.stage{background:#388; color:#eee;}
- th.live{background:#3a3; color: #eee; }
- tr{background: linear-gradient(#fff,#fff,#fff,#fff,#eee);}
- tr:hover{background:#ddd; background: linear-gradient(#ddd,#eee,#ddd);}
-
- td.preview{background:#f4f8ff; color:#333; background: rgba(210,220,255, 0.4);}
- td.stage{background:#f4ffff; color:#333; background: rgba(180,230,230, 0.4);}
- td.live{background:#f0fff0; color:#333; background: rgba(180,255,180, 0.4);}
- .preview{background:#ccf;}
- .stage{background:#cff;}
- .live{background:#cfc;}
-
- .preview, .stage, .live{
- padding: 4px;
- }
-
- a.info { border-bottom: 1px dotted; padding-bottom: 2px;}
- a.info:hover { text-decoration: none; background: #fff;}
- a.info span{ display: none; position: absolute; margin-top: -1em; background: #fff; padding: 0.5em; box-shadow: 0 0 10px #888;}
- a.info:hover span{ display: block; text-decoration: none;}
- a.info span span.title{ background: #888; color:#f8f8f8; padding: 0.5em 0.5em; display: block; box-shadow: 0 0 5px #ccc; border: 2px solid #fff;}
-
- .infobox{
- background:#fea; background: linear-gradient(#fea,#fff8f0,#fea);
- padding: 1em; border: 2px solid #fff; box-shadow: 0 0 10px #ccc;
- }
- .warning{background: #fe8;}
- .error{background: #fcc;}
- .center{text-align: center;}
- .inactive{color:#999; font-style: italic;}
- .versioninfo{
- border: 0px solid #ccc;
- padding: 0px;
- border-radius: 0px;
- margin-bottom: 0px;
- }
-
- ul.nav li.dropdown:hover ul.dropdown-menu{
- display: block;
- margin-top:0px
- }
- label.control-label{width: 300px; float: left; text-align: right; padding-right: 2em;}
- input, textarea {
- width: 400px;
- height: none !important;
- padding: 1px 2px !important;
- }
-
- </style>
<title>IML Deployment</title>
- <!--
-
-
- <style type="text/css" title="currentStyle">
- @import "/shared/js/datatables/media/css/demo_page.css";
- @import "/shared/js/datatables/media/css/demo_table.css";
- </style>
-
- <script type="text/javascript" src="/shared/js/jquery.js"></script>
- <script type="text/javascript" src="/shared/js/datatables/media/js/jquery.dataTables.min.js"></script>
- -->
-
- <link rel="stylesheet" type="text/css" href="main.css" media="screen">
- <script type="text/javascript" src="main.js"></script>
+ <link rel="stylesheet" type="text/css" href="/deployment/main.css" media="screen">
{{HEADER}}
@@ -182,29 +30,11 @@
</div>
{{FOOTER}}{{JSONREADY}}
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="/deployment/bootstrap/js/jquery-1.8.0.min.js"></script>
- <script src="/deployment/bootstrap/js/jquery-ui-1.8.23.custom.min.js"></script>
<script src="/deployment/bootstrap/js/bootstrap.min.js"></script>
- <script src="/deployment/bootstrap/js/history.js"></script>
- <script src="/deployment/bootstrap/js/jquery.tocify.min.js"></script>
- <script src="/deployment/bootstrap/js/prettify.js"></script>
- <!-- <script src="js/githubrepo.js"></script> -->
<script>
$(function() {
-
- $("#toc").tocify({selectors: "h2, h3, h4", scrollTo: 60, highlightOffset: 60, extendPage: false});
-
- prettyPrint();
-
$(".optionName").popover({trigger: "hover"});
-
- $("a[href='#']").click(function(event) {
-
- event.preventDefault();
-
- });
-
+ $("#content").hide().fadeIn(300);
});
diff --git a/public_html/deployment/inc_functions.php b/public_html/deployment/inc_functions.php
index 17b8efc332e73cc46d618ab928f728f58110c2d2..8f07b47b050fc3d1d4038937527e21e6846831e3 100644
--- a/public_html/deployment/inc_functions.php
+++ b/public_html/deployment/inc_functions.php
@@ -181,9 +181,9 @@ function getTopArea() {
</ul>
</li>
</ul>
- </div>
+ </div>
</div><div id="header2">';
-
+
if (!array_key_exists("prj", $aParams)) {
$sReturn.='<img src="' . $sImageBase . $aImages['overview'] . '" id="imgtop" alt="">'
. '<h1>Übersicht</h1><span class="description">Alle Projekte und Versionen in den einzelnen Phasen</span>';
diff --git a/public_html/deployment/index.php b/public_html/deployment/index.php
index a7e249ad0ce4eb735d23b41005fbd37697c8decf..4026f91706349207c172ac52701c7d36f0c4bab1 100644
--- a/public_html/deployment/index.php
+++ b/public_html/deployment/index.php
@@ -1,69 +1,64 @@
-<?php
-
-/* ######################################################################
-
- IML DEPLOYMENT
-
- webgui - index file - controller like
- ensure that you activated the rewrite rules
-
- RewriteEngine on
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_URI} !^/server-status$
- RewriteRule ^(.*)$ index.php [QSA,L]
-
- ---------------------------------------------------------------------
- 2013-11-08 Axel <axel.hahn@iml.unibe.ch>
- ###################################################################### */
-
-require_once("./inc_functions.php");
-require_once("./classes/page.class.php");
-
-$sPrj = "";
-$sAction = "overview";
-
-// ------ check parameters
-
-if (array_key_exists("prj", $aParams)) {
- $sPrj = $aParams["prj"];
-}
-if (array_key_exists("action", $aParams)) {
- if (file_exists(__DIR__ . '/act_' . $aParams["action"] . ".php")) {
- $sAction = $aParams["action"];
- }
-}
-
-// ------ action
-
-$sActionFile = __DIR__ . '/act_' . $sAction . ".php";
-include($sActionFile);
-
-// ------ Ausgabe
-$sPhpOut = '
- <div id="header" style="display: none;">
- IML DEPLOYMENT GUI
- </div>
- <br>
- ' . getTopArea() . '
- <div id="content">
- ' . getAction() . '
- ' . $sPhpOut . '
- </div>
- <div id="footer">
- IML Deployment © ' . date("Y") . ' <a href="http://www.iml.unibe.ch/">Institut für medizinische Lehre; Universität Bern</a>
- </div>
- ';
-
-$oPage = new Page();
-$oPage->addResponseHeader("Pragma: no-cache");
-$oPage->setOutputtype('html');
-$oPage->addJsOnReady('
- $(\'.tblOverview\').dataTable({
- "bPaginate": false,
- "bLengthChange": false
- });
-');
-
-$oPage->setContent($sPhpOut);
-echo $oPage->render();
-?>
+<?php
+
+/* ######################################################################
+
+ IML DEPLOYMENT
+
+ webgui - index file - controller like
+ ensure that you activated the rewrite rules
+
+ RewriteEngine on
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteCond %{REQUEST_URI} !^/server-status$
+ RewriteRule ^(.*)$ index.php [QSA,L]
+
+ ---------------------------------------------------------------------
+ 2013-11-08 Axel <axel.hahn@iml.unibe.ch>
+ ###################################################################### */
+
+require_once("./inc_functions.php");
+require_once("./classes/page.class.php");
+
+$sPrj = "";
+$sAction = "overview";
+
+// ------ check parameters
+
+if (array_key_exists("prj", $aParams)) {
+ $sPrj = $aParams["prj"];
+}
+if (array_key_exists("action", $aParams)) {
+ if (file_exists(__DIR__ . '/act_' . $aParams["action"] . ".php")) {
+ $sAction = $aParams["action"];
+ }
+}
+
+// ------ action
+
+$sActionFile = __DIR__ . '/act_' . $sAction . ".php";
+include($sActionFile);
+
+// ------ Ausgabe
+$sPhpOut = '
+ <div id="header" style="display: none;">
+ IML DEPLOYMENT GUI
+ </div>
+ <br>
+ ' . getTopArea() . '
+ <div id="content">
+ ' . getAction() . '
+ ' . $sPhpOut . '
+ </div>
+ <div id="footer">
+ IML Deployment © ' . date("Y") . ' <a href="http://www.iml.unibe.ch/">Institut für medizinische Lehre; Universität Bern</a>
+ </div>
+ ';
+
+$oPage = new Page();
+$oPage->addResponseHeader("Pragma: no-cache");
+$oPage->setOutputtype('html');
+$oPage->addJsOnReady('');
+
+$oPage->setContent($sPhpOut);
+echo $oPage->render();
+?>
diff --git a/public_html/deployment/main.css b/public_html/deployment/main.css
new file mode 100644
index 0000000000000000000000000000000000000000..29a7a0ef94b713d3dc8b8230f6f1248695ec382f
--- /dev/null
+++ b/public_html/deployment/main.css
@@ -0,0 +1,125 @@
+
+body{padding-top: 0;}
+body, label, input, button, select, textarea, p, .btn {
+ font-size: 12px;
+}
+
+#header,#footer{
+ background:#eee; background: linear-gradient(#fff,#eee);
+ padding: 1em; font-size: 300%;
+ color:#a33;
+ text-shadow: 1px 1px 0 #fff, 10px 10px 10px #aaa;
+ border-bottom: 2px solid #ccc;
+}
+#footer{
+ background: none;
+ /* background: linear-gradient(#fff,#eee,#fff); */
+ font-size: 100%;
+ color:#a33;
+ text-align: right;
+ text-shadow: 1px 1px 0 #fff, 3px 3px 3px #aaa;
+ border: 0px solid #ccc;
+ border-top: 0px solid #ddd;
+ margin-top: 5em;
+}
+#header2{
+ background: none;
+ padding: 0.5em; margin-bottom: 2em;
+}
+.description{font-weight:bold; color:#ccc; font-size: 150%; font-style: italic;}
+.navbar .brand {color:#a33;}
+#content{
+ margin-top: 2em;
+ border-left: 0px solid #ccc;
+ padding: 1em;
+ box-shadow: 0 0 50px #ddd;
+}
+
+h1{font-size: 250%; margin: 0;}
+h2{font-size: 16px; margin: 0;}
+
+/* actions */
+h2.action{
+ background: #e8f0f8 url("/deployment/images/nuvola64x64/apps/aktion.png") 10px 10px no-repeat;
+ background-repeat: no-repeat;
+ box-shadow: 0 30px 50px #fff inset;
+ padding: 20px 0 0 90px;
+ height: 70px;
+ margin: 0 0 1em 0;
+ font-size: 250%; color: #abc; text-shadow: -1px -1px 0 #789, 1px 1px 1px #fff;
+ border-bottom: 2px solid;
+}
+h2.accept{background-image: url("/deployment/images/nuvola64x64/apps/korganizer.png");}
+h2.build{background-image: url("/deployment/images/nuvola64x64/apps/kthememgr.png");}
+h2.cleanup{background-image: url("/deployment/images/nuvola64x64/apps/kasteroids.png");}
+h2.deploy{background-image: url("/deployment/images/nuvola64x64/apps/iconthemes.png");}
+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{font-size: 14px; margin: 0;}
+#imgtop{float:left; margin: 0 20px 40px 0;}
+pre{line-height: 1.2em; padding: 5px;}
+pre.cli{ color:#555;}
+pre.clistrong{color: #000;}
+td{vertical-align: top; border-left: 1px solid #fff;}
+ul {}
+ul li {
+ margin-bottom: 3px;
+}
+
+thead{font-size: 130%;}
+
+#tbloverview th{}
+#tbloverview td{}
+th.prj{background:#f8f8f8;}
+th.versioncontrol{background: #ccc;}
+th.preview{background:#358; color:#eee;}
+th.stage{background:#388; color:#eee;}
+th.live{background:#3a3; color: #eee; }
+tr{background: linear-gradient(#fff,#fff,#fff,#fff,#eee);}
+tr:hover{background:#ddd; background: linear-gradient(#ddd,#eee,#ddd);}
+
+td.preview{background:#f4f8ff; color:#333; background: rgba(210,220,255, 0.4);}
+td.stage{background:#f4ffff; color:#333; background: rgba(180,230,230, 0.4);}
+td.live{background:#f0fff0; color:#333; background: rgba(180,255,180, 0.4);}
+.preview{background:#ccf;}
+.stage{background:#cff;}
+.live{background:#cfc;}
+
+.preview, .stage, .live{
+ padding: 4px;
+}
+
+a.info { border-bottom: 1px dotted; padding-bottom: 2px;}
+a.info:hover { text-decoration: none; background: #fff;}
+a.info span{ display: none; position: absolute; margin-top: -1em; background: #fff; padding: 0.5em; box-shadow: 0 0 10px #888;}
+a.info:hover span{ display: block; text-decoration: none;}
+a.info span span.title{ background: #888; color:#f8f8f8; padding: 0.5em 0.5em; display: block; box-shadow: 0 0 5px #ccc; border: 2px solid #fff;}
+
+.infobox{
+ background:#fea; background: linear-gradient(#fea,#fff8f0,#fea);
+ padding: 1em; border: 2px solid #fff; box-shadow: 0 0 10px #ccc;
+}
+.warning{background: #fe8;}
+.error{background: #fcc;}
+.center{text-align: center;}
+.inactive{color:#999; font-style: italic;}
+.versioninfo{
+ border: 0px solid #ccc;
+ padding: 0px;
+ border-radius: 0px;
+ margin-bottom: 0px;
+}
+
+ul.nav li.dropdown:hover ul.dropdown-menu{
+ display: block;
+ margin-top:0px
+}
+label.control-label{width: 300px; float: left; text-align: right; padding-right: 2em;}
+input, textarea {
+ width: 400px;
+ height: none !important;
+ padding: 1px 2px !important;
+}
\ No newline at end of file