diff options
| author | Simon | 2011-04-14 13:56:38 +0200 |
|---|---|---|
| committer | Simon | 2011-04-14 13:56:38 +0200 |
| commit | 6ce4da61d83b84965b7db6af2b07abe5de25ca46 (patch) | |
| tree | 32741719c9fcbb66a9335fe4adb46e6535b53bc7 | |
| parent | Ticket #208 - Layouts umbenannt, application.ini angepasst (diff) | |
| download | pbs2-6ce4da61d83b84965b7db6af2b07abe5de25ca46.tar.gz pbs2-6ce4da61d83b84965b7db6af2b07abe5de25ca46.tar.xz pbs2-6ce4da61d83b84965b7db6af2b07abe5de25ca46.zip | |
bugfix für fbgui
| -rw-r--r-- | application/modules/fbgui/controllers/IndexController.php | 5 | ||||
| -rw-r--r-- | application/modules/fbgui/layouts/fbgui.phtml | 99 |
2 files changed, 3 insertions, 101 deletions
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php index 6941e47..2da3a6c 100644 --- a/application/modules/fbgui/controllers/IndexController.php +++ b/application/modules/fbgui/controllers/IndexController.php @@ -22,7 +22,8 @@ class Fbgui_IndexController extends Zend_Controller_Action } public function indexAction() - { + { + $_POST = $_SESSION['postdata']; if(isset($_POST['bootisoID']) || isset($_POST['serialnumber'])){ // Create a session $n = new Pbs_Session(); @@ -33,7 +34,7 @@ class Fbgui_IndexController extends Zend_Controller_Action $bootisomapper->find($_POST['bootisoID'],$bootiso); $groupID = $bootiso->getGroupID(); } - elseif(isset($_POST['serialnumber'])){ + elseif(isset($_POST['serialnumber'])){ $results = $bootisomapper->findBy(array('serialnumber' => $_POST['serialnumber']),true); if(count($results) == 0){ $this->_redirect('/fbgui/index/error/serialresult/noserial'); diff --git a/application/modules/fbgui/layouts/fbgui.phtml b/application/modules/fbgui/layouts/fbgui.phtml deleted file mode 100644 index 6ea324c..0000000 --- a/application/modules/fbgui/layouts/fbgui.phtml +++ /dev/null @@ -1,99 +0,0 @@ -<?php echo $this->doctype(); ?> - -<html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"> -<head> - -<?php -$request = Zend_Controller_Front::getInstance()->getRequest(); -$this->headTitle()->append(ucwords($request->getControllerName())); -$this->headTitle()->append(ucwords($request->getActionName())); -echo $this->headTitle()."\n"; -echo $this->headMeta()."\n"; -echo $this->headStyle()."\n"; -echo $this->headLink()."\n"; -echo $this->headScript()."\n"; -?> -<script src='/media/js/jquery.min.js'></script> -<script src='/media/js/jquery-ui.min.js'></script> -<script src='/media/js/script.js'></script> - -<script src='/media/js/jquery.mousewheel.js'></script> -<script src='/media/js/jquery.keyboard.js'></script> -<script src='/media/js/jquery.keyboard.extension-typing.js'></script> - -<link href="/media/css/keyboard.css" media="screen" rel="stylesheet" type="text/css" /> -<script type="text/javascript"> -function toggleKeyboard(onoff){ - if($('#email').hasClass('qwerty') == false){ - $('#email').addClass('qwerty'); - $('#pass').addClass('qwerty'); - $('.qwerty').keyboard({ layout: 'qwerty' }).addTyping(); - } - else{ - $('#email').removeClass('qwerty ui-keyboard-input ui-widget-content ui-corner-all').unbind(); - $('#pass').removeClass('qwerty ui-keyboard-input ui-widget-content ui-corner-all').unbind(); - - } -} -</script> - -</head> -<body> -<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> - <ul> - - </ul> - </li> - - </ul> -</ul> --> - </div> -</div> -<div id='main'> - <div id="head-bg"> - <div id="head"> - <h1>OpenSLX Preboot Portal</h1> - <h2>Rechenzentrum Universität Freiburg</h2> - </div> - </div> - <div id="logo-bar-red"></div> - <div id="head-titlebar"> - <?php - echo ucwords($request->getControllerName()) . " > " . ucwords($request->getActionName()); - ?> - </div> - <div id="content"> - <?php echo $this->layout()->content; ?> - </div> - - <div id="footer" class="footer flexbox flex"> - <div style='padding:5px;'> - <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display Debug</a> // - <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> // - <i>version: 0.1.1</i> - </div> - </div> -</div> - -<div id='debug'> - <div class='v1'> - <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> - <img src='/media/img/down.png' /> - </a> - </div> - <div class='v2' style='display:none;'> - <div style='text-align:right;'> - <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();"> - <img src='/media/img/up.png' /> - </a> - </div> - <?php print_a('Session',$_SESSION,'GET',$_GET,'POST',$_POST); ?> - </div> -</div> -</body> -</html> |