verschiedene Layouts korrigiert

3 files changed, 212 insertions, 105 deletions

diff --git a/application/modules/user/views/scripts/person/index.phtml b/application/modules/user/views/scripts/person/index.phtml
index c285ece..8f91cfd 100644
--- a/application/modules/user/views/scripts/person/index.phtml
+++ b/application/modules/user/views/scripts/person/index.phtml
@@ -1,25 +1,75 @@
-<h1>Person</h1>
+<h1>Own Details</h1>
 <?php if($this->editRight === true) echo $this->formButton('editperson', 'Edit', array(
 							'onclick' => 'self.location="/user/person/edit/"',
 							'class' => 'rightbutton'))?>
-<br />
-<br />
-<div class="personColorDiv"><span class="bold">Title:</span>&nbsp;<?php echo $this->person->getTitle(); ?></div>
-<div class="personDiv"><span class="bold">Name:</span>&nbsp;<?php echo $this->person->getName(); ?></div>
-<div class="personColorDiv"><span class="bold">Firstname:</span>&nbsp;<?php echo $this->person->getFirstname(); ?></div>
-<div class="personDiv"><span class="bold">Street:</span>&nbsp;<?php echo $this->person->getStreet(); ?></div>
-<div class="personColorDiv"><span class="bold">Housenumber:</span>&nbsp;<?php echo $this->person->getHousenumber(); ?></div>
-<div class="personDiv"><span class="bold">City:</span>&nbsp;<?php echo $this->person->getCity(); ?></div>
-<div class="personColorDiv"><span class="bold">Postalcode:</span>&nbsp;<?php echo $this->person->getPostalcode(); ?></div>
-<div class="personDiv"><span class="bold">Email:</span>&nbsp;<?php echo $this->person->getEmail(); ?></div>
-<div class="personColorDiv"><span class="bold">Last Login Date:</span>&nbsp;<?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?></div>
-<div class="personDiv"><span class="bold">Register Date:</span>&nbsp;<?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?></div>
-<?php
-if(isset($this->groups)) {
-	?>
+<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
@@ -41,18 +91,18 @@ $class= 'highlight checked';
 							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>
-</div>
+								<?php
+							} else {
+								?>
+<div class='subtitle'>&nbsp;</div>
+								<?php
+							}
+							?></div>
 <div class='clear'></div>
 </div>
 							<?php endforeach ?></div>
 							<?php echo $this->pagination;
