diff options
| author | michael pereira | 2011-03-22 14:21:22 +0100 |
|---|---|---|
| committer | michael pereira | 2011-03-22 14:21:22 +0100 |
| commit | c7bfa919c97cd0ae3510707c052a41ee3d255ada (patch) | |
| tree | 0ae17f306457f0ebc3813e06e97f778e01bdb86c /application | |
| parent | Download funtzt jetzt (diff) | |
| parent | quickfix für back-button (diff) | |
| download | pbs2-c7bfa919c97cd0ae3510707c052a41ee3d255ada.tar.gz pbs2-c7bfa919c97cd0ae3510707c052a41ee3d255ada.tar.xz pbs2-c7bfa919c97cd0ae3510707c052a41ee3d255ada.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application')
4 files changed, 9 insertions, 9 deletions
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php index ef04b9d..a9bf16b 100644 --- a/application/modules/fbgui/controllers/IndexController.php +++ b/application/modules/fbgui/controllers/IndexController.php @@ -14,7 +14,7 @@ class Fbgui_IndexController extends Zend_Controller_Action if(isset($_SESSION['postdata'])){ $_POST = ($_SESSION['postdata']); - unset($_SESSION['postdata']); + #unset($_SESSION['postdata']); } if(isset($_POST['bootisoID']) || isset($_POST['serialnumber'])){ diff --git a/application/modules/fbgui/layouts/fbgui.phtml b/application/modules/fbgui/layouts/fbgui.phtml index 335e3c5..d04664a 100644 --- a/application/modules/fbgui/layouts/fbgui.phtml +++ b/application/modules/fbgui/layouts/fbgui.phtml @@ -23,22 +23,22 @@ echo $this->headScript()."\n"; <div id='sidepannel'> <div id="logo"><div id="logo-bar-gray"></div></div> <div id="sidepannel-top"> - <h1><a href=/><</a> <a href=/fbgui/>fbgui</a></h1> - <ul> - <li>Controller: + <!-- <h1><a href=/><</a> <a href=/fbgui/>fbgui</a></h1> --> + <!-- <ul> + <li> <ul> </ul> </li> </ul> -</ul> +</ul> --> </div> </div> <div id='main'> <div id="head-bg"> <div id="head"> - <h1>pbs<sup>2</sup></h1> + <h1>OpenSLX Preboot Portal</h1> <h2>Rechenzentrum Universität Freiburg</h2> </div> </div> diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml index 9f243e5..60ec5a8 100644 --- a/application/modules/fbgui/views/scripts/index/index.phtml +++ b/application/modules/fbgui/views/scripts/index/index.phtml @@ -3,8 +3,7 @@ $(document).ready(function(){ $('.menu').click(function(){ $('.menu').removeClass('selected'); - $(this).addClass('selected'); - console.log($(this).find('.id').val()); + $(this).addClass('selected'); $("#selectedBootOs").val($(this).find('.id').val()); }); }); @@ -39,5 +38,5 @@ <div class="right" style='cursor:pointer;' onClick="start();"> <img style='vertical-align:-8px;' src='/media/img/startOs.png'> <span style='font-size:18px;'>Start System</span> - </div> + </div> <?php endif;?> diff --git a/application/modules/fbgui/views/scripts/index/start.phtml b/application/modules/fbgui/views/scripts/index/start.phtml index a8f91fe..c341e02 100644 --- a/application/modules/fbgui/views/scripts/index/start.phtml +++ b/application/modules/fbgui/views/scripts/index/start.phtml @@ -98,3 +98,4 @@ <div class="bar7"></div> <div class="bar8"></div> </div> +<a href='/fbgui'>back</a> |