Some of the required changes for the dataset/study page #12

ISA-tools · Sep 30, 2015 · 0d61ea0 · 0d61ea0
1 parent cf3bf36
commit 0d61ea0
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 17 deletions.
diff --git a/assets/css/viewer.css b/assets/css/viewer.css
@@ -153,7 +153,7 @@ ISA-Tab Viewer CSS
 }
 
 .section-header {
-    color: #AAA;
+    color: #324559;
     font-weight: normal;
     font-size: 1.5em;
 }

diff --git a/assets/js/ISATabViewer.js b/assets/js/ISATabViewer.js
@@ -237,7 +237,7 @@ ISATabViewer.rendering = {
 
         this.set_active_list_item(study_id_hash);
 
-        $("#isa-breadcrumb-items").html('<li onclick="Transition.functions.hideContent();" class="active"><i class="fa fa-chevron-left"></i> Back to Studies </li><li >' + study_id + '</li>');
+        $("#isa-breadcrumb-items").html('<li onclick="Transition.functions.hideContent();" class="active"><i class="fa fa-chevron-left"></i> Back to Datasets</li><li >' + study_id + '</li>');
         var study = {};
         for (var study_index in ISATabViewer.investigation.STUDY) {
 

diff --git a/index.html b/index.html
@@ -89,7 +89,7 @@
     </div>
     <div id="isatab_list" class="main">
         <section class="grid">
-            <header class="top-bar"><span id="article-count"></span> Studies Displayed</header>
+            <header class="top-bar"><span id="article-count"></span> Datasets Displayed</header>
             <!--populated from isatab-index.json content-->
         </section>
         <section class="content">
@@ -276,28 +276,51 @@ <h2 class="title title--preview">{{title}}</h2>
 <script id="study-template" type="text/x-handlebars-template">
 
     <div id="study-title">{{study_title}}</div>
-    <div id="study-description"><a href="{{study_description}}" target="_new">Abstract available from the SciData
-        Publication</a></div>
+    <div id="study-description"><a href="http://dx.doi.org/{{study_id}}" target="_new">Read the <b>data descriptor article</b></a></div>
 
     <div class="cf"></div>
     <br/>
 
+    <div id="investigation">
+        <div class="section-header">Investigation Details</div>
+
+        <div class="clearfix"></div>
+
+        <div id="investigation-details">
+
+        </div>
+
+    </div>
+
+
     <div id="samples">
-        <div class="section-header">Sample Information</div>
+        <div class="section-header">Samples Details</div>
 
         <div class="clearfix"></div>
 
         <div id="sample-distribution">
-hi
+
         </div>
 
     </div>
 
+    <div id="protocols">
+        <span class="section-header">Methods Details</span>
+        <ul>
+            {{#each protocols}}
+            <li>
+                <p class="protocol-name">{{[Study Protocol Name]}} <span
+                        class="type-tag">{{[Study Protocol Type]}}</span></p>
+            </li>
+            {{/each}}
+        </ul>
+    </div>
+
     <div class="clearfix"></div>
 
     <div id="publications">
 
-        <span class="section-header">Publications</span>
+        <span class="section-header">Related Publications using this Dataset</span>
         <ul>
             {{#each publications}}
             <li>
@@ -327,30 +350,33 @@ <h2 class="title title--preview">{{title}}</h2>
         </ul>
     </div>
 
-    <div id="factors">
+   <div id="funders">
 
-        <span class="section-header">Factors</span>
+        <span class="section-header">Funders</span>
         <ul>
-            {{#each factors}}
+            {{#each contacts}}
             <li>
-                <p class="protocol-name">{{[Study Factor Name]}} </p>
+                <p class="publication-title">{{[Study Person First Name]}} {{[Study Person Last Name]}} <span
+                        class="publication-pubmed-id">{{[Study Person Affiliation]}}</span></p>
             </li>
             {{/each}}
         </ul>
     </div>
 
-    <div id="protocols">
-        <span class="section-header">Protocols</span>
+
+    <div id="factors">
+
+        <span class="section-header">Factors</span>
         <ul>
-            {{#each protocols}}
+            {{#each factors}}
             <li>
-                <p class="protocol-name">{{[Study Protocol Name]}} <span
-                        class="type-tag">{{[Study Protocol Type]}}</span></p>
+                <p class="protocol-name">{{[Study Factor Name]}} </p>
             </li>
             {{/each}}
         </ul>
     </div>
 
+
 </script>
 
 <link rel="stylesheet" media="screen" href="http://handsontable.com/dist/handsontable.full.css">