Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

7 files changed, 261 insertions, 249 deletions

diff --git a/application/modules/user/views/scripts/auth/delete.phtml b/application/modules/user/views/scripts/auth/delete.phtml
index 62bf24e..83afc80 100644
--- a/application/modules/user/views/scripts/auth/delete.phtml
+++ b/application/modules/user/views/scripts/auth/delete.phtml
@@ -1,5 +1,5 @@
 <h1>Delete Account</h1>
-Do you really want to delete this account?
+Do you really want to delete account?
 <?php
 $this->deleteconfirmform->setAction($this->url());
 echo $this->deleteconfirmform;
diff --git a/application/modules/user/views/scripts/group/showall.phtml b/application/modules/user/views/scripts/group/index.phtml
index 2e376b3..2e376b3 100644
--- a/application/modules/user/views/scripts/group/showall.phtml
+++ b/application/modules/user/views/scripts/group/index.phtml
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index 19dc396..2bb200c 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -83,13 +83,26 @@ foreach($this->groupRequestList as $grouprequest) {
 <br />
 <h2>Members:</h2>
 <div class='listelement'><?php if(count($this->membersList)==0)
-echo "This hroup has no members." ?> <?php foreach ($this->membersList as $member): ?>
+echo "This hroup has no members." ?> <?php foreach ($this->membersList as $k => $member): ?>
 <?php
 $membershipID = $member['membershipID'];
 $person = $member['person'];
 $role = $member['role'];
+$class='';
+if($person->getID() == $this->userIDsNamespace['personID'])
+$class= 'highlight checked';
+?>
+<div class='element<?php echo " $class";?>'>
+<?php
+if($person->getID() != $this->userIDsNamespace['personID']) {
+	?>
+	<div class='number'>
+		<div class='smallnumber'>Person</div>
+		<?php echo $k+1; ?>
+	</div>
+<?php
+}
 ?>
-<div class='element'>
 <div class='content'>
 <div class='actions'><a
 	href="<?php echo $this->url(
diff --git a/application/modules/user/views/scripts/person/index.phtml b/application/modules/user/views/scripts/person/index.phtml
index 8f91cfd..1304299 100644
--- a/application/modules/user/views/scripts/person/index.phtml
+++ b/application/modules/user/views/scripts/person/index.phtml
@@ -1,108 +1,126 @@
-<h1>Own Details</h1>
-<?php if($this->editRight === true) echo $this->formButton('editperson', 'Edit', array(
-							'onclick' => 'self.location="/user/person/edit/"',
-							'class' => 'rightbutton'))?>
-<div class='detailelement'>
-<div class='element'>
-<div class='content'>
-<div class="title">Title:&nbsp;<span class="noBold"><?php echo $this->person->getTitle(); ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
-<div class='element'>
-<div class='content'>
-<div class="title">Name:&nbsp;<span class="noBold"><?php echo $this->person->getName(); ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
-<div class='element'>
-<div class='content'>
-<div class="title">Firstname:&nbsp;<span class="noBold"><?php echo $this->person->getFirstname(); ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
-<div class='element'>
-<div class='content'>
-<div class="title">Street:&nbsp;<span class="noBold"><?php echo $this->person->getStreet(); ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
-<div class='element'>
-<div class='content'>
-<div class="title">Housenumber:&nbsp;<span class="noBold"><?php echo $this->person->getHousenumber(); ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
-<div class='element'>
-<div class='content'>
-<div class="title">City:&nbsp;<span class="noBold"><?php echo $this->person->getCity(); ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
-<div class='element'>
-<div class='content'>
-<div class="title">Postalcode:&nbsp;<span class="noBold"><?php echo $this->person->getPostalcode(); ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
-<div class='element'>
-<div class='content'>
-<div class="title">Email:&nbsp;<span class="noBold"><?php echo $this->person->getEmail(); ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
-<div class='element'>
-<div class='content'>
-<div class="title">Last Login Date:&nbsp;<span class="noBold"><?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
-<div class='element'>
-<div class='content'>
-<div class="title">Register Date:&nbsp;<span class="noBold"><?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?></span></div>
-</div>
-<div class='clear'></div>
-</div>
-</div>
-<br />
-<h2>Member in the following Groups:</h2>
-<?php if($this->groupRequestRight === true) echo $this->formButton('addtogroup', 'Add to additional
-Groups', array(
-							'onclick' => 'self.location="/user/person/request/"',
-							'class' => 'addbutton')); ?>
-<div class='listelement'><?php if(count($this->groups)==0)
-echo "You are in no group." ?> <?php foreach ($this->groups as $group): ?>
+<h1>Persons Overview</h1>
+<?php echo $this->searchform; ?>
+<div class='searchvars'>
+<div class='head'>Available searchfilter:</div>
+<div class='code'>title</div>
+<div class='code'>name</div>
+<div class='code'>firstname</div>
+<div class='code'>email</div>
+</div>
+
+<div class='listelement'><?php if(count($this->personList)==0)
+echo "There are no Persons to display." ?> <?php foreach ($this->personList as $k => $person): ?>
 <?php
 $class='';
