verschiedene Layouts korrigiert

2 files changed, 85 insertions, 79 deletions

diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index ea677ac..19dc396 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -2,7 +2,7 @@
 if($this->groupID) {
 	if(isset($this->userIDsNamespace['groupID'])) {
 		?>
-<h1>Group</h1>
+<h1>Own Group</h1>
 		<?php
 		echo $this->formButton('deletegroup', 'Delete', array(
 							'onclick' => 'self.location="/user/group/delete/"',
@@ -22,63 +22,61 @@ if($this->groupID) {
 							'class' => 'rightbutton'));
 	}
 	?>
-<span class="clear"></span>
-<table>
-	<tr>
-		<th>Title</th>
-		<th>Description</th>
-	</tr>
-	<tr class="entry">
-		<td><?php echo $this->group->getTitle(); ?></td>
-		<td><?php echo $this->group->getDescription(); ?></td>
-	</tr>
+<div class='detailelement'>
+<div class='element'>
+<div class='content'>
+<div class='title'>Title:&nbsp;<span class="noBold"><?php echo $this->group->getTitle(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+<div class='element'>
+<div class='content'>
+<div class='title'>Description:&nbsp;<span class="noBold"><?php echo $this->group->getDescription(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
 	<?php
 	if(isset($parentGroup) && is_object($parentGroup)) {
 		?>
-	<tr>
-		<td><b>Superordinated Group:</b></td>
-		<td><?php echo $this->parentGroup->getTitle(); ?></td>
-	</tr>
-	<?php
+<div class='element'>
+<div class='content'>
+<div class='title'>Superordinated Group:&nbsp;<span class="noBold"><?php echo $this->parentGroup->getTitle(); ?></span></div>
+</div>
+<div class='clear'></div>
+</div>
+		<?php
 	}
-	?>
-</table>
+	?></div>
 	<?php
 	if(isset($this->groupRequestList)) {
 		?>
 <br />
 <h2>Requests:</h2>
-<table>
-	<tr>
-		<th>Firstname</th>
-		<th>Name</th>
-		<th>email</th>
-		<th>city</th>
-		<th>grant</th>
-	</tr>
-	<?php
-	foreach($this->groupRequestList as $grouprequest) {
-		$grouprequestID = $grouprequest['grouprequestID'];
-		$person = $grouprequest['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>
-		<form action="/user/group/grantperson" method="post"><input
-			type="hidden" name="grouprequestID"
-			value="<?php echo $grouprequestID; ?>" /> <?php printRoleSelect($this->roleList); ?>
-		<input type="image" src='/media/img/save.png' alt='Grant Person'
-			name="confirm" value="confirm" /></form>
-		</td>
-	</tr>
-	<?php
-	}
+<div class='listelement'><?php
+foreach($this->groupRequestList as $grouprequest) {
+	$grouprequestID = $grouprequest['grouprequestID'];
+	$person = $grouprequest['person'];
 	?>
-</table>
+<div class='element'>
+<div class='content'>
+<div class='actions'>
+<form action="/user/group/grantperson" method="post"><input
+	type="hidden" name="grouprequestID"
+	value="<?php echo $grouprequestID; ?>" /> <?php printRoleSelect($this->roleList); ?>
+<input type="image" src='/media/img/save.png' alt='Grant Person'
+	name="confirm" value="confirm" /></form>
+</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->getCity(); ?></div>
+<div class='details dispnone'><label>Email</label>
+<div class='item'><?php echo $person->getEmail(); ?></div>
+</div>
+</div>
+</div>
 	<?php
+}
+?></div>
+<?php
 	}
 	if(isset($this->membersList)) {
 		?>
@@ -132,5 +130,3 @@ function printRoleSelect($roleList) {
 	echo "</select>";
 }
 ?>
-<br />
-<br />
diff --git a/application/modules/user/views/scripts/group/showall.phtml b/application/modules/user/views/scripts/group/showall.phtml
index 2ed777a..5e53f87 100644
--- a/application/modules/user/views/scripts/group/showall.phtml
+++ b/application/modules/user/views/scripts/group/showall.phtml
@@ -6,26 +6,28 @@
 ?>
 
 <div class='searchvars'>
-	<div class='head'>Available searchfilter:</div>
-	<div class='code'>title</div>
-	<div class='code'>description</div>
+<div class='head'>Available searchfilter:</div>
+<div class='code'>title</div>
+<div class='code'>description</div>
 </div>
 
-<div class='listelement'>
+<div class='listelement'><?php
+if(count($this->groupList)==0)
+echo "There are no groups" ?> <?php foreach ($this->groupList as $k => $group): ?>
+<?php
+$class='';
+if($group->getID() == $this->userIDsNamespace['groupID'])
+$class= 'highlight checked';
+?>
+<div class='element<?php echo " $class";?>'><?php if($group->getID() != $this->userIDsNamespace['groupID']) {
+	?>
+<div class='number'><?php echo $k+1; ?></div>
 	<?php
-	$count = 0;
-	if(count($this->groupList)==0)
-		echo "There are no groups" ?>
-	<?php foreach ($this->groupList as $group): ?>
-		<?php 
-		$class='';
-		if($group->getID() == $this->userIDsNamespace['groupID'])
-			$class= 'highlight checked';
-		?>
-		<div class='element<?php echo " $class";?>'>
-  		<div class='content'>
-  			<div class='actions'>
-  				<a	href="<?php if($group->getID() == $this->userIDsNamespace['groupID']) echo $this->url(
+}
+?>
+<div class='content'>
+<div class='actions'><a
+	href="<?php if($group->getID() == $this->userIDsNamespace['groupID']) echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'group',
@@ -40,8 +42,9 @@
 						'groupID'   =>  $group->getID()
 					),
 					'default',
-					true); ?>"> <img src='/media/img/show.png' alt='Show Group' /></a></td>
-				<a href="<?php if($group->getID() == $this->userIDsNamespace['groupID']) echo $this->url(
+					true); ?>"> <img src='/media/img/show.png' alt='Show Group' /></a>
+<a
+	href="<?php if($group->getID() == $this->userIDsNamespace['groupID']) echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'group',
@@ -56,8 +59,9 @@
 						'groupID'   =>  $group->getID()
 					),
 					'default',
-					true); ?>"> <img src='/media/img/edit.png' alt='Edit Group' /></a></td>
-				<a href="<?php if($group->getID() == $this->userIDsNamespace['groupID']) echo $this->url(
+					true); ?>"> <img src='/media/img/edit.png' alt='Edit Group' /></a>
+<a
+	href="<?php if($group->getID() == $this->userIDsNamespace['groupID']) echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'group',
@@ -73,20 +77,26 @@
 					),
 					'default',
 					true); ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
-			</div>		  		
-	  		<div class='title'><?php echo $group->getTitle(); ?></div>
-	  		<div class='subtitle'><?php echo $group->getDescription(); ?></div>
-  		</div>
-  		<div class='clear'></div>
-	</div>	
-	<?php $count++; ?>
-	<?php endforeach ?> 
 </div>
+<div class='title'><?php echo $group->getTitle(); ?></div>
+					<?php if($group->getDescription()) {
+						?>
+<div class='subtitle'><?php echo $group->getDescription(); ?></div>
+						<?php
+					} else {
+						?>
+<div class='subtitle'>&nbsp;</div>
+						<?php
+					}
+					?></div>
+<div class='clear'></div>
+</div>
+<?php endforeach ?></div>
 <?php echo $this->pagination; ?>
 
 <?php echo $this->formButton('linkgroups', 'Link Groups', array(
 							'onclick' => 'self.location="/user/group/link"',
 							'class' => 'addbutton'))
-	?>
+?>
 <br />
 <br />