diff --git a/module/my/control.php b/module/my/control.php index 8fac7b1941..0861c28899 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -1169,7 +1169,7 @@ EOF; * @access public * @return void */ - public function manageContacts($listID = 0, $mode = '') + public function manageContacts($listID = 0, $mode = 'new') { if($_POST) { @@ -1191,7 +1191,7 @@ EOF; } $this->user->setGlobalContacts($listID, isset($data->share)); if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.parent.ajaxGetContacts('#mailto')")); - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('manageContacts', "listID=$listID"))); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('manageContacts', "listID=$listID&mode=edit"))); } elseif($data->mode == 'edit') { @@ -1208,7 +1208,7 @@ EOF; return $this->send($response); } - $response['locate'] = inlink('manageContacts', "listID=$listID"); + $response['locate'] = inlink('manageContacts', "listID=$listID&mode=edit"); return $this->send($response); } } @@ -1231,7 +1231,6 @@ EOF; } $listID = $listID ? $listID : key($lists); - if(!$listID) $mode = 'new'; /* Create or manage list according to mode. */ if($mode == 'new') diff --git a/module/my/css/managecontacts.css b/module/my/css/managecontacts.css index 82c80117ae..ba5a1455e6 100644 --- a/module/my/css/managecontacts.css +++ b/module/my/css/managecontacts.css @@ -1,3 +1,6 @@ body.body-modal {padding-bottom: 20px; min-height: 400px;} -.side-col {padding-right: 40px; padding-top: 25px;} +.side-col {padding-right: 40px;} .btn-block {display: block; width: 100%; text-overflow: ellipsis; white-space: nowrap; overflow: hidden;} +.contactListTitle {margin-left: 45px !important;} +.createBtn {width: 100%; margin-bottom: 5px;} +.main-col .main-header .title {margin-left: 17px !important;} diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 5ea1688567..66e1068d95 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -45,6 +45,7 @@ $lang->my->pri = 'Priority'; $lang->my->alert = 'You can click on your profile at the top right and select "Preference" to modify your information. '; $lang->my->assignedToMe = 'AssignedToMe'; $lang->my->byQuery = 'Search'; +$lang->my->contactList = 'Contact List'; $lang->my->indexAction = 'My Index'; $lang->my->calendarAction = 'My Calendar'; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index b1c3471f89..3c168dab0f 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -45,6 +45,7 @@ $lang->my->pri = '优先级'; $lang->my->alert = '后续您可以点击右上方的头像,选择“个性化设置”修改信息。'; $lang->my->assignedToMe = '指派给我'; $lang->my->byQuery = '搜索'; +$lang->my->contactList = '联系人列表'; $lang->my->indexAction = '地盘仪表盘'; $lang->my->calendarAction = '我的日程'; diff --git a/module/my/view/managecontacts.html.php b/module/my/view/managecontacts.html.php index 4f395908f8..7c2c6e65ba 100644 --- a/module/my/view/managecontacts.html.php +++ b/module/my/view/managecontacts.html.php @@ -11,27 +11,28 @@ */ ?> -
'> - +
+

my->contactList;?>

+
+ ' . $lang->user->contacts->createList, '', "class='btn btn-secondary createBtn'"); ?> $listName) { - $listClass = ($id == $listID) ? 'btn btn-block active' : 'btn btn-block'; + $listClass = ($id == $listID and $mode == 'edit') ? 'btn btn-block active' : 'btn btn-block'; $shareIcon = in_array($id, $globalContacts) ? ' ' : ''; echo html::a(inlink('managecontacts', "listID=$id&mode=edit"), $shareIcon . $listName, '', "class='{$listClass}' title='$listName'"); } ?> - ' . $lang->user->contacts->createList, '', "class='btn btn-block'"); ?> +
-
-

+

- user->contacts->createList;?> + user->contacts->createList;?> - user->contacts->manage;?> + user->contacts->manage;?>