[phpBT-dev] CVS: phpbt/templates/default/admin grouplist.html,1.10,1.11 wrap.html,1.25,1.26

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/templates/default/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1698/templates/default/admin

Modified Files:
	grouplist.html wrap.html 
Log Message:
Adding a role-based permission system


Index: grouplist.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/grouplist.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grouplist.html	22 Aug 2005 20:04:05 -0000	1.10
+++ grouplist.html	31 Oct 2005 21:34:35 -0000	1.11
@@ -3,14 +3,17 @@
 	var me = '<?php echo $_SERVER['SCRIPT_NAME']; ?>';
 		
 	function popupGroup(id) {
-		window.open(me + '?op=edit&use_js=1&group_id='+id, 'ewin', 'dependent=yes,width=250,height=250,scrollbars=1');
+		window.open(me + '?op=edit<?php echo $do_group ? '' : '-role'?>&use_js=1&group_id='+id, 'ewin', 'dependent=yes,width=250,height=250,scrollbars=1');
 	}
 // -->
 </script>
 <table border="0" width="100%">
   <tr>
     <td valign="top">
-      <b><?php echo $page_title; ?></b> - <a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>?op=edit&group_id=0" onClick="popupGroup(0); return false;"><?php echo translate("Add new group"); ?></a>
+      <b><?php echo $page_title; ?></b>
+	<?php if ($do_group) { ?>
+	 - <a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>?op=edit<?php echo $do_group ? '' : '-role'?>&group_id=0" onClick="popupGroup(0); return false;"><?php echo translate("Add new group"); ?></a>
+	<?php } ?>
       <hr size="1">
       <table class="bordertable" align="center">
         <tr>
@@ -20,14 +23,14 @@
         </tr>
         <?php for ($i = 0, $count = count($groups); $i < $count; $i++) { ?>
         <tr>
-          <td><a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>?op=edit&group_id=<?php echo $groups[$i]['group_id']; ?>" onClick="popupGroup(<?php echo $groups[$i]['group_id']; ?>); return false;"><?php echo stripslashes($groups[$i]['group_name']); ?></a></td>
+          <td><a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>?op=edit<?php echo $do_group ? '' : '-role'?>&group_id=<?php echo $groups[$i]['group_id']; ?>" onClick="popupGroup(<?php echo $groups[$i]['group_id']; ?>); return false;"><?php echo stripslashes($groups[$i]['group_name']); ?></a></td>
           <td align="center"><?php echo $groups[$i]['count']; ?></td>
 					<td align="center">
 						<?php if($groups[$i]['locked']) { 
                             echo translate("Locked"); 
                         } else { ?>
-							<a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>?op=del&group_id=<?php echo $groups[$i]['group_id']; ?>" onClick="return confirm('<?php echo translate("This will remove all user assignments to this group and the group itself.  Continue?"); ?>')"><?php echo translate("Delete"); ?></a> | 
-							<a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>?op=purge&group_id=<?php echo $groups[$i]['group_id']; ?>" onClick="return confirm('<?php echo translate("This will remove all user assignments to this group.  Continue?"); ?>')"><?php echo translate("Purge"); ?></a>
+							<a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>?op=del<?php echo $do_group ? '' : '-role'?>&group_id=<?php echo $groups[$i]['group_id']; ?>" onClick="return confirm('<?php echo translate("This will remove all user assignments to this group and the group itself.  Continue?"); ?>')"><?php echo translate("Delete"); ?></a> | 
+							<a href="<?php echo $_SERVER['SCRIPT_NAME']; ?>?op=purge<?php echo $do_group ? '' : '-role'?>&group_id=<?php echo $groups[$i]['group_id']; ?>" onClick="return confirm('<?php echo translate("This will remove all user assignments to this group.  Continue?"); ?>')"><?php echo translate("Purge"); ?></a>
 						<?php } ?>
 					</td>
         </tr>

Index: wrap.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/wrap.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wrap.html	22 Aug 2005 19:44:47 -0000	1.25
+++ wrap.html	31 Oct 2005 21:34:35 -0000	1.26
@@ -24,6 +24,7 @@
         <li><a href="project.php" class="navlink"><?php echo translate("Projects"); ?></a></li>
         <li><a href="user.php" class="navlink"><?php echo translate("Users"); ?></a></li>
         <li><a href="group.php" class="navlink"><?php echo translate("Groups"); ?></a></li>
+        <li><a href="group.php?op=list-roles" class="navlink"><?php echo translate("Roles"); ?></a></li>
         <li><a href="../docs/html/userguide.html" class="navlink"><?php echo translate("Documentation"); ?></a></li>
         <li><a href="../index.php" class="navlink"><?php echo translate("User Tools"); ?></a></li>
     </ul>