Refactor template to use new json-ld format.

Signed-off-by: Munyoki Kilyungi <me@bonfacemunyoki.com>

1 files changed, 92 insertions, 57 deletions

diff --git a/wqflask/wqflask/templates/metadata/dataset.html b/wqflask/wqflask/templates/metadata/dataset.html
index dfe58f9b..eec91de1 100644
--- a/wqflask/wqflask/templates/metadata/dataset.html
+++ b/wqflask/wqflask/templates/metadata/dataset.html
@@ -1,112 +1,147 @@
 <header class="page-header text-justify">
     <h1>
 	{% if dataset.title %}
-	<u>{{ dataset.title}}</u>
+	{{ dataset.title }}
 	<br/>
-	<small>({{ dataset.prefLabel or dataset.altlabel}})</small>
+	<small>({{ dataset.prefLabel or dataset.label }})</small>
         {% else %}
         {{ name }}
         {% endif %}
     </h1>
 </header>
 
-<div class="container">
-    <div class="panel-about panel panel-info panel-metadata text-muted{{ float_p }}">
+{% if dataset.title or dataset.prefLabel or dataset.label %}
+<hr style="height: 1px;border-width:0;color:rgb(162, 169, 177);background-color:rgb(162, 169, 177);margin:0;">
+{% endif %}
+
+<div class="dataset-content">
+    <div class="panel-about panel panel-info panel-metadata text-muted">
         <div class="panel-heading"><strong><span class="glyphicon glyphicon-info-sign aria-hidden=true"></span> Details</strong> </div>
         <div class="panel-body">
             <dl class="dl-horizontal">
-                {% if dataset.created %} <dt>Created</dt> <dd>{{ dataset.created }}</dd> {% endif %}
-                {% if dataset.classifiedUnder %} <dt>Data Set Group</dt> <dd>{{ dataset.classifiedUnder}}</dd> {% endif %}
-                {% if dataset.identifier %} <dt>Accession Id</dt> <dd>{{ dataset.identifier}}</dd> {% endif %}
+                {% if dataset.created %}
+		<dt>Created</dt>
+		<dd>{{ dataset.created }}</dd>
+		{% endif %}
+                {% if dataset.inbredSet %}
+		<dt>Data Set Group</dt>
+		<dd>{{ dataset.inbredSet}}</dd>
+		{% endif %}
+
+		{% if dataset.accessionId %}
+		<dt>Accession Id</dt>
+		<dd>{{ dataset.accessionId}}</dd>
+		{% endif %}
+
                 {% if dataset.hasGeoSeriesId %}
 		<dt>GEO Series</dt>
 		<dd>
-		    <a href="{{ dataset.hasGeoSeriesId }}" target="_blank">{{ dataset.hasGeoSeriesId.split("=")[-1] }}</a>
+		    <a href="{{ dataset.geoSeriesId }}" target="_blank">{{ dataset.geoSeriesId.split("=")[-1] }}</a>
 		</dd>
 		{% endif %}
-                {% if dataset.title %} <dt>Name</dt> <dd>{{ dataset.title }}</dd> {% endif %}
-		{% if dataset.organism %}
-		<dt>Organism</dt>
-		<dd>
-		    <a href="{{ dataset.organismUrl}}" target="_blank">{{ dataset.organism }}</a>
-		</dd>
+
+                {% if dataset.title %}
+		<dt>Name</dt>
+		<dd>{{ dataset.title }}</dd>
+		{% endif %}
+
+		{% if dataset.inbredSet %}
+		<dt>Group</dt>
+		<dd>{{dataset.inbredSet}}</dd>
 		{% endif %}
-		{% if dataset.inbredSetName %} <dt>Group</dt> <dd>{{ dataset.inbredSetName}}</dd> {% endif %}
-                {% if dataset.tissueName %} <dt>Tissue</dt> <dd>{{ dataset.tissueName}}</dd> {% endif %}
-		{% if dataset.datasetStatusName %} <dt>Dataset Status</dt> <dd>{{ dataset.datasetStatusName }}</dd> {% endif %}
-		{% if dataset.platformName %}
+
+                {% if dataset.tissue %}
+		<dt>Tissue</dt>
+		<dd>{{ dataset.tissue.label }}</dd>
+		{% endif %}
+
+		{% if dataset.platform %}
 		<dt>Platforms</dt>
 		<dd>
-		    {% if dataset.geoPlatformUrl %}
-		    [<a href="{{ dataset.geoPlatformUrl }}" target="_blank">{{ dataset.geoPlatformUrl.split("=")[-1] }}</a>]
-		    {% endif %}
-                    {{ dataset.platformName }}
+		    {{ dataset.platform.prefLabel }}
+		    [<a href="{{ dataset.platform.id}}" target="_blank">
+		    {{ dataset.platform.prefLabel}}
+		    </a>]
 		</dd>
 		{% endif %}
