From ed8fd4c8cb510fc652ce1d0e096da6367543ca9a Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Tue, 17 Dec 2013 11:13:24 -0800 Subject: [PATCH] Update templates to consistently use {% static %} instead of hard coding paths Also import a few media files that were missing. --- htsworkflow/frontend/static/css/dashboard.css | 30 ++++++++++++++++++ htsworkflow/frontend/static/img/dna80.png | Bin 0 -> 8481 bytes htsworkflow/frontend/templates/base.html | 2 +- htsworkflow/frontend/templates/base_site.html | 3 +- .../experiments/flowcell_detail.html | 7 ++-- .../experiments/flowcell_header.html | 3 +- .../experiments/flowcell_lane_detail.html | 5 +-- .../templates/experiments/sequencer.html | 5 +-- .../frontend/templates/sample_header.html | 3 +- .../templates/samples/library_detail.html | 9 +++--- .../templates/samples/library_index.html | 9 +++--- .../templates/samples/species_detail.html | 5 +-- 12 files changed, 60 insertions(+), 21 deletions(-) create mode 100644 htsworkflow/frontend/static/css/dashboard.css create mode 100644 htsworkflow/frontend/static/img/dna80.png diff --git a/htsworkflow/frontend/static/css/dashboard.css b/htsworkflow/frontend/static/css/dashboard.css new file mode 100644 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 index 0000000000000000000000000000000000000000..845c255e87209ccf238ea11ee80ed7d7a4286a47 GIT binary patch literal 8481 zcmV++A>Q7JP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igP$ z6ekS=bOvt#03ZNKL_t(|+U6=R3#yjAuO07!!DYJU^Zv&yVNF^W*vP{CIvm zKb{}|=MPnVz6ig~5q_s%xOn^v|JN_#dw%ji%NObbR-f+&|MqA889sjXdvNyPkKh;I z_@z6ae8g|5s(6nCB><*Gi~&^$G#a|37*`dPgn)=4fB*yl32^v-<-Y-faZ>R|{?hxu z?B@XB`+nl5@z=ikPkuoy;P3e4|Iv^C`}eXw{zMf85(G3L1c3-Z5&}R(kkn9D0Y;#b z03`ts5&%$OBw`TId?}4U5MSJ`Z@=?HANWIm3jlukKYc%b|NFk-3wsOyoqzG~hX1|h z^araLAOezv(I6m5B1nlSff@k%q9#+21O%`x2vsv!{=5nT0u%v4sJ`v*{@6$UC;(h9 z^$Q;Z?@z8aAsXt}A*A`vWEBGdp+MO7N)l8vj4B}n3?jZ`^DY$u&B!3aC;=iuHPT25 zAVxw&P}e)J1HdO{55Dj*@Xlxf0Qh_V^n30F2~$;K*(UB!YsuIJ0T5#l2RT53ASppo z1cDF&RYME`5D3X(RjU|~l1T`@g&~4*OossQ%H#$={IefJ(u67mr2HKOKwAE{pEUTk z@ZAssEaR`z&n+UjnXmA^_q>kxzx#EV`De@zZTt9qpCLmO0E7^J=LP(!kNzw^`sN-0 zpxyb>ziRS17G+5XQ=%e@!=o&A$;rCef@8rM84zS{5SmVuX#7V_s9O#-9>!Ir$?iD z4wjQ$mmkRmG@|n2u_!x|FZUvzLT?Pf8>j1fJL+ z0hjX?4kjaMQ{oHb*{8noYyR}ZvPM7j&%X;_|G{s0b^(9n2frQbllS2pzxo6CzMuTq z*Ur28NBv|u%mnlk1Q9`rDCXoKRSZZO{FkB0C4hWFbu5%}=wXYt_PE5J7qKmLcmcJ#){x3!Z|)RZg`6g9Alz71m#VNS7r zF@Vve3c_R_sRsYOoID`nG^S5UVvH=22>?Mvlw`=@WCR>)B;((+nWHM2dNq6c6@UMm|J=`&Yx(70`J`ju z_xy*>KlvwupZMY*ec#!>qUn1kBQi!qmC|Q=VkAfbX+rviBVVwe|Lw6O0um0N{tp0A zBdQo+MwpRR45H?XW(0!>j3$0VKox|Ulnd$DY9urE4hhakf&%7lQ2fD3S$tKa zfk??@cQW$iD8c|ijQ)i&1jZm$41!f({TTqm0)E-Smu_w0kG%0+qiXagdbI;1U(S42 z@wKm=PuW8UX?G`VzyQ%E?M{G#5N=dqXnAq^|P0 zhgt__K#a}=g7|k270~9_p1J1o0M#ELVvu1Amk7)S00oc`$Y%<> za??_h0XKBQGHKmJ{AQbq06_xIXKNhqjR6vB7!nQPxL2yC3`JNpJ*J~le)^Yh)>@qS zZf=(Zq)mz{1gzWc=E>7X@2uYWo-hB)<5BhA{3kS0G_SgU?+``wrvgc85CN(XNC4*L zaarzXl7kTF%^1rQAV2|VUWL$1Bm~3|VV0Qsl%c^F)O<67fW#OOLPU&_MnOs{UhNPu zkaZM*6f^pw1Yw&LQGyWu5XyE+O4%7#&RvmFT_9aD)G>fyzTW~k6hJVF5kbJ|cyx64 z&gqA$X&qk`1O)MuRlet;HqaH8d{wrs2w2E1GRxRbd@K}!CB`Jx6JloE%RvXrSX2PM&<&EP>I&=iS{921X0sUxDJ)+g0*MiIbdGPx)P|cZyKXyK zH7%~Ludy@T!S3EZ>hVOXTo`H2Rswo%;RZXDPWUsr_=7c(vPNfzJ1`o6&1YMxk`#P3 zBkI8OYTfDiWNaA43I<=KaTN!kB_S!}Od+-<<9TM?(7mBt%L#*dF$KPuPEAyYtVP|2B+u?S0b5K5={qH&>UL z0XPA+eEyKLTVDSmca^Ftsb9ys>vMg*iBPk*F@J%m8OU%EG^M%0D}|!*`A&0SH7j(1 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 endblock %} - + {% endblock %} diff --git a/htsworkflow/frontend/templates/base_site.html b/htsworkflow/frontend/templates/base_site.html index 7381f62..1c02752 100644 --- 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 %} - + {% block title %}{{ sitename }}{% endblock %} diff --git a/htsworkflow/frontend/templates/experiments/flowcell_detail.html b/htsworkflow/frontend/templates/experiments/flowcell_detail.html index d958bf1..64da7e2 100644 --- 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 %} - - + + {% block additional_javascript %} {% endblock %} @@ -41,7 +42,7 @@ {% if user.is_staff %} + src="{% static "admin/img/icon_changelink.gif" %}"/> {% endif %} diff --git a/htsworkflow/frontend/templates/experiments/flowcell_header.html b/htsworkflow/frontend/templates/experiments/flowcell_header.html index f71ae0f..f0cb470 100644 --- a/htsworkflow/frontend/templates/experiments/flowcell_header.html +++ b/htsworkflow/frontend/templates/experiments/flowcell_header.html @@ -1,7 +1,8 @@ +{% load staticfiles %}

