1 files changed, 46 insertions, 37 deletions
diff --git a/uploader/templates/phenotypes/view-phenotype.html b/uploader/templates/phenotypes/view-phenotype.html
index 99bb8e5..21ac501 100644
--- a/uploader/templates/phenotypes/view-phenotype.html
+++ b/uploader/templates/phenotypes/view-phenotype.html
@@ -16,7 +16,7 @@
            species_id=species.SpeciesId,
            population_id=population.Id,
            dataset_id=dataset.Id,
-           xref_id=xref_id)}}">View Datasets</a>
+           xref_id=xref_id)}}">View Phenotype</a>
 </li>
 {%endblock%}
 
@@ -34,51 +34,58 @@
           <td>{{phenotype.Post_publication_description or phenotype.Pre_publication_abbreviation or phenotype.Original_description}}
         </tr>
         <tr>
-          <td><strong>Cross-Reference ID</strong></td>
-          <td>{{phenotype.xref_id}}</td>
-        </tr>
-        <tr>
-          <td><strong>Collation</strong></td>
+          <td><strong>Database</strong></td>
           <td>{{dataset.FullName}}</td>
         </tr>
         <tr>
           <td><strong>Units</strong></td>
           <td>{{phenotype.Units}}</td>
         </tr>
+        {%for key,value in publish_data.items()%}
+        <tr>
+          <td><strong>{{key}}</strong></td>
+          <td>{{value}}</td>
+        </tr>
+        {%else%}
+        <tr>
+          <td colspan="2" class="text-muted">
+            <span class="glyphicon glyphicon-exclamation-sign"></span>
+            No publication data found.
+          </td>
+        </tr>
+        {%endfor%}
       </tbody>
     </table>
+  </div>
+</div>
 
-    <form action="#edit-delete-phenotype"
-          method="POST"
-          id="frm-delete-phenotype">
-
-          <input type="hidden" name="species_id" value="{{species.SpeciesId}}" />
-          <input type="hidden" name="population_id" value="{{population.Id}}" />
-          <input type="hidden" name="dataset_id" value="{{dataset.Id}}" />
-          <input type="hidden" name="phenotype_id" value="{{phenotype.Id}}" />
-
-          <div class="btn-group btn-group-justified">
-            <div class="btn-group">
-              {%if "group:resource:edit-resource" in privileges%}
-                <input type="submit"
-                       title="Edit the values for the phenotype. This is meant to be used when you need to update only a few values."
-                       class="btn btn-primary not-implemented"
-                       value="edit" />
-                     {%endif%}
-            </div>
-            <div class="btn-group"></div>
-            <div class="btn-group">
-              {%if "group:resource:delete-resource" in privileges%}
-                <input type="submit"
-                       title="Delete the entire phenotype. This is useful when you need to change data for most or all of the fields for this phenotype."
-                       class="btn btn-danger not-implemented"
-                       value="delete" />
-                     {%endif%}
-            </div>
-          </div>
-    </form>
+{%if "group:resource:edit-resource" in privileges
+or "group:resource:delete-resource" in privileges%}
+<div class="row">
+  <div class="btn-group btn-group-justified">
+    <div class="btn-group">
+      {%if "group:resource:edit-resource" in privileges%}
+      <a href="{{url_for('species.populations.phenotypes.edit_phenotype_data',
+               species_id=species.SpeciesId,
+               population_id=population.Id,
+               dataset_id=dataset.Id,
+               xref_id=xref_id)}}"
+         title="Edit the values for the phenotype. This is meant to be used when you need to update only a few values."
+         class="btn btn-primary">Edit</a>
+      {%endif%}
+    </div>
+    <div class="btn-group"></div>
+    <div class="btn-group">
+      {%if "group:resource:delete-resource" in privileges%}
+      <a href="#"
+         title="Delete the entire phenotype. This is useful when you need to change data for most or all of the fields for this phenotype."
+         class="btn btn-danger not-implemented"
+         disabled="disabled">delete</a>
+      {%endif%}
+    </div>
   </div>
 </div>
+{%endif%}
 
 <div class="row">
   <div class="panel panel-default">
@@ -90,9 +97,10 @@
           <th>#</th>
           <th>Sample</th>
           <th>Value</th>
-          <th>Symbol</th>
+          {%if has_se%}
           <th>SE</th>
           <th>N</th>
+          {%endif%}
         </tr>
       </thead>
 
@@ -102,9 +110,10 @@
           <td>{{loop.index}}</td>
           <td>{{item.StrainName}}</td>
           <td>{{item.value}}</td>
-          <td>{{item.Symbol or "-"}}</td>
+          {%if has_se%}
           <td>{{item.error or "-"}}</td>
           <td>{{item.count or "-"}}</td>
+          {%endif%}
         </tr>
         {%endfor%}
       </tbody>