-if($group['membershipID'] == $this->userIDsNamespace['membershipID'])
+if($person->getID() == $this->userIDsNamespace['personID'])
 $class= 'highlight checked';
 ?>
 <div class='element<?php echo " $class";?>'>
+<?php if($person->getID() != $this->userIDsNamespace['personID']) {
+	?>
+	<div class='number'>
+		<div class='smallnumber'>Person</div>
+		<?php echo $k+1; ?>
+	</div>
+<?php
+}
+?>
 <div class='content'>
-<div class='actions'><?php if($this->leaveRight === true): ?> <a
+<div class='actions'><?php
+if($person->getID() == $this->userIDsNamespace['personID']) {
+	if($this->showRight === true) {
+		?> <a
+	href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'person',
+							'action'     => 'owndetails'
+						),
+						'default',
+						true);?>"> <img src='/media/img/show.png' alt='Show Person' /></a>
+						<?php
+	}
+	if($this->editRight === true) { ?> <a
 	href="<?php echo $this->url(
-							array(
-								'module'	=> 'user',
-								'controller' => 'person',
-								'action'     => 'leave',
-								'membershipID'   =>  $group['membershipID']
-							),
-							'default',
-							true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
-							<?php endif; ?></div>
-<div class='title'><?php echo $group['title']; ?></div>
-							<?php if($group['description']) {
-								?>
-<div class='subtitle'><?php echo $group['description']; ?></div>
-								<?php
-							} else {
-								?>
-<div class='subtitle'>&nbsp;</div>
-								<?php
-							}
-							?></div>
+						array(
+							'module'	=> 'user',
+							'controller' => 'person',
+							'action'     => 'edit'
+						),
+						'default',
+						true);?>"> <img src='/media/img/edit.png' alt='Edit Person' /></a>
+						<?php
+	}
+	if($this->deleteRight === true) { ?> <a
+	href="<?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'auth',
+							'action'     => 'delete'
+						),
+						'default',
+						true);?>"> <img src='/media/img/delete.png' alt='Delete Account' /></a>
+						<?php
+	}
+} else {
+	if($this->showOtherRight === true) {
+		?> <a
+	href=" <?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'person',
+							'action'     => 'show',
+							'personID'   =>  $person->getID()
+						),
+						'default',
+						true); ?>"> <img src='/media/img/show.png' alt='Show Person' /></a>
+						<?php
+	}
+	if($this->editOtherRight === true) {
+		?> <a
+	href=" <?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'person',
+							'action'     => 'edit',
+							'personID'   =>  $person->getID()
+						),
+						'default',
+						true); ?>"> <img src='/media/img/edit.png' alt='Edit Person' /></a>
+						<?php
+	}
+	if($this->deleteOtherRight === true) {
+		?> <a
+	href=" <?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'auth',
+							'action'     => 'delete',
+							'personID'   =>  $person->getID()
+						),
+						'default',
+						true); ?>"> <img src='/media/img/delete.png' alt='Delete Account' /></a>
+						<?php
+	}
+}
+?></div>
+<div class='title'><?php echo $person->getTitle(); ?>&nbsp;<?php echo $person->getFirstname(); ?>&nbsp;<?php echo $person->getName(); ?></div>
+<div class='subtitle'><?php echo $person->getEmail(); ?></div>
+</div>
 <div class='clear'></div>
 </div>
