From e4c40098c2549b752dce0a884b8eb03b55aeee42 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 14 Oct 2015 16:06:30 +0800
Subject: [PATCH]  * finish task #2367.

---
 module/bug/control.php          |  2 +-
 module/bug/css/create.css       |  4 ++--
 module/bug/js/common.js         |  4 ++--
 module/bug/view/create.html.php | 31 +++++++++++++++++++++----------
 module/user/control.php         | 13 +++++++++++++
 www/js/my.full.js               | 21 +++++++++++++++++++++
 6 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 4eb3c79108..cf7613ad98 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -345,7 +345,7 @@ class bug extends control
         $this->view->contactLists     = $this->user->getContactLists($this->app->user->account, 'withnote');
         $this->view->keywords         = $keywords;
         $this->view->severity         = $severity;
-        $this->view->type             = $type;    
+        $this->view->type             = $type;
 
         $this->display();
     }
diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index e34aa1f98b..a1e7e704e7 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -8,8 +8,8 @@
 #buildBoxActions {padding-left: 15px;}
 
 #tplBoxWrapper {position: relative; z-index: 10;}
-#tplBoxWrapper > .btn-toolbar {position: absolute; right: 5px; top: 2px;}
-#tplBoxWrapper .btn {padding: 2px 8px}
+#tplBoxWrapper > .btn-toolbar {position: absolute; right: 0px; top: 0px;}
+#tplBoxWrapper .btn {padding: 4px 8px}
 #tplBox li {position: relative;}
 #tplBox li .btn-delete {position: absolute; right: 0; top: 0; display: block; width: 40px; text-align:center;}
 #tplBox li .tpl-name {padding-right: 40px;}
diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 9e9274feac..efe0107e35 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -237,12 +237,12 @@ function notice()
         var html = '';
         if($('#project').val() == '')
         {
-            html += '<a href="' + createLink('release', 'create', 'productID=' + $('#product').val()) + '" target="_blank">' + createRelease + '</a> ';
+            html += '<a href="' + createLink('release', 'create', 'productID=' + $('#product').val()) + '" target="_blank" style="padding-right:5px">' + createRelease + '</a> ';
             html += '<a href="javascript:loadProductBuilds(' + $('#product').val() + ')">' + refresh + '</a>';
         }
         else
         {
-            html += '<a href="' + createLink('build', 'create','projectID=' + $('#project').val()) + '" target="_blank">' + createBuild + '</a> ';
+            html += '<a href="' + createLink('build', 'create','projectID=' + $('#project').val()) + '" target="_blank" style="padding-right:5px">' + createBuild + '</a> ';
             html += '<a href="javascript:loadProjectBuilds(' + $('#project').val() + ')">' + refresh + '</a>';
         }
         var $bba = $('#buildBoxActions');
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index d38e667ecf..bdf27ba64b 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -91,10 +91,10 @@ js::set('refresh', $lang->refresh);
             <div class='col-sm-8'><?php echo html::input('title', $bugTitle, "class='form-control'");?></div>
             <div class='col-sm-4'>
               <div class='input-group'>
-                <span class='input-group-addon fix-border'><?php echo $lang->bug->pri?></span>
-                <?php echo html::select('pri', $lang->bug->priList, $severity, "class='form-control'");?>
                 <span class='input-group-addon fix-border'><?php echo $lang->bug->severity?></span>
                 <?php echo html::select('severity', $lang->bug->severityList, $severity, "class='form-control'");?>
+                <span class='input-group-addon fix-border'><?php echo $lang->bug->pri?></span>
+                <?php echo html::select('pri', $lang->bug->priList, $severity, "class='form-control'");?>
               </div>
             </div>
           </div>
@@ -105,8 +105,8 @@ js::set('refresh', $lang->refresh);
         <td colspan='2'>
           <div id='tplBoxWrapper'>
             <div class='btn-toolbar'>
-              <div class='btn-group'><button id='saveTplBtn' type='button' class='btn btn-mini'><?php echo $lang->bug->saveTemplate?></button></div>
-              <div class="btn-group">
+              <div class='btn-group'>
+                <button id='saveTplBtn' type='button' class='btn btn-mini'><?php echo $lang->bug->saveTemplate?></button>
                 <button type='button' class='btn btn-mini dropdown-toggle' data-toggle='dropdown'><?php echo $lang->bug->applyTemplate?> <span class='caret'></span></button>
                 <ul id='tplBox' class='dropdown-menu pull-right'>
                   <?php echo $this->fetch('bug', 'buildTemplates');?>
@@ -130,19 +130,30 @@ js::set('refresh', $lang->refresh);
         </td>
       </tr>
       <tr>
-        <th><nobr><?php echo $lang->bug->lblMailto;?></nobr></th>
-        <td colspan='2'>
+        <th><?php echo $lang->bug->lblMailto;?></th>
+        <td>
           <div class='input-group'>
           <?php 
           echo html::select('mailto[]', $users, str_replace(' ', '', $mailto), "class='form-control chosen' multiple");
           if($contactLists) echo html::select('', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");
+          if(empty($contactLists))
+          {
+              echo '<span class="input-group-addon">';
+              echo '<a href="' . $this->createLink('company', 'browse') . '" target="_blank">' . $lang->user->contacts->manage . '</a>';
+              echo '</span>';
+              echo '<span class="input-group-addon">';
+              echo '<a href="###" onclick="ajaxGetContacts(this)">' . $lang->refresh . '</a>';
+              echo '</span>';
+          }
           ?>
           </div>
         </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->bug->keywords;?></th>
-        <td colspan='2'><?php echo html::input('keywords', $keywords, "class='form-control'");?></td>
+        <td>
+          <div class='input-group'>
+            <span class='input-group-addon'><?php echo $lang->bug->keywords;?></span>
+            <?php echo html::input('keywords', $keywords, "class='form-control'");?>
+          </div>
+        </td>
       </tr>
       <tr>
         <th><?php echo $lang->bug->files;?></th>
diff --git a/module/user/control.php b/module/user/control.php
index 9d0f07b563..ca7f91f8a1 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -952,4 +952,17 @@ class user extends control
         $list = $this->user->getContactListByID($contactListID);
         return print(html::select('mailto[]', $users, $list->userList, "class='form-control' multiple data-placeholder='{$this->lang->chooseUsersToMail}'"));
     }
+
+    /**
+     * Ajax get contact list.
+     * 
+     * @access public
+     * @return string
+     */
+    public function ajaxGetContactList()
+    {
+        $contactList = $this->user->getContactLists($this->app->user->account, 'withnote');
+        if(empty($contactList)) return false;
+        return print(html::select('', $contactList, '', "class='form-control' onchange=\"setMailto('mailto', this.value)\""));
+    }
 }
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 15e2bf98eb..ef6840b2d6 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -605,6 +605,27 @@ function setMailto(mailto, contactListID)
     });
 }
 
+/**
+ * Ajax get contacts.
+ * 
+ * @param  obj $obj 
+ * @access public
+ * @return void
+ */
+function ajaxGetContacts(obj)
+{
+    link = createLink('user', 'ajaxGetContactList');
+    $.get(link, function(contacts)
+    {
+      if(!contacts) return false;
+
+      $inputgroup = $(obj).parent().parent();
+      $inputgroup.find('.input-group-addon').remove();
+      $inputgroup.append(contacts);
+      $inputgroup.find('select:last').chosen(defaultChosenOptions);
+    });
+}
+
 /**
  * Set comment. 
  *