[geeklog-cvs] geeklog-1.3/public_html/admin group.php,1.43,1.44 user.php,1.91,1.92

[blaine at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv1628/public_html/admin

Modified Files:
	group.php user.php 
Log Message:
Additional refinement of the Group User List and Edit layouts. I think I'm done now :)


Index: group.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/group.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** group.php	25 Mar 2005 21:47:27 -0000	1.43
--- group.php	30 Mar 2005 01:12:10 -0000	1.44
***************
*** 628,635 ****
      $C = DB_fetchArray ($cntresult);
      $num_pages = ceil ($C['count'] / $limit);
! 
!     $headline = sprintf ($LANG_ACCESS['usersingroup'],
!                          DB_getItem ($_TABLES['groups'], 'grp_name',
!                          "grp_id = '$grp_id'"));
      $retval .= COM_startBlock ($headline . ' (' . $C['count'] . ')', '',
                                 COM_getBlockTemplate ('_admin_block', 'header'));
--- 628,633 ----
      $C = DB_fetchArray ($cntresult);
      $num_pages = ceil ($C['count'] / $limit);
!     $groupname = DB_getItem ($_TABLES['groups'], 'grp_name',"grp_id = '$grp_id'");
!     $headline = sprintf ($LANG_ACCESS['usersingroup'],$groupname);
      $retval .= COM_startBlock ($headline . ' (' . $C['count'] . ')', '',
                                 COM_getBlockTemplate ('_admin_block', 'header'));
***************
*** 642,645 ****
--- 640,647 ----
      $user_templates->set_var ('layout_url', $_CONF['layout_url']);
      $user_templates->set_var ('lang_adminhome', $LANG28[16]);
+     $user_templates->set_var ('lang_grouplist', $LANG28[38]);
+     $user_templates->set_var ('lang_home', $LANG28[39]);
+     $user_templates->set_var('lang_instructions', sprintf($LANG_ACCESS['listgroupmsg'],$groupname)); 
+     $user_templates->set_var ('lang_uid', $LANG28[37]);
      $user_templates->set_var ('lang_username', $LANG28[3]);
      $user_templates->set_var ('lang_fullname', $LANG28[4]);
***************
*** 701,705 ****
  function editusers ($group)
  {
!     global $_CONF, $_TABLES, $_USER, $LANG_ACCESS;
  
      $thisUsersGroups = SEC_getUserGroups ();
--- 703,707 ----
  function editusers ($group)
  {
!     global $_CONF, $_TABLES, $_USER, $LANG_ACCESS, $LANG28;
  
      $thisUsersGroups = SEC_getUserGroups ();
***************
*** 727,731 ****
--- 729,736 ----
      $groupmembers->set_var ('site_url', $_CONF['site_url']);
      $groupmembers->set_var ('site_admin_url', $_CONF['site_admin_url']);
+     $groupmembers->set_var ('layout_url', $_CONF['layout_url']);
      $groupmembers->set_var ('phpself', $_CONF['site_admin_url'] . '/group.php');
+     $groupmembers->set_var('lang_adminhome', $LANG_ACCESS['adminhome']);
+     $groupmembers->set_var('lang_instructions', $LANG_ACCESS['editgroupmsg']); 
      $groupmembers->set_var ('LANG_sitemembers',$LANG_ACCESS['availmembers']);
      $groupmembers->set_var ('LANG_grpmembers',$LANG_ACCESS['groupmembers']);
***************
*** 736,739 ****
--- 741,745 ----
      $groupmembers->set_var('lang_save', $LANG_ACCESS['save']);
      $groupmembers->set_var('lang_cancel', $LANG_ACCESS['cancel']);
+     $groupmembers->set_var ('lang_grouplist', $LANG28[38]);
      $groupmembers->set_var ('group_id',$group);
      $groupmembers->parse ('output', 'groupmembers');

Index: user.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/user.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** user.php	25 Mar 2005 21:47:27 -0000	1.91
--- user.php	30 Mar 2005 01:12:10 -0000	1.92
***************
*** 453,456 ****
--- 453,457 ----
      $user_templates->set_var('last_query', $query);
      $user_templates->set_var('lang_limit_results', $LANG28[27]);
+     $user_templates->set_var('lang_uid', $LANG28[37]);
      $user_templates->set_var('lang_username', $LANG28[3]);
      $user_templates->set_var('lang_fullname', $LANG28[4]);