About this Flowcell

Flowcell: - {{flowcell.flowcell_id}}{% if user.is_staff %}Edit{% endif%} + {{flowcell.flowcell_id}}{% if user.is_staff %}Edit{% endif%}
- - + + {% block additional_javascript %} {% endblock %} diff --git a/htsworkflow/frontend/templates/experiments/sequencer.html b/htsworkflow/frontend/templates/experiments/sequencer.html index b79aa38..411288c 100644 --- 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 %} - - + + {% block additional_javascript %} {% endblock %} diff --git a/htsworkflow/frontend/templates/sample_header.html b/htsworkflow/frontend/templates/sample_header.html index ed24bbd..a198cef 100644 --- a/htsworkflow/frontend/templates/sample_header.html +++ b/htsworkflow/frontend/templates/sample_header.html @@ -1,3 +1,4 @@ +{% load staticfiles %}
@@ -5,7 +6,7 @@

Library Name

Library ID: {{ lib.id }} - {% if user.is_staff %}Edit{% endif %} + {% if user.is_staff %}Edit{% endif %}
Name: {{ lib.library_name }} diff --git a/htsworkflow/frontend/templates/samples/library_detail.html b/htsworkflow/frontend/templates/samples/library_detail.html index 3214df6..65747dc 100644 --- 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 %} - - + + {% block additional_javascript %} {% endblock %} @@ -33,7 +34,7 @@ {{ result.run_date|date}} {{ result.cycle }} - {{ result.flowcell_id }}{% if user.is_staff %}Edit{% endif%} + {{ result.flowcell_id }}{% if user.is_staff %}Edit{% endif%} {{ result.lane.lane_number }} Summary {{ result.result_label }} @@ -143,7 +144,7 @@ {% if user.is_staff %} Edit + src="{% static "admin/img/icon_changelink.gif" %}" alt="Edit"/> {% endif%} diff --git a/htsworkflow/frontend/templates/samples/library_index.html b/htsworkflow/frontend/templates/samples/library_index.html index c37635d..6ee9750 100644 --- 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 %} - + {% block additional_javascript %} - - + + + + {% block additional_javascript %} {% endblock %} -- 2.30.2