-							
-}
-if($this->groupRequestRight === true) echo $this->formButton('addtogroup', 'Add to additional
-Groups', array(
-							'onclick' => 'self.location="/user/person/request/"',
-							'class' => 'addbutton'));
-?>
-<br />
-<br />
+							?>
\ No newline at end of file
diff --git a/application/modules/user/views/scripts/person/show.phtml b/application/modules/user/views/scripts/person/show.phtml
index 8ebb371..5fb4bde 100644
--- a/application/modules/user/views/scripts/person/show.phtml
+++ b/application/modules/user/views/scripts/person/show.phtml
@@ -5,41 +5,92 @@
 <?php if($this->deleteRight === true) echo $this->formButton('deleteperson', 'Delete', array(
 							'onclick' => 'self.location="/user/auth/delete/personID/' . $this->personID . '"',
 							'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 />
-<br />
-<div class="personColorDiv"><span class="bold">Title:</span>&nbsp;<?php echo $this->person->getTitle(); ?></div>
-<div class="personDiv"><span class="bold">Name:</span>&nbsp;<?php echo $this->person->getName(); ?></div>
-<div class="personColorDiv"><span class="bold">Firstname:</span>&nbsp;<?php echo $this->person->getFirstname(); ?></div>
-<div class="personDiv"><span class="bold">Street:</span>&nbsp;<?php echo $this->person->getStreet(); ?></div>
-<div class="personColorDiv"><span class="bold">Housenumber:</span>&nbsp;<?php echo $this->person->getHousenumber(); ?></div>
-<div class="personDiv"><span class="bold">City:</span>&nbsp;<?php echo $this->person->getCity(); ?></div>
-<div class="personColorDiv"><span class="bold">Postalcode:</span>&nbsp;<?php echo $this->person->getPostalcode(); ?></div>
-<div class="personDiv"><span class="bold">Email:</span>&nbsp;<?php echo $this->person->getEmail(); ?></div>
-<div class="personColorDiv"><span class="bold">Last Login Date:</span>&nbsp;<?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?></div>
-<div class="personDiv"><span class="bold">Register Date:</span>&nbsp;<?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?></div>
+<h2>Member in the following Groups:</h2>
+<div class='listelement'><?php if(count($this->groups)==0)
+echo "You are in no group." ?> <?php foreach ($this->groups as $group): ?>
 <?php
-if(isset($this->groups)) {
+$class='';
+if($group['membershipID'] == $this->userIDsNamespace['membershipID'])
+$class= 'highlight checked';
+?>
+<div class='element<?php echo " $class";?>'>
+<div class='content'>
+<div class='title'><?php echo $group['title']; ?></div>
+<?php if($group['description']) {
 	?>
-<br />
-<h2>Member in the following Groups:</h2>
-<table>
-	<tr>
-		<th>Title</th>
-		<th>Description</th>
-	</tr>
+<div class='subtitle'><?php echo $group['description']; ?></div>
 	<?php
-	foreach($this->groups as $group) {
-		?>
-	<tr class="entry">
-		<td><?php echo $group['title']; ?></td>
-		<td><?php echo $group['description']; ?></td>
-	</tr>
-	<?php
-	}
+} else {
 	?>
-</table>
-	<?php echo $this->pagination;
+<div class='subtitle'>&nbsp;</div>
+	<?php
 }
-?>
-<br />
-<br />
+?></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
index f20f490..1521744 100644
--- a/application/modules/user/views/scripts/person/showall.phtml
+++ b/application/modules/user/views/scripts/person/showall.phtml
@@ -1,25 +1,33 @@
 <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 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 Sessions to display." ?>
-	<?php foreach ($this->personList as $person): ?>	
-	<div class='element'>		
-  		<div class='content'>  		
-  			<div class='actions'>
-  				<?php
-		if($person->getID() == $this->userIDsNamespace['personID']) {
-			if($this->showRight === true) {
-				?>
-			<a href="<?php echo $this->url(
+<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'><?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',
@@ -28,9 +36,9 @@
 						'default',
 						true);?>"> <img src='/media/img/show.png' alt='Show Person' /></a>
 						<?php
-				}
-				if($this->editRight === true) { ?>
-			<a href="<?php echo $this->url(
+	}
+	if($this->editRight === true) { ?> <a
+	href="<?php echo $this->url(
 						array(
 							'module'	=> 'user',
 							'controller' => 'person',
@@ -39,9 +47,9 @@
 						'default',
 						true);?>"> <img src='/media/img/edit.png' alt='Edit Person' /></a>
 						<?php
-				}
-				if($this->deleteRight === true) { ?>
-			<a href="<?php echo $this->url(
+	}
+	if($this->deleteRight === true) { ?> <a
+	href="<?php echo $this->url(
 						array(
 							'module'	=> 'user',
 							'controller' => 'auth',
@@ -50,11 +58,11 @@
 						'default',
 						true);?>"> <img src='/media/img/delete.png' alt='Delete Account' /></a>
 						<?php
-				}
-			} else {
-				if($this->showOtherRight === true) {
-					?>
-			<a href=" <?php echo $this->url(
+	}
+} else {
+	if($this->showOtherRight === true) {
+		?> <a
+	href=" <?php echo $this->url(
 						array(
 							'module'	=> 'user',
 							'controller' => 'person',
@@ -64,10 +72,10 @@
 						'default',
 						true); ?>"> <img src='/media/img/show.png' alt='Show Person' /></a>
 						<?php
-				}
-				if($this->editOtherRight === true) {
-					?>
-			<a href=" <?php echo $this->url(
+	}
+	if($this->editOtherRight === true) {
+		?> <a
+	href=" <?php echo $this->url(
 						array(
 							'module'	=> 'user',
 							'controller' => 'person',
@@ -77,10 +85,10 @@
 						'default',
 						true); ?>"> <img src='/media/img/edit.png' alt='Edit Person' /></a>
 						<?php
-				}
-				if($this->deleteOtherRight === true) {
-					?>
-			<a href=" <?php echo $this->url(
+	}
+	if($this->deleteOtherRight === true) {
+		?> <a
+	href=" <?php echo $this->url(
 						array(
 							'module'	=> 'user',
 							'controller' => 'auth',
@@ -90,17 +98,15 @@
 						'default',
 						true); ?>"> <img src='/media/img/delete.png' alt='Delete Account' /></a>
 						<?php
-				}
-			}
-			?>
-  			</div>	  		
-	  		<div class='title'><?php echo $person->getTitle(); ?> <?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div>
-	  		<div class='subtitle'><?php echo $person->getEmail(); ?></div>
-  		</div>
-  		<div class='clear'></div>
-	</div>	
-	<?php endforeach ?> 
+	}
+}
+?></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; ?>