From 105e7a1a6bfdcfd4dccc1b95a17dc6fad7a6bf95 Mon Sep 17 00:00:00 2001
From: Björn Geiger
Date: Mon, 28 Mar 2011 12:58:13 +0200
Subject: kleine Fehler korrigiert

---
 application/modules/user/layouts/user.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/modules/user/layouts')

diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml
index c7f54dc..e608298 100644
--- a/application/modules/user/layouts/user.phtml
+++ b/application/modules/user/layouts/user.phtml
@@ -36,7 +36,7 @@ echo $this->headScript()."\n";
 			<li class='navTreeItem'><a href='/user/client'>Client</a></li>
 			<li class='navTreeItem'><a href='/user/filter'>Filter</a></li>
 			<li class='navTreeItem'><a href='/user/pool'>Pool</a></li>
-			<li class='navTreeItem'><a href='/user/auth'>Auth</a></li>
+			<li class='navTreeItem'><a href='/user/person/changemembership'>Select Membership</a></li>
 			<?php if (!Zend_Auth::getInstance()->hasIdentity()) {?>
 			<li class='navTreeItem'><a href='/user/auth/login'>Login</a></li>
 			<li class='navTreeItem'><a href='/user/auth/register'>Register</a></li>
-- 
cgit v1.2.3-55-g7522


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 ++++++++-------
 library/Pbs/Graph.php                              |   2 +-
 public/media/css/style.css                         |  24 ++++++++++-----------
 public/media/img/sub-logo-small-transparent.gif    | Bin 0 -> 1591 bytes
 9 files changed, 53 insertions(+), 50 deletions(-)
 create mode 100644 public/media/img/sub-logo-small-transparent.gif

(limited to 'application/modules/user/layouts')

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 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();">
diff --git a/library/Pbs/Graph.php b/library/Pbs/Graph.php
index fc21336..df36ac4 100644
--- a/library/Pbs/Graph.php
+++ b/library/Pbs/Graph.php
@@ -17,7 +17,7 @@ class Pbs_Graph{
 				size="5,5";
 				graph[ bgcolor=transparent ];
 				node [ style=filled fillcolor="#ffffffff" ];
-				"'.$this->getGroupTitle($groupID).'" [ fontcolor="#ffffffff", style=filled, fillcolor="#003592FF"];
+				"'.$this->getGroupTitle($groupID).'" [ fontcolor="#ffffffff", style=filled, fillcolor="#004A99FF"];
 				';
 		$this->getParentGroups($groupID);
 		$this->getChildGroups($groupID);
diff --git a/public/media/css/style.css b/public/media/css/style.css
index 7e147d0..0cfb17a 100644
--- a/public/media/css/style.css
+++ b/public/media/css/style.css
@@ -40,15 +40,20 @@ body {
 
 #footer {	
 	margin: 0;
-	width: 1000px;
 	clear: both;
 	bottom: 0px;
 	border-top: 1px solid #ccc;
-	background-color: #eee;
+	background-color: #004A99;
 	text-align: right;
 	font-size: 10.5px;
-	line-height: 16px;
-	color: #666;
+	line-height: 12px;
+	color: #FFF;
+}
+.footer {
+	text-align: right;
+	font-size: 10px;
+	font-family: Verdana, Arial;
+	padding: 5px 2px 5px 0px;
 }
 
 #main {
@@ -58,13 +63,14 @@ body {
 
 #head-bg {
 	height: 116px;
-	background-color: #003592;
+	background-color: #004A99;
+
 }
 
 #head {
 	height: 116px;
 	background: url(/media/img/siegel-93x55.png) bottom left no-repeat,
-		url(/media/img/sub-logo-small.gif) bottom right no-repeat;
+		url(/media/img/sub-logo-small-transparent.gif) bottom right no-repeat;
 }
 
 #head h1,h2 {
@@ -389,12 +395,6 @@ td.action img {
 	font-weight: bold;
 }
 
-.footer {
-	text-align: right;
-	font-size: 10px;
-	font-family: Verdana, Arial;
-	padding: 10px 0px 10px 0px;
-}
 
 /* boxes */
 .okbox,.warningbox,.errorbox,.infobox {
diff --git a/public/media/img/sub-logo-small-transparent.gif b/public/media/img/sub-logo-small-transparent.gif
new file mode 100644
index 0000000..6ac7b92
Binary files /dev/null and b/public/media/img/sub-logo-small-transparent.gif differ
-- 
cgit v1.2.3-55-g7522


From 822a995873ca147e1dc040edd7088b2b403cc4b1 Mon Sep 17 00:00:00 2001
From: Simon
Date: Mon, 28 Mar 2011 14:18:28 +0200
Subject: quickfix gegen account löschen

---
 application/modules/user/layouts/user.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/modules/user/layouts')

diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml
index 0132279..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
 			}
-- 
cgit v1.2.3-55-g7522


From 04c69f27f49c3f40888ee4938388413b07ad5e09 Mon Sep 17 00:00:00 2001
From: Björn Geiger
Date: Mon, 28 Mar 2011 16:51:10 +0200
Subject: überschriften hinzugefügt, andere Fehler korrigiert

---
 .zfproject.xml                                     |  7 ++++
 .../modules/dev/controllers/AuthController.php     | 40 +++++++++++++---------
 .../modules/dev/forms/AuthRecoverPassword.php      |  2 +-
 .../modules/dev/forms/ConfirmDeleteAccount.php     | 27 +++++++++++++++
 application/modules/dev/forms/GroupAdd.php         |  2 +-
 application/modules/dev/forms/GroupEdit.php        |  2 +-
 application/modules/dev/forms/GroupLink.php        |  4 +--
 application/modules/dev/forms/GroupRequest.php     |  2 +-
 application/modules/dev/forms/GroupSelect.php      |  2 +-
 application/modules/dev/forms/LinkRight.php        |  4 +--
 application/modules/dev/forms/PersonEdit.php       |  2 +-
 application/modules/dev/forms/RoleAdd.php          |  2 +-
 application/modules/dev/forms/RoleEdit.php         |  2 +-
 application/modules/dev/layouts/dev.phtml          |  2 +-
 .../modules/dev/views/scripts/auth/delete.phtml    |  6 ++++
 .../modules/dev/views/scripts/auth/login.phtml     |  1 +
 .../dev/views/scripts/auth/recoverpassword.phtml   |  1 +
 .../modules/dev/views/scripts/auth/register.phtml  |  1 +
 .../modules/dev/views/scripts/group/add.phtml      |  1 +
 .../modules/dev/views/scripts/group/edit.phtml     |  1 +
 .../modules/dev/views/scripts/group/link.phtml     |  1 +
 .../modules/dev/views/scripts/person/edit.phtml    |  1 +
 .../modules/dev/views/scripts/person/request.phtml |  1 +
 .../modules/dev/views/scripts/role/add.phtml       |  1 +
 .../modules/dev/views/scripts/role/edit.phtml      |  1 +
 .../dev/views/scripts/role/groupselect.phtml       |  1 +
 .../modules/dev/views/scripts/role/linkright.phtml |  1 +
 .../modules/fbgui/forms/MembershipSelect.php       |  2 +-
 .../modules/fbgui/views/scripts/auth/login.phtml   |  1 +
 .../views/scripts/auth/selectmembership.phtml      |  1 +
 .../modules/user/controllers/AuthController.php    | 40 +++++++++++++---------
 .../modules/user/controllers/RoleController.php    |  1 +
 .../modules/user/forms/ConfirmDeleteAccount.php    | 27 +++++++++++++++
 application/modules/user/forms/GroupAdd.php        |  2 +-
 application/modules/user/forms/GroupEdit.php       | 24 ++-----------
 application/modules/user/forms/GroupLink.php       |  2 +-
 application/modules/user/forms/GroupRequest.php    |  4 +--
 application/modules/user/forms/LinkRight.php       |  4 +--
 .../modules/user/forms/MembershipSelect.php        |  2 +-
 application/modules/user/forms/PersonEdit.php      |  2 +-
 application/modules/user/forms/RecoverPassword.php |  2 +-
 application/modules/user/forms/RoleAdd.php         |  2 +-
 application/modules/user/forms/RoleEdit.php        | 15 ++------
 application/modules/user/layouts/user.phtml        |  2 +-
 .../modules/user/views/scripts/auth/delete.phtml   |  6 ++++
 .../modules/user/views/scripts/auth/login.phtml    |  1 +
 .../user/views/scripts/auth/recoverpassword.phtml  |  1 +
 .../modules/user/views/scripts/auth/register.phtml |  1 +
 .../modules/user/views/scripts/group/add.phtml     |  1 +
 .../modules/user/views/scripts/group/edit.phtml    |  1 +
 .../modules/user/views/scripts/group/link.phtml    |  1 +
 .../modules/user/views/scripts/group/show.phtml    |  9 ++---
 .../modules/user/views/scripts/person/edit.phtml   |  1 +
 .../user/views/scripts/person/request.phtml        |  1 +
 .../views/scripts/person/selectmembership.phtml    |  1 +
 .../modules/user/views/scripts/role/add.phtml      |  1 +
 .../modules/user/views/scripts/role/edit.phtml     |  1 +
 .../user/views/scripts/role/linkright.phtml        |  1 +
 .../modules/user/views/scripts/role/show.phtml     | 10 +++++-
 59 files changed, 189 insertions(+), 99 deletions(-)
 create mode 100644 application/modules/dev/forms/ConfirmDeleteAccount.php
 create mode 100644 application/modules/dev/views/scripts/auth/delete.phtml
 create mode 100644 application/modules/user/forms/ConfirmDeleteAccount.php
 create mode 100644 application/modules/user/views/scripts/auth/delete.phtml

(limited to 'application/modules/user/layouts')

diff --git a/.zfproject.xml b/.zfproject.xml
index 35860e2..588998d 100644
--- a/.zfproject.xml
+++ b/.zfproject.xml
@@ -198,6 +198,7 @@
             <formFile formName="GroupEdit"/>
             <formFile formName="GroupAdd"/>
             <formFile formName="GroupLink"/>
+            <formFile formName="ConfirmDeleteAccount"/>
           </formsDirectory>
           <layoutsDirectory enabled="false"/>
           <modelsDirectory>
@@ -358,8 +359,10 @@
             <viewScriptsDirectory>
               <viewControllerScriptsDirectory forControllerName="Index">
                 <viewScriptFile forActionName="index"/>
+              </viewControllerScriptsDirectory>
               <viewControllerScriptsDirectory forControllerName="Auth">
                 <viewScriptFile forActionName="login"/>
+              </viewControllerScriptsDirectory>
               <viewControllerScriptsDirectory forControllerName="Auth">
                 <viewScriptFile forActionName="selectmembership"/>
               </viewControllerScriptsDirectory>
@@ -520,6 +523,7 @@
             <formFile formName="LinkRight"/>
             <formFile formName="RoleAdd"/>
             <formFile formName="NewPassword"/>
+            <formFile formName="ConfirmDeleteAccount"/>
           </formsDirectory>
           <layoutsDirectory enabled="false"/>
           <modelsDirectory>
@@ -542,6 +546,9 @@
               <viewControllerScriptsDirectory forControllerName="Auth">
                 <viewScriptFile forActionName="register"/>
               </viewControllerScriptsDirectory>
+              <viewControllerScriptsDirectory forControllerName="Auth">
+                <viewScriptFile forActionName="delete"/>
+              </viewControllerScriptsDirectory>
               <viewControllerScriptsDirectory forControllerName="Auth">
                 <viewScriptFile forActionName="recoverpassword"/>
               </viewControllerScriptsDirectory>
diff --git a/application/modules/dev/controllers/AuthController.php b/application/modules/dev/controllers/AuthController.php
index 0edb78c..078a4cf 100644
--- a/application/modules/dev/controllers/AuthController.php
+++ b/application/modules/dev/controllers/AuthController.php
@@ -207,25 +207,31 @@ class dev_AuthController extends Zend_Controller_Action
 
 	public function deleteAction()
 	{
-		$this->_helper-> viewRenderer-> setNoRender();
-		$result = $this->personmapper->findBy('email', Zend_Auth::getInstance()->getIdentity());
-		$person = $result[0];
-		$personID = $person["personID"];
-		if (isset($personID)){
-			$this->personmapper = new Application_Model_PersonMapper();
-			$person = $this->personmapper->find($personID);
-			try {
-				$this->personmapper->delete($person);
-			}catch(Zend_Exception $e)
-			{
-				echo "Caught exception: " . get_class($e) . "<br/>";
-				echo "Message: " . $e->getMessage() . "<br/>";
+		if($_POST['confirmdelete']) {
+			$auth = Zend_Auth::getInstance();
+			$result = $this->personmapper->findBy('email', $auth->getIdentity());
+			$person = $result[0];
+			$personID = $person["personID"];
+			if (isset($personID)){
+				$this->personmapper = new Application_Model_PersonMapper();
+				$person = $this->personmapper->find($personID);
+				try {
+					$this->personmapper->delete($person);
+				}catch(Zend_Exception $e)
+				{
+					echo "Caught exception: " . get_class($e) . "<br/>";
+					echo "Message: " . $e->getMessage() . "<br/>";
+					return;
+				}
+				$auth->clearIdentity();
+				Zend_Session::namespaceUnset('userIDs');
+				Zend_Session::forgetMe();
+				$this->_helper->redirector('login', 'auth');
 				return;
 			}
-			$auth = Zend_Auth::getInstance();
-			$auth->clearIdentity();
-			$this->_helper->redirector('login', 'auth');
-			return;
+		} else {
+			$deleteconfirmform = new dev_Form_ConfirmDeleteAccount();
+			$this->view->deleteconfirmform = $deleteconfirmform;
 		}
 	}
 }
diff --git a/application/modules/dev/forms/AuthRecoverPassword.php b/application/modules/dev/forms/AuthRecoverPassword.php
index a1de7ea..35779fc 100644
--- a/application/modules/dev/forms/AuthRecoverPassword.php
+++ b/application/modules/dev/forms/AuthRecoverPassword.php
@@ -19,7 +19,7 @@ class dev_Form_AuthRecoverPassword extends Zend_Form
 		$this->addElement('submit', 'recoverPassword', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Recover Password',
+            'label'    => 'Recover',
         ));  
     }
 
