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

module/my/control.php

@@ -415,7 +415,7 @@ class my extends control
             {
                 $listID = $this->user->createContactList($this->post->newList, $this->post->users);
                 $this->user->setGlobalContacts($listID, isset($_POST['share']));
-                if(isonlybody()) die(js::closeModal('parent.parent', '', 'function(){parent.parent.ajaxGetContacts(\'#mailtoGroup\')}'));
+                if(isonlybody()) die(js::closeModal('parent.parent', '', ' function(){parent.parent.ajaxGetContacts(\'#mailto\')}'));
                 die(js::locate(inlink('manageContacts', "listID=$listID"), 'parent'));
             }
             elseif($this->post->mode == 'edit')

module/my/view/buildcontactlists.html.php

@@ -19,6 +19,8 @@ else
 {
     echo '<span class="input-group-btn">';
     echo '<a title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new", '', true) . "\" target='_blank' data-icon='cog' data-title='{$lang->user->contacts->manage}' class='btn btn-icon iframe'><i class='icon icon-cog'></i></a>";
+    echo '</span>';
+    echo '<span class="input-group-btn">';
     echo '<button type="button" title="' . $lang->refresh . '" class="btn btn-icon" onclick="ajaxGetContacts(this)"><i class="icon icon-refresh"></i></button>';
     echo '</span>';
 }

module/my/view/changepassword.html.php

@@ -11,6 +11,11 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php if(!isonlybody()):?>
+<style>
+.main-content{width: 500px; margin: 0 auto;}
+</style>
+<?php endif;?>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
     <h2><i class='icon-key'></i> <?php echo $lang->my->changePassword;?></h2>
@@ -18,7 +23,7 @@
   <form method='post' target='hiddenwin'>
     <table align='center' class='table table-form w-320px'>
       <tr>
-        <th class='rowhead w-120px'><?php echo $lang->user->account;?></th>
+        <th class='rowhead w-90px'><?php echo $lang->user->account;?></th>
         <td><?php echo $user->account . html::hidden('account',$user->account);?></td>
       </tr>  
       <tr>

module/story/view/create.html.php

@@ -64,9 +64,10 @@
                 if(count($plans) != 1)
                 {
                     echo "<div class='input-group-btn'>";
-                    echo html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch"), "<i class='icon icon-plus'></i>", '_blank', "class='btn' data-toggle='tooltip' title='{$lang->productplan->create}'");
-                    echo '&nbsp; ';
-                    echo html::a("javascript:loadProductPlans($productID)", "<i class='icon icon-refresh'></i>", '', "class='btn' data-toggle='tooltip' title='{$lang->refresh}'");
+                    echo html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch"), "<i class='icon icon-plus'></i>", '_blank', "class='btn btn-icon' data-toggle='tooltip' title='{$lang->productplan->create}'");
+                    echo '</div>';
+                    echo "<div class='input-group-btn'>";
+                    echo html::a("javascript:loadProductPlans($productID)", "<i class='icon icon-refresh'></i>", '', "class='btn btn-icon' data-toggle='tooltip' title='{$lang->refresh}'");
                     echo '</div>';
                 }
                 ?>

www/js/my.full.js

@@ -504,7 +504,7 @@ function ajaxGetContacts(obj)
       $inputgroup = $(obj).closest('.input-group');
       $inputgroup.find('.input-group-btn').remove();
       $inputgroup.append(contacts);
-      $inputgroup.find('select:last').chosen(defaultChosenOptions);
+      $inputgroup.find('select:last').chosen(defaultChosenOptions).fixInputGroup();
     });
 }