Update templates to consistently use {% static %} instead of hard coding paths

Also import a few media files that were missing.

diff --git a/htsworkflow/frontend/static/css/dashboard.css b/htsworkflow/frontend/static/css/dashboard.css
new file mode 100644 (file)
index 0000000..05808bc
--- /dev/null
+++ b/htsworkflow/frontend/static/css/dashboard.css
@@ -0,0 +1,30 @@
+/* DASHBOARD */
+
+.dashboard .module table th {
+    width: 100%;
+}
+
+.dashboard .module table td {
+    white-space: nowrap;
+}
+
+.dashboard .module table td a {
+    display: block;
+    padding-right: .6em;
+}
+
+/* RECENT ACTIONS MODULE */
+
+.module ul.actionlist {
+    margin-left: 0;
+}
+
+ul.actionlist li {
+    list-style-type: none;
+}
+
+ul.actionlist li {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+}

diff --git a/htsworkflow/frontend/static/img/dna80.png b/htsworkflow/frontend/static/img/dna80.png
new file mode 100644 (file)
index 0000000..845c255
Binary files /dev/null and b/htsworkflow/frontend/static/img/dna80.png differ

diff --git a/htsworkflow/frontend/templates/base.html b/htsworkflow/frontend/templates/base.html
index 336568945ac8cc60e43807b6f3b0ad663ba82ad4..0325a84e2162af3edb3e4b4d4cc81a8d694b21be 100644 (file)
--- a/htsworkflow/frontend/templates/base.html
+++ b/htsworkflow/frontend/templates/base.html
@@ -22,7 +22,7 @@
     {% block extrastyle %}{% endblock %}
     {% block extrahead %}{% endblock %}
     {% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
-    <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/data-browse-index.css" />
+    <link rel="stylesheet" type="text/css" href="{% static "css/data-browse-index.css" %}" />
 {% endblock %}
 
 </head>

diff --git a/htsworkflow/frontend/templates/base_site.html b/htsworkflow/frontend/templates/base_site.html
index 7381f62c645b5585a0fb02c07c58a6cba377ff23..1c02752c40358038e670725b03a55a8c095c30bf 100644 (file)
--- a/htsworkflow/frontend/templates/base_site.html
+++ b/htsworkflow/frontend/templates/base_site.html
@@ -1,7 +1,8 @@
 {% extends "base.html" %}
+{% load staticfiles %}
 {% load i18n %}
 
-<link type="text/css" rel="stylesheet" href="/static/css/app.css" />
+<link type="text/css" rel="stylesheet" href="{% static "css/app.css" %}" />
 
 {% block title %}{{ sitename }}{% endblock %}
 

diff --git a/htsworkflow/frontend/templates/experiments/flowcell_detail.html b/htsworkflow/frontend/templates/experiments/flowcell_detail.html
index d958bf1084ad18e6e246d392f84253e46db00e00..64da7e2886881d3609e4344353a0da75aceb00d5 100644 (file)
--- a/htsworkflow/frontend/templates/experiments/flowcell_detail.html
+++ b/htsworkflow/frontend/templates/experiments/flowcell_detail.html
@@ -1,9 +1,10 @@
 {% extends "base_site.html" %}
+{% load staticfiles %}
 {% load humanize i18n %}
 {% block extrahead %}
     <!-- App Stuff -->
-    <link type="text/css" rel="stylesheet" href="/static/css/app.css" />
-    <script type="text/javascript" src="/static/js/jquery.min.js"></script>
+    <link type="text/css" rel="stylesheet" href="{% static "css/app.css" %}" />
+    <script type="text/javascript" src="{% static "js/jquery.min.js" %}"></script>
 
     {% block additional_javascript %}
     {% endblock %}
@@ -41,7 +42,7 @@
               {% if user.is_staff %}
               <a href="{{lane.library.get_admin_url}}">
                   <img class="icon_button"
-                       src="/media/img/admin/icon_changelink.gif"/>
+                       src="{% static "admin/img/icon_changelink.gif" %}"/>
               </a>{% endif %}
           </td>
           <td>

diff --git a/htsworkflow/frontend/templates/experiments/flowcell_header.html b/htsworkflow/frontend/templates/experiments/flowcell_header.html
index f71ae0fed0e77a05520b7e35c6f631004d437666..f0cb470102ce3932bbfbe17fbec315a51f152202 100644 (file)
--- a/htsworkflow/frontend/templates/experiments/flowcell_header.html
+++ b/htsworkflow/frontend/templates/experiments/flowcell_header.html
@@ -1,7 +1,8 @@
+{% load staticfiles %}
 <div class="flowcell_identity" typeof="libns:IlluminaFlowcell" resource="{{flowcell.get_absolute_url}}">
   <h2>About this Flowcell</h2>
   <b>Flowcell</b>:
-    <a href="{{flowcell.get_absolute_url}}"><span property="libns:flowcell_id">{{flowcell.flowcell_id}}</span></a>{% if user.is_staff %}<a href="{{flowcell.get_admin_url}}"><img class="icon_button" src="/media/img/admin/icon_changelink.gif" alt="Edit"/></a>{% endif%}
+    <a href="{{flowcell.get_absolute_url}}"><span property="libns:flowcell_id">{{flowcell.flowcell_id}}</span></a>{% if user.is_staff %}<a href="{{flowcell.get_admin_url}}"><img class="icon_button" src="{% static "admin/img/icon_changelink.gif" %}" alt="Edit"/></a>{% endif%}
   <br/>
   <div rel="libns:sequenced_by">
   <div typeof="libns:Sequencer"

diff --git a/htsworkflow/frontend/templates/experiments/flowcell_lane_detail.html b/htsworkflow/frontend/templates/experiments/flowcell_lane_detail.html
index 591b5ba3ecec0e0dd037bb2b0990595adedc6f1e..ebe2c59d261be2740b40ab5e6dc9e1c20e30ba7a 100644 (file)
--- a/htsworkflow/frontend/templates/experiments/flowcell_lane_detail.html
+++ b/htsworkflow/frontend/templates/experiments/flowcell_lane_detail.html
@@ -1,9 +1,10 @@
 {% extends "base_site.html" %}
 {% load humanize i18n %}
+{% load staticfiles %}
 {% block extrahead %}
     <!-- App Stuff -->
-    <link type="text/css" rel="stylesheet" href="/static/css/app.css" />
-    <script type="text/javascript" src="/static/js/jquery.min.js"></script>
+    <link type="text/css" rel="stylesheet" href="{% static "css/app.css" %}"/>
+    <script type="text/javascript" src="{% static "js/jquery.min.js" %}"></script>
 
     {% block additional_javascript %}
     {% endblock %}

diff --git a/htsworkflow/frontend/templates/experiments/sequencer.html b/htsworkflow/frontend/templates/experiments/sequencer.html
index b79aa380eaeea1225f176bc249ca43f5c73afce7..411288c5b33ec244cde4ebe769dcc7bb3edeb261 100644 (file)
--- a/htsworkflow/frontend/templates/experiments/sequencer.html
+++ b/htsworkflow/frontend/templates/experiments/sequencer.html
@@ -1,9 +1,10 @@
 {% extends "base_site.html" %}
 {% load humanize i18n %}
+{% load staticfiles %}
 {% block extrahead %}
     <!-- App Stuff -->
-    <link type="text/css" rel="stylesheet" href="/static/css/app.css" />
-    <script type="text/javascript" src="/static/js/jquery.min.js"></script>
+    <link type="text/css" rel="stylesheet" href="{% static "css/app.css" %}" />
+    <script type="text/javascript" src="{% static "js/jquery.min.js" %}"></script>
 
     {% block additional_javascript %}
     {% endblock %}

diff --git a/htsworkflow/frontend/templates/sample_header.html b/htsworkflow/frontend/templates/sample_header.html
index ed24bbde1e21b3e8d2c4267fdcd2c20920dd4b98..a198cef383aa91e5b0a19c5ebd68413c3da928e4 100644 (file)
--- a/htsworkflow/frontend/templates/sample_header.html
+++ b/htsworkflow/frontend/templates/sample_header.html
@@ -1,3 +1,4 @@
+{% load staticfiles %}
 <div id="librarydetail"
      about="{{lib.get_absolute_url}}"
      typeof="libns:Library">
@@ -5,7 +6,7 @@
     <h2>Library Name</h2>
     <b>Library ID</b>:
        <a href="{{lib.get_absolute_url}}"><span property="libns:library_id">{{ lib.id }}</span></a>
-       {% if user.is_staff %}<a href="{{lib.get_admin_url}}"><img class="icon_button" src="/media/img/admin/icon_changelink.gif" alt="Edit"/></a>{% endif %}
+       {% if user.is_staff %}<a href="{{lib.get_admin_url}}"><img class="icon_button" src="{% static "admin/img/icon_changelink.gif" %}" alt="Edit"/></a>{% endif %}
        <br />
     <b>Name</b>:
       <span property="libns:name">{{ lib.library_name }}</span>

diff --git a/htsworkflow/frontend/templates/samples/library_detail.html b/htsworkflow/frontend/templates/samples/library_detail.html
index 3214df65e259010d2977c2d2680e3b5c855e873f..65747dcac5194ca6d73191a3ad419d6c9f500fe1 100644 (file)
--- a/htsworkflow/frontend/templates/samples/library_detail.html
+++ b/htsworkflow/frontend/templates/samples/library_detail.html
@@ -1,9 +1,10 @@
 {% extends "base_site.html" %}
+{% load staticfiles %}
 {% load humanize i18n %}
 {% block extrahead %}
     <!-- App Stuff -->
-    <link type="text/css" rel="stylesheet" href="/static/css/app.css" />
-    <script type="text/javascript" src="/static/js/jquery.min.js"></script>
+    <link type="text/css" rel="stylesheet" href="{% static "css/app.css" %}"/>
+    <script type="text/javascript" src="{% static "js/jquery.min.js" %}"></script>
 
     {% block additional_javascript %}
     {% endblock %}
@@ -33,7 +34,7 @@
     <tr about="{{result.flowcell.get_absolute_url}}">
       <td property="libns:date" content="{{result.run_date|date:'Y-m-d\TH:i:s'}}" datatype="xsd:dateTime">{{ result.run_date|date}}</td>
       <td>{{ result.cycle }}</td>
-      <td><a href="{{result.flowcell.get_absolute_url}}"><span property="libns:flowcell_id">{{ result.flowcell_id }}</span></a>{% if user.is_staff %}<a href="{{result.flowcell.get_admin_url}}"><img class="icon_button" src="/media/img/admin/icon_changelink.gif" alt="Edit"/></a>{% endif%}</td>
+      <td><a href="{{result.flowcell.get_absolute_url}}"><span property="libns:flowcell_id">{{ result.flowcell_id }}</span></a>{% if user.is_staff %}<a href="{{result.flowcell.get_admin_url}}"><img class="icon_button" src="{% static "admin/img/icon_changelink.gif" %}" alt="Edit"/></a>{% endif%}</td>
       <td>{{ result.lane.lane_number }}</td>
       <td><a href="{{ result.summary_url }}">Summary</a></td>
       <td><a href="{{ result.result_url }}">{{ result.result_label }}</a></td>
@@ -143,7 +144,7 @@
           {% if user.is_staff %}
             <a href="{{lane.flowcell.get_admin_url}}">
                <img class="icon_button"
-                    src="/media/img/admin/icon_changelink.gif" alt="Edit"/>
+                    src="{% static "admin/img/icon_changelink.gif" %}" alt="Edit"/>
             </a>
           {% endif%}
         </td>

diff --git a/htsworkflow/frontend/templates/samples/library_index.html b/htsworkflow/frontend/templates/samples/library_index.html
index c37635d188a2df95b209cb56fd23de816e2695b2..6ee9750cd8e0bc282fe57202596fd803cdd4f2f6 100644 (file)
--- a/htsworkflow/frontend/templates/samples/library_index.html
+++ b/htsworkflow/frontend/templates/samples/library_index.html
@@ -1,12 +1,13 @@
 {% extends "base_site.html" %}
 {% load admin_list i18n %}
+{% load staticfiles %}
 {% block extrahead %}
     <!-- App Stuff -->
-    <link type="text/css" rel="stylesheet" href="/static/css/app.css" />
+    <link type="text/css" rel="stylesheet" href="{% static "css/app.css" %}"/>
 
     {% block additional_javascript %}
-    <script type="text/javascript" src="/static/js/jquery.min.js"></script>
-    <script type="text/javascript" src="/static/js/htsw.js"></script>
+    <script type="text/javascript" src="{% static "js/jquery.min.js" %}"></script>
+    <script type="text/javascript" src="{% static "js/htsw.js" %}"></script>
     <script type="text/javascript">
       $(document).ready(function() {
         $(window).resize(function() {
@@ -91,7 +92,7 @@
         <td  bgcolor="#66CDAA">{{ lib.lanes_run.1.1 }}</td>
         <td  bgcolor="#66CDAA">{{ lib.lanes_run.1.2 }}</td>
         {% if lib.is_archived %}
-          <td ><img src="/static/img/hdd_unmount.png" alt="Archived" /></td>
+          <td ><img src="{% static "img/hdd_unmount.png" %}" alt="Archived" /></td>
         {% else %}
           <td ></td>
         {% endif %}

diff --git a/htsworkflow/frontend/templates/samples/species_detail.html b/htsworkflow/frontend/templates/samples/species_detail.html
index b65aec61182756216d1177895b0b502ae04a1a3f..d22c9cd58b6ffad4aa5acea4df3ae72d4b868e4e 100644 (file)
--- a/htsworkflow/frontend/templates/samples/species_detail.html
+++ b/htsworkflow/frontend/templates/samples/species_detail.html
@@ -1,9 +1,10 @@
 {% extends "base_site.html" %}
+{% load staticfiles %}
 {% load humanize i18n %}
 {% block extrahead %}
     <!-- App Stuff -->
-    <link type="text/css" rel="stylesheet" href="/static/css/app.css" />
-    <script type="text/javascript" src="/static/js/jquery.min.js"></script>
+    <link type="text/css" rel="stylesheet" href="{% static "css/app.css" %}" />
+    <script type="text/javascript" src="{% static 'js/jquery.min.js" %}></script>
     
     {% block additional_javascript %}
     {% endblock %}