From: Brandon King Date: Thu, 25 Jun 2009 18:32:15 +0000 (+0000) Subject: CSS fixes X-Git-Tag: 0.2.6~36 X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=7c02c18335a009ed894aa2360783d690ed3d7395 CSS fixes --- diff --git a/htsworkflow/frontend/static/css/click-table.css b/htsworkflow/frontend/static/css/click-table.css index 34a8594..9ccc469 100644 --- a/htsworkflow/frontend/static/css/click-table.css +++ b/htsworkflow/frontend/static/css/click-table.css @@ -1,19 +1,19 @@ -table.libtable, td.libtable { +table.djangocss, td.djangocss { border-style: solid; } -table.libtable { +table.djangocss { border-width: 0 0 1px 1px; border-spacing: 0; border-collapse: collapse; } -thead.libtable { +thead.djangocss { text-align: center; } -td.libtable { +td.djangocss { margin: 0; padding: 4px; border-width: 1px 1px 0 0; } -td.libtable a { +td.djangocss a { display: block; } diff --git a/htsworkflow/frontend/static/css/forms.css b/htsworkflow/frontend/static/css/forms.css index a4b145f..7be902b 100644 --- a/htsworkflow/frontend/static/css/forms.css +++ b/htsworkflow/frontend/static/css/forms.css @@ -4,34 +4,34 @@ /* FORM ROWS */ .form-row { overflow:hidden; padding:8px 12px; font-size:11px; border-bottom:1px solid #eee; } .form-row img, .form-row input { vertical-align:middle; } -form .form-row p { padding-left:0; font-size:11px; } +form.djangocss .form-row p { padding-left:0; font-size:11px; } /* FORM LABELS */ -form h4 { margin:0 !important; padding:0 !important; border:none !important; } -label { font-weight:normal !important; color:#666; font-size:12px; } +form.djangocss h4 { margin:0 !important; padding:0 !important; border:none !important; } +label.djangocss { font-weight:normal !important; color:#666; font-size:12px; } .required label, label.required { font-weight:bold !important; color:#333 !important; } /* RADIO BUTTONS */ -form ul.radiolist li { list-style-type:none; } -form ul.radiolist label { float:none; display:inline; } -form ul.inline { margin-left:0; padding:0; } -form ul.inline li { float:left; padding-right:7px; } +form.djangocss ul.radiolist li { list-style-type:none; } +form.djangocss ul.radiolist label { float:none; display:inline; } +form.djangocss ul.inline { margin-left:0; padding:0; } +form.djangocss ul.inline li { float:left; padding-right:7px; } /* ALIGNED FIELDSETS */ .aligned label { display:block; padding:3px 10px 0 0; float:left; width:8em; } .colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { width:350px; } -form .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; } -form .aligned table p { margin-left:0; padding-left:0; } -form .aligned p.help { padding-left:38px; } +form.djangocss .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; } +form.djangocss .aligned table p { margin-left:0; padding-left:0; } +form.djangocss .aligned p.help { padding-left:38px; } .aligned .vCheckboxLabel { float:none !important; display:inline; padding-left:4px; } .colM .aligned .vLargeTextField, .colM .aligned .vXMLLargeTextField { width:610px; } .checkbox-row p.help { margin-left:0; padding-left:0 !important; } -fieldset .field-box { float:left; margin-right: 20px; } +fieldset.djangocss .field-box { float:left; margin-right: 20px; } /* WIDE FIELDSETS */ .wide label { width:15em !important; } -form .wide p { margin-left:15em; } -form .wide p.help { padding-left:38px; } +form.djangocss .wide p { margin-left:15em; } +form.djangocss .wide p.help { padding-left:38px; } .colM fieldset.wide .vLargeTextField, .colM fieldset.wide .vXMLLargeTextField { width:450px; } /* COLLAPSED FIELDSETS */ diff --git a/htsworkflow/frontend/static/css/global.css b/htsworkflow/frontend/static/css/global.css index 7aebac5..0381afe 100644 --- a/htsworkflow/frontend/static/css/global.css +++ b/htsworkflow/frontend/static/css/global.css @@ -1,39 +1,39 @@ -body { margin:0; padding:0; font-size:12px; font-family:"Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif; color:#333; background:#fff; } +body.djangocss { margin:0; padding:0; font-size:12px; font-family:"Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif; color:#333; background:#fff; } /* LINKS */ -a:link, a:visited { color: #5b80b2; text-decoration:none; } -a:hover { color: #036; } -a img { border:none; } +a.djangocss:link, a.djangocss:visited { color: #5b80b2; text-decoration:none; } +a.djangocss:hover { color: #036; } +a.djangocss img { border:none; } a.section:link, a.section:visited { color: white; text-decoration:none; } /* GLOBAL DEFAULTS */ -p, ol, ul, dl { margin:.2em 0 .8em 0; } -p { padding:0; line-height:140%; } +p.djangocss, ol.djangocss, ul.djangocss, dl.djangocss { margin:.2em 0 .8em 0; } +p.djangocss { padding:0; line-height:140%; } -h1,h2,h3,h4,h5 { font-weight:bold; } -h1 { font-size:18px; color:#666; padding:0 6px 0 0; margin:0 0 .2em 0; } -h2 { font-size:16px; margin:1em 0 .5em 0; } +h1.djangocss,h2.djangocss,h3.djangocss,h4.djangocss,h5.djangocss { font-weight:bold; } +h1.djangocss { font-size:18px; color:#666; padding:0 6px 0 0; margin:0 0 .2em 0; } +h2.djangocss { font-size:16px; margin:1em 0 .5em 0; } h2.subhead { font-weight:normal;margin-top:0; } -h3 { font-size:14px; margin:.8em 0 .3em 0; color:#666; font-weight:bold; } -h4 { font-size:12px; margin:1em 0 .8em 0; padding-bottom:3px; } -h5 { font-size:10px; margin:1.5em 0 .5em 0; color:#666; text-transform:uppercase; letter-spacing:1px; } +h3.djangocss { font-size:14px; margin:.8em 0 .3em 0; color:#666; font-weight:bold; } +h4.djangocss { font-size:12px; margin:1em 0 .8em 0; padding-bottom:3px; } +h5.djangocss { font-size:10px; margin:1.5em 0 .5em 0; color:#666; text-transform:uppercase; letter-spacing:1px; } -ul li { list-style-type:square; padding:1px 0; } +ul.djangocss li.djangocss { list-style-type:square; padding:1px 0; } ul.plainlist { margin-left:0 !important; } ul.plainlist li { list-style-type:none; } -li ul { margin-bottom:0; } -li, dt, dd { font-size:11px; line-height:14px; } -dt { font-weight:bold; margin-top:4px; } -dd { margin-left:0; } +li.djangocss ul { margin-bottom:0; } +li.djangocss, dt.djangocss, dd.djangocss { font-size:11px; line-height:14px; } +dt.djangocss { font-weight:bold; margin-top:4px; } +dd.djangocss { margin-left:0; } -form { margin:0; padding:0; } -fieldset { margin:0; padding:0; } +form.djangocss { margin:0; padding:0; } +fieldset.djangocss { margin:0; padding:0; } -blockquote { font-size:11px; color:#777; margin-left:2px; padding-left:10px; border-left:5px solid #ddd; } -code, pre { font-family:"Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; background:inherit; color:#666; font-size:11px; } +blockquote.djangocss { font-size:11px; color:#777; margin-left:2px; padding-left:10px; border-left:5px solid #ddd; } +code.djangocss, pre.djangocss { font-family:"Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; background:inherit; color:#666; font-size:11px; } pre.literal-block { margin:10px; background:#eee; padding:6px 8px; } -code strong { color:#930; } -hr { clear:both; color:#eee; background-color:#eee; height:1px; border:none; margin:0; padding:0; font-size:1px; line-height:1px; } +code.djangocss strong { color:#930; } +hr.djangocss { clear:both; color:#eee; background-color:#eee; height:1px; border:none; margin:0; padding:0; font-size:1px; line-height:1px; } /* TEXT STYLES & MODIFIERS */ .small { font-size:11px; } @@ -54,27 +54,27 @@ p img, h1 img, h2 img, h3 img, h4 img, td img { vertical-align:middle; } .nowrap { white-space:nowrap; } /* TABLES */ -table.libtable { border-collapse:collapse; border-color:#ccc; } -td.libtable, th.libtable { font-size:11px; line-height:13px; border-bottom:1px solid #eee; vertical-align:top; padding:5px; font-family:"Lucida Grande", Verdana, Arial, sans-serif; } -th.libtable { text-align:left; font-size:12px; font-weight:bold; } -thead.libtable th, -tfoot.libtable td { color:#666; padding:2px 5px; font-size:11px; background:#e1e1e1 url(../img/nav-bg.gif) top left repeat-x; border-left:1px solid #ddd; border-bottom:1px solid #ddd; } -tfoot.libtable td { border-bottom:none; border-top:1px solid #ddd; } -thead.libtable th:first-child, -tfoot.libtable td:first-child { border-left:none !important; } -thead.libtable th.optional { font-weight:normal !important; } -fieldset table { border-right:1px solid #eee; } +table.djangocss { border-collapse:collapse; border-color:#ccc; } +td.djangocss, th.djangocss { font-size:11px; line-height:13px; border-bottom:1px solid #eee; vertical-align:top; padding:5px; font-family:"Lucida Grande", Verdana, Arial, sans-serif; } +th.djangocss { text-align:left; font-size:12px; font-weight:bold; } +thead.djangocss th, +tfoot.djangocss td { color:#666; padding:2px 5px; font-size:11px; background:#e1e1e1 url(../img/nav-bg.gif) top left repeat-x; border-left:1px solid #ddd; border-bottom:1px solid #ddd; } +tfoot.djangocss td { border-bottom:none; border-top:1px solid #ddd; } +thead.djangocss th:first-child, +tfoot.djangocss td:first-child { border-left:none !important; } +thead.djangocss th.optional { font-weight:normal !important; } +fieldset.djangocss table { border-right:1px solid #eee; } tr.row-label td { font-size:9px; padding-top:2px; padding-bottom:0; border-bottom:none; color:#666; margin-top:-1px; } tr.alt { background:#f6f6f6; } .row1 { background:#EDF3FE; } .row2 { background:white; } /* SORTABLE TABLES */ -thead.libtable th a:link, thead th a:visited { color:#666; display:block; } -table.libtable thead th.sorted { background-position:bottom left !important; } -table.libtable thead th.sorted a { padding-right:13px; } -table.libtable thead th.ascending a { background:url(../img/arrow-down.gif) right .4em no-repeat; } -table.libtable thead th.descending a { background:url(../img/arrow-up.gif) right .4em no-repeat; } +thead.djangocss th a:link, thead th a:visited { color:#666; display:block; } +table.djangocss thead th.sorted { background-position:bottom left !important; } +table.djangocss thead th.sorted a { padding-right:13px; } +table.djangocss thead th.ascending a { background:url(../img/arrow-down.gif) right .4em no-repeat; } +table.djangocss thead th.descending a { background:url(../img/arrow-up.gif) right .4em no-repeat; } /* ORDERABLE TABLES */ table.orderable tbody tr td:hover { cursor:move; } @@ -82,9 +82,9 @@ table.orderable tbody tr td:first-child { padding-left:14px; background-image:ur table.orderable-initalized .order-cell, body>tr>td.order-cell { display:none; } /* FORM DEFAULTS */ -input, textarea, select { margin:2px 0; padding:2px 3px; vertical-align:middle; font-family:"Lucida Grande", Verdana, Arial, sans-serif; font-weight:normal; font-size:11px; } -textarea { vertical-align:top !important; } -input[type=text], input[type=password], textarea, select, .vTextField { border:1px solid #ccc; } +input.djangocss, textarea.djangocss, select.djangocss { margin:2px 0; padding:2px 3px; vertical-align:middle; font-family:"Lucida Grande", Verdana, Arial, sans-serif; font-weight:normal; font-size:11px; } +textarea.djangocss { vertical-align:top !important; } +input.djangocss[type=text], input.djangocss[type=password], textarea.djangocss, select.djangocss, .vTextField { border:1px solid #ccc; } /* FORM BUTTONS */ .button, input[type=submit], input[type=button], .submit-row input { background:white url(../img/nav-bg.gif) bottom repeat-x; padding:3px; color:black; border:1px solid #bbb; border-color:#ddd #aaa #aaa #ddd; } diff --git a/htsworkflow/frontend/static/js/htsw.js b/htsworkflow/frontend/static/js/htsw.js index 2d12e87..43097cf 100644 --- a/htsworkflow/frontend/static/js/htsw.js +++ b/htsworkflow/frontend/static/js/htsw.js @@ -22,6 +22,14 @@ var goto_url = function(www_url) } $(document).ready(function(){ + //---------------------------------------- + // Django Library Page CSS Fix + /*var fix_library_css = function() { + Ext.fly('library-index-div').select('*').addClass('djangocss'); + } + fix_library_css(); + */ + //---------------------------------------- // Dynamically Generate Panels from HTML! diff --git a/htsworkflow/frontend/templates/app_base.html b/htsworkflow/frontend/templates/app_base.html index a28e16c..8a98343 100644 --- a/htsworkflow/frontend/templates/app_base.html +++ b/htsworkflow/frontend/templates/app_base.html @@ -10,7 +10,7 @@ - + @@ -75,7 +75,7 @@ {% block east_region %}
{% endblock %} -
Check contents of div w/ id east_region_config, as the id supplied in text block does not exist.
+
Check contents of div w/ id east_region_config, as the id supplied in text block does not exist.
diff --git a/htsworkflow/frontend/templates/base.html b/htsworkflow/frontend/templates/base.html index 311eb20..b88d679 100644 --- a/htsworkflow/frontend/templates/base.html +++ b/htsworkflow/frontend/templates/base.html @@ -19,13 +19,13 @@ {% endif %} --> {% if messages %} - + {% endif %} -
+
{% block pretitle %}{% endblock %} - {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} + {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} {% block content %} {% block object-tools %}{% endblock %} {{ content }} @@ -35,5 +35,5 @@
- {% block footer %}{% endblock %} + {% block footer %}{% endblock %} diff --git a/htsworkflow/frontend/templates/base_site.html b/htsworkflow/frontend/templates/base_site.html index 81b4f47..7e80060 100644 --- a/htsworkflow/frontend/templates/base_site.html +++ b/htsworkflow/frontend/templates/base_site.html @@ -4,7 +4,7 @@ {% block title %}{{ sitename }}{% endblock %} {% block branding %} -

HTSWorkflow

+

HTSWorkflow

{% endblock %} {% block nav-global %}{% endblock %} diff --git a/htsworkflow/frontend/templates/samples/library_index.html b/htsworkflow/frontend/templates/samples/library_index.html index 62dc273..56c8e79 100644 --- a/htsworkflow/frontend/templates/samples/library_index.html +++ b/htsworkflow/frontend/templates/samples/library_index.html @@ -5,14 +5,14 @@ {% block coltype %}flex{% endblock %} {% block content %} -
+
{% block search %}{% search_form cl %}{% endblock %} {% block filters %} {% if cl.has_filters %}
-

{% trans 'Filter' %}

+

{% trans 'Filter' %}

{% for spec in cl.filter_specs %} {% admin_list_filter cl spec %} {% endfor %} @@ -24,29 +24,29 @@ {% block pagination %}{% pagination cl %}{% endblock %} {% block summary_stats %} - - - - - - - - - +
ParentLibrary IDSpeciesLibrary NameTotal LanesHD
+ + + + + + + + - + {% for lib in library_list %} - - - - - - + + + + + + {% if lib.is_archived %} - + {% else %} - + {% endif %} {% endfor %}
ParentLibrary IDSpeciesLibrary NameTotal LanesHD
{{ lib.amplified_from }}{{ lib.library_id }}{{ lib.species_name }}{{ lib.library_name }}{{ lib.lanes_run }}
{{ lib.amplified_from }}{{ lib.library_id }}{{ lib.species_name }}{{ lib.library_name }}{{ lib.lanes_run }}ArchivedArchived