From 2306be7eaf83caa174353d0a5dcf18ce499d34e7 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Mon, 28 Mar 2016 16:05:03 +0800
Subject: [PATCH] * finish task #2558. * add manage contacts and refresh button
 for task and testtask module.

---
 module/bug/view/create.html.php      |  2 +-
 module/company/js/browse.js          |  4 ----
 module/company/view/browse.html.php  |  4 +---
 module/story/view/create.html.php    |  2 +-
 module/task/css/create.css           |  2 ++
 module/task/view/create.html.php     | 11 ++++++++++-
 module/testtask/css/create.css       |  1 +
 module/testtask/js/create.js         |  6 ++++++
 module/testtask/view/create.html.php | 11 ++++++++++-
 9 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 module/testtask/css/create.css

diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index ef90712a28..598c5345dc 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -171,7 +171,7 @@ js::set('refresh', $lang->refresh);
           if(empty($contactLists))
           {
               echo '<span class="input-group-btn">';
-              echo '<a href="' . $this->createLink('company', 'browse') . '" target="_blank" data-toggle="tooltip" class="btn" title="' . $lang->user->contacts->manage . '"><i class="icon icon-cog"></i></a>';
+              echo '<a href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new") . '" target="_blank" data-toggle="tooltip" class="btn" title="' . $lang->user->contacts->manage . '"><i class="icon icon-cog"></i></a>';
               echo '<a href="###" onclick="ajaxGetContacts(this)" data-toggle="tooltip" class="btn" title="' . $lang->refresh . '"><i class="icon icon-refresh"></i></a>';
               echo '</span>';
           }
diff --git a/module/company/js/browse.js b/module/company/js/browse.js
index 26d385e9de..afdb55566e 100644
--- a/module/company/js/browse.js
+++ b/module/company/js/browse.js
@@ -2,10 +2,6 @@ function batchEdit()
 {
     $('#userListForm').attr('action', createLink('user', 'batchEdit', 'dept=' + deptID));
 }
-function manageContacts()
-{
-    $('#userListForm').attr('action', createLink('user', 'manageContacts'));
-}
 $(function()
 {
     setTimeout(function(){fixedTfootAction('#userListForm')}, '100');
diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index cae7b55e80..e3c22f8f3d 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -54,8 +54,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
     <tbody>
     
     <?php 
-    $canBatchEdit      = common::hasPriv('user', 'batchEdit');
-    $canManageContacts = common::hasPriv('user', 'manageContacts');
+    $canBatchEdit = common::hasPriv('user', 'batchEdit');
     ?>
     <?php foreach($users as $user):?>
     <tr class='text-center'>
@@ -99,7 +98,6 @@ js::set('confirmDelete', $lang->user->confirmDelete);
       <?php
       if($canBatchEdit or $canManageContacts) echo html::selectButton();
       if($canBatchEdit) echo html::submitButton($lang->edit, 'onclick=batchEdit()', 'btn btn-default');
-      if($canManageContacts) echo html::submitButton($lang->user->contacts->manage, 'onclick=manageContacts()');
       ?>
       </div>
       <?php echo $pager->show();?>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 0398785f29..a8b396e34b 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -127,8 +127,8 @@
             if(empty($contactLists))
             {
                 echo '<span class="input-group-btn">';
+                echo '<a data-toggle="tooltip" title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new") . '" target="_blank" class="btn"><i class="icon icon-cog"></i></a>';
                 echo '<a data-toggle="tooltip" title="' . $lang->refresh . '" href="###" class="btn" onclick="ajaxGetContacts(this)"><i class="icon icon-refresh"></i></a>';
-                echo '<a data-toggle="tooltip" title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('company', 'browse') . '" target="_blank" class="btn"><i class="icon icon-cog"></i></a>';
                 echo '</span>';
             }
             ?>
diff --git a/module/task/css/create.css b/module/task/css/create.css
index 3784181619..c756136b77 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -1,6 +1,8 @@
 .dropdown-pris > .btn {background-color: #fff;}
 #mailto + .chosen-container-multi .chosen-choices {border-top-left-radius: 0; border-bottom-left-radius: 0}
 
+#mailtoGroup .input-group-btn > .btn {margin-left: -1px!important;}
+
 .chosen-container {max-width: 980px}
 
 .minw-80px {min-width: 80px;}
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index e2734e6273..8e4b712f70 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -94,10 +94,19 @@
           </div>
         </td>
         <td colspan='2'>
-          <div class='input-group'>
+          <div id='mailtoGroup' class='input-group'>
             <span class='input-group-addon'><?php echo $lang->task->mailto;?></span>
             <?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "multiple class='form-control'");?>
             <?php if($contactLists) echo html::select('', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");?>
+            <?php
+            if(empty($contactLists))
+            {
+                echo '<span class="input-group-btn">';
+                echo '<a data-toggle="tooltip" title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new") . '" target="_blank" class="btn"><i class="icon icon-cog"></i></a>';
+                echo '<a data-toggle="tooltip" title="' . $lang->refresh . '" href="###" class="btn" onclick="ajaxGetContacts(this)"><i class="icon icon-refresh"></i></a>';
+                echo '</span>';
+            }
+            ?>
           </div>
         </td>
       </tr>
diff --git a/module/testtask/css/create.css b/module/testtask/css/create.css
new file mode 100644
index 0000000000..876d1ee127
--- /dev/null
+++ b/module/testtask/css/create.css
@@ -0,0 +1 @@
+#mailtoGroup .input-group-btn > .btn {margin-left: -1px!important;}
diff --git a/module/testtask/js/create.js b/module/testtask/js/create.js
index e422618ffd..f35f82e8f8 100755
--- a/module/testtask/js/create.js
+++ b/module/testtask/js/create.js
@@ -58,3 +58,9 @@ function suitEndDate()
     endDate = endDate.toString('yyyy-M-dd');
     $('#end').val(endDate);
 }
+
+/* If the mouse hover over the manage contacts button, give tip. */
+$(function()
+{
+    $('[data-toggle=tooltip]').tooltip();
+});
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index 56613844aa..c59dd8f5c9 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -73,9 +73,18 @@
       <tr>
         <th><?php echo $lang->testtask->mailto;?></th>
         <td colspan='2'>
-          <div class='input-group'>
+          <div id='mailtoGroup' class='input-group'>
             <?php echo html::select('mailto[]', $users, '', "multiple class='form-control'");?>
             <?php if($contactLists) echo html::select('', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");?>
+            <?php
+            if(empty($contactLists))
+            {
+                echo '<span class="input-group-btn">';
+                echo '<a href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new") . '" target="_blank" data-toggle="tooltip" class="btn" title="' . $lang->user->contacts->manage . '"><i class="icon icon-cog"></i></a>';
+                echo '<a href="###" onclick="ajaxGetContacts(this)" data-toggle="tooltip" class="btn" title="' . $lang->refresh . '"><i class="icon icon-refresh"></i></a>';
+                echo '</span>';
+            }
+            ?>
           </div>
         </td>
       </tr>