From 39dea5abfab1e5404e9725a596dc675ad106fb90 Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Thu, 8 Sep 2011 15:12:50 -0700 Subject: [PATCH] Add links to the admin page on the public pages if you're logged in as staff. This also required tightening the css for the list of flowcells on the inventory page. --- htsworkflow/frontend/static/css/app.css | 9 ++++--- .../frontend/static/css/click-table.css | 3 ++- .../experiments/flowcell_detail.html | 18 ++++++++----- .../inventory/inventory_itemtype_index.html | 8 +++--- .../templates/samples/library_detail.html | 26 ++++++++++++------- 5 files changed, 40 insertions(+), 24 deletions(-) diff --git a/htsworkflow/frontend/static/css/app.css b/htsworkflow/frontend/static/css/app.css index 72a626c..1725e15 100644 --- a/htsworkflow/frontend/static/css/app.css +++ b/htsworkflow/frontend/static/css/app.css @@ -40,6 +40,7 @@ div.msg { } div.htswdetail { + clear: both; margin: 0; padding: 0; } @@ -80,7 +81,7 @@ div.htswdetail ol, div.htswdetail li { list-style: none; - margin: 0; + margin: 0; } div.htswdetail ul, @@ -89,7 +90,7 @@ div.htswdetail ol margin-bottom: .5em; } -/* style library detail headers */ +/* style library detail headers */ div#librarydetail { margin: 0; padding: 0; @@ -131,7 +132,7 @@ div#librarydetail ol, div#librarydetail li { list-style: none; - margin: 0; + margin: 0; } div#librarydetail ul, @@ -140,7 +141,7 @@ div#librarydetail ol margin-bottom: .5em; } -div.library_identity { +div.library_identity { clear: left; float: left; margin: 5px; } div.library_sample_detail { float: left; margin: 5px; } div.library_library_detail { float: left; margin: 5px; } diff --git a/htsworkflow/frontend/static/css/click-table.css b/htsworkflow/frontend/static/css/click-table.css index 1d48412..27b793c 100644 --- a/htsworkflow/frontend/static/css/click-table.css +++ b/htsworkflow/frontend/static/css/click-table.css @@ -14,6 +14,7 @@ td { padding: 4px; border-width: 1px 1px 0 0; } -td a { +td.cell_list a { display: block; } + diff --git a/htsworkflow/frontend/templates/experiments/flowcell_detail.html b/htsworkflow/frontend/templates/experiments/flowcell_detail.html index 5ec9afe..a835a6e 100644 --- a/htsworkflow/frontend/templates/experiments/flowcell_detail.html +++ b/htsworkflow/frontend/templates/experiments/flowcell_detail.html @@ -4,7 +4,7 @@ - + {% block additional_javascript %} {% endblock %} {% endblock %} @@ -27,11 +27,17 @@ {% for lane in lanes %} - + {{lane.lane_number}} - {{lane.library.id}} + >{{lane.library.id}} + {% if user.is_staff %} + + + {% endif %} + {{lane.library.library_name}} {{ lane.library.library_species.scientific_name }} @@ -85,10 +91,10 @@ {% endif %} - {% endfor %} + {% endfor %} {% endfor %} - + {% endblock %} diff --git a/htsworkflow/frontend/templates/inventory/inventory_itemtype_index.html b/htsworkflow/frontend/templates/inventory/inventory_itemtype_index.html index d3a0038..62ebdce 100644 --- a/htsworkflow/frontend/templates/inventory/inventory_itemtype_index.html +++ b/htsworkflow/frontend/templates/inventory/inventory_itemtype_index.html @@ -20,7 +20,7 @@
{% block search %}{% search_form item_changelist %}{% endblock %} - + {% block pagination %}{% pagination item_changelist %}{% endblock %} {% block filters %} @@ -53,9 +53,9 @@ {{ item.barcode_id }} {{ item.location }} {{ item.item_type }} - - {{ item.creation_date }} - + + {{ item.creation_date }} + {% for content in item.longtermstorage_set.all %} {{ content.flowcell }} {% endfor %} diff --git a/htsworkflow/frontend/templates/samples/library_detail.html b/htsworkflow/frontend/templates/samples/library_detail.html index 918dc4f..771538c 100644 --- a/htsworkflow/frontend/templates/samples/library_detail.html +++ b/htsworkflow/frontend/templates/samples/library_detail.html @@ -4,7 +4,7 @@ - + {% block additional_javascript %} {% endblock %} {% endblock %} @@ -32,7 +32,7 @@ {{ result.run_date|date}} {{ result.cycle }} - {{ result.flowcell_id }} + {{ result.flowcell_id }}{% if user.is_staff %}Edit{% endif%} {{ result.lane.lane_number }} Summary {{ result.result_label }} @@ -50,7 +50,7 @@ {% endfor %} - +

Lane Summary Statistics

{% block summary_stats %} @@ -85,12 +85,13 @@ - + {# ls short for lane summary #} {% for ls in lane_summary_list %} - + @@ -126,8 +127,15 @@ {% for lane in lib.lane_set.all %} - + @@ -140,13 +148,13 @@

Count of multi-reads

{% for eland_lane in lane_summary_list %} {% if eland_lane.summarized_reads %} -

{{eland_lane.cycle_width}} {{ eland_lane.flowcell_id }} lane {{ eland_lane.lane_id }} +

{{eland_lane.cycle_width}} {{ eland_lane.flowcell_id }} lane {{ eland_lane.lane_id }} {% if eland_lane.end %} end {{ eland_lane.end }}{% endif %}

    {% for name, counts in eland_lane.summarized_reads.items %}
  • - {{ name }}: + {{ name }}: {{ counts|intcomma }}
  • {% endfor %}
-- 2.30.2
{{ ls.cycle_width }}{{ ls.flowcell_id }}{{ ls.flowcell_id }} + {{ ls.lane_id }} {% if ls.end %}{{ ls.end }}{% endif %} {{ ls.clusters.0|intcomma }}
{{ lane.flowcell.flowcell_id }} + >{{ lane.flowcell.flowcell_id }} + {% if user.is_staff %} + + Edit + + {% endif%} + {{ lane.lane_number }} {{ lane.comment }}