Pulling stuff back out of strain component

app/templates/components/species/species-details.hbs

@@ -21,6 +21,7 @@
             {{/link-to}}
           {{/each}}
           {{#if (can "edit species" species)}}
+            <br>
             {{#link-to 'strains.new' class="button-gray smaller"}}
               Add Strain
             {{/link-to}}

app/templates/components/strains/strain-details.hbs

@@ -120,11 +120,11 @@
       <div class="grid-4">
         <div class="span-1">
           {{! Does nothing ATM }}
-          <a {{bind-attr class=":smaller isEditing:button-red:button-gray"}} {{action 'editStrain'}}>
+          <a {{bind-attr class=":smaller isEditing:button-red:button-gray"}} {{action 'cancel'}}>
             {{#if isEditing}}Cancel{{else}}Edit{{/if}}
           </a>
           {{#if isEditing}}
-            <a class="button-green smaller" {{action 'saveStrain'}}>
+            <a class="button-green smaller" {{action 'save'}}>
               Save
             </a>
           {{/if}}

app/templates/strains/new.hbs

@@ -1,8 +1,8 @@
 {{
   strains/strain-details
-  strain=model.strain
-  species=model.species
+  strain=strain
+  species=species
   isEditing=true
-  isNew=true
-  action="cancelStrain"
+  save="save"
+  cancel="cancel"
 }}

app/templates/strains/show.hbs

@@ -1,4 +1,11 @@
-{{strains/strain-details strain=model.strain species=model.species}}
+{{
+  strains/strain-details
+  strain=strain
+  species=species
+  isEditing=isEditing
+  save="save"
+  cancel="cancel"
+}}
 
 <div class="measurements-container">
   {{outlet}}