WIP banned user

misago/emberapp/app/controllers/login-modal.js

@@ -5,13 +5,14 @@ import getCsrfToken from 'misago/utils/csrf';
 export default Ember.Controller.extend({
   modal: null,
 
-  message: '',
+  isLoading: false,
+  isBanned: false,
+  showActivation: false,
 
   username: '',
   password: '',
 
-  isLoading: false,
-  showActivation: false,
+  ban: null,
 
   scheduleSetup: function() {
     Ember.run.scheduleOnce('afterRender', this, this.setup);
@@ -31,18 +32,17 @@ export default Ember.Controller.extend({
   },
 
   reset: function() {
-    this.set('message', '');
+    this.set('ban', null);
 
     this.set('username', '');
     this.set('password', '');
 
     this.set('isLoading', false);
+    this.set('isBanned', false);
     this.set('showActivation', false);
   },
 
   isValid: function(credentials) {
-    this.set('isLoading', true);
-
     if (!credentials.username || !credentials.password) {
       this.send('flashWarning', gettext("Fill out both fields."));
       return false;
@@ -83,6 +83,8 @@ export default Ember.Controller.extend({
       this.send('flashInfo', rejection.detail);
       this.set('showActivation', true);
     } else if (rejection.code === 'banned') {
+      this.set('ban', rejection.detail);
+      this.set('isBanned', true);
     } else {
       this.send('flashError', rejection.detail);
     }
@@ -101,11 +103,12 @@ export default Ember.Controller.extend({
         };
 
         if (this.isValid(credentials)) {
+          this.set('isLoading', true);
           this.authenticate(credentials);
         } else {
           this.set('isLoading', false);
         }
       }
-    }
+    },
   }
 });

misago/emberapp/app/styles/misago/modals.less

@@ -17,6 +17,13 @@
     .form-group {
       margin: @padding-large-vertical 0px;
     }
+
+    &.modal-ban-message {
+      p {
+        margin-top: @padding-large-vertical;
+        margin-bottom: @padding-large-vertical;
+      }
+    }
   }
 
   .modal-footer {

misago/emberapp/app/templates/login-modal.hbs

@@ -2,8 +2,26 @@
   <div class="modal-dialog modal-sm modal-sign-in">
     <div class="modal-content">
       <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="{{unbound gettext "Close"}}"><span aria-hidden="true">&times;</span></button>
+        {{#if isBanned}}
+        <h4 class="modal-title" id="loginModalLabel">{{gettext "Account banned"}}</h4>
+        {{else}}
         <h4 class="modal-title" id="loginModalLabel">{{gettext "Sign in"}}</h4>
+        {{/if}}
+      </div>
+
+      {{#if isBanned}}
+      <div class="modal-body modal-ban-message">
+
+        {{{ban.message.html}}}
+
+        <p>This ban is permanent.</p>
+
+      </div>
+      <div class="modal-footer">
+        <button class="btn btn-block btn-default" data-dismiss="modal">{{gettext "Ok"}}</button>
       </div>
+      {{else}}
       <div class="modal-body">
 
         <div class="form-group">
@@ -36,6 +54,7 @@
         <button class="btn btn-block btn-default">{{gettext "Forgot password?"}}</button>
 
       </div>
+      {{/if}}
     </div>
   </div>
 </div>