[Gforge-commits] gforge/www/project/admin userperms.php, 1.5, 1.6 userpermedit.php, 1.9, 1.10 editgroupinfo.php, 1.12, 1.13

[gsmet]

Update of /cvsroot/gforge/gforge/www/project/admin
In directory db.perdue.net:/tmp/cvs-serv18907/www/project/admin

Modified Files:
        userperms.php userpermedit.php editgroupinfo.php 
Log Message:
corrected several UI bugs

Index: userperms.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/project/admin/userperms.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- userperms.php       15 Mar 2003 23:12:43 -0000      1.5
+++ userperms.php       17 Feb 2004 14:57:15 -0000      1.6
@@ -39,7 +39,7 @@
                } 
        }
 
-       return '???';
+       return '';
 }
 
 // Render table row of developer's permissions
@@ -78,10 +78,10 @@
        $forum2perm = 
array(0=>'-',2=>$Language->getText('project_admin_userperms','moderator'));
        print '<td>'.$forum2perm[$row_dev['forum_flags']].'</td>';
 
-       // documenation manager permissions
-       $forum2perm = 
array(0=>'-',1=>$Language->getText('project_admin_userperms','editor'));
+       // documentation manager permissions
+       $docman2perm = 
array(0=>'-',1=>$Language->getText('project_admin_userperms','editor'));
 
-       print '<td>'.$forum2perm[$row_dev['doc_flags']].'</td>';
+       print '<td>'.$docman2perm[$row_dev['doc_flags']].'</td>';
 
        print '</tr>';
 }
@@ -101,53 +101,46 @@
 <p>&nbsp;</p>
 <p><?php echo $Language->getText('project_admin_userperms','info') ?>.</p>
 <p>&nbsp;</p>
-
-<table width="100%" cellspacing="0" cellpadding="2" border="0">
-
-<tr align="center">
-<td><span style="font-size:smaller"><strong><?php echo 
$Language->getText('project_admin_userperms','general') ?></strong></span></td>
-<td><font size="-1"><strong>CVS</strong></font></td>
-<td><span style="font-size:smaller"><strong><?php echo 
$Language->getText('project_admin_userperms','tracker_manager') 
?></strong></span></td>
-<td><span style="font-size:smaller"><strong><?php echo 
$Language->getText('project_admin_userperms','task_manager') 
?></strong></span></td>
-<td><span style="font-size:smaller"><strong><?php echo 
$Language->getText('project_admin_userperms','forums') ?></strong></span></td>
-<td><span style="font-size:smaller"><strong><?php echo 
$Language->getText('project_admin_userperms','docman') ?></strong></span></td>
-</tr>
 <?php
+$tableHeaders = array(
+       $Language->getText('project_admin_userperms','general'),
+       'CVS',
+       $Language->getText('project_admin_userperms','tracker_manager'),
+       $Language->getText('project_admin_userperms','task_manager'),
+       $Language->getText('project_admin_userperms','forums'),
+       $Language->getText('project_admin_userperms','docman')
+);
 
-       $res_dev = db_query("
-               SELECT users.user_name AS user_name,
-               users.realname, 
-               users.user_id AS user_id, 
-               user_group.admin_flags, 
-               user_group.forum_flags, 
-               user_group.project_flags, 
-               user_group.doc_flags, 
-               user_group.cvs_flags, 
-               user_group.release_flags, 
-               user_group.artifact_flags, 
-               user_group.member_role 
-               FROM users,user_group 
-               WHERE 
-               users.user_id=user_group.user_id AND 
user_group.group_id='$group_id'
-               ORDER BY users.user_name
-       ");
-
-       if (!$res_dev || db_numrows($res_dev) < 1) {
-               echo 
'<h2>'.$Language->getText('project_admin_userperms','no_developers').'</h2>';
-       } else {
-               $i = 0;
-
-               while ($row_dev = db_fetch_array($res_dev)) {
+echo $HTML->listTableTop($tableHeaders);
 
-                       show_permissions_row($i++, $row_dev);
+$res_dev = db_query("
+       SELECT users.user_name AS user_name,
+       users.realname, 
+       users.user_id AS user_id, 
+       user_group.admin_flags, 
+       user_group.forum_flags, 
+       user_group.project_flags, 
+       user_group.doc_flags, 
+       user_group.cvs_flags, 
+       user_group.release_flags, 
+       user_group.artifact_flags, 
+       user_group.member_role 
+       FROM users,user_group 
+       WHERE 
+       users.user_id=user_group.user_id AND user_group.group_id='$group_id'
+       ORDER BY users.user_name
+");
 
-               }
+if (!$res_dev || db_numrows($res_dev) < 1) {
+       echo '<tr><td 
colspan="6">'.$Language->getText('project_admin_userperms','no_developers').'</td></tr>';
+} else {
+       $i = 0;
+       while ($row_dev = db_fetch_array($res_dev)) {
+               show_permissions_row($i++, $row_dev);
        }
+}
 
-?>
-
-</table>
+echo $HTML->listTableBottom();
 
-<?php
 project_admin_footer(array());
-?>
+?>
\ No newline at end of file

Index: userpermedit.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/project/admin/userpermedit.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- userpermedit.php    9 Nov 2003 19:40:05 -0000       1.9
+++ userpermedit.php    17 Feb 2004 14:57:15 -0000      1.10
@@ -70,7 +70,7 @@
                }
 
                if (!$group->addUser($u->getUnixName())) {
-                       exit_error('Error', $group->getErrorMessage());
+                       exit_error($Language->getText('general','error'), 
$group->getErrorMessage());
                } else {
                        $feedback = 
$Language->getText('project_admin_userpermedit','user_added').' <br />';
                }

Index: editgroupinfo.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/project/admin/editgroupinfo.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- editgroupinfo.php   9 Jan 2004 21:51:25 -0000       1.12
+++ editgroupinfo.php   17 Feb 2004 14:57:15 -0000      1.13
@@ -266,7 +266,7 @@
 <?php
 }
 
-if($sys_use_file) {
+if($sys_use_frs) {
 ?>
 <tr>
 <td>