Merge branch 'master' into clostridium

* master:
  Fix "New Strain" button under species edit
  Don't transition to loading route during login

app/pods/login/controller.js

@@ -1,6 +1,8 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
+  loading: false,
+
   actions: {
     authenticate: function() {
       let credentials = this.getProperties('identification', 'password');
@@ -9,12 +11,12 @@ export default Ember.Controller.extend({
 
       // Manually clean up because there might not be a transition
       this.get('flashMessages').clearMessages();
-      this.transitionToRoute('loading').then(() => {
-        session.authenticate(authenticator, credentials).then(null, (error)=> {
-          this.transitionToRoute('login');
-          this.get('flashMessages').error(error.error);
-        });
-      });
+      this.set('loading', true).then(session.authenticate(authenticator, credentials).catch((error) => {
+        this.transitionToRoute('login');
+        this.set('loading', false);
+        this.get('flashMessages').error(error.error);
+      }));
+      this.set('loading', false);
     }
   }
 });

app/pods/login/template.hbs

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

app/pods/protected/species/edit/route.js

@@ -16,4 +16,9 @@ export default Ember.Route.extend({
     }
   },
 
+  setupController: function(controller, model) {
+    controller.set('model', model);
+    controller.set('metaData', this.store.metadataFor('species'));
+  },
+
 });

app/pods/protected/species/edit/template.hbs

@@ -1,6 +1,7 @@
 {{
   protected/species/species-form
   species=model
+  metaData=metaData
   save="save"
   cancel="cancel"
 }}

app/pods/protected/species/species-form/template.hbs

@@ -11,8 +11,9 @@
         {{input type="checkbox" checked=species.typeSpecies}} {{if species.typeSpecies 'Yes' 'No'}}
       </div>
     </div>
-    <div data-row-span="2">
-      <div data-field-span="2">
+    {{#unless species.isNew}}
+    <div data-row-span="1">
+      <div data-field-span="1">
         <label>Strains</label>
         {{#each species.strains as |strain index|}}
           {{if index ","}}
@@ -20,11 +21,13 @@
             {{{strain.strainNameMU}}}
           {{/link-to}}
         {{/each}}
-        {{add-button label="Add Strain" link="protected.strains.new"}}
+        {{add-button label="Add Strain" link="protected.strains.new" canAdd=metaData.canAdd}}
       </div>
     </div>
-    <div data-row-span="2">
-      <div data-field-span="2">
+    {{/unless}}
+
+    <div data-row-span="1">
+      <div data-field-span="1">
         <label>Etymology</label>
         {{text-editor value=species.etymology}}
       </div>