diff --git a/application/modules/dev/forms/ConfirmDeleteAccount.php b/application/modules/dev/forms/ConfirmDeleteAccount.php
new file mode 100644
index 0000000..c093996
--- /dev/null
+++ b/application/modules/dev/forms/ConfirmDeleteAccount.php
@@ -0,0 +1,27 @@
+<?php
+
+class dev_Form_ConfirmDeleteAccount extends Zend_Form
+{
+
+	public function init()
+	{
+		$this->setName("ConfirmDeleteAccount");
+		$this->setMethod('post');
+			
+		$this->addElement('submit', 'confirmdelete', array(
+            'required' => false,
+            'ignore'   => true,
+            'label'    => 'Confirm',
+		));
+
+		$this->addElement('button', 'cancel', array(
+            'required' => false,
+            'ignore'   => true,
+            'label'    => 'Cancel',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
+		));
+	}
+
+
+}
+
diff --git a/application/modules/dev/forms/GroupAdd.php b/application/modules/dev/forms/GroupAdd.php
index a235b56..8132f3a 100644
--- a/application/modules/dev/forms/GroupAdd.php
+++ b/application/modules/dev/forms/GroupAdd.php
@@ -56,7 +56,7 @@ class dev_Form_GroupAdd extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/dev/group/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/dev/forms/GroupEdit.php b/application/modules/dev/forms/GroupEdit.php
index f2f51a4..96784de 100644
--- a/application/modules/dev/forms/GroupEdit.php
+++ b/application/modules/dev/forms/GroupEdit.php
@@ -39,7 +39,7 @@ class dev_Form_GroupEdit extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/dev/group/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/dev/forms/GroupLink.php b/application/modules/dev/forms/GroupLink.php
index 81c2dbe..8a65e77 100644
--- a/application/modules/dev/forms/GroupLink.php
+++ b/application/modules/dev/forms/GroupLink.php
@@ -24,7 +24,7 @@ class dev_Form_GroupLink extends Zend_Form
 		}
 		$groupfield->setRegisterInArrayValidator(false);
 		$this->addElement($groupfield);
