[Openfirst-cvscommit] projects groups.php,1.10,1.11 index.php,1.12,1.13

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/openfirst/projects
In directory sc8-pr-cvs1:/tmp/cvs-serv1967

Modified Files:
	groups.php index.php 
Log Message:
Fixed command spacing problem with the index page of tasks. The groups script is the beginning of my attempt at making the module easier to use.

Index: groups.php
===================================================================
RCS file: /cvsroot/openfirst/projects/groups.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** groups.php	7 Sep 2003 13:13:26 -0000	1.10
--- groups.php	10 Oct 2003 01:36:34 -0000	1.11
***************
*** 100,126 ****
  ?>
  <h2>System Work Groups</h2>
! <table width="540">
!   <tr>
!     <td width="0" height="0"> <div align="left"><em>Location:</em> <a href="groups.php"><strong>Groups</strong></a>
!         / </div></td>
!   </tr>
! </table>
! <br>
! <table width="100%" border="0" cellspacing="0" cellpadding="6">
!   <tr>
!     <th>
!       Groups Listings
!   </th>
! </table>
! <table width="100%">
    <tr>
!     <td class="sub" width="5%">&nbsp;</td>
!     <td class="sub" width="20%">Group Name</td>
!     <td class="sub" width="6%">Projects</td>
!     <td class="sub" width="35%">Description</td>
!     <td class="sub" width="9%">Moderators</td>
!     <td class="sub" width="25%">Members</td>
!   </tr>
! <?php
  
    // Query the current group values and loop through them
--- 100,128 ----
  ?>
  <h2>System Work Groups</h2>
! <p>These are workgroups that are currently setup with the
!   action register system. Only administrators have<br>
!   access to editing 
!   these groups. </p>
! <table width="100%" align="center" cellpadding="0" cellspacing="0">
    <tr>
!     <td width="22%" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="6">
!       <tr>
!         <th>  Navigation </th>
!       <tr>
!         <td><?php projecttree("groups"); ?></td>
!     </table></td>
!     <td width="78%" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="6">
!       <tr>
!         <th> Groups Listings </th>
!     </table>
!       <table width="100%">
!         <tr>
!           <td class="sub" width="7%">&nbsp;</td>
!           <td class="sub" width="21%">Group Name</td>
!           <td class="sub" width="10%">Projects</td>
!           <td class="sub" width="44%">Description</td>
!           <?php if($user->membertype == "administrator"){ ?><td class="sub" width="18%">Option</td><?php } ?>
!         </tr>
!         <?php
  
    // Query the current group values and loop through them
***************
*** 129,147 ****
  
  ?>
!   <tr <?php if(date("F j, Y",time()) == date("F j, Y",$groups->Dates)){ echo "bgColor='#CCCCCC'"; } ?>>
!     <td>
!       <div align="center"><a href="projects.php?GroupID=<?php echo $groups->ID; ?>"><img src="../members/icons/apps/kuser.png" width="32" height="32" border="0"></a></div></td>
!     <td><?php echo $groups->GroupName; ?></td>
!     <td>
!     <?php
      $projquery = ofirst_dbquery("SELECT * FROM ofirst_projects_projects WHERE GroupID = '".$groups->ID."'");
      echo ofirst_dbnum_rows($projquery);
      ?>
!     </td>
!     <td><?php echo $groups->Description; ?></td>
!     <td><?php echo str_replace(",", ", ",$groups->Moderators); ?></td>
!     <td><?php echo str_replace(",", ", ",$groups->Members); ?> </td>
!   </tr>
! <?php
  
    }
--- 131,150 ----
  
  ?>
!         <tr <?php if(date("F j, Y",time()) == date("F j, Y",$groups->Dates)){ echo "bgColor='#CCCCCC'"; } ?>>
!           <td>
!             <div align="center"><a href="projects.php?GroupID=<?php echo $groups->ID; ?>"><img src="../members/icons/apps/kuser.png" width="32" height="32" border="0"></a></div></td>
!           <td><a href='projects.php?GroupID=<?php echo $groups->ID; ?>'><?php echo $groups->GroupName; ?></a></td>
!           <td>
!             <?php
      $projquery = ofirst_dbquery("SELECT * FROM ofirst_projects_projects WHERE GroupID = '".$groups->ID."'");
      echo ofirst_dbnum_rows($projquery);
      ?>
!           </td>
!           <td><?php echo $groups->Description; ?></td>
!           <?php if($user->membertype == "administrator"){ ?>
!           <td><p align="center"><a href="admin/edit.php?ID=<?php echo $groups->ID; ?>">Edit</a> | <a href="admin/delete.php?ID=<?php echo $groups->ID; ?>">Delete</a></p>          </td>
!           <?php } ?>
!         </tr>
!         <?php
  
    }
***************
*** 151,156 ****
--- 154,162 ----
  
  ?>
+       </table></td>
+   </tr>
  </table>
  <br>
+ <?php if($user->membertype == "administrator"){ ?>
  <form action='groups.php' method='POST'>
    <table width="39%">
***************
*** 196,229 ****
        <input type="reset" name="Reset" value="Reset"> </td>
    </tr>
-     <tr>
-       <th>&nbsp;</th>
-       <th>Remove Group</th>
-   </tr>
-   <tr>
-     <td><div align="right">Group Name:</div></td>
-     <td><select name="group" size="1" id="group">
-           <?php
- 
-      $query = ofirst_dbquery("SELECT * FROM ofirst_projects_groups ORDER BY GroupName;");
- 
-      while($groups = ofirst_dbfetch_object($query)){
-        echo "<option value='".$groups->ID."'>".$groups->GroupName."</option>";
-      }
- 
-     ?>
-         </select></td>
-   </tr>
-   <tr>
-     <td><div align="right">
-         <input name="confirm" type="checkbox" id="confirm" value="checkbox">
-       </div></td>
-     <td>Click here to confirm the removal of this group. Without checking the
-       group will not be removed.</td>
-   </tr>
-   <tr>
-     <td>&nbsp;</td>
-     <td><input name="remove" type="submit" id="remove" value="Remove"></td>
-   </tr>
  </table>
  </form>
! <?php } include($footer); ?>
--- 202,206 ----
        <input type="reset" name="Reset" value="Reset"> </td>
    </tr>
  </table>
  </form>
! <?php } } include($footer); ?>

Index: index.php
===================================================================
RCS file: /cvsroot/openfirst/projects/index.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** index.php	29 Sep 2003 23:44:30 -0000	1.12
--- index.php	10 Oct 2003 01:36:34 -0000	1.13
***************
*** 118,122 ****
      ?>
      </td>
!     <td><?php echo $tasks->Assigned; ?></td>
    </tr>
    <?
--- 118,122 ----
      ?>
      </td>
!     <td><?php echo str_replace(",", ", ",$tasks->Assigned); ?></td>
    </tr>
    <?
***************
*** 130,135 ****
    <tr>
      <td width="4%">&nbsp;</th> 
!     <td width="20%">&nbsp; 
!     <td width="13%">&nbsp; 
      <td width="30%">[ <a href="mytask.php">Detailed Related Tasks</a> ]</tr>
  </table>
--- 130,135 ----
    <tr>
      <td width="4%">&nbsp;</th> 
!     <td width="20%"> 
!     <td width="13%"> 
      <td width="30%">[ <a href="mytask.php">Detailed Related Tasks</a> ]</tr>
  </table>