diff options
| author | Simon | 2011-04-14 13:51:47 +0200 |
|---|---|---|
| committer | Simon | 2011-04-14 13:51:47 +0200 |
| commit | 98ff85c219068d13aedf50ccba959f9d74ea1db1 (patch) | |
| tree | f4969e2c53354b4515cb62b5d2a63e141a4b0e82 | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-98ff85c219068d13aedf50ccba959f9d74ea1db1.tar.gz pbs2-98ff85c219068d13aedf50ccba959f9d74ea1db1.tar.xz pbs2-98ff85c219068d13aedf50ccba959f9d74ea1db1.zip | |
Ticket #208 - Layouts umbenannt, application.ini angepasst
| -rw-r--r-- | application/configs/application.ini.dist | 2 | ||||
| -rw-r--r-- | application/modules/fbgui/layouts/rz.phtml | 99 | ||||
| -rw-r--r-- | library/Pbs/Controller/Plugin/Modularlayout.php | 2 |
3 files changed, 101 insertions, 2 deletions
diff --git a/application/configs/application.ini.dist b/application/configs/application.ini.dist index a86e56b..64618e4 100644 --- a/application/configs/application.ini.dist +++ b/application/configs/application.ini.dist @@ -26,7 +26,7 @@ dev.resources.layout.layoutPath = APPLICATION_PATH "/layouts" user.resources.layout.layout = "user" user.resources.layout.layoutPath = APPLICATION_PATH "/layouts" -fbgui.resources.layout.layout = "fbgui" +fbgui.resources.layout.layout = "rz" fbgui.resources.layout.layoutPath = APPLICATION_PATH "/layouts" [staging : production] diff --git a/application/modules/fbgui/layouts/rz.phtml b/application/modules/fbgui/layouts/rz.phtml new file mode 100644 index 0000000..6ea324c --- /dev/null +++ b/application/modules/fbgui/layouts/rz.phtml @@ -0,0 +1,99 @@ +<?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> diff --git a/library/Pbs/Controller/Plugin/Modularlayout.php b/library/Pbs/Controller/Plugin/Modularlayout.php index 1cc25dd..12ac4f1 100644 --- a/library/Pbs/Controller/Plugin/Modularlayout.php +++ b/library/Pbs/Controller/Plugin/Modularlayout.php @@ -19,7 +19,7 @@ class Pbs_Controller_Plugin_Modularlayout extends Zend_Controller_Plugin_Abstrac $moduleDir = Zend_Controller_Front::getInstance()->getModuleDirectory(); $moduleDir .= "/layouts"; $layoutScript = $config[$moduleName]['resources']['layout']['layout']; - $str = $moduleDir."/".$layoutScript; + $str = $moduleDir."/".$layoutScript; Zend_Layout::getMvcInstance()->setLayoutPath($moduleDir/*. DIRECTORY_SEPARATOR .$layoutPath*/); Zend_Layout::getMvcInstance()->setLayout($layoutScript); |