From e69db13b77bca9e91c8f6f4acc479b8b993e96de Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 28 Mar 2011 13:00:47 +0200 Subject: Uni-Farben und Footer angepasst --- application/layouts/default.phtml | 19 ++++++++++--------- application/modules/dev/layouts/dev.phtml | 19 ++++++++++--------- .../modules/fbgui/controllers/IndexController.php | 2 +- application/modules/fbgui/layouts/fbgui.phtml | 17 +++++++++-------- .../modules/user/controllers/FilterController.php | 3 +-- application/modules/user/layouts/user.phtml | 17 +++++++++-------- 6 files changed, 40 insertions(+), 37 deletions(-) (limited to 'application') diff --git a/application/layouts/default.phtml b/application/layouts/default.phtml index 463be5d..86c4155 100644 --- a/application/layouts/default.phtml +++ b/application/layouts/default.phtml @@ -44,15 +44,16 @@ echo $this->headScript()."\n";
layout()->content; ?>
- - - + + + +
diff --git a/application/modules/dev/layouts/dev.phtml b/application/modules/dev/layouts/dev.phtml index 29b5306..b9bd27a 100644 --- a/application/modules/dev/layouts/dev.phtml +++ b/application/modules/dev/layouts/dev.phtml @@ -70,15 +70,16 @@ echo $this->headScript()."\n";
layout()->content; ?>
-
- - + + +
+
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php index 809ecae..c70386f 100644 --- a/application/modules/fbgui/controllers/IndexController.php +++ b/application/modules/fbgui/controllers/IndexController.php @@ -76,7 +76,7 @@ class Fbgui_IndexController extends Zend_Controller_Action } } else{ - echo "

Not Welcome

"; + echo "

Not Welcome

"; } } diff --git a/application/modules/fbgui/layouts/fbgui.phtml b/application/modules/fbgui/layouts/fbgui.phtml index 7bb59fa..09f2f9d 100644 --- a/application/modules/fbgui/layouts/fbgui.phtml +++ b/application/modules/fbgui/layouts/fbgui.phtml @@ -49,15 +49,16 @@ echo $this->headScript()."\n";
layout()->content; ?>
+ +
- - +
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php index 70aa60b..ad69ce9 100644 --- a/application/modules/user/controllers/FilterController.php +++ b/application/modules/user/controllers/FilterController.php @@ -171,10 +171,9 @@ class User_FilterController extends Zend_Controller_Action $filtermapper->find($this->_request->getParam('filterID'),$DBfilterentry); $compareresult = $filtermapper->compare($newfilterentry,$DBfilterentry); - print_a($compareresult); if(isset($compareresult['priority']) && count($compareresult) == 1){ $filtermapper->save($newfilterentry); - #$this->_redirect('/user/filter/index/modifyresult/ok'); + $this->_redirect('/user/filter/index/modifyresult/ok'); } else{ $this->_redirect('/user/filter/index/modifyresult/forbidden'); diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml index c7f54dc..b8ab8a7 100644 --- a/application/modules/user/layouts/user.phtml +++ b/application/modules/user/layouts/user.phtml @@ -68,15 +68,16 @@ echo $this->headScript()."\n";
layout()->content; ?>
+ +
- - +