CSS fixes

diff --git a/htsworkflow/frontend/static/css/click-table.css b/htsworkflow/frontend/static/css/click-table.css
index 34a85941a1514d828aacb8509493f2b05614c1c0..9ccc46904923240c16f20147e9e21e63c13fb3c7 100644 (file)
--- 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 a4b145f7660437b388dc2d1b44855f98e9cda104..7be902b0382f5bd03c85b8bb81f3d697dbd2bef4 100644 (file)
--- 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 7aebac5d3e267008d267a4eb2486e172fdac19a5..0381afe9a189eddbb735a99fdd27ee2c6670b256 100644 (file)
--- 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 2d12e87b93965d0c38581cbc56c149385f54e49e..43097cfd785156290358fa1accab4f6d287908ba 100644 (file)
--- 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 a28e16c61c929cb17b75acfeba5d1f323b234058..8a983436152b33917bcc2e5a871406566601465a 100644 (file)
--- a/htsworkflow/frontend/templates/app_base.html
+++ b/htsworkflow/frontend/templates/app_base.html
@@ -10,7 +10,7 @@
     <!-- App Stuff -->
     <link type="text/css" rel="stylesheet" href="/static/css/app.css" />
     <link rel="stylesheet" type="text/css" href="/static/js/ext-3.0-rc2/resources/css/ext-all.css" />
-    <script type="text/javascript" src="/static/js/jquery-1.3.2.js"></script>
+    <script type="text/javascript" src="/static/js/jquery-1.3.2.min.js"></script>
     <script type="text/javascript" src="/static/js/ext-3.0-rc2/adapter/jquery/ext-jquery-adapter.js"></script>
     <script type="text/javascript" src="/static/js/ext-3.0-rc2/ext-all.js"></script>
     <!--<script type="text/javascript" src="/static/js/menu.js"></script>-->
@@ -75,7 +75,7 @@
     {% block east_region %}
     <div id="east_region_config" class="x-hidden"></div>
     {% endblock %}
-    <div id="east_region_config_error">Check contents of div w/ id east_region_config, as the id supplied in text block does not exist.</div>
+    <div id="east_region_config_error" class="x-hidden">Check contents of div w/ id east_region_config, as the id supplied in text block does not exist.</div>
     
     <!-- Left side tool bar -->
     <div id="left_tbar_data" class="x-hidden">

diff --git a/htsworkflow/frontend/templates/base.html b/htsworkflow/frontend/templates/base.html
index 311eb205f0089f142a19da1fc261c3fb6f44d89a..b88d67945f09edd2f3e5710b331f8ef9d69cf045 100644 (file)
--- a/htsworkflow/frontend/templates/base.html
+++ b/htsworkflow/frontend/templates/base.html
@@ -19,13 +19,13 @@
     {% endif %}
     -->
         {% if messages %}
-        <ul class="messagelist">{% for message in messages %}<li>{{ message }}</li>{% endfor %}</ul>
+        <ul  class="djangocss" class="messagelist">{% for message in messages %}<li>{{ message }}</li>{% endfor %}</ul>
         {% endif %}
 
     <!-- Content -->
-    <div id="content" class="{% block coltype %}colM{% endblock %}">
+    <div id="content"  class="djangocss" class="{% block coltype %}colM{% endblock %}">
         {% block pretitle %}{% endblock %}
