Fixed some problems with the previous attempt at resolving conflicts before merging (there are a lot of conflicts between this and the changes that integrated Scroller)

3 files changed, 94 insertions, 105 deletions

diff --git a/wqflask/wqflask/static/new/css/show_trait.css b/wqflask/wqflask/static/new/css/show_trait.css
index 42009a70..d8964f5d 100644
--- a/wqflask/wqflask/static/new/css/show_trait.css
+++ b/wqflask/wqflask/static/new/css/show_trait.css
@@ -59,6 +59,7 @@ table.dataTable.cell-border tbody tr td:first-child {
 
 .trait_value_input {
   text-align: right;
+}
 
 .glyphicon {
   position: relative;
@@ -236,6 +237,7 @@ div.sample-table-export-container {
 }
 
 div.export-code-container {
+  padding-top: 20px;
   width: 600px;
   display: none;
 }
diff --git a/wqflask/wqflask/templates/show_trait_edit_data.html b/wqflask/wqflask/templates/show_trait_edit_data.html
index e94a8d23..2e730248 100644
--- a/wqflask/wqflask/templates/show_trait_edit_data.html
+++ b/wqflask/wqflask/templates/show_trait_edit_data.html
@@ -12,33 +12,33 @@
           </select>
           <input type="button" class="btn btn-success reset" value="Reset">
         </div>
-      </div>
-      <div id="export_code" class="export-code-container" style="">
-        <pre class="export-code_field">
-          <code>
-# read into R
-trait <- read.csv("{{ this_trait.display_name}}.csv", header = TRUE, comment.char = "#")
+        <div id="export_code" class="export-code-container">
+          <pre class="export-code_field">
+            <code>
+  # read into R
+  trait <- read.csv("{{ this_trait.display_name}}.csv", header = TRUE, comment.char = "#")
 
-# read into python
-import pandas as pd
-trait = pd.read_csv("{{ this_trait.display_name}}.csv", header = 0, comment = "#")
-          </code>
-        </pre>
+  # read into python
+  import pandas as pd
+  trait = pd.read_csv("{{ this_trait.display_name}}.csv", header = 0, comment = "#")
+            </code>
+          </pre>
+        </div>
       </div>
-        {% set outer_loop = loop %}
-        <div class="sample_group" style="width:{{ trait_table_width }};">
-          <div style="position: relative;">
-            <div class="inline-div"><h3 style="float: left;">{{ sample_type.header }}<span name="transform_text"></span></h3>
-          </div>
-          <div id="table_container">
-          <table class="table-hover table-striped cell-border sample-table" id="samples_{{ sample_type.sample_group_type }}">
-              <tbody>
-                <td colspan="100%" align="center"><br><b><font size="15">Loading...</font></b><br></td>
-              </tbody>
-          </table>
-          </div>
+      {% set outer_loop = loop %}
+      <div class="sample_group" style="width:{{ trait_table_width }};">
+        <div style="position: relative;">
+          <div class="inline-div"><h3 style="float: left;">{{ sample_type.header }}<span name="transform_text"></span></h3></div>
         </div>
-        <br>
+        <div id="table_container">
+        <table class="table-hover table-striped cell-border sample-table" id="samples_{{ sample_type.sample_group_type }}">
+            <tbody>
+              <td colspan="100%" align="center"><br><b><font size="15">Loading...</font></b><br></td>
+            </tbody>
+        </table>
+        </div>
+      </div>
+      <br>
     {% endfor %}
     <input type="hidden" name="Default_Name">
 </div>
diff --git a/wqflask/wqflask/templates/show_trait_transform_and_filter.html b/wqflask/wqflask/templates/show_trait_transform_and_filter.html
index 9946c25b..0418d972 100644
--- a/wqflask/wqflask/templates/show_trait_transform_and_filter.html
+++ b/wqflask/wqflask/templates/show_trait_transform_and_filter.html
@@ -1,87 +1,74 @@
 <div>
   <div class="form-horizontal">
-          <p>Edit or delete values in the Trait Data boxes, and use the
-              <strong>Reset</strong> option as
-              needed.
-          </p>
-
-            <div id="blockMenuSpan" class="input-append block-by-index-div">
-                <label for="remove_samples_field">Block samples by index:</label>
-                <input type="text" id="remove_samples_field" placeholder="Example: 3, 5-10, 12">
-                <select id="block_group" size="1">
-                  <option value="primary">
-                    {{ sample_group_types['samples_primary'] }}
-                  </option>
-                  <option value="other">
-                    {{ sample_group_types['samples_other'] }}
-                  </option>
-                </select>
-                <input type="button" id="block_by_index" class="btn btn-danger" value="Block">
-            </div>
-            <div id="remove_samples_invalid" class="alert alert-error" style="display:none;">
-                  Please check that your input is formatted correctly, e.g. <strong>3, 5-10, 12</strong>
-            </div>
-            {% if sample_groups[0].attributes %}
-            <div class="input-append block-by-attribute-div">
-                <label for="exclude_menu">Block samples by group:</label>
-                <select id="exclude_menu" size=1>
-                  {% for attribute in sample_groups[0].attributes %}
-                  <option value="{{ sample_groups[0].attributes[attribute].name.replace(' ', '_') }}">
-                      {{ sample_groups[0].attributes[attribute].name }}</option>
-                  {% endfor %}
-                </select>
-                <select id="attribute_values" size=1>
-                </select>
-                <input type="button" id="exclude_group" class="btn" value="Block">
-            </div>
-            {% endif %}
-            <div>
-              <input type="button" id="hide_no_value" class="btn btn-default" value="Hide No Value">
-              <input type="button" id="block_outliers" class="btn btn-default" value="Block Outliers">
-              <input type="button" class="btn btn-success reset" value="Reset">
-              <span class="input-append">
-                <input type="button" class="btn btn-default export" value="Export">
-                <select class="select optional span2 export_format">
-                  <option value="excel">Excel</option>
-                  <option value="csv">CSV</option>
-                </select>
-              </span>
-              <br>
-              <div class="normalize-div">
-                <input type="button" id="normalize" class="btn btn-success" value="Normalize">
-                <select id="norm_method" class="select optional span2">
-                  {% if negative_vals_exist == "false" %}
-                  <option value="log2">Log2</option>
-                  <option value="log10">Log10</option>
-                  <option value="sqrt">Square Root</option>
-                  {% endif %}
-                  <option value="zscore">Z-score</option>
-                  <option value="qnorm">Quantile</option>
-                  <option value="invert">Invert +/-</option>
-                </select>
-              </div>
-              <!--
-              {% if sample_groups[0].sample_qnorm is not none %}
-              <input type="button" id="qnorm" class="btn btn-default" value="Quantile Normalize">
-              {% endif %}
-              <option value="zscore">Z-score</option>
-              <option value="qnorm">Quantile</option>
-              <option value="invert">Invert +/-</option>
-            </select>
-            </div>
-          </div>
+    <p>Edit or delete values in the Trait Data boxes, and use the
+        <strong>Reset</strong> option as
+        needed.
+    </p>
+    <div id="blockMenuSpan" class="input-append block-by-index-div">
+        <label for="remove_samples_field">Block samples by index:</label>
+        <input type="text" id="remove_samples_field" placeholder="Example: 3, 5-10, 12">
+        <select id="block_group" size="1">
+          <option value="primary">
+            {{ sample_group_types['samples_primary'] }}
+          </option>
+          <option value="other">
+            {{ sample_group_types['samples_other'] }}
+          </option>
+        </select>
+        <input type="button" id="block_by_index" class="btn btn-danger" value="Block">
+    </div>
+    <div id="remove_samples_invalid" class="alert alert-error" style="display:none;">
+          Please check that your input is formatted correctly, e.g. <strong>3, 5-10, 12</strong>
+    </div>
+    {% if sample_groups[0].attributes %}
+    <div class="input-append block-by-attribute-div">
+        <label for="exclude_menu">Block samples by group:</label>
+        <select id="exclude_menu" size=1>
+          {% for attribute in sample_groups[0].attributes %}
+          <option value="{{ sample_groups[0].attributes[attribute].name.replace(' ', '_') }}">
+              {{ sample_groups[0].attributes[attribute].name }}</option>
+          {% endfor %}
+        </select>
+        <select id="attribute_values" size=1>
+        </select>
+        <input type="button" id="exclude_group" class="btn" value="Block">
+    </div>
+    {% endif %}
+    <div>
+      <input type="button" id="hide_no_value" class="btn btn-default" value="Hide No Value">
+      <input type="button" id="block_outliers" class="btn btn-default" value="Block Outliers">
+      <input type="button" class="btn btn-success reset" value="Reset">
+      <span class="input-append">
+        <input type="button" class="btn btn-default export" value="Export">
+        <select class="select optional span2 export_format">
+          <option value="excel">Excel</option>
+          <option value="csv">CSV</option>
+        </select>
+      </span>
       <br>
-
-      <div>
-          <p>Outliers highlighted in
-                  <strong style="background-color:orange;">orange</strong>
-                  can be hidden using
-                  the <strong>Hide Outliers</strong> button.
-          </p>
-
-          <p>Samples with no value (x) can be hidden by clicking
-                  <strong>Hide No Value</strong> button.
-          </p>
+      <div class="normalize-div">
+        <input type="button" id="normalize" class="btn btn-success" value="Normalize">
+        <select id="norm_method" class="select optional span2">
+          {% if negative_vals_exist == "false" %}
+          <option value="log2">Log2</option>
+          <option value="log10">Log10</option>
+          <option value="sqrt">Square Root</option>
+          {% endif %}
+          <option value="zscore">Z-score</option>
+          <option value="qnorm">Quantile</option>
+          <option value="invert">Invert +/-</option>
+        </select>
       </div>
+    </div>
+  </div>
+  <br>
+  <div>
+    <p>Outliers highlighted in
+      <strong style="background-color:orange;">orange</strong>
+      can be hidden using
+      the <strong>Hide Outliers</strong> button.
+    </p>
+
+    <p>Samples with no value (x) can be hidden by clicking<strong>Hide No Value</strong> button.</p>
   </div>
 </div>
\ No newline at end of file