Revert #22

app/pods/login/controller.js

@@ -3,20 +3,19 @@ import Ember from 'ember';
 export default Ember.Controller.extend({
   session: Ember.inject.service('session'),
 
-  loading: false,
-
   actions: {
     authenticate: function() {
       // Manually clean up because there might not be a transition
       this.get('flashMessages').clearMessages();
+
       let { identification, password } = this.getProperties('identification', 'password');
-      this.set('loading', true);
+      this.transitionToRoute('loading').then(() => {
         this.get('session').authenticate('authenticator:oauth2', identification, password).catch((error) => {
-        this.transitionToRoute('login');
-        this.set('loading', false);
+          this.transitionToRoute('login').then(() => {
             this.get('flashMessages').error(error.error);
           });
-      this.set('loading', false);
+        });
+      });
     }
   }
 });

app/pods/login/template.hbs

@@ -1,7 +1,4 @@
 {{#x-application invalidateSession="invalidateSession"}}
-  {{#if loading}}
-    {{loading-panel}}
-  {{else}}
   <form {{action "authenticate" on="submit"}}>
     <h2>Log In</h2>
       {{input value=identification type="text" placeholder="Email"}}
@@ -12,5 +9,4 @@
   <div>
     Forget your password? {{link-to 'Request a lockout email.' 'users.requestlockouthelp'}}
   </div>
-  {{/if}}
 {{/x-application}}