From 92b7336c9a1c7a19384ebf58a74a2c3c1284ead2 Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Wed, 7 Sep 2011 15:00:27 -0700 Subject: [PATCH] Add link to admin page to flowcell & library pages for logged in staff --- htsworkflow/frontend/static/css/app.css | 11 +++++++++- .../experiments/flowcell_detail.html | 15 +------------- .../experiments/flowcell_header.html | 16 +++++++++++++++ .../experiments/flowcell_lane_detail.html | 20 +++++++------------ .../frontend/templates/sample_header.html | 5 ++++- 5 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 htsworkflow/frontend/templates/experiments/flowcell_header.html diff --git a/htsworkflow/frontend/static/css/app.css b/htsworkflow/frontend/static/css/app.css index 0a86f8a..72a626c 100644 --- a/htsworkflow/frontend/static/css/app.css +++ b/htsworkflow/frontend/static/css/app.css @@ -27,6 +27,13 @@ min-height:600px; } +.icon_button { + border-style: solid; + border-width: 1px; + padding: 1px; + margin: 0px 0px -2px 2px; +} + div.msg { color: white; background: #880000; @@ -134,8 +141,10 @@ div#librarydetail ol } div.library_identity { - float: left; margin: 5px; } + clear: left; float: left; margin: 5px; } div.library_sample_detail { float: left; margin: 5px; } div.library_library_detail { float: left; margin: 5px; } div.library_statistics { clear: both; border: 1px; } +div.flowcell_identity { clear: left; float: left; margin: 5px;} +div.flowcell_lane_detail { float: left; margin: 5px; } \ No newline at end of file diff --git a/htsworkflow/frontend/templates/experiments/flowcell_detail.html b/htsworkflow/frontend/templates/experiments/flowcell_detail.html index 865fc97..5ec9afe 100644 --- a/htsworkflow/frontend/templates/experiments/flowcell_detail.html +++ b/htsworkflow/frontend/templates/experiments/flowcell_detail.html @@ -11,20 +11,7 @@ {% block content %}
-

About this Flowcell

- Flowcell: - {{flowcell.flowcell_id}}
- Run Date: - {{ flowcell.run_date }}
- Type: - {{flowcell.flowcell_type}}
- Read Length: - {{flowcell.read_length}}
- Control Lane: - {{flowcell.control_lane}}
- - Notes: -
{{flowcell.notes}}
+ {% include "experiments/flowcell_header.html" %}

Lanes

diff --git a/htsworkflow/frontend/templates/experiments/flowcell_header.html b/htsworkflow/frontend/templates/experiments/flowcell_header.html new file mode 100644 index 0000000..abca499 --- /dev/null +++ b/htsworkflow/frontend/templates/experiments/flowcell_header.html @@ -0,0 +1,16 @@ +
+

About this Flowcell

+ Flowcell: + {{flowcell.flowcell_id}}{% if user.is_staff %}Edit{% endif%}
+ Run Date: + {{ flowcell.run_date }}
+ Type: + {{flowcell.flowcell_type}}
+ Read Length: + {{flowcell.read_length}}
+ Control Lane: + {{flowcell.control_lane}}
+ + Notes: +
{{flowcell.notes}}
+
diff --git a/htsworkflow/frontend/templates/experiments/flowcell_lane_detail.html b/htsworkflow/frontend/templates/experiments/flowcell_lane_detail.html index bf9ee00..19480ed 100644 --- a/htsworkflow/frontend/templates/experiments/flowcell_lane_detail.html +++ b/htsworkflow/frontend/templates/experiments/flowcell_lane_detail.html @@ -11,28 +11,22 @@ {% block content %}
-

About this lane

- Flowcell: - {{flowcell.flowcell_id}}
- Run Date: - {{ flowcell.run_date }}
- Type: - {{flowcell.flowcell_type}}
-
+ {% include "experiments/flowcell_header.html" %} +
+

About this lane

Lane: {{lane.lane_number}}
- Cycles: - {{lane.flowcell.read_length}}
- pM + pM: {{ lane.pM }}
- Cluster Estimate + Cluster Estimate: {{ lane.cluster_estimate|intcomma }}
Lane Status: {{ lane.status }}
- Comment: + Comments: {{ lane.comment }}
+

{% include "sample_header.html" %}
diff --git a/htsworkflow/frontend/templates/sample_header.html b/htsworkflow/frontend/templates/sample_header.html index f51e649..c125a1c 100644 --- a/htsworkflow/frontend/templates/sample_header.html +++ b/htsworkflow/frontend/templates/sample_header.html @@ -1,7 +1,10 @@

Library Name

- Library ID: {{ lib.id }}
+ Library ID: + {{ lib.id }} + {% if user.is_staff %}{% endif %} +
Name: {{ lib.library_name }}
-- 2.30.2