Merge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2

1 files changed, 20 insertions, 21 deletions

diff --git a/application/modules/user/views/scripts/role/index.phtml b/application/modules/user/views/scripts/role/index.phtml
index 0488211..80a4299 100644
--- a/application/modules/user/views/scripts/role/index.phtml
+++ b/application/modules/user/views/scripts/role/index.phtml
@@ -22,19 +22,18 @@ $class='';
 if($role['roleID'] == $this->userIDsNamespace['roleID'])
 $class= 'highlight checked';
 ?>
-<div class='element<?php echo " $class";?>'><?php if($role['roleID'] != $this->userIDsNamespace['roleID']) {
-	?>
-<div class='number'>	
-	<div class='smallnumber'>Role</div>
-	<?php echo $k+1; ?>
-</div>
+	<div class='element<?php echo " $class";?>'>
+	<?php if($role['roleID'] != $this->userIDsNamespace['roleID']) {	?>
+		<div class='number'>	
+			<div class='smallnumber'>Role</div>
+			<?php echo $k+1; ?>
+		</div>
 	<?php
-}
-?>
-<div class='content'>
-<div class='actions'><?php if($this->detailsRight) {
-	?> <a
-	href="<?php echo $this->url(
+	}
+	?>
+	<div class='content'>
+	<div class='actions'><?php if($this->detailsRight) {?> 
+		<a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'role',
@@ -43,10 +42,9 @@ $class= 'highlight checked';
 					),
 					'default',
 					true) ?>"> <img src='/media/img/show.png' alt='Show Group' /></a> <?php
-}
-if($this->editRight) {
-	?> <a
-	href="<?php echo $this->url(
+	}
+	if($this->editRight) { ?>
+		<a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'role',
@@ -55,10 +53,9 @@ if($this->editRight) {
 					),
 					'default',
 					true) ?>"> <img src='/media/img/edit.png' alt='Edit Group' /></a> <?php
-}
-if($this->deleteRight) {
-	?> <a
-	href="<?php echo $this->url(
+	}
+if($this->deleteRight) { ?>
+	<a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
 						'controller' => 'role',
@@ -67,6 +64,8 @@ if($this->deleteRight) {
 					),
 					'default',
 					true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' /></a>
+
+<?php } ?>
 </div>
 <div class='title'><?php echo $role['title'] ?></div>
 					<?php if($role['description']) {
@@ -79,7 +78,7 @@ if($this->deleteRight) {
 						<?php
 					}
 
-}
+
 ?></div>
 <div class='clear'></div>
 </div>