-		
+
 		$groupfield1 = $this->createElement('select','superordinatedGroupID');
 		$groupfield1 ->setLabel('superordinated Group:');
 
@@ -46,7 +46,7 @@ class dev_Form_GroupLink extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/dev/group/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/dev/forms/GroupRequest.php b/application/modules/dev/forms/GroupRequest.php
index efaafaf..2c12aaf 100644
--- a/application/modules/dev/forms/GroupRequest.php
+++ b/application/modules/dev/forms/GroupRequest.php
@@ -33,7 +33,7 @@ class dev_Form_GroupRequest extends Zend_Form
 		$this->addElement('submit', 'request', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Request Membership',
+            'label'    => 'Request',
 		));
 
 	}
diff --git a/application/modules/dev/forms/GroupSelect.php b/application/modules/dev/forms/GroupSelect.php
index 1eaf455..be28997 100644
--- a/application/modules/dev/forms/GroupSelect.php
+++ b/application/modules/dev/forms/GroupSelect.php
@@ -33,7 +33,7 @@ class dev_Form_GroupSelect extends Zend_Form
 		$this->addElement('submit', 'selectgroup', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Select Group',
+            'label'    => 'Select',
 		));
 	}
 
diff --git a/application/modules/dev/forms/LinkRight.php b/application/modules/dev/forms/LinkRight.php
index 8b9c3a9..0745791 100644
--- a/application/modules/dev/forms/LinkRight.php
+++ b/application/modules/dev/forms/LinkRight.php
@@ -32,14 +32,14 @@ class dev_Form_LinkRight extends Zend_Form
 		$this->addElement('submit', 'link', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Add Right',
+            'label'    => 'Add',
 		));
 
 		$this->addElement('button', 'cancel', array(
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/dev/role/show/roleID/' . $this->roleID . '"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/dev/forms/PersonEdit.php b/application/modules/dev/forms/PersonEdit.php
index aa39c34..c04f418 100644
--- a/application/modules/dev/forms/PersonEdit.php
+++ b/application/modules/dev/forms/PersonEdit.php
@@ -108,7 +108,7 @@ class dev_Form_PersonEdit extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/dev/person/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/dev/forms/RoleAdd.php b/application/modules/dev/forms/RoleAdd.php
index 7aae426..6d43904 100644
--- a/application/modules/dev/forms/RoleAdd.php
+++ b/application/modules/dev/forms/RoleAdd.php
@@ -45,7 +45,7 @@ class dev_Form_RoleAdd extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/dev/role/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/dev/forms/RoleEdit.php b/application/modules/dev/forms/RoleEdit.php
index c0617b7..1a9afc5 100644
--- a/application/modules/dev/forms/RoleEdit.php
+++ b/application/modules/dev/forms/RoleEdit.php
@@ -53,7 +53,7 @@ class dev_Form_RoleEdit extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/dev/role/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/dev/layouts/dev.phtml b/application/modules/dev/layouts/dev.phtml
index b9bd27a..944c617 100644
--- a/application/modules/dev/layouts/dev.phtml
+++ b/application/modules/dev/layouts/dev.phtml
@@ -43,7 +43,7 @@ echo $this->headScript()."\n";
 			<li class='navTreeItem'><a href='/dev/auth/register'>Register</a></li>
 			<?php
 			} else {?>
-			<li class='navTreeItem'><a href='/dev/auth/delete'>Account Löschen</a></li>
+			<li class='navTreeItem'><a href='/dev/auth/delete'>Delete Account</a></li>
 			<li class='navTreeItem'><a href='/dev/auth/logout'>Logout</a></li>
 			<?php
 			}
diff --git a/application/modules/dev/views/scripts/auth/delete.phtml b/application/modules/dev/views/scripts/auth/delete.phtml
new file mode 100644
index 0000000..62bf24e
--- /dev/null
+++ b/application/modules/dev/views/scripts/auth/delete.phtml
@@ -0,0 +1,6 @@
+<h1>Delete Account</h1>
+Do you really want to delete this account?
+<?php
+$this->deleteconfirmform->setAction($this->url());
+echo $this->deleteconfirmform;
+?>
\ No newline at end of file
diff --git a/application/modules/dev/views/scripts/auth/login.phtml b/application/modules/dev/views/scripts/auth/login.phtml
index 815cda4..e22bd0b 100644
--- a/application/modules/dev/views/scripts/auth/login.phtml
+++ b/application/modules/dev/views/scripts/auth/login.phtml
@@ -1,3 +1,4 @@
+<h1>Login</h1>
 <?php
 $this->loginForm->setAction($this->url());
 echo $this->loginForm;
diff --git a/application/modules/dev/views/scripts/auth/recoverpassword.phtml b/application/modules/dev/views/scripts/auth/recoverpassword.phtml
index 881e00e..089aec3 100644
--- a/application/modules/dev/views/scripts/auth/recoverpassword.phtml
+++ b/application/modules/dev/views/scripts/auth/recoverpassword.phtml
@@ -1,3 +1,4 @@
+<h1>Recover Password</h1>
 <?php
 $this->recoverPasswordForm->setAction($this->url());
 echo $this->recoverPasswordForm;
diff --git a/application/modules/dev/views/scripts/auth/register.phtml b/application/modules/dev/views/scripts/auth/register.phtml
index 5196738..74c7df5 100644
--- a/application/modules/dev/views/scripts/auth/register.phtml
+++ b/application/modules/dev/views/scripts/auth/register.phtml
@@ -1,3 +1,4 @@
+<h1>New Account</h1>
 <?php
 $this->registerForm->setAction($this->url());
 echo $this->registerForm;
diff --git a/application/modules/dev/views/scripts/group/add.phtml b/application/modules/dev/views/scripts/group/add.phtml
index 4f96cf0..588ce31 100644
--- a/application/modules/dev/views/scripts/group/add.phtml
+++ b/application/modules/dev/views/scripts/group/add.phtml
@@ -1,3 +1,4 @@
+<h1>Add Group</h1>
 <?php
 $this->addForm->setAction($this->url());
 echo $this->addForm;
diff --git a/application/modules/dev/views/scripts/group/edit.phtml b/application/modules/dev/views/scripts/group/edit.phtml
index a0f9b32..6b042e1 100644
--- a/application/modules/dev/views/scripts/group/edit.phtml
+++ b/application/modules/dev/views/scripts/group/edit.phtml
@@ -1,3 +1,4 @@
+<h1>Edit Group</h1>
 <?php
 if(isset($this->addForm)) {
 	$this->addForm->setAction('/dev/group/add');
diff --git a/application/modules/dev/views/scripts/group/link.phtml b/application/modules/dev/views/scripts/group/link.phtml
index 94ad343..5bb2a9d 100644
--- a/application/modules/dev/views/scripts/group/link.phtml
+++ b/application/modules/dev/views/scripts/group/link.phtml
@@ -1,3 +1,4 @@
+<h1>Link Groups</h1>
 <?php
 $this->linkForm->setAction($this->url());
 echo $this->linkForm;
diff --git a/application/modules/dev/views/scripts/person/edit.phtml b/application/modules/dev/views/scripts/person/edit.phtml
index 955ed35..3e666d4 100644
--- a/application/modules/dev/views/scripts/person/edit.phtml
+++ b/application/modules/dev/views/scripts/person/edit.phtml
@@ -1,3 +1,4 @@
+<h1>Edit Person</h1>
 <?php
 $this->editForm->setAction($this->url());
 echo $this->editForm;
diff --git a/application/modules/dev/views/scripts/person/request.phtml b/application/modules/dev/views/scripts/person/request.phtml
index 2da570f..91a625b 100644
--- a/application/modules/dev/views/scripts/person/request.phtml
+++ b/application/modules/dev/views/scripts/person/request.phtml
@@ -1,3 +1,4 @@
+<h1>Request Membership</h1>
 <?php
 if(count($this->requestForm->getGrouplist())>0) {
 	$this->requestForm->setAction($this->url());
diff --git a/application/modules/dev/views/scripts/role/add.phtml b/application/modules/dev/views/scripts/role/add.phtml
index 4f96cf0..23d4c55 100644
--- a/application/modules/dev/views/scripts/role/add.phtml
+++ b/application/modules/dev/views/scripts/role/add.phtml
@@ -1,3 +1,4 @@
+<h1>Add Role</h1>
 <?php
 $this->addForm->setAction($this->url());
 echo $this->addForm;
diff --git a/application/modules/dev/views/scripts/role/edit.phtml b/application/modules/dev/views/scripts/role/edit.phtml
index c976a90..59482f0 100644
--- a/application/modules/dev/views/scripts/role/edit.phtml
+++ b/application/modules/dev/views/scripts/role/edit.phtml
@@ -1,3 +1,4 @@
+<h1>Edit Role</h1>
 <?php
 if(isset($this->addForm)) {
 	$this->addForm->setAction('/etc/role/add');
diff --git a/application/modules/dev/views/scripts/role/groupselect.phtml b/application/modules/dev/views/scripts/role/groupselect.phtml
index fe81758..d1c08fd 100644
--- a/application/modules/dev/views/scripts/role/groupselect.phtml
+++ b/application/modules/dev/views/scripts/role/groupselect.phtml
@@ -1,3 +1,4 @@
+<h1>Select Group</h1>
 <?php
 $this->groupSelectForm->setAction($this->url());
 echo $this->groupSelectForm;
diff --git a/application/modules/dev/views/scripts/role/linkright.phtml b/application/modules/dev/views/scripts/role/linkright.phtml
index 94ad343..38c0d45 100644
--- a/application/modules/dev/views/scripts/role/linkright.phtml
+++ b/application/modules/dev/views/scripts/role/linkright.phtml
@@ -1,3 +1,4 @@
+<h1>Add Right</h1>
 <?php
 $this->linkForm->setAction($this->url());
 echo $this->linkForm;
diff --git a/application/modules/fbgui/forms/MembershipSelect.php b/application/modules/fbgui/forms/MembershipSelect.php
index 5b21fa7..6e03f7d 100644
--- a/application/modules/fbgui/forms/MembershipSelect.php
+++ b/application/modules/fbgui/forms/MembershipSelect.php
@@ -33,7 +33,7 @@ class fbgui_Form_MembershipSelect extends Zend_Form
 		$this->addElement('submit', 'selectmembership', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Select Membership',
+            'label'    => 'Select',
 		));
 	}
 
diff --git a/application/modules/fbgui/views/scripts/auth/login.phtml b/application/modules/fbgui/views/scripts/auth/login.phtml
index 17b1c16..9742c35 100644
--- a/application/modules/fbgui/views/scripts/auth/login.phtml
+++ b/application/modules/fbgui/views/scripts/auth/login.phtml
@@ -1,3 +1,4 @@
+<h1>Login</h1>
 <?php
 $this->loginForm->setAction($this->url());
 echo $this->loginForm;
diff --git a/application/modules/fbgui/views/scripts/auth/selectmembership.phtml b/application/modules/fbgui/views/scripts/auth/selectmembership.phtml
index 2bfe4d6..5f7e5bf 100644
--- a/application/modules/fbgui/views/scripts/auth/selectmembership.phtml
+++ b/application/modules/fbgui/views/scripts/auth/selectmembership.phtml
@@ -1,3 +1,4 @@
+<h1>Select Membership</h1>
 <?php
 $this->membershipSelectForm->setAction($this->url());
 echo $this->membershipSelectForm;
diff --git a/application/modules/user/controllers/AuthController.php b/application/modules/user/controllers/AuthController.php
index 13ad7f4..5d63b20 100644
--- a/application/modules/user/controllers/AuthController.php
+++ b/application/modules/user/controllers/AuthController.php
@@ -120,25 +120,31 @@ class User_AuthController extends Zend_Controller_Action
 
 	public function deleteAction()
 	{
-		$this->_helper-> viewRenderer-> setNoRender();
-		$result = $this->personmapper->findBy('email', Zend_Auth::getInstance()->getIdentity());
-		$person = $result[0];
-		$personID = $person["personID"];
-		if (isset($personID)){
-			$this->personmapper = new Application_Model_PersonMapper();
-			$person = $this->personmapper->find($personID);
-			try {
-				$this->personmapper->delete($person);
-			}catch(Zend_Exception $e)
-			{
-				echo "Caught exception: " . get_class($e) . "<br/>";
-				echo "Message: " . $e->getMessage() . "<br/>";
+		if($_POST['confirmdelete']) {
+			$auth = Zend_Auth::getInstance();
+			$result = $this->personmapper->findBy('email', $auth->getIdentity());
+			$person = $result[0];
+			$personID = $person["personID"];
+			if (isset($personID)){
+				$this->personmapper = new Application_Model_PersonMapper();
+				$person = $this->personmapper->find($personID);
+				try {
+					$this->personmapper->delete($person);
+				}catch(Zend_Exception $e)
+				{
+					echo "Caught exception: " . get_class($e) . "<br/>";
+					echo "Message: " . $e->getMessage() . "<br/>";
+					return;
+				}
+				$auth->clearIdentity();
+				Zend_Session::namespaceUnset('userIDs');
+				Zend_Session::forgetMe();
+				$this->_helper->redirector('login', 'auth');
 				return;
 			}
-			$auth = Zend_Auth::getInstance();
-			$auth->clearIdentity();
-			$this->_helper->redirector('login', 'auth');
-			return;
+		} else {
+			$deleteconfirmform = new user_Form_ConfirmDeleteAccount();
+			$this->view->deleteconfirmform = $deleteconfirmform;
 		}
 	}
 
diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php
index d2491ff..9e118b2 100644
--- a/application/modules/user/controllers/RoleController.php
+++ b/application/modules/user/controllers/RoleController.php
@@ -125,6 +125,7 @@ class User_RoleController extends Zend_Controller_Action
 			}
 			$this->view->role = $this->roleMapper->find($roleID);
 			$this->view->roleID = $roleID;
+			$this->view->userIDsNamespace = $this->userIDsNamespace;
 		} else {
 			$this->_helper->redirector('', 'role');
 			return;
diff --git a/application/modules/user/forms/ConfirmDeleteAccount.php b/application/modules/user/forms/ConfirmDeleteAccount.php
new file mode 100644
index 0000000..7bf5a32
--- /dev/null
+++ b/application/modules/user/forms/ConfirmDeleteAccount.php
@@ -0,0 +1,27 @@
+<?php
+
+class user_Form_ConfirmDeleteAccount extends Zend_Form
+{
+
+	public function init()
+	{
+		$this->setName("ConfirmDeleteAccount");
+		$this->setMethod('post');
+			
+		$this->addElement('submit', 'confirmdelete', array(
+            'required' => false,
+            'ignore'   => true,
+            'label'    => 'Confirm',
+		));
+
+		$this->addElement('button', 'cancel', array(
+            'required' => false,
+            'ignore'   => true,
+            'label'    => 'Cancel',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
+		));
+	}
+
+
+}
+
diff --git a/application/modules/user/forms/GroupAdd.php b/application/modules/user/forms/GroupAdd.php
index 47855de..ff2b97a 100644
--- a/application/modules/user/forms/GroupAdd.php
+++ b/application/modules/user/forms/GroupAdd.php
@@ -56,7 +56,7 @@ class user_Form_GroupAdd extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/dev/group/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/user/forms/GroupEdit.php b/application/modules/user/forms/GroupEdit.php
index 0da0f61..4f0d7fc 100644
--- a/application/modules/user/forms/GroupEdit.php
+++ b/application/modules/user/forms/GroupEdit.php
@@ -40,29 +40,11 @@ class user_Form_GroupEdit extends Zend_Form
             'label'    => 'Save',
 		));
 
-		if(strpos($_SERVER['HTTP_REFERER'], '/user/group/show')) {
-			if(strpos($_SERVER['HTTP_REFERER'], '/groupID/')) {
-				$this->addElement('button', 'cancel', array(
+		$this->addElement('button', 'cancel', array(
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/group/show/groupID/' . $this->groupID . '"',
-				));
-			} else {
-				$this->addElement('button', 'cancel', array(
-            'required' => false,
-            'ignore'   => true,
-            'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/group/show/"',
-				));
-			}
-		} else {
-			$this->addElement('button', 'cancel', array(
-            'required' => false,
-            'ignore'   => true,
-            'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/group/showall"',
-			));
-		}
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
+		));
 	}
 }
