Fix online not showing, closes #9

ReFlar · Apr 19, 2017 · f995821 · f995821
1 parent cac65f0
commit f995821
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/js/admin/dist/extension.js b/js/admin/dist/extension.js
@@ -155,7 +155,7 @@ System.register('Reflar/UserManagement/components/MemberPage', ['flarum/app', 'f
         var online = user.isOnline();
         var activated = user.isActivated();
 
-        return [m('li', { "data-id": user.id() }, [m('div', { className: 'MemberListItem-info' }, [m('span', { className: 'MemberListItem-name' }, [user.username()]), m('div', { className: 'MemberListItem-info' + (activated ? '1' : '0') }, [activated ? [m('span', { className: 'MemberCard-lastSeen' + (online ? ' online' : '') }, [online ? [icon('circle'), ' ', { className: 'MemberCard-online' }, app.translator.trans('reflar-usermanagement.admin.page.online_text')] : [icon('clock-o'), ' ', humanTime(user.lastSeenTime())]])] : [m('span', { className: 'MemberCard-lastSeen' }, [m('a', {
+        return [m('li', { "data-id": user.id() }, [m('div', { className: 'MemberListItem-info' }, [m('span', { className: 'MemberListItem-name' }, [user.username()]), m('div', { className: 'MemberListItem-info' + (activated ? '1' : '0') }, [activated ? [m('span', { className: 'MemberCard-lastSeen' + (online ? ' online' : '') }, [online ? [{ className: 'MemberCard-online' }, icon('circle'), ' ', app.translator.trans('reflar-usermanagement.admin.page.online_text')] : [icon('clock-o'), ' ', humanTime(user.lastSeenTime())]])] : [m('span', { className: 'MemberCard-lastSeen' }, [m('a', {
             className: 'Button Button--link',
             onclick: function onclick() {
                 app.request({
@@ -168,10 +168,10 @@ System.register('Reflar/UserManagement/components/MemberPage', ['flarum/app', 'f
             }
         }, [app.translator.trans('reflar-usermanagement.admin.page.activate')])])]]), m('span', { className: 'MemberListItem-comments' }, [icon('comment-o'), user.commentsCount()]), m('span', { className: 'MemberListItem-discussions' }, [icon('reorder'), user.discussionsCount()]), Button.component({
             className: 'Button Button--link',
-            icon: 'times',
+            icon: 'exclamation-triangle',
             onclick: function onclick(e) {
-                e.preventDefault();
                 app.modal.show(new AdminStrikeModal({ user: user }));
+                m.redraw();
             }
         }), m('a', {
             className: 'Button Button--link',
@@ -314,7 +314,7 @@ System.register('Reflar/UserManagement/components/MemberPage', ['flarum/app', 'f
                                     }));
                                 }).then(function () {
                                     _this2.loading = false;
-                                    m.redraw();
+                                    window.location.reload();
                                 });
                             }
                         })])]), m('div', { className: 'MemberList-list' }, [m('div', { className: 'container' }, [m('div', { className: 'MemberListItems' }, [m('label', { className: 'MemberListLabel' }, app.translator.trans('reflar-usermanagement.admin.page.list_title')), m('ol', {

diff --git a/js/admin/src/components/MemberPage.js b/js/admin/src/components/MemberPage.js
@@ -25,7 +25,8 @@ function MemberItem(user) {
                       activated
                           ? [m('span', {className: 'MemberCard-lastSeen' + (online ? ' online' : '')}, [
                                 online 
-                                    ? [icon('circle'), ' ', {className: 'MemberCard-online'}, app.translator.trans('reflar-usermanagement.admin.page.online_text')]
+
+                                    ? [{className: 'MemberCard-online'}, icon('circle'), ' ', app.translator.trans('reflar-usermanagement.admin.page.online_text')]
                                     : [icon('clock-o'), ' ', humanTime(user.lastSeenTime())]
                             ])]
                           : [m('span', {className: 'MemberCard-lastSeen'}, [
@@ -55,10 +56,10 @@ function MemberItem(user) {
                   ]),
                  Button.component({
                     className: 'Button Button--link',
-                    icon: 'times',
+                    icon: 'exclamation-triangle',
                     onclick: function (e) {
-                        e.preventDefault();
                         app.modal.show(new AdminStrikeModal({user}));
+                        m.redraw();
                     }
                   }),
                   m('a', {
@@ -170,7 +171,7 @@ export default class MemberPage extends Page {
                                     }));
                                   }).then(() => {
                                     this.loading = false;
-                                    m.redraw();
+                                    window.location.reload();
                                     })
                             }
                         })

diff --git a/locale/en.yml b/locale/en.yml
@@ -29,7 +29,7 @@ reflar-usermanagement:
       settings: Settings
       list_title: Users
       load_more_button: Load More
-      about_text: "Your users at a glance. Click on the eye to view the user's profile. Click on the 'X' to view a user's strikes"
+      about_text: "Your users at a glance. Click on the eye to view the user's profile. Click on the '!' to view a user's strikes"
   forum:
     post_controls:
       strike_button: Serve Strike

diff --git a/locale/es.yml b/locale/es.yml
@@ -29,7 +29,7 @@ reflar-usermanagement:
       settings: Ajustes
       list_title: Usuarios
       load_more_button: Ver más
-      about_text: "Tus usuarios estan a la vista. Dale click al ojo para ver el perfil de un usuario. Dale click a la X para ver sus advertencias."
+      about_text: "Tus usuarios estan a la vista. Dale click al ojo para ver el perfil de un usuario. Dale click a la ! para ver sus advertencias."
   forum:
     post_controls:
       strike_button: Dar advertencia