diff options
| author | Simon | 2011-03-28 13:00:47 +0200 |
|---|---|---|
| committer | Simon | 2011-03-28 13:00:47 +0200 |
| commit | e69db13b77bca9e91c8f6f4acc479b8b993e96de (patch) | |
| tree | 1ef1fb0357ec94c3eb4444e55f9667b5e97f4b7c /application/modules | |
| parent | updatebutton geadded (diff) | |
| download | pbs2-e69db13b77bca9e91c8f6f4acc479b8b993e96de.tar.gz pbs2-e69db13b77bca9e91c8f6f4acc479b8b993e96de.tar.xz pbs2-e69db13b77bca9e91c8f6f4acc479b8b993e96de.zip | |
Uni-Farben und Footer angepasst
Diffstat (limited to 'application/modules')
| -rw-r--r-- | application/modules/dev/layouts/dev.phtml | 19 | ||||
| -rw-r--r-- | application/modules/fbgui/controllers/IndexController.php | 2 | ||||
| -rw-r--r-- | application/modules/fbgui/layouts/fbgui.phtml | 17 | ||||
| -rw-r--r-- | application/modules/user/controllers/FilterController.php | 3 | ||||
| -rw-r--r-- | application/modules/user/layouts/user.phtml | 17 |
5 files changed, 30 insertions, 28 deletions
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"; <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="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();"> 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 "<h1>Not Welcome</h1>"; + echo "<h1>Not Welcome</h1>"; } } 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"; <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="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();"> 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"; <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="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();"> |