verschiedene Korrekturen

2 files changed, 225 insertions, 99 deletions

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