summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/layouts/default.phtml19
-rw-r--r--application/modules/dev/layouts/dev.phtml19
-rw-r--r--application/modules/fbgui/controllers/IndexController.php2
-rw-r--r--application/modules/fbgui/layouts/fbgui.phtml17
-rw-r--r--application/modules/user/controllers/FilterController.php3
-rw-r--r--application/modules/user/layouts/user.phtml19
6 files changed, 41 insertions, 38 deletions
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";
<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/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 e608298..e0c9961 100644
--- a/application/modules/user/layouts/user.phtml
+++ b/application/modules/user/layouts/user.phtml
@@ -42,7 +42,7 @@ echo $this->headScript()."\n";
<li class='navTreeItem'><a href='/user/auth/register'>Register</a></li>
<?php
} else {?>
- <li class='navTreeItem'><a href='/user/auth/delete'>Account Löschen</a></li>
+ <li class='navTreeItem'><a href='/user/auth/delete' onclick='var agree=confirm("Delete Your Account?");if (agree){ return true;}else{return false;}'>Account Löschen</a></li>
<li class='navTreeItem'><a href='/user/auth/logout'>Logout</a></li>
<?php
}
@@ -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();">