Merge branch 'master' of https://github.com/easysoft/zentaopms

module/product/css/common.css

@@ -0,0 +1 @@
+#whitelistBox .checkbox-primary, #whitelistBox .radio-inline{margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}

module/story/view/edit.html.php

@@ -146,8 +146,10 @@
               <tr>
                 <th><?php echo $lang->story->mailto;?></th>
                 <td>
-                  <?php echo html::select('mailto[]', $users, str_replace(' ' , '', $story->mailto), "class='form-control' multiple");?>
-                  <?php echo $this->fetch('my', 'buildContactLists')?>
+                  <div class='input-group'>
+                    <?php echo html::select('mailto[]', $users, str_replace(' ' , '', $story->mailto), "class='form-control' multiple");?>
+                    <div class='input-group-btn'><?php echo $this->fetch('my', 'buildContactLists')?></div>
+                  </div>
                 </td>
               </tr>
             </table>

module/task/view/edit.html.php

@@ -126,8 +126,10 @@
               <tr>
                 <th><?php echo $lang->task->mailto;?></th>
                 <td>
-                <?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ' , '', $task->mailto), 'class="form-control" multiple');?>
-                <?php echo $this->fetch('my', 'buildContactLists');?>
+                  <div class='input-group'>
+                    <?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ' , '', $task->mailto), 'class="form-control" multiple');?>
+                    <div class='input-group-btn'><?php echo $this->fetch('my', 'buildContactLists');?></div>
+                  </div>
                 </td>
               </tr>
             </table>