diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 812eeaaa..be90348f 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -211,7 +211,11 @@
STATUS_WARNING: 'Warning',
SCORE_DETAIL: 'Score detail',
INVITATIONS: 'Invitations',
- INVITE_INVALID: 'invalid invitation'
+ INVITE_INVALID: 'invalid invitation',
+ MY_FOLLOWERS: 'My Followers',
+ MY_FOLLOWING: 'My Following',
+ USER_FOLLOWERS: 'User`s Followers',
+ USER_FOLLOWING: 'User`s Following'
},
//sign in, sign up, password
@@ -684,6 +688,12 @@
EDIT_SIGNATURE_SUCCESSFULLY: 'Edit signature successfully',
EDIT_SIGNATURE_ERROR: 'Edit signature failed',
+ //follow
+ FOLLOW: {
+ NO_FOLLOWERS: 'Has no anybody following you.',
+ NO_FOLLOWING: 'You aren’t following anybody.'
+ },
+
//user status
STATUS_ACCOUNT: 'Account Status',
STATUS_UPLOADED: 'Uploaded torrents',
@@ -733,6 +743,10 @@
MAKER: 'Maker Group',
VIP_START_AT: 'Vip start at',
VIP_END_AT: 'Vip end at',
+ MY_FOLLOWERS: 'My Followers',
+ MY_FOLLOWING: 'My Following',
+ FOLLOWERS: 'Followers',
+ FOLLOWING: 'Following',
UPLOADED: 'Total uploaded',
DOWNLOADED: 'Total downloaded',
RATIO: 'Total ratio',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index ebed5cb9..43a5ac9e 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -211,7 +211,11 @@
STATUS_WARNING: '正被警告',
SCORE_DETAIL: '积分详情',
INVITATIONS: '我的邀请',
- INVITE_INVALID: '无效的邀请'
+ INVITE_INVALID: '无效的邀请',
+ MY_FOLLOWERS: '关注我的',
+ MY_FOLLOWING: '我关注的',
+ USER_FOLLOWERS: '关注他的',
+ USER_FOLLOWING: '他的关注'
},
//sign in, sign up, password
@@ -684,6 +688,12 @@
EDIT_SIGNATURE_SUCCESSFULLY: '修改签名成功',
EDIT_SIGNATURE_ERROR: '修改签名失败',
+ //follow
+ FOLLOW: {
+ NO_FOLLOWERS: '还没有任何用户关注到您.',
+ NO_FOLLOWING: '您还没有关注任何人.'
+ },
+
//user status
STATUS_ACCOUNT: '帐户状态',
STATUS_UPLOADED: '我上传的种子',
@@ -733,6 +743,10 @@
MAKER: '资源压制小组',
VIP_START_AT: 'Vip 资格开始于',
VIP_END_AT: 'Vip 资格结束于',
+ MY_FOLLOWERS: '关注我的',
+ MY_FOLLOWING: '我关注的',
+ FOLLOWERS: '被关注',
+ FOLLOWING: '关注',
UPLOADED: '总上传量',
DOWNLOADED: '总下载量',
RATIO: '总分享率',
diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index 6914ef6b..31ede96b 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -1447,6 +1447,22 @@ body {
line-height: 2;
}
+.dl-hover {
+ @media (min-width: @screen-sm-min) {
+ dt {
+ width: 170px !important;
+ }
+ dd {
+ padding: 0 10px;
+ }
+ dt, dd {
+ &:hover {
+ background-color: #f8f8f8;
+ }
+ }
+ }
+}
+
.rss-desc-line {
line-height: 1.5 !important;
padding-top: 4px;
diff --git a/modules/users/client/config/users.client.routes.js b/modules/users/client/config/users.client.routes.js
index 595659f4..810de7ff 100644
--- a/modules/users/client/config/users.client.routes.js
+++ b/modules/users/client/config/users.client.routes.js
@@ -75,6 +75,28 @@
pageTitle: 'EDIT_SIGNATURE'
}
})
+ .state('follow', {
+ abstract: true,
+ url: '/follow',
+ template: '