-							<?php endforeach ?></div>
-							<?php echo $this->pagination;
-							?>
\ No newline at end of file
+<?php endforeach ?></div>
+
+<?php echo $this->pagination; ?>
+
+<script>
+$(document).ready(function(){
+	if($('.element').find('.dispnone').length >= 1){
+		$(this).find('.title').css('cursor','pointer');
+		
+		$('.title').click(function(){
+			$(this).siblings('.dispnone').toggle();
+		});
+	}
+});
+</script>
diff --git a/application/modules/user/views/scripts/person/owndetails.phtml b/application/modules/user/views/scripts/person/owndetails.phtml
new file mode 100644
index 0000000..8f91cfd
--- /dev/null
+++ b/application/modules/user/views/scripts/person/owndetails.phtml
@@ -0,0 +1,108 @@
+<h1>Own Details</h1>
+<?php if($this->editRight === true) echo $this->formButton('editperson', 'Edit', array(
+							'onclick' => 'self.location="/user/person/edit/"',
+							'class' => 'rightbutton'))?>
+<div class='detailelement'>
+<div class='element'>
+<div class='content'>
+<div class="title">Title:&nbsp;<span class="noBold"><?php echo $this->person->getTitle(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Name:&nbsp;<span class="noBold"><?php echo $this->person->getName(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Firstname:&nbsp;<span class="noBold"><?php echo $this->person->getFirstname(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Street:&nbsp;<span class="noBold"><?php echo $this->person->getStreet(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Housenumber:&nbsp;<span class="noBold"><?php echo $this->person->getHousenumber(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">City:&nbsp;<span class="noBold"><?php echo $this->person->getCity(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Postalcode:&nbsp;<span class="noBold"><?php echo $this->person->getPostalcode(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Email:&nbsp;<span class="noBold"><?php echo $this->person->getEmail(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Last Login Date:&nbsp;<span class="noBold"><?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class="title">Register Date:&nbsp;<span class="noBold"><?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+</div>
+<br />
+<h2>Member in the following Groups:</h2>
+<?php if($this->groupRequestRight === true) echo $this->formButton('addtogroup', 'Add to additional
+Groups', array(
+							'onclick' => 'self.location="/user/person/request/"',
+							'class' => 'addbutton')); ?>
+<div class='listelement'><?php if(count($this->groups)==0)
+echo "You are in no group." ?> <?php foreach ($this->groups as $group): ?>
+<?php
+$class='';
+if($group['membershipID'] == $this->userIDsNamespace['membershipID'])
+$class= 'highlight checked';
+?>
+<div class='element<?php echo " $class";?>'>
+<div class='content'>
+<div class='actions'><?php if($this->leaveRight === true): ?> <a
+	href="<?php echo $this->url(
+							array(
+								'module'	=> 'user',
+								'controller' => 'person',
+								'action'     => 'leave',
+								'membershipID'   =>  $group['membershipID']
+							),
+							'default',
+							true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
+							<?php endif; ?></div>
+<div class='title'><?php echo $group['title']; ?></div>
+							<?php if($group['description']) {
+								?>
+<div class='subtitle'><?php echo $group['description']; ?></div>
+								<?php
+							} else {
+								?>
+<div class='subtitle'>&nbsp;</div>
+								<?php
+							}
+							?></div>
+<div class='clear'></div>
+</div>
+							<?php endforeach ?></div>
+							<?php echo $this->pagination;
+							?>
\ No newline at end of file
diff --git a/application/modules/user/views/scripts/person/showall.phtml b/application/modules/user/views/scripts/person/showall.phtml
deleted file mode 100644
index 1909782..0000000
--- a/application/modules/user/views/scripts/person/showall.phtml
+++ /dev/null
@@ -1,126 +0,0 @@
-<h1>Persons Overview</h1>
-<?php echo $this->searchform; ?>
-<div class='searchvars'>
-<div class='head'>Available searchfilter:</div>
-<div class='code'>title</div>
-<div class='code'>name</div>
-<div class='code'>firstname</div>
-<div class='code'>email</div>
-</div>
-
-<div class='listelement'><?php if(count($this->personList)==0)
-echo "There are no Persons to display." ?> <?php foreach ($this->personList as $k => $person): ?>
-<?php
-$class='';
-if($person->getID() == $this->userIDsNamespace['personID'])
-$class= 'highlight checked';
-?>
-<div class='element<?php echo " $class";?>'>
-<?php if($person->getID() != $this->userIDsNamespace['personID']) {
-	?>
-	<div class='number'>
-		<div class='smallnumber'>Person</div>
-		<?php echo $k+1; ?>
-	</div>
-<?php
-}
-?>
-<div class='content'>
-<div class='actions'><?php
-if($person->getID() == $this->userIDsNamespace['personID']) {
-	if($this->showRight === true) {
-		?> <a
-	href="<?php echo $this->url(
-						array(
-							'module'	=> 'user',
-							'controller' => 'person',
-							'action'     => 'index'
-						),
-						'default',
-						true);?>"> <img src='/media/img/show.png' alt='Show Person' /></a>
-						<?php
-	}
-	if($this->editRight === true) { ?> <a
-	href="<?php echo $this->url(
-						array(
-							'module'	=> 'user',
-							'controller' => 'person',
-							'action'     => 'edit'
-						),
-						'default',
-						true);?>"> <img src='/media/img/edit.png' alt='Edit Person' /></a>
-						<?php
-	}
-	if($this->deleteRight === true) { ?> <a
-	href="<?php echo $this->url(
-						array(
-							'module'	=> 'user',
-							'controller' => 'auth',
-							'action'     => 'delete'
-						),
-						'default',
-						true);?>"> <img src='/media/img/delete.png' alt='Delete Account' /></a>
-						<?php
-	}
-} else {
-	if($this->showOtherRight === true) {
-		?> <a
-	href=" <?php echo $this->url(
-						array(
-							'module'	=> 'user',
-							'controller' => 'person',
-							'action'     => 'show',
-							'personID'   =>  $person->getID()
-						),
-						'default',
-						true); ?>"> <img src='/media/img/show.png' alt='Show Person' /></a>
-						<?php
-	}
-	if($this->editOtherRight === true) {
-		?> <a
-	href=" <?php echo $this->url(
-						array(
-							'module'	=> 'user',
-							'controller' => 'person',
-							'action'     => 'edit',
-							'personID'   =>  $person->getID()
-						),
-						'default',
-						true); ?>"> <img src='/media/img/edit.png' alt='Edit Person' /></a>
-						<?php
-	}
-	if($this->deleteOtherRight === true) {
-		?> <a
-	href=" <?php echo $this->url(
-						array(
-							'module'	=> 'user',
-							'controller' => 'auth',
-							'action'     => 'delete',
-							'personID'   =>  $person->getID()
-						),
-						'default',
-						true); ?>"> <img src='/media/img/delete.png' alt='Delete Account' /></a>
-						<?php
-	}
-}
-?></div>
-<div class='title'><?php echo $person->getTitle(); ?>&nbsp;<?php echo $person->getFirstname(); ?>&nbsp;<?php echo $person->getName(); ?></div>
-<div class='subtitle'><?php echo $person->getEmail(); ?></div>
-</div>
-<div class='clear'></div>
-</div>
-<?php endforeach ?></div>
-
-<?php echo $this->pagination; ?>
-
-<script>
-$(document).ready(function(){
-	if($('.element').find('.dispnone').length >= 1){
-		$(this).find('.title').css('cursor','pointer');
-		
-		$('.title').click(function(){
-			$(this).siblings('.dispnone').toggle();
-		});
-	}
-});
-</script>
diff --git a/application/modules/user/views/scripts/role/index.phtml b/application/modules/user/views/scripts/role/index.phtml
index 0488211..80a4299 100644
--- a/application/modules/user/views/scripts/role/index.phtml
+++ b/application/modules/user/views/scripts/role/index.phtml
@@ -22,19 +22,18 @@ $class='';
 if($role['roleID'] == $this->userIDsNamespace['roleID'])
 $class= 'highlight checked';
 ?>
