Person und Gruppen, Fehler korrigiert + Layout

3 files changed, 35 insertions, 65 deletions

diff --git a/application/modules/dev/views/scripts/person/index.phtml b/application/modules/dev/views/scripts/person/index.phtml
deleted file mode 100644
index e69de29..0000000
--- a/application/modules/dev/views/scripts/person/index.phtml
+++ /dev/null
diff --git a/application/modules/dev/views/scripts/person/leave.phtml b/application/modules/dev/views/scripts/person/leave.phtml
deleted file mode 100644
index fc96431..0000000
--- a/application/modules/dev/views/scripts/person/leave.phtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-if(!isset($_POST['groupID'])) {
-	?>
-<div>No group has been chosen.</div>
-	<?php
-}
\ No newline at end of file
diff --git a/application/modules/dev/views/scripts/person/show.phtml b/application/modules/dev/views/scripts/person/show.phtml
index 945bb61..b0c6fc1 100644
--- a/application/modules/dev/views/scripts/person/show.phtml
+++ b/application/modules/dev/views/scripts/person/show.phtml
@@ -1,70 +1,45 @@
-<div align="right">
-<button onclick="location.href='/dev/person/edit'">Edit</button>
-</div>
-<table>
-	<tr>
-		<td><b>Title:</b></td>
-		<td><?php echo $this->person->getTitle(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Name:</b></td>
-		<td><?php echo $this->person->getName(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Firstname:</b></td>
-		<td><?php echo $this->person->getFirstname(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Street:</b></td>
-		<td><?php echo $this->person->getStreet(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Housenumber:</b></td>
-		<td><?php echo $this->person->getHousenumber(); ?></td>
-	</tr>
-	<tr>
-		<td><b>City:</b></td>
-		<td><?php echo $this->person->getCity(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Postalcode:</b></td>
-		<td><?php echo $this->person->getPostalcode(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Email:</b></td>
-		<td><?php echo $this->person->getEmail(); ?></td>
-	</tr>
-	<tr>
-		<td><b>Last Login Date:</b></td>
-		<td><?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()); ?> Uhr</td>
-	</tr>
-	<tr>
-		<td><b>Register Date:</b></td>
-		<td><?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()); ?> Uhr</td>
-	</tr>
-</table>
+<h1>Person</h1>
+<?php echo $this->formButton('editperson', 'Edit', array(
+							'onclick' => 'self.location="/dev/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)) {
 	?>
 <br />
-<div>Member in the following Groups:</div>
-<br />
+<h2>Member in the following Groups:</h2>
 <table>
 <?php
 foreach($this->groups as $group) {
 	?>
 	<tr>
 		<th>Title</th>
-		<th>Functions</th>
+		<th>Description</th>
+		<th>Leave</th>
 	</tr>
 	<tr>
 		<td><?php echo $group['title']; ?></td>
-		<td>
-		<form name="leaveGroup<?php echo $group['id']; ?>"
-			action="/dev/person/leave/" method="post"><input type="hidden"
-			name="groupID" value="<?php echo $group['id']; ?>" /> <a
-			href="javascript:document.leaveGroup<?php echo $group['id']; ?>.submit();">Remove
-		Membership</a></form>
+		<td><?php echo $group['description']; ?></td>
+		<td class='action'><a
+			href="<?php echo $this->url(
+					array(
+						'module'	=> 'dev',
+						'controller' => 'person',
+						'action'     => 'leave',
+						'membershipID'   =>  $group['membershipID']
+					),
+					'default',
+					true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
 		</td>
 	</tr>
 	<?php
@@ -72,8 +47,9 @@ foreach($this->groups as $group) {
 }
 ?>
 </table>
-<br />
-<div>
-<button onclick="location.href='/dev/person/request'">Add to additional
-Groups</button>
-</div>
+<?php echo $this->formButton('addtogroup', 'Add to additional
+Groups', array(
+							'onclick' => 'self.location="/dev/person/request/"',
+							'class' => 'addbutton'));
+?>
+<br /><br /><br /><br /><br />
\ No newline at end of file