From a2edb89d9fa554f1ff8dcdf11882df9a39356b48 Mon Sep 17 00:00:00 2001
From: fujia <yuren_@126.com>
Date: Fri, 19 Nov 2010 08:28:17 +0000
Subject: [PATCH]  + complete task #343:optimize group users.

---
 module/group/control.php                |  4 ++--
 module/group/lang/en.php                |  2 ++
 module/group/lang/zh-cn.php             |  2 ++
 module/group/view/managemember.html.php | 22 ++++++++++++++++++----
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/module/group/control.php b/module/group/control.php
index e489b6376d..4e2324c344 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -122,8 +122,8 @@ class group extends control
         }
         $group      = $this->group->getById($groupID);
         $groupUsers = $this->group->getUserPairs($groupID);
-        $groupUsers = join(',', array_keys($groupUsers));
         $allUsers   = $this->user->getPairs('noclosed|noempty|noletter');
+        $otherUsers = array_diff_assoc($allUsers, $groupUsers);
 
         $header['title'] = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->manageMember;
         $position[]      = $group->name . $this->lang->colon . $this->lang->group->manageMember;
@@ -132,7 +132,7 @@ class group extends control
         $this->view->position   = $position;
         $this->view->group      = $group;
         $this->view->groupUsers = $groupUsers;
-        $this->view->allUsers   = $allUsers;
+        $this->view->otherUsers = $otherUsers;
 
         $this->display();
     }
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 078b46b585..f38bd0ef81 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -31,6 +31,8 @@ $lang->group->method   = 'Method';
 $lang->group->priv     = 'Priviledge';
 $lang->group->checkall = 'Select all';
 $lang->group->option   = 'Option';
+$lang->group->inside   = 'Group users';
+$lang->group->outside  = 'Other users';
 
 $lang->group->copyOptions['copyPriv'] = 'Copy priviledge';
 $lang->group->copyOptions['copyUser'] = 'Copy user';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 09235f07c3..c7a8e587fe 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -31,6 +31,8 @@ $lang->group->method   = '方法';
 $lang->group->priv     = '权限';
 $lang->group->checkall = '全选';
 $lang->group->option   = '选项';
+$lang->group->inside   = '组内用户';
+$lang->group->outside  = '组外用户';
 
 $lang->group->copyOptions['copyPriv'] = '复制权限';
 $lang->group->copyOptions['copyUser'] = '复制用户';
diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php
index 8bfe90c573..9fc3b79fb6 100644
--- a/module/group/view/managemember.html.php
+++ b/module/group/view/managemember.html.php
@@ -11,9 +11,9 @@
  */
 ?>
 <script language="Javascript">
-function checkall(checker)
+function checkall(checker, id)
 {
-    $('input').each(function() 
+    $('#' + id + ' input').each(function() 
     {
         $(this).attr("checked", checker.checked)
     });
@@ -26,8 +26,22 @@ function checkall(checker)
     <table align='center' class='table-1 a-left'> 
       <caption><?php echo $group->name . $lang->colon . $lang->group->manageMember;?></caption>
       <tr>
-        <th class='rowhead'><?php echo $lang->group->checkall;?><input type='checkbox' onclick='checkall(this);'></th>
-        <td id='users'><?php foreach($allUsers as $account => $realname) echo '<span>' . html::checkbox('members', array($account => $realname), $groupUsers) . '</span>';?></td>
+        <th class='rowhead'><?php echo $lang->group->inside;?><input type='checkbox' onclick='checkall(this, "group");'></th>
+        <td id='group' class='f-14px pv-10px'><?php $i = 1;?>
+          <?php foreach($groupUsers as $account => $realname):?>
+          <div class='w-p10 f-left'><?php echo '<span>' . html::checkbox('members', array($account => $realname), $account) . '</span>';?></div>
+          <?php if(($i %  8) == 0) echo "<div class='c-both'></div>"; $i ++;?>
+          <?php endforeach;?>
+        </td>
+      </tr>
+      <tr>
+        <th class='rowhead'><?php echo $lang->group->outside;?><input type='checkbox' onclick='checkall(this, "other");'></th>
+        <td id='other' class='f-14px pv-10px'><?php $i = 1;?>
+          <?php foreach($otherUsers as $account => $realname):?>
+          <div class='w-p10 f-left'><?php echo '<span>' . html::checkbox('members', array($account => $realname), '') . '</span>';?></div>
+          <?php if(($i %  8) == 0) echo "<div class='c-both'></div>"; $i ++;?>
+          <?php endforeach;?>
+        </td>
       </tr>
       <tr>
         <th class='rowhead'></th>