From 7875fa116fca77020b42ee183a0229b6e5e67f54 Mon Sep 17 00:00:00 2001
From: Munyoki Kilyungi
Date: Wed, 4 Oct 2023 15:32:48 +0300
Subject: Move dataset template to metadata directory.

* wqflask/wqflask/templates/dataset.html: Move this ...
* wqflask/wqflask/templates/metadata/dataset.html: here.  Also, add
htmx library.

Signed-off-by: Munyoki Kilyungi <me@bonfacemunyoki.com>
---
 wqflask/wqflask/templates/dataset.html          | 152 -----------------------
 wqflask/wqflask/templates/metadata/dataset.html | 156 ++++++++++++++++++++++++
 2 files changed, 156 insertions(+), 152 deletions(-)
 delete mode 100644 wqflask/wqflask/templates/dataset.html
 create mode 100644 wqflask/wqflask/templates/metadata/dataset.html

diff --git a/wqflask/wqflask/templates/dataset.html b/wqflask/wqflask/templates/dataset.html
deleted file mode 100644
index f465cb19..00000000
--- a/wqflask/wqflask/templates/dataset.html
+++ /dev/null
@@ -1,152 +0,0 @@
-{% extends "base.html" %}
-
-{% block css %}
-<style type="text/css">
- .page-header {
-     text-underline-offset: 0.5rem;
-     padding: 1em;
- }
- .panel-about {
-     background: #F8F8F8;
-     max-width: 35em;
-     margin: 10px;
- }
- .panel-metadata {
-     display: inline-block;
-     width: fit-content;
-     height: fit-content;
-     padding: 0;
- }
-
- .panel-metadata dt {
-     color: green;
- }
-
- .panel-metadata dt::after {
-     content: ":";
- }
-
-</style>
-{% endblock %}
-
-{% block title %}Dataset: {{ name }}{% endblock %}
-
-{% block content %}
-
-<header class="page-header text-justify">
-    <h1>
-	{% if metadata.publicationTitle %}
-	<u>{{ metadata.publicationTitle}}</u>
-	<br/>
-	<small>({{ metadata.title or metadata.name}})</small>
-        {% else %}
-        {{ name }}
-        {% endif %}
-    </h1>
-</header>
-
-<div class="container">
-    {% if metadata == {} %}
-    <p class="lead">We appreciate your interest, but unfortunately, we don't have any additional information available for: <strong>{{ name }}</strong>. If you have any other questions or need assistance with something else, please feel free to reach out to us.</p>
-    {% else %}
-    <div class="panel-about panel panel-info panel-metadata text-muted{{ float_p }}">
-        <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 metadata.created %} <dt>Created</dt> <dd>{{ metadata.created }}</dd> {% endif %}
-                {% if metadata.datasetGroup %} <dt>Data Set Group</dt> <dd>{{ metadata.datasetGroup }}</dd> {% endif %}
-                {% if metadata.accessionId %} <dt>Accession Id</dt> <dd>{{ metadata.accessionId }}</dd> {% endif %}
-                {% if metadata.geoSeries %}
-		<dt>GEO Series</dt>
-		<dd>
-		    <a href="{{ metadata.geoSeries }}" target="_blank">{{ metadata.geoSeries.split("=")[-1] }}</a>
-		</dd>
-		{% endif %}
-                {% if metadata.title %} <dt>Name</dt> <dd>{{ metadata.title }}</dd> {% endif %}
-		{% if metadata.organism %}
-		<dt>Organism</dt>
-		<dd>
-		    <a href="{{ metadata.organismUrl}}" target="_blank">{{ metadata.organism }}</a>
-		</dd>
-		{% endif %}
-		{% if metadata.inbredSetName %} <dt>Group</dt> <dd>{{ metadata.inbredSetName}}</dd> {% endif %}
-                {% if metadata.tissueName %} <dt>Tissue</dt> <dd>{{ metadata.tissueName}}</dd> {% endif %}
-		{% if metadata.datasetStatusName %} <dt>Dataset Status</dt> <dd>{{ metadata.datasetStatusName }}</dd> {% endif %}
-		{% if metadata.platformName %}
-		<dt>Platforms</dt>
-		<dd>
-		    {% if metadata.geoPlatformUrl %}
-		    [<a href="{{ metadata.geoPlatformUrl }}" target="_blank">{{ metadata.geoPlatformUrl.split("=")[-1] }}</a>]
-		    {% endif %}
-                    {{ metadata.platformName }}
-		</dd>
-		{% endif %}
-                {% if metadata.normalization %} <dt>Normalization</dt> <dd>{{ metadata.normalization }}</dd> {% endif %}
-                {% if metadata.investigatorName %}
-                <dt>Investigator</dt>
-                <dd>
-                    <a href="{{ metadata.investigatorWebUrl }}" target="_blank">{{ metadata.investigatorName }}</a>
-                </dd>
-                {% endif %}
-                {% if metadata.contributors %} <dt>Contributors</dt> <dd>{{ metadata.contributors|safe }}</dd> {% endif %}
-		{% if metadata.datasetOfOrganization %} <dt>Organization</dt> <dd>{{ metadata.datasetOfOrganization }}</dd> {% endif %}
-            </dl>
-        </div>
-    </div>
-
-    <div class="container">
-	{% if metadata.specifics %}
-	<h3><strong>Specifics of this Data Set:</strong></h3>
-	<div>{{ metadata.specifics}}</div>
-	{% endif %}
-
-        {% if metadata.summary %}
-        <h3><strong>Summary:</strong></h3>
-        <div>{{ metadata.summary|safe }}</div>
-        {% endif %}
-
-	{% if metadata.experimentDesign %}
-        <h3><strong>Experiment Design:</strong></h3>
-        <div>{{ metadata.experimentDesign|safe }}</div>
-        {% endif %}
-
-	{% if metadata.aboutCases %}
-        <h3><strong>About the cases used to generate this set of data:</strong></h3>
-        <div>{{ metadata.aboutCases|safe }}</div>
-        {% endif %}
-
-	{% if metadata.aboutTissue %}
-        <h3><strong>About the tissue used to generate this set of data:</strong></h3>
-        <div>{{ metadata.aboutTissue|safe }}</div>
-        {% endif %}
-
-        {% if metadata.aboutPlatform %}
-        <h3><strong>About the array platform:</strong></h3>
-        <div>{{ metadata.aboutPlatform|safe }}</div>
-        {% endif %}
-
-        {% if metadata.aboutDataProcessing %}
-        <h3><strong>About data values and data processing:</strong></h3>
-        <div>{{ metadata.aboutDataProcessing|safe }}</div>
-        {% endif %}
-
-	{% if metadata.notes %}
-        <h3><strong>Notes:</strong></h3>
-        <div>{{ metadata.notes|safe }}</div>
-        {% endif %}
-
-	{% if metadata.citation|trim %}
-        <h3><strong>Citation:</strong></h3>
-        <div>{{ metadata.citation|safe}}</div>
-        {% endif %}
-
-	{% if metadata.acknowledgment|trim %}
-        <h3><strong>Acknowledgment:</strong></h3>
-        <div>{{ metadata.acknowledgment|safe}}</div>
-        {% endif %}
-    </div>
-    {% endif %}
-
-</div>
-
-{% endblock %}
diff --git a/wqflask/wqflask/templates/metadata/dataset.html b/wqflask/wqflask/templates/metadata/dataset.html
new file mode 100644
index 00000000..6bad6fda
--- /dev/null
+++ b/wqflask/wqflask/templates/metadata/dataset.html
@@ -0,0 +1,156 @@
+{% extends "base.html" %}
+
+{% block css %}
+<style type="text/css">
+ .page-header {
+     text-underline-offset: 0.5rem;
+     padding: 1em;
+ }
+ .panel-about {
+     background: #F8F8F8;
+     max-width: 35em;
+     margin: 10px;
+ }
+ .panel-metadata {
+     display: inline-block;
+     width: fit-content;
+     height: fit-content;
+     padding: 0;
+ }
+
+ .panel-metadata dt {
+     color: green;
+ }
+
+ .panel-metadata dt::after {
+     content: ":";
+ }
+
+</style>
+{% endblock %}
+
+{% block title %}Dataset: {{ name }}{% endblock %}
+
+{% block content %}
+
+<header class="page-header text-justify">
+    <h1>
+	{% if metadata.publicationTitle %}
+	<u>{{ metadata.publicationTitle}}</u>
+	<br/>
+	<small>({{ metadata.title or metadata.name}})</small>
+        {% else %}
+        {{ name }}
+        {% endif %}
+    </h1>
+</header>
+
+<div class="container">
+    {% if metadata == {} %}
+    <p class="lead">We appreciate your interest, but unfortunately, we don't have any additional information available for: <strong>{{ name }}</strong>. If you have any other questions or need assistance with something else, please feel free to reach out to us.</p>
+    {% else %}
+    <div class="panel-about panel panel-info panel-metadata text-muted{{ float_p }}">
+        <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 metadata.created %} <dt>Created</dt> <dd>{{ metadata.created }}</dd> {% endif %}
+                {% if metadata.datasetGroup %} <dt>Data Set Group</dt> <dd>{{ metadata.datasetGroup }}</dd> {% endif %}
+                {% if metadata.accessionId %} <dt>Accession Id</dt> <dd>{{ metadata.accessionId }}</dd> {% endif %}
+                {% if metadata.geoSeries %}
+		<dt>GEO Series</dt>
+		<dd>
+		    <a href="{{ metadata.geoSeries }}" target="_blank">{{ metadata.geoSeries.split("=")[-1] }}</a>
+		</dd>
+		{% endif %}
+                {% if metadata.title %} <dt>Name</dt> <dd>{{ metadata.title }}</dd> {% endif %}
+		{% if metadata.organism %}
+		<dt>Organism</dt>
+		<dd>
+		    <a href="{{ metadata.organismUrl}}" target="_blank">{{ metadata.organism }}</a>
+		</dd>
+		{% endif %}
+		{% if metadata.inbredSetName %} <dt>Group</dt> <dd>{{ metadata.inbredSetName}}</dd> {% endif %}
+                {% if metadata.tissueName %} <dt>Tissue</dt> <dd>{{ metadata.tissueName}}</dd> {% endif %}
+		{% if metadata.datasetStatusName %} <dt>Dataset Status</dt> <dd>{{ metadata.datasetStatusName }}</dd> {% endif %}
+		{% if metadata.platformName %}
+		<dt>Platforms</dt>
+		<dd>
+		    {% if metadata.geoPlatformUrl %}
+		    [<a href="{{ metadata.geoPlatformUrl }}" target="_blank">{{ metadata.geoPlatformUrl.split("=")[-1] }}</a>]
+		    {% endif %}
+                    {{ metadata.platformName }}
+		</dd>
+		{% endif %}
+                {% if metadata.normalization %} <dt>Normalization</dt> <dd>{{ metadata.normalization }}</dd> {% endif %}
+                {% if metadata.investigatorName %}
+                <dt>Investigator</dt>
+                <dd>
+                    <a href="{{ metadata.investigatorWebUrl }}" target="_blank">{{ metadata.investigatorName }}</a>
+                </dd>
+                {% endif %}
+                {% if metadata.contributors %} <dt>Contributors</dt> <dd>{{ metadata.contributors|safe }}</dd> {% endif %}
+		{% if metadata.datasetOfOrganization %} <dt>Organization</dt> <dd>{{ metadata.datasetOfOrganization }}</dd> {% endif %}
+            </dl>
+        </div>
+    </div>
+
+    <div class="container">
+	{% if metadata.specifics %}
+	<h3><strong>Specifics of this Data Set:</strong></h3>
+	<div>{{ metadata.specifics}}</div>
+	{% endif %}
+
+        {% if metadata.summary %}
+        <h3><strong>Summary:</strong></h3>
+        <div>{{ metadata.summary|safe }}</div>
+        {% endif %}
+
+	{% if metadata.experimentDesign %}
+        <h3><strong>Experiment Design:</strong></h3>
+        <div>{{ metadata.experimentDesign|safe }}</div>
+        {% endif %}
+
+	{% if metadata.aboutCases %}
+        <h3><strong>About the cases used to generate this set of data:</strong></h3>
+        <div>{{ metadata.aboutCases|safe }}</div>
+        {% endif %}
+
+	{% if metadata.aboutTissue %}
+        <h3><strong>About the tissue used to generate this set of data:</strong></h3>
+        <div>{{ metadata.aboutTissue|safe }}</div>
+        {% endif %}
+
+        {% if metadata.aboutPlatform %}
+        <h3><strong>About the array platform:</strong></h3>
+        <div>{{ metadata.aboutPlatform|safe }}</div>
+        {% endif %}
+
+        {% if metadata.aboutDataProcessing %}
+        <h3><strong>About data values and data processing:</strong></h3>
+        <div>{{ metadata.aboutDataProcessing|safe }}</div>
+        {% endif %}
+
+	{% if metadata.notes %}
+        <h3><strong>Notes:</strong></h3>
+        <div>{{ metadata.notes|safe }}</div>
+        {% endif %}
+
+	{% if metadata.citation|trim %}
+        <h3><strong>Citation:</strong></h3>
+        <div>{{ metadata.citation|safe}}</div>
+        {% endif %}
+
+	{% if metadata.acknowledgment|trim %}
+        <h3><strong>Acknowledgment:</strong></h3>
+        <div>{{ metadata.acknowledgment|safe}}</div>
+        {% endif %}
+    </div>
+    {% endif %}
+
+</div>
+
+{% endblock %}
+
+{% block js %}
+<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/htmx.min.js') }}"></script>
+{% endblock %}
-- 
cgit 1.4.1