From 0068d91a05cb77f4381f7adc4fb924ef83fee8bf Mon Sep 17 00:00:00 2001
From: Simon
Date: Thu, 7 Apr 2011 11:20:03 +0200
Subject: Layout bei "Members in Group"

---
 .../modules/user/controllers/GroupController.php   |  5 ++-
 .../modules/user/views/scripts/group/show.phtml    | 47 ++++++++++------------
 2 files changed, 25 insertions(+), 27 deletions(-)

(limited to 'application/modules/user')

diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
index 064ca60..d910707 100644
--- a/application/modules/user/controllers/GroupController.php
+++ b/application/modules/user/controllers/GroupController.php
@@ -147,9 +147,12 @@ class User_GroupController extends Zend_Controller_Action
 			if(isset($members)) {
 				foreach($members as $member) {
 					$person = $this->personmapper->find($member['personID']);
+					$membership_tmp = $this->membershipMapper->find($member['membershipID']);
+					$role = $this->rolemapper->find($membership_tmp->getRoleID());
 					$membersList[] = array(
 					'membershipID' => $member['membershipID'],
-					'person' => $person
+					'person' => $person,
+					'role' => $role
 					);
 				}
 				if(is_array($membersList)) {
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index 12c149f..306a279 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -87,27 +87,19 @@ if($this->groupID) {
 		?>
 <br />
 <h2>Members:</h2>
-<table>
-	<tr>
-		<th>Firstname</th>
-		<th>Name</th>
-		<th>email</th>
-		<th>city</th>
-		<th>revoke</th>
-	</tr>
-
-	<?php
-	foreach($this->membersList as $member) {
+<div class='listelement'>
+	<?php if(count($this->membersList)==0)
+		echo "This hroup has no members." ?>
+	<?php foreach ($this->membersList as $member): ?>
+	<?php 
 		$membershipID = $member['membershipID'];
 		$person = $member['person'];
-		?>
-	<tr class="entry">
-		<td><?php echo $person->getFirstname(); ?></td>
-		<td><?php echo $person->getName(); ?></td>
-		<td><?php echo $person->getEmail(); ?></td>
-		<td><?php echo $person->getCity(); ?></td>
-		<td class='action'><a
-			href="<?php echo $this->url(
+		$role = $member['role'];
+	?>
+	<div class='element'>	
+  		<div class='content'>  		
+  			<div class='actions'>
+  				<a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'group',
@@ -115,13 +107,16 @@ if($this->groupID) {
 						'membershipID'   =>  $membershipID,
 					),
 					'default',
-					true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
-		</td>
-	</tr>
-	<?php
-	}
-	?>
-</table>
+					true) ?>"> <img src='/media/img/delete.png' alt='Revoke Membership' /></a>
+  			</div>	  		
+	  		<div class='title'><?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div>
+	  		<div class='subtitle'>Role: <?php echo $role->getTitle(); ?></div>
+  		</div>
+  		<div class='clear'></div>
+	</div>	
+	<?php endforeach ?> 
+</div>
+
 	<?php echo $this->memberPagination; ?>
 	<?php
 	}
-- 
cgit v1.2.3-55-g7522