\ No newline at end of file
diff --git a/application/modules/user/forms/GroupLink.php b/application/modules/user/forms/GroupLink.php
index d2aafcc..9db7ce4 100644
--- a/application/modules/user/forms/GroupLink.php
+++ b/application/modules/user/forms/GroupLink.php
@@ -46,7 +46,7 @@ class user_Form_GroupLink extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/group/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/user/forms/GroupRequest.php b/application/modules/user/forms/GroupRequest.php
index 2cdada0..c9ba273 100644
--- a/application/modules/user/forms/GroupRequest.php
+++ b/application/modules/user/forms/GroupRequest.php
@@ -33,14 +33,14 @@ class user_Form_GroupRequest extends Zend_Form
 		$this->addElement('submit', 'request', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Request Membership',
+            'label'    => 'Request',
 		));
 
 		$this->addElement('button', 'cancel', array(
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/person/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 
 	}
diff --git a/application/modules/user/forms/LinkRight.php b/application/modules/user/forms/LinkRight.php
index 139aee4..a7b28b1 100644
--- a/application/modules/user/forms/LinkRight.php
+++ b/application/modules/user/forms/LinkRight.php
@@ -32,14 +32,14 @@ class user_Form_LinkRight extends Zend_Form
 		$this->addElement('submit', 'link', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Add Right',
+            'label'    => 'Add',
 		));
 
 		$this->addElement('button', 'cancel', array(
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/role/show/roleID/' . $this->roleID . '"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/user/forms/MembershipSelect.php b/application/modules/user/forms/MembershipSelect.php
index fe6870a..b4b54c4 100644
--- a/application/modules/user/forms/MembershipSelect.php
+++ b/application/modules/user/forms/MembershipSelect.php
@@ -33,7 +33,7 @@ class user_Form_MembershipSelect extends Zend_Form
 		$this->addElement('submit', 'selectmembership', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Select Membership',
+            'label'    => 'Select',
 		));
 	}
 