-        {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
+        {% block content_title %}{% if title %}<h1 class="djangocss">{{ title }}</h1>{% endif %}{% endblock %}
         {% block content %}
         {% block object-tools %}{% endblock %}
         {{ content }}
@@ -35,5 +35,5 @@
     </div>
     <!-- END Content -->
 
-    {% block footer %}<div id="footer"></div>{% endblock %}
+    {% block footer %}<div id="footer" class="djangocss"></div>{% endblock %}
 <!-- END Container -->

diff --git a/htsworkflow/frontend/templates/base_site.html b/htsworkflow/frontend/templates/base_site.html
index 81b4f47430c291c754c92f55cedef394d328b722..7e80060d8b1f04338595b5c5ab78b56b7f15d10c 100644 (file)
--- a/htsworkflow/frontend/templates/base_site.html
+++ b/htsworkflow/frontend/templates/base_site.html
@@ -4,7 +4,7 @@
 {% block title %}{{ sitename }}{% endblock %}
 
 {% block branding %}
-<h1 id="site-name">HTSWorkflow</h1>
+<h1 id="site-name" class="djangocss">HTSWorkflow</h1>
 {% endblock %}
 
 {% block nav-global %}{% endblock %}

diff --git a/htsworkflow/frontend/templates/samples/library_index.html b/htsworkflow/frontend/templates/samples/library_index.html
index 62dc273660c2550cb808927fc9505a63f301eadf..56c8e79c00634977381388cfb39094646d6397e5 100644 (file)
--- 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 %}
-<div id="content-main">
+<div id="library-index-div" class="djangocss">
   <div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">
     {% block search %}{% search_form cl %}{% endblock %}
 
     {% block filters %}
     {% if cl.has_filters %}
     <div id="changelist-filter">
-      <h2>{% trans 'Filter' %}</h2>
+      <h2 class="djangocss">{% trans 'Filter' %}</h2>
       {% for spec in cl.filter_specs %}
          {% admin_list_filter cl spec %}
          {% endfor %}
@@ -24,29 +24,29 @@
  {% block pagination %}{% pagination cl %}{% endblock %}
 
 {% block summary_stats %}
-<table class="libtable">
-  <thead class="libtable">
-    <tr>
-    <td>Parent</td>
-    <td>Library ID</td>
-    <td>Species</td>
-    <td>Library Name</td>
-    <td>Total Lanes</td>
-    <td>HD</td>
+<table class="djangocss">
+  <thead class="djangocss">
+    <tr class="djangocss">
+    <td class="djangocss">Parent</td>
+    <td class="djangocss">Library ID</td>
+    <td class="djangocss">Species</td>
+    <td class="djangocss">Library Name</td>
+    <td class="djangocss">Total Lanes</td>
+    <td class="djangocss">HD</td>
     </tr>
   </thead>
-  <tbody class="libtable">
+  <tbody class="djangocss">
     {% for lib in library_list %}
-    <tr class="libtable">
-      <td class="libtable"><a href="/library/{{ lib.library_id }}">{{ lib.amplified_from }}</a></td>
-      <td class="libtable"><a href="/library/{{ lib.library_id }}">{{ lib.library_id }}</a></td>
-      <td class="libtable"><a href="/library/{{ lib.library_id }}">{{ lib.species_name }}</a></td>
-      <td class="libtable"><a href="/library/{{ lib.library_id }}">{{ lib.library_name }}</a></td>
-      <td class="libtable">{{ lib.lanes_run }}</td>
+    <tr class="djangocss">
+      <td class="djangocss"><a href="/library/{{ lib.library_id }}">{{ lib.amplified_from }}</a></td>
+      <td class="djangocss"><a href="/library/{{ lib.library_id }}">{{ lib.library_id }}</a></td>
+      <td class="djangocss"><a href="/library/{{ lib.library_id }}">{{ lib.species_name }}</a></td>
+      <td class="djangocss"><a href="/library/{{ lib.library_id }}">{{ lib.library_name }}</a></td>
+      <td class="djangocss">{{ lib.lanes_run }}</td>
       {% if lib.is_archived %}
-        <td class="libtable"><img src="/static/img/hdd_unmount.png" alt="Archived" /></td>
+        <td class="djangocss"><img src="/static/img/hdd_unmount.png" alt="Archived" /></td>
       {% else %}
-        <td class="libtable"></td>
+        <td class="djangocss"></td>
       {% endif %}
     </tr>
     {% endfor %}