-                {% if dataset.usesNormalization %} <dt>Normalization</dt> <dd>{{ dataset.usesNormalization }}</dd> {% endif %}
-                {% if dataset.investigatorName %}
+
+                {% if dataset.normalization %}
+		<dt>Normalization</dt>
+		<dd>{{ dataset.normalization }}</dd>
+		{% endif %}
+
+                {% if dataset.contactPoint %}
                 <dt>Investigator</dt>
                 <dd>
-                    <a href="{{ dataset.investigatorWebUrl }}" target="_blank">{{ dataset.investigatorName }}</a>
+                    {{ dataset.contactPoint }}
                 </dd>
                 {% endif %}
-                {% if dataset.contributors %} <dt>Contributors</dt> <dd>{{ dataset.contributors|safe }}</dd> {% endif %}
-		{% if dataset.datasetOfOrganization %} <dt>Organization</dt> <dd>{{ dataset.datasetOfOrganization }}</dd> {% endif %}
+
+		{% if dataset.organization %}
+		<dt>Organization</dt>
+		<dd>{{ dataset.organization }}</dd>
+		{% endif %}
             </dl>
-        </div>
+													</div>
     </div>
 
-    <div class="container">
-	{% if dataset.specifics %}
-	<h3><strong>Specifics of this Data Set:</strong></h3>
-	<div>{{ dataset.specifics}}</div>
-	{% endif %}
-
-        {% if dataset.description %}
-        <h3><strong>Summary:</strong></h3>
+    <div class="row dataset-metadata">
+	{% if dataset.description %}
         <div>{{ dataset.description|safe }}</div>
         {% endif %}
 
-	{% if dataset.hasExperimentDesignInfo %}
-        <h3><strong>Experiment Design:</strong></h3>
-        <div>{{ dataset.hasExperimentDesignInfo|safe }}</div>
+	{% if dataset.specificity %}
+	<h2><strong>Specifics of this Dataset</strong></h2>
+	<div>{{ dataset.specificity}}</div>
+	{% endif %}
+
+	{% if dataset.experimentDesignInfo %}
+        <h3><strong>Experiment Design</strong></h3>
+        <div>{{ dataset.experimentDesignInfo|safe }}</div>
         {% endif %}
 
-	{% if dataset.hasCaseInfo %}
-        <h3><strong>About the cases used to generate this set of data:</strong></h3>
-        <div>{{ dataset.hasCaseInfo|safe }}</div>
+	{% if dataset.caseInfo %}
+        <h3><strong>About the Cases Used to Generate this Dataset:</strong></h3>
+        <div>{{ dataset.caseInfo|safe }}</div>
         {% endif %}
 
-	{% if dataset.aboutTissue %}
-        <h3><strong>About the tissue used to generate this set of data:</strong></h3>
-        <div>{{ dataset.aboutTissue|safe }}</div>
+	{% if dataset.tissue %}
+        <h3><strong>About the Tissue Used to Generate this Dataset</strong></h3>
+        <div>{{ dataset.tissue.info|safe }}</div>
         {% endif %}
 
-        {% if dataset.hasPlatformInfo %}
-        <h3><strong>About the array platform:</strong></h3>
-        <div>{{ dataset.hasPlatformInfo|safe }}</div>
+        {% if dataset.platform %}
+        <h3><strong>About the Array Platform</strong></h3>
+        <div>{{ dataset.platform.info|safe }}</div>
         {% endif %}
 
-        {% if dataset.hasDataProcessingInfo %}
-        <h3><strong>About data values and data processing:</strong></h3>
-        <div>{{ dataset.hasDataProcessingInfo|safe }}</div>
+        {% if dataset.processingInfo %}
+        <h3><strong>About Data Values and Data Processing</strong></h3>
+        <div>{{ dataset.processingInfo|safe }}</div>
         {% endif %}
 
 	{% if dataset.notes %}
-        <h3><strong>Notes:</strong></h3>
+        <h3><strong>Notes</strong></h3>
         <div>{{ dataset.notes|safe }}</div>
         {% endif %}
 
-	{% if dataset.citation|trim %}
-        <h3><strong>Citation:</strong></h3>
-        <div>{{ dataset.citation|safe}}</div>
+	{% if dataset.references|trim %}
+        <h3><strong>Citation</strong></h3>
+        <div>{{ dataset.references|safe}}</div>
         {% endif %}
 
 	{% if dataset.acknowledgment|trim %}
-        <h3><strong>Acknowledgment:</strong></h3>
+        <h3><strong>Acknowledgment</strong></h3>
         <div>{{ dataset.acknowledgment|safe}}</div>
         {% endif %}
-    </div>
+
+        {% if dataset.contributors %}
+	<h3><strong>Contributors</strong></h3>
+	<div>{{ dataset.contributors|safe }}</div>
+	{% endif %}
+            </div>
+
+</div>
 
 </div>