diff --git a/application/modules/user/forms/PersonEdit.php b/application/modules/user/forms/PersonEdit.php
index d6c68e7..a6bd123 100644
--- a/application/modules/user/forms/PersonEdit.php
+++ b/application/modules/user/forms/PersonEdit.php
@@ -108,7 +108,7 @@ class user_Form_PersonEdit extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/person/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/user/forms/RecoverPassword.php b/application/modules/user/forms/RecoverPassword.php
index 90feb87..22a775f 100644
--- a/application/modules/user/forms/RecoverPassword.php
+++ b/application/modules/user/forms/RecoverPassword.php
@@ -19,7 +19,7 @@ class user_Form_RecoverPassword extends Zend_Form
 		$this->addElement('submit', 'recoverPassword', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Recover Password',
+            'label'    => 'Recover',
 		));
 	}
 
diff --git a/application/modules/user/forms/RoleAdd.php b/application/modules/user/forms/RoleAdd.php
index a7e43a7..e8e99a5 100644
--- a/application/modules/user/forms/RoleAdd.php
+++ b/application/modules/user/forms/RoleAdd.php
@@ -45,7 +45,7 @@ class user_Form_RoleAdd extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/role/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/user/forms/RoleEdit.php b/application/modules/user/forms/RoleEdit.php
index 848dba3..0bdc977 100644
--- a/application/modules/user/forms/RoleEdit.php
+++ b/application/modules/user/forms/RoleEdit.php
@@ -54,21 +54,12 @@ class user_Form_RoleEdit extends Zend_Form
             'label'    => 'Save',
 		));
 
