diff options
| -rw-r--r-- | application/Bootstrap.php | 21 | ||||
| -rw-r--r-- | application/configs/application.ini.dist | 15 | ||||
| -rw-r--r-- | application/controllers/IndexController.php | 1 | ||||
| -rw-r--r-- | application/layouts/default.phtml | 98 | ||||
| -rw-r--r-- | application/modules/dev/Bootstrap.php | 2 | ||||
| -rw-r--r-- | application/modules/dev/layouts/dev.phtml (renamed from application/layouts/main.phtml) | 1 | ||||
| -rw-r--r-- | application/modules/fbgui/layouts/fbgui.phtml | 99 | ||||
| -rw-r--r-- | application/modules/user/controllers/IndexController.php | 2 | ||||
| -rw-r--r-- | application/modules/user/layouts/user.phtml | 99 | ||||
| -rwxr-xr-x | zend-su.sh | 1 |
10 files changed, 332 insertions, 7 deletions
diff --git a/application/Bootstrap.php b/application/Bootstrap.php index f9ee092..efdb785 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -15,10 +15,16 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap 'path' => 'forms/', 'namespace' => 'Form', ) - ) + ) ) ); } + protected function _initAutoloaders() + { + $this->getApplication()->setAutoloaderNamespaces(array('Pbs_')); + return $this; + } + protected function _initAuth(){ $auth = Zend_Auth::getInstance(); $auth->setStorage(new Zend_Auth_Storage_Session('auth')); @@ -31,15 +37,24 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap } function _initViewHelpers() { - $this->bootstrap('layout'); + $this->bootstrap('layout'); $layout = $this->getResource('layout'); $view = $layout->getView(); - + # print_a($layout); $view->doctype('XHTML1_STRICT'); $view->headMeta()->appendHttpEquiv('Content-Type', 'text/html;charset=utf-8'); $view->headLink()->appendStylesheet('/media/css/style.css'); $view->headTitle('pbs²') ->setSeparator(' :: '); } + protected function _initPlugins() + { + $this->bootstrap('autoloaders'); + $this->bootstrap('frontController'); + $plugin = new Pbs_Controller_Plugin_Modularlayout(); + $this->frontController->registerPlugin($plugin); + + } + } include 'Functions.php'; diff --git a/application/configs/application.ini.dist b/application/configs/application.ini.dist index 9bc14f6..a86e56b 100644 --- a/application/configs/application.ini.dist +++ b/application/configs/application.ini.dist @@ -6,6 +6,7 @@ bootstrap.path = APPLICATION_PATH "/Bootstrap.php" bootstrap.class = "Bootstrap" appnamespace = "Application" resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers" +resources.frontController.moduleDirectory = APPLICATION_PATH "/modules" resources.frontController.params.displayExceptions = 0 resources.db.adapter = PDO_MYSQL resources.db.params.host = localhost @@ -14,10 +15,20 @@ resources.db.params.password = resources.db.params.dbname = pbs resources.db.isDefaultTableAdapter = true resources.view[] = "" -resources.layout.layoutPath = APPLICATION_PATH "/layouts" -resources.layout.layout = "main" resources.modules = "" +resources.layout.layout = "default" +resources.layout.layoutPath = APPLICATION_PATH "/layouts" + +dev.resources.layout.layout = "dev" +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.layoutPath = APPLICATION_PATH "/layouts" + [staging : production] [testing : production] diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php index df2f91c..0523e4b 100644 --- a/application/controllers/IndexController.php +++ b/application/controllers/IndexController.php @@ -11,6 +11,7 @@ class IndexController extends Zend_Controller_Action public function indexAction() { // action body + echo 'test'; } diff --git a/application/layouts/default.phtml b/application/layouts/default.phtml new file mode 100644 index 0000000..3b15a03 --- /dev/null +++ b/application/layouts/default.phtml @@ -0,0 +1,98 @@ +<?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"; +?> +<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/> +<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script> +<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script> + +</head> +<body> +<div id='sidepannel'> + <div id="logo"><div id="logo-bar-gray"></div></div> + <div id="sidepannel-top"> + <h1>default</h1> + <ul> + <li>Controller: + <ul> + <li><a href='/dev/person'>Person</a></li> + <li><a href='/dev/group'>Group</a></li> + <li><a href='/dev/role'>Role</a></li> + <li><a href='/dev/bootiso'>BootIso</a></li> + <li><a href='/dev/bootmenu'>BootMenu</a></li> + <li><a href='/dev/config'>Config</a></li> + <li><a href='/dev/bootos'>BootOs</a></li> + <li><a href='/dev/client'>Client</a></li> + <li><a href='/dev/filter'>Filter</a></li> + <li><a href='/dev/pool'>Pool</a></li> + <li><a href='/dev/session'>Session</a></li> + <?php if (!Zend_Auth::getInstance()->hasIdentity()) {?> + <li><a href='/dev/auth/login'>Login</a></li> + <li><a href='/dev/auth/register'>Register</a></li> + <?php + } else {?> + <li><a href='/dev/auth/delete'>Account Löschen</a></li> + <li><a href='/dev/auth/logout'>Logout</a></li> + <?php + } + ?> + </ul> + </li> + + </ul> +</ul> + </div> +</div> +<div id='main'> + <div id="head-bg"> + <div id="head"> + <h1>pbs<sup>2</sup></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> + +<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 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/application/modules/dev/Bootstrap.php b/application/modules/dev/Bootstrap.php index 7fc413c..24c7aa9 100644 --- a/application/modules/dev/Bootstrap.php +++ b/application/modules/dev/Bootstrap.php @@ -1,5 +1,5 @@ <?php class dev_Bootstrap extends Zend_Application_Module_Bootstrap { - + } diff --git a/application/layouts/main.phtml b/application/modules/dev/layouts/dev.phtml index 6efbb4d..f48b9ad 100644 --- a/application/layouts/main.phtml +++ b/application/modules/dev/layouts/dev.phtml @@ -22,6 +22,7 @@ echo $this->headScript()."\n"; <div id='sidepannel'> <div id="logo"><div id="logo-bar-gray"></div></div> <div id="sidepannel-top"> + <h1>dev</h1> <ul> <li>Controller: <ul> diff --git a/application/modules/fbgui/layouts/fbgui.phtml b/application/modules/fbgui/layouts/fbgui.phtml new file mode 100644 index 0000000..1f10683 --- /dev/null +++ b/application/modules/fbgui/layouts/fbgui.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"; +?> +<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/> +<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script> +<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script> + +</head> +<body> + +<div id='sidepannel'> + <div id="logo"><div id="logo-bar-gray"></div></div> + <div id="sidepannel-top"> + <ul> + <h1>fbgui</h1> + <li>Controller: + <ul> + <li><a href='/dev/person'>Person</a></li> + <li><a href='/dev/group'>Group</a></li> + <li><a href='/dev/role'>Role</a></li> + <li><a href='/dev/bootiso'>BootIso</a></li> + <li><a href='/dev/bootmenu'>BootMenu</a></li> + <li><a href='/dev/config'>Config</a></li> + <li><a href='/dev/bootos'>BootOs</a></li> + <li><a href='/dev/client'>Client</a></li> + <li><a href='/dev/filter'>Filter</a></li> + <li><a href='/dev/pool'>Pool</a></li> + <li><a href='/dev/session'>Session</a></li> + <?php if (!Zend_Auth::getInstance()->hasIdentity()) {?> + <li><a href='/dev/auth/login'>Login</a></li> + <li><a href='/dev/auth/register'>Register</a></li> + <?php + } else {?> + <li><a href='/dev/auth/delete'>Account Löschen</a></li> + <li><a href='/dev/auth/logout'>Logout</a></li> + <?php + } + ?> + </ul> + </li> + + </ul> +</ul> + </div> +</div> +<div id='main'> + <div id="head-bg"> + <div id="head"> + <h1>pbs<sup>2</sup></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> + +<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 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/application/modules/user/controllers/IndexController.php b/application/modules/user/controllers/IndexController.php index 934b9ba..3a18bff 100644 --- a/application/modules/user/controllers/IndexController.php +++ b/application/modules/user/controllers/IndexController.php @@ -10,7 +10,7 @@ class User_IndexController extends Zend_Controller_Action public function indexAction() { - $this->view->loginform = new user_Form_Login(); + echo 'test'; } diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml new file mode 100644 index 0000000..f5e9db4 --- /dev/null +++ b/application/modules/user/layouts/user.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"; +?> +<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/> +<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script> +<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script> + +</head> +<body> + +<div id='sidepannel'> + <div id="logo"><div id="logo-bar-gray"></div></div> + <div id="sidepannel-top"> + <ul> + <h1>user</h1> + <li>Controller: + <ul> + <li><a href='/dev/person'>Person</a></li> + <li><a href='/dev/group'>Group</a></li> + <li><a href='/dev/role'>Role</a></li> + <li><a href='/dev/bootiso'>BootIso</a></li> + <li><a href='/dev/bootmenu'>BootMenu</a></li> + <li><a href='/dev/config'>Config</a></li> + <li><a href='/dev/bootos'>BootOs</a></li> + <li><a href='/dev/client'>Client</a></li> + <li><a href='/dev/filter'>Filter</a></li> + <li><a href='/dev/pool'>Pool</a></li> + <li><a href='/dev/session'>Session</a></li> + <?php if (!Zend_Auth::getInstance()->hasIdentity()) {?> + <li><a href='/dev/auth/login'>Login</a></li> + <li><a href='/dev/auth/register'>Register</a></li> + <?php + } else {?> + <li><a href='/dev/auth/delete'>Account Löschen</a></li> + <li><a href='/dev/auth/logout'>Logout</a></li> + <?php + } + ?> + </ul> + </li> + + </ul> +</ul> + </div> +</div> +<div id='main'> + <div id="head-bg"> + <div id="head"> + <h1>pbs<sup>2</sup></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> + +<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 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> @@ -13,6 +13,7 @@ cd /tmp/ su sf34 -c "git clone git@openslx.org:lsfks/master-teamprojekt/pbs2.git" mkdir /tmp/pbs2/library/ ln -s /usr/share/php/libzend-framework-php/Zend/ /tmp/pbs2/library/Zend +chown sf34:uni library/ touch /etc/apache2/sites-available/pbs2 echo " <VirtualHost 127.0.0.2:80>" >> /etc/apache2/sites-available/pbs2 echo " ServerName pbs2.local" >> /etc/apache2/sites-available/pbs2 |