-<div class='element<?php echo " $class";?>'><?php if($role['roleID'] != $this->userIDsNamespace['roleID']) {
-	?>
-<div class='number'>	
-	<div class='smallnumber'>Role</div>
-	<?php echo $k+1; ?>
-</div>
+	<div class='element<?php echo " $class";?>'>
+	<?php if($role['roleID'] != $this->userIDsNamespace['roleID']) {	?>
+		<div class='number'>	
+			<div class='smallnumber'>Role</div>
+			<?php echo $k+1; ?>
+		</div>
 	<?php
-}
-?>
-<div class='content'>
-<div class='actions'><?php if($this->detailsRight) {
-	?> <a
-	href="<?php echo $this->url(
+	}
+	?>
+	<div class='content'>
+	<div class='actions'><?php if($this->detailsRight) {?> 
+		<a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'role',
@@ -43,10 +42,9 @@ $class= 'highlight checked';
 					),
 					'default',
 					true) ?>"> <img src='/media/img/show.png' alt='Show Group' /></a> <?php
-}
-if($this->editRight) {
-	?> <a
-	href="<?php echo $this->url(
+	}
+	if($this->editRight) { ?>
+		<a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'role',
@@ -55,10 +53,9 @@ if($this->editRight) {
 					),
 					'default',
 					true) ?>"> <img src='/media/img/edit.png' alt='Edit Group' /></a> <?php
-}
-if($this->deleteRight) {
-	?> <a
-	href="<?php echo $this->url(
+	}
+if($this->deleteRight) { ?>
+	<a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'role',
@@ -67,6 +64,8 @@ if($this->deleteRight) {
 					),
 					'default',
 					true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
+
+<?php } ?>
 </div>
 <div class='title'><?php echo $role['title'] ?></div>
 					<?php if($role['description']) {
@@ -79,7 +78,7 @@ if($this->deleteRight) {
 						<?php
 					}
 
-}
+
 ?></div>
 <div class='clear'></div>
 </div>