-		if(strpos($_SERVER['HTTP_REFERER'], '/user/role/show/roleID')) {
-			$this->addElement('button', 'cancel', array(
+		$this->addElement('button', 'cancel', array(
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/role/show/roleID/' . $this->roleID . '"',
-			));
-		} else {
-			$this->addElement('button', 'cancel', array(
-            'required' => false,
-            'ignore'   => true,
-            'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/role/"',
-			));
-		}
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
+		));
 	}
 
 
diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml
index e0c9961..c22811f 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' 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/delete'>Delete Account</a></li>
 			<li class='navTreeItem'><a href='/user/auth/logout'>Logout</a></li>
 			<?php
 			}
diff --git a/application/modules/user/views/scripts/auth/delete.phtml b/application/modules/user/views/scripts/auth/delete.phtml
new file mode 100644
index 0000000..62bf24e
--- /dev/null
+++ b/application/modules/user/views/scripts/auth/delete.phtml
@@ -0,0 +1,6 @@
+<h1>Delete Account</h1>
+Do you really want to delete this account?
+<?php
+$this->deleteconfirmform->setAction($this->url());
+echo $this->deleteconfirmform;
+?>
\ No newline at end of file
diff --git a/application/modules/user/views/scripts/auth/login.phtml b/application/modules/user/views/scripts/auth/login.phtml
index d68d2af..899c6e7 100644
--- a/application/modules/user/views/scripts/auth/login.phtml
+++ b/application/modules/user/views/scripts/auth/login.phtml
@@ -1,3 +1,4 @@
+<h1>Login</h1>
 <?php
 $this->loginForm->setAction($this->url());
 echo $this->loginForm;
