From e9e93da8ec72e7196488776c645036ff16affe26 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Mon, 17 Jul 2017 22:45:54 +0800
Subject: [PATCH] feat(users): add user-info link at many place

---
 .../client/views/topic.client.view.html       | 27 ++++++++++---------
 .../userinfo/userinfo.client.controller.js    | 13 +++++++--
 .../directives/user-info.client.directive.js  |  3 ++-
 .../views/userinfo/userinfo.client.view.html  |  2 +-
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/modules/forums/client/views/topic.client.view.html b/modules/forums/client/views/topic.client.view.html
index 1494c518..b19af25f 100644
--- a/modules/forums/client/views/topic.client.view.html
+++ b/modules/forums/client/views/topic.client.view.html
@@ -86,15 +86,15 @@
                             <div class="reply-item">
                                 <!-- topic content -->
                                 <div class="reply-wrapper">
-                                    <a class="reply-avatar">
-                                        <img title="{{vm.topic.user.displayName}}" ng-src="/{{vm.topic.user.profileImageURL}}">
-                                    </a>
+                                    <span user-info="vm.topic.user" info-class="reply-avatar">
+                                        <img ng-src="/{{vm.topic.user.profileImageURL}}">
+                                    </span>
 
                                     <div class="reply-comment">
                                         <div class="reply-comment-header">
-                                            <div class="reply-comment-header-text">{{vm.topic.user.displayName}} <span
-                                                    score-level="vm.getUserScoreLevel(vm.topic.user);"></span>
-
+                                            <div class="reply-comment-header-text">
+                                                <span user-info="vm.topic.user">{{vm.topic.user.displayName}}</span>
+                                                <span score-level="vm.getUserScoreLevel(vm.topic.user);"></span>
                                                 <span message-to="vm.topic.user" to-class="message-to-icon"></span>
                                                 <span class="user-ud-text">
                                                     (<span class="glyphicon glyphicon-arrow-up torrent-up"></span>{{vm.topic.user.uploaded | bytes}}
@@ -115,7 +115,8 @@
                                                        title="{{'FORUMS.TITLES.TOPIC_DELETE' | translate}}"
                                                        ng-show="vm.canEdit() || vm.isOwner(vm.topic)"
                                                        ng-click="vm.beginDeleteTopic(vm.topic);"></i>
-                                                    <i class="fa" ng-class="vm.topic.isTop ? 'fa-arrow-circle-down' : 'fa-arrow-circle-up'" aria-hidden="true"
+                                                    <i class="fa" ng-class="vm.topic.isTop ? 'fa-arrow-circle-down' : 'fa-arrow-circle-up'"
+                                                       aria-hidden="true"
                                                        title="{{'FORUMS.TITLES.TOPIC_TOP_TOPIC' | translate}}"
                                                        ng-show="vm.canEdit()"
                                                        ng-click="vm.beginTopTopic(vm.topic);"></i>
@@ -159,15 +160,15 @@
 
                                 <!-- topic replies -->
                                 <div class="reply-wrapper" ng-repeat="rep in vm.topic._replies">
-                                    <a class="reply-avatar">
-                                        <img title="{{rep.user.displayName}}" ng-src="/{{rep.user.profileImageURL}}">
-                                    </a>
+                                    <span user-info="rep.user" info-class="reply-avatar">
+                                        <img ng-src="/{{rep.user.profileImageURL}}">
+                                    </span>
 
                                     <div class="reply-comment">
                                         <div class="reply-comment-header">
-                                            <div class="reply-comment-header-text">{{rep.user.displayName}} <span
-                                                    score-level="vm.getUserScoreLevel(vm.topic.user);"></span>
-
+                                            <div class="reply-comment-header-text">
+                                                <span user-info="rep.user">{{rep.user.displayName}}</span>
+                                                <span score-level="vm.getUserScoreLevel(vm.topic.user);"></span>
                                                 <span message-to="vm.topic.user" to-class="message-to-icon"></span>
                                                 <span class="user-ud-text">
                                                     (<span class="glyphicon glyphicon-arrow-up torrent-up"></span>{{rep.user.uploaded | bytes}}
diff --git a/modules/users/client/controllers/userinfo/userinfo.client.controller.js b/modules/users/client/controllers/userinfo/userinfo.client.controller.js
index 14e0d875..658a6842 100644
--- a/modules/users/client/controllers/userinfo/userinfo.client.controller.js
+++ b/modules/users/client/controllers/userinfo/userinfo.client.controller.js
@@ -5,9 +5,9 @@
     .module('users')
     .controller('UserInfoController', UserInfoController);
 
-  UserInfoController.$inject = ['$scope', '$state', 'Authentication', 'userResolve', 'ScoreLevelService'];
+  UserInfoController.$inject = ['$scope', '$state', 'Authentication', 'userResolve', 'ScoreLevelService', '$timeout'];
 
-  function UserInfoController($scope, $state, Authentication, user, ScoreLevelService) {
+  function UserInfoController($scope, $state, Authentication, user, ScoreLevelService, $timeout) {
     var vm = this;
 
     vm.authentication = Authentication;
@@ -31,5 +31,14 @@
     function isContextUserSelf() {
       return vm.user.username === vm.authentication.user.username;
     }
+
+    /**
+     * init
+     */
+    vm.init = function () {
+      $timeout(function () {
+        $('html,body').scrollTop(0);
+      }, 0);
+    };
   }
 }());
diff --git a/modules/users/client/directives/user-info.client.directive.js b/modules/users/client/directives/user-info.client.directive.js
index 10765a46..04edc916 100644
--- a/modules/users/client/directives/user-info.client.directive.js
+++ b/modules/users/client/directives/user-info.client.directive.js
@@ -19,7 +19,8 @@
         if (s) {
           var user = s;
           var title = $translate.instant('USER_INFO_TITLE', {name: user.displayName});
-          var e = angular.element('<a href="#" ui-sref="userinfo({userId: \'' + user._id + '\'})" title="' + title + '">' + element[0].innerHTML + '</a>');
+          var cls = attrs.infoClass;
+          var e = angular.element('<a href="#" class="' + (cls ? cls : "") + '" ui-sref="userinfo({userId: \'' + user._id + '\'})" title="' + title + '">' + element[0].innerHTML + '</a>');
           element.html(e[0].outerHTML);
           $compile(element.contents())(scope);
         }
diff --git a/modules/users/client/views/userinfo/userinfo.client.view.html b/modules/users/client/views/userinfo/userinfo.client.view.html
index af0632d1..7b2124f6 100644
--- a/modules/users/client/views/userinfo/userinfo.client.view.html
+++ b/modules/users/client/views/userinfo/userinfo.client.view.html
@@ -1,4 +1,4 @@
-<section class="container">
+<section class="container" ng-init="vm.init();">
     <div class="page-header">
         <div class="row">
             <div class="col-md-3 col-md-offset-3">