[Fusionforge-commits] r10661 - trunk/src/www/project/admin

Roland Mas lolando at libremir.placard.fr.eu.org
Fri Sep 24 13:21:38 CEST 2010


Author: lolando
Date: 2010-09-24 13:21:38 +0200 (Fri, 24 Sep 2010)
New Revision: 10661

Modified:
   trunk/src/www/project/admin/users.php
Log:
Shuffle blocks around in the project membership page: member-related operations on the left column, role-related operations on the right one

Modified: trunk/src/www/project/admin/users.php
===================================================================
--- trunk/src/www/project/admin/users.php	2010-09-24 11:12:59 UTC (rev 10660)
+++ trunk/src/www/project/admin/users.php	2010-09-24 11:21:38 UTC (rev 10661)
@@ -288,70 +288,9 @@
 
 			<?php
 		}
-		//
-		//      RBAC Editing Functions
-		//
-		echo $HTML->boxMiddle(_("Edit Roles"));
 
-if (!USE_PFO_RBAC) {
-		echo '
-        <form action="roleedit.php?group_id='. $group_id .'&amp;role_id=observer" method="post">
-        <p><input type="submit" name="edit" value="'._("Edit Observer").'" /></p>
-        </form>';
-}
+		echo $HTML->boxMiddle(_("Current Project Members"));
 
-		echo '<form action="roleedit.php?group_id='. $group_id .'" method="post"><p>';
-		echo role_box($group_id,'role_id','',false);
-		echo '&nbsp;<input type="submit" name="edit" value="'._("Edit Role").'" /></p></form>';
-
-
-		echo '<form action="roleedit.php?group_id='. $group_id .'" method="post"><p>';
-		echo '<input type="text" name="role_name" size="10" value="" />';
-		echo '&nbsp;<input type="submit" name="add" value="'._("Create Role").'" /></p></form>';
-
-
-
-if (USE_PFO_RBAC) {
-	if (count ($used_external_roles)) {
-		echo $HTML->boxMiddle(_("Currently used external roles"));
-		$ids = array () ;
-		$names = array () ;
-		foreach ($used_external_roles as $r) {
-			$ids[] = $r->getID() ;
-			$names[] = $r->getDisplayableName($group) ;
-		}		
-		echo '<form action="'.getStringFromServer('PHP_SELF').'" method="post">' ;
-		echo '<input type="hidden" name="submit" value="y" />' ;
-		echo '<input type="hidden" name="group_id" value="'.$group_id.'" />' ;
-		
-		echo html_build_select_box_from_arrays($ids,$names,'role_id','',false,'',false,'');
-		echo '<input type="submit" name="unlinkrole" value="'._("Unlink external role").'" /></form><br />' ;
-	}
-
-	if (count ($unused_external_roles)) {
-		echo $HTML->boxMiddle(_("Available external roles"));
-		$ids = array () ;
-		$names = array () ;
-		foreach ($unused_external_roles as $r) {
-			$ids[] = $r->getID() ;
-			$names[] = $r->getDisplayableName($group) ;
-		}		
-		echo '<form action="'.getStringFromServer('PHP_SELF').'" method="post">' ;
-		echo '<input type="hidden" name="submit" value="y" />' ;
-		echo '<input type="hidden" name="group_id" value="'.$group_id.'" />' ;
-		
-		echo html_build_select_box_from_arrays($ids,$names,'role_id','',false,'',false,'');
-		echo '<input type="submit" name="linkrole" value="'._("Link external role").'" /></form><br />' ;
-	}
-}
-
-		echo $HTML->boxBottom();
-	
-		?></td>
-		<td><?php
-			 
-		echo $HTML->boxTop(_("Project Members"));
-
 		/*
 
 		Show the members of this project
@@ -418,6 +357,75 @@
                 </form></tr>';
 }
 echo '</tbody></table>';
+
+		echo $HTML->boxBottom();
+	
+		?></td>
+		<td><?php
+			 
+
+
+
+
+
+
+		//
+		//      RBAC Editing Functions
+		//
+		echo $HTML->boxTop(_("Edit Roles"));
+
+if (!USE_PFO_RBAC) {
+		echo '
+        <form action="roleedit.php?group_id='. $group_id .'&amp;role_id=observer" method="post">
+        <p><input type="submit" name="edit" value="'._("Edit Observer").'" /></p>
+        </form>';
+}
+
+		echo '<form action="roleedit.php?group_id='. $group_id .'" method="post"><p>';
+		echo role_box($group_id,'role_id','',false);
+		echo '&nbsp;<input type="submit" name="edit" value="'._("Edit Role").'" /></p></form>';
+
+
+		echo '<form action="roleedit.php?group_id='. $group_id .'" method="post"><p>';
+		echo '<input type="text" name="role_name" size="10" value="" />';
+		echo '&nbsp;<input type="submit" name="add" value="'._("Create Role").'" /></p></form>';
+
+
+
+if (USE_PFO_RBAC) {
+	if (count ($used_external_roles)) {
+		echo $HTML->boxMiddle(_("Currently used external roles"));
+		$ids = array () ;
+		$names = array () ;
+		foreach ($used_external_roles as $r) {
+			$ids[] = $r->getID() ;
+			$names[] = $r->getDisplayableName($group) ;
+		}		
+		echo '<form action="'.getStringFromServer('PHP_SELF').'" method="post">' ;
+		echo '<input type="hidden" name="submit" value="y" />' ;
+		echo '<input type="hidden" name="group_id" value="'.$group_id.'" />' ;
+		
+		echo html_build_select_box_from_arrays($ids,$names,'role_id','',false,'',false,'');
+		echo '<input type="submit" name="unlinkrole" value="'._("Unlink external role").'" /></form><br />' ;
+	}
+
+	if (count ($unused_external_roles)) {
+		echo $HTML->boxMiddle(_("Available external roles"));
+		$ids = array () ;
+		$names = array () ;
+		foreach ($unused_external_roles as $r) {
+			$ids[] = $r->getID() ;
+			$names[] = $r->getDisplayableName($group) ;
+		}		
+		echo '<form action="'.getStringFromServer('PHP_SELF').'" method="post">' ;
+		echo '<input type="hidden" name="submit" value="y" />' ;
+		echo '<input type="hidden" name="group_id" value="'.$group_id.'" />' ;
+		
+		echo html_build_select_box_from_arrays($ids,$names,'role_id','',false,'',false,'');
+		echo '<input type="submit" name="linkrole" value="'._("Link external role").'" /></form><br />' ;
+	}
+}
+
 echo $HTML->boxBottom(); 
 ?></td>
 	</tr>




More information about the Fusionforge-commits mailing list