diff --git a/application/modules/user/views/scripts/auth/recoverpassword.phtml b/application/modules/user/views/scripts/auth/recoverpassword.phtml
index 881e00e..089aec3 100644
--- a/application/modules/user/views/scripts/auth/recoverpassword.phtml
+++ b/application/modules/user/views/scripts/auth/recoverpassword.phtml
@@ -1,3 +1,4 @@
+<h1>Recover Password</h1>
 <?php
 $this->recoverPasswordForm->setAction($this->url());
 echo $this->recoverPasswordForm;
diff --git a/application/modules/user/views/scripts/auth/register.phtml b/application/modules/user/views/scripts/auth/register.phtml
index 2033b04..6217e06 100644
--- a/application/modules/user/views/scripts/auth/register.phtml
+++ b/application/modules/user/views/scripts/auth/register.phtml
@@ -1,3 +1,4 @@
+<h1>New Account</h1>
 <?php
 $this->registerForm->setAction($this->url());
 echo $this->registerForm;
diff --git a/application/modules/user/views/scripts/group/add.phtml b/application/modules/user/views/scripts/group/add.phtml
index 4f96cf0..588ce31 100644
--- a/application/modules/user/views/scripts/group/add.phtml
+++ b/application/modules/user/views/scripts/group/add.phtml
@@ -1,3 +1,4 @@
+<h1>Add Group</h1>
 <?php
 $this->addForm->setAction($this->url());
 echo $this->addForm;
