chg(core): change the User Ranking menu item position into about

modules/about/client/config/about.client.menus.js

@@ -22,22 +22,23 @@
       state: 'about.rules',
       position: 1
     });
-    menuService.addSubMenuItem('topbar', 'about', {
-      title: 'MENU_ABOUT_BLACKLIST',
-      state: 'about.black',
-      position: 2
-    });
+    // 2 is item of Users Ranking configure in module ranking
     menuService.addSubMenuItem('topbar', 'about', {
       title: 'MENU_ABOUT_MAKERGROUP',
       state: 'about.maker',
-      position: 3,
-      divider: true
+      position: 3
     });
     menuService.addSubMenuItem('topbar', 'about', {
       title: 'MENU_ABOUT_OPERLIST',
       state: 'about.operlist',
       position: 4
     });
+    menuService.addSubMenuItem('topbar', 'about', {
+      title: 'MENU_ABOUT_BLACKLIST',
+      state: 'about.black',
+      position: 5,
+      divider: true
+    });
 
   }
 }());

modules/core/client/app/trans-string-en.js

@@ -29,12 +29,12 @@
     MENU_USERS_ADMIN: 'Manage User',
     MENU_UPLOAD: 'Upload',
     MENU_FORUMS: 'Forums',
-    MENU_RANKING: 'Ranking',
     MENU_ABOUT: 'About',
-    MENU_ABOUT_RULES: 'Rules',
+    MENU_ABOUT_RULES: 'User Rules',
     MENU_ABOUT_BLACKLIST: 'Client Black List',
     MENU_ABOUT_MAKERGROUP: 'Torrents Maker Group',
     MENU_ABOUT_OPERLIST: 'Admin/Oper List',
+    MENU_ABOUT_RANKING: 'Users Ranking',
     MENU_VIP: 'VIP',
     MENU_ADMIN: 'Admin',
 
@@ -155,8 +155,8 @@
       EBOOK_LIST: 'eBook List',
       OTHER_LIST: 'Other List',
       TORRENT_INFO: 'Torrent Info',
-      RANKING: 'Ranking',
-      RULES: 'Rules',
+      RANKING: 'Users Ranking',
+      RULES: 'User Rules',
       BLACK: 'Client Black List',
       MAKER: 'Torrents Maker Group',
       OPERLIST: 'Admin/Oper List',

modules/core/client/app/trans-string-zh.js

@@ -29,12 +29,12 @@
     MENU_USERS_ADMIN: '用户管理',
     MENU_UPLOAD: '发布',
     MENU_FORUMS: '论坛',
-    MENU_RANKING: '排行榜',
     MENU_ABOUT: '关于',
-    MENU_ABOUT_RULES: '站内规则',
+    MENU_ABOUT_RULES: '站内用户规则',
     MENU_ABOUT_BLACKLIST: '禁止客户端列表',
     MENU_ABOUT_MAKERGROUP: '资源压制小组',
     MENU_ABOUT_OPERLIST: 'Admin/Oper 列表',
+    MENU_ABOUT_RANKING: '用户排行榜',
     MENU_VIP: 'VIP',
     MENU_ADMIN: '管理中心',
 
@@ -155,8 +155,8 @@
       EBOOK_LIST: '电子书列表',
       OTHER_LIST: '其它列表',
       TORRENT_INFO: '种子信息',
-      RANKING: '排行榜',
-      RULES: '规则',
+      RANKING: '用户排行榜',
+      RULES: '用户规则',
       BLACK: '禁止客户端列表',
       MAKER: '资源压制小组',
       OPERLIST: 'Admin/Oper 列表',

modules/core/client/views/header.client.view.html

@@ -33,7 +33,7 @@
       <li class="dropdown" uib-dropdown>
         <a class="dropdown-toggle user-header-dropdown-toggle" uib-dropdown-toggle role="button">
           <img ng-src="{{vm.authentication.user.profileImageURL}}" alt="{{vm.authentication.user.displayName}}" class="header-profile-image" />
-          <span ng-bind="vm.authentication.user.displayName"></span> <b class="caret"></b>
+          <span class="sm-hide" ng-bind="vm.authentication.user.displayName"></span> <b class="caret"></b>
         </a>
         <ul class="dropdown-menu" role="menu">
           <li>

modules/ranking/client/config/ranking.client.menus.js

@@ -8,12 +8,11 @@
   menuConfig.$inject = ['menuService'];
 
   function menuConfig(menuService) {
-    menuService.addMenuItem('topbar', {
-      title: 'MENU_RANKING',
+    menuService.addSubMenuItem('topbar', 'about', {
+      title: 'MENU_ABOUT_RANKING',
       state: 'ranking',
-      roles: ['*'],
-      class: 'sm-hide',
-      position: 4
+      position: 2,
+      divider: true
     });
   }
 }());