diff --git a/application/modules/user/views/scripts/group/edit.phtml b/application/modules/user/views/scripts/group/edit.phtml
index d513dea..add3a77 100644
--- a/application/modules/user/views/scripts/group/edit.phtml
+++ b/application/modules/user/views/scripts/group/edit.phtml
@@ -1,3 +1,4 @@
+<h1>Edit Group</h1>
 <?php
 if(isset($this->addForm)) {
 	$this->addForm->setAction('/user/group/add');
diff --git a/application/modules/user/views/scripts/group/link.phtml b/application/modules/user/views/scripts/group/link.phtml
index 94ad343..5bb2a9d 100644
--- a/application/modules/user/views/scripts/group/link.phtml
+++ b/application/modules/user/views/scripts/group/link.phtml
@@ -1,3 +1,4 @@
+<h1>Link Groups</h1>
 <?php
 $this->linkForm->setAction($this->url());
 echo $this->linkForm;
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index 18ad1d3..d343204 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -4,12 +4,6 @@ if($this->groupID) {
 		?>
 <h1>Group</h1>
 		<?php
-	} else {
-		?>
-<h1>Group Details</h1>
-		<?php
-	}
-	if(isset($this->userIDsNamespace['groupID'])) {
 		echo $this->formButton('deletegroup', 'Delete', array(
 							'onclick' => 'self.location="/user/group/delete/"',
 							'class' => 'rightbutton'));
@@ -17,6 +11,9 @@ if($this->groupID) {
 							'onclick' => 'self.location="/user/group/edit/"',
 							'class' => 'rightbutton'));
 	} else {
+		?>
+<h1>Group Details</h1>
+		<?php
 		echo $this->formButton('deletegroup', 'Delete', array(
 							'onclick' => 'self.location="/user/group/delete/groupID/' . $this->group->getID() .'"',
 							'class' => 'rightbutton'));
diff --git a/application/modules/user/views/scripts/person/edit.phtml b/application/modules/user/views/scripts/person/edit.phtml
index 955ed35..3e666d4 100644
--- a/application/modules/user/views/scripts/person/edit.phtml
+++ b/application/modules/user/views/scripts/person/edit.phtml
@@ -1,3 +1,4 @@
+<h1>Edit Person</h1>
 <?php
 $this->editForm->setAction($this->url());
 echo $this->editForm;
diff --git a/application/modules/user/views/scripts/person/request.phtml b/application/modules/user/views/scripts/person/request.phtml
index 2da570f..91a625b 100644
--- a/application/modules/user/views/scripts/person/request.phtml
+++ b/application/modules/user/views/scripts/person/request.phtml
@@ -1,3 +1,4 @@
+<h1>Request Membership</h1>
 <?php
 if(count($this->requestForm->getGrouplist())>0) {
 	$this->requestForm->setAction($this->url());
diff --git a/application/modules/user/views/scripts/person/selectmembership.phtml b/application/modules/user/views/scripts/person/selectmembership.phtml
index 2bfe4d6..5f7e5bf 100644
--- a/application/modules/user/views/scripts/person/selectmembership.phtml
+++ b/application/modules/user/views/scripts/person/selectmembership.phtml
@@ -1,3 +1,4 @@
+<h1>Select Membership</h1>
 <?php
 $this->membershipSelectForm->setAction($this->url());
 echo $this->membershipSelectForm;
diff --git a/application/modules/user/views/scripts/role/add.phtml b/application/modules/user/views/scripts/role/add.phtml
index 4f96cf0..23d4c55 100644
--- a/application/modules/user/views/scripts/role/add.phtml
+++ b/application/modules/user/views/scripts/role/add.phtml
@@ -1,3 +1,4 @@
+<h1>Add Role</h1>
 <?php
 $this->addForm->setAction($this->url());
 echo $this->addForm;
diff --git a/application/modules/user/views/scripts/role/edit.phtml b/application/modules/user/views/scripts/role/edit.phtml
index c976a90..59482f0 100644
--- a/application/modules/user/views/scripts/role/edit.phtml
+++ b/application/modules/user/views/scripts/role/edit.phtml
@@ -1,3 +1,4 @@
+<h1>Edit Role</h1>
 <?php
 if(isset($this->addForm)) {
 	$this->addForm->setAction('/etc/role/add');
diff --git a/application/modules/user/views/scripts/role/linkright.phtml b/application/modules/user/views/scripts/role/linkright.phtml
index 94ad343..38c0d45 100644
--- a/application/modules/user/views/scripts/role/linkright.phtml
+++ b/application/modules/user/views/scripts/role/linkright.phtml
@@ -1,3 +1,4 @@
+<h1>Add Right</h1>
 <?php
 $this->linkForm->setAction($this->url());
 echo $this->linkForm;
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index 8213e73..b99c1f8 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -1,6 +1,14 @@
-<h1>Role Details</h1>
 <?php
 if($this->roleID) {
+	if(isset($this->userIDsNamespace['roleID'])) {
+		?>
+<h1>Role</h1>
+		<?php
+	} else {
+		?>
+<h1>Role Details</h1>
+		<?php
+	}
 	?>
 	<?php echo $this->formButton('deleterole', 'Delete', array(
 							'onclick' => 'self.location="/user/role/delete/roleID/' . $this->role->getID() .'"',
-- 
cgit v1.2.3-55-g7522


From 0a35f45bdecf6a7febe1b6ff455f13f1bd2e9a67 Mon Sep 17 00:00:00 2001
From: Björn Geiger
Date: Mon, 28 Mar 2011 17:09:56 +0200
Subject: navigationsmenü in user module geändert

---
 application/modules/user/layouts/user.phtml | 151 ++++++++++++++--------------
 1 file changed, 78 insertions(+), 73 deletions(-)

(limited to 'application/modules/user/layouts')

diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml
index c22811f..3fa851d 100644
--- a/application/modules/user/layouts/user.phtml
+++ b/application/modules/user/layouts/user.phtml
@@ -1,8 +1,8 @@
 <?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()));
@@ -13,85 +13,90 @@ 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.min.js'></script>
 <script src='/media/js/jquery-ui.min.js'></script>
-<script src='/media/js/script.js'></script> 
+<script src='/media/js/script.js'></script>
 </head>
 <body>
 <div id='sidepannel'>
-	<div id="logo"><div id="logo-bar-gray"></div></div> 
-	<div id="sidepannel-top" class='portletNavigationTree'> 
-		<ul class='navTreeLevel0'>
-			<li class='navTreeItem'><a href='/'><<</a></li>
-			<li class='navTreeItem'><a href='/user/'>user</a></li>
-			<li>
-			<ul class='navTreeLevel1'>
-			<li class='navTreeItem'><a href='/user/person'>Person</a></li>
-			<li class='navTreeItem'><a href='/user/group'>Group</a></li>
-			<li class='navTreeItem'><a href='/user/role'>Role</a></li>
-			<li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li>
-			<li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li>
-			<li class='navTreeItem'><a href='/user/config'>Config</a></li>
-			<li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li>
-			<li class='navTreeItem'><a href='/user/client'>Client</a></li>
-			<li class='navTreeItem'><a href='/user/filter'>Filter</a></li>
-			<li class='navTreeItem'><a href='/user/pool'>Pool</a></li>
-			<li class='navTreeItem'><a href='/user/person/changemembership'>Select Membership</a></li>
-			<?php if (!Zend_Auth::getInstance()->hasIdentity()) {?>
-			<li class='navTreeItem'><a href='/user/auth/login'>Login</a></li>
-			<li class='navTreeItem'><a href='/user/auth/register'>Register</a></li>
-			<?php
-			} else {?>
-			<li class='navTreeItem'><a href='/user/auth/delete'>Delete Account</a></li>
-			<li class='navTreeItem'><a href='/user/auth/logout'>Logout</a></li>
-			<?php
-			}
+<div id="logo">
+<div id="logo-bar-gray"></div>
+</div>
+<div id="sidepannel-top" class='portletNavigationTree'>
+<ul class='navTreeLevel0'>
+	<li class='navTreeItem'><a href='/'><<</a></li>
+	<li class='navTreeItem'><a href='/user/'>user</a></li>
+	<li>
+	<ul class='navTreeLevel1'>
+		<li class='navTreeItem'><a href='/user/person'>Person</a></li>
+		<li class='navTreeItem'><a href='/user/group'>Group</a></li>
+		<li class='navTreeItem'><a href='/user/role'>Role</a></li>
+		<li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li>
+		<li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li>
+		<li class='navTreeItem'><a href='/user/config'>Config</a></li>
+		<li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li>
+		<li class='navTreeItem'><a href='/user/client'>Client</a></li>
+		<li class='navTreeItem'><a href='/user/filter'>Filter</a></li>
+		<li class='navTreeItem'><a href='/user/pool'>Pool</a></li>
+		<?php
+		if(count(Zend_Session::namespaceGet('userIDs')) > 0) {
 			?>
-			</ul></li>			
-		</ul>
-</ul> 
-	</div>  
+		<li class='navTreeItem'><a href='/user/person/changemembership'>Change
+		Membership</a></li>
+		<?php
+		} else {
+			?>
+		<li class='navTreeItem'><a href='/user/person/selectmembership'>Select
+		Membership</a></li>
+		<?php
+		}
+		?>
+		<?php if (!Zend_Auth::getInstance()->hasIdentity()) {?>
+		<li class='navTreeItem'><a href='/user/auth/login'>Login</a></li>
+		<li class='navTreeItem'><a href='/user/auth/register'>Register</a></li>
+		<?php
+		} else {?>
+		<li class='navTreeItem'><a href='/user/auth/delete'>Delete Account</a></li>
+		<li class='navTreeItem'><a href='/user/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&auml;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 id="head-bg">
+<div id="head">
+<h1>pbs<sup>2</sup></h1>
+<h2>Rechenzentrum Universit&auml;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 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> 
+</body>
+</html>
-- 
cgit v1.2.3-55-g7522