From c8d5bd327f0a73d2b7ac1d9935fd2bb6f11cc262 Mon Sep 17 00:00:00 2001
From: Zachary Sloan
Date: Fri, 1 Nov 2013 23:08:02 +0000
Subject: In the process of opening a modal with the collection page inside

---
 wqflask/wqflask/static/new/javascript/bar_chart.coffee   | 4 ++++
 wqflask/wqflask/static/new/javascript/bar_chart.js       | 4 ++++
 wqflask/wqflask/templates/show_trait_statistics_new.html | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/static/new/javascript/bar_chart.coffee b/wqflask/wqflask/static/new/javascript/bar_chart.coffee
index a5164790..0ab70e0d 100644
--- a/wqflask/wqflask/static/new/javascript/bar_chart.coffee
+++ b/wqflask/wqflask/static/new/javascript/bar_chart.coffee
@@ -252,6 +252,10 @@ class Bar_Chart
     color_by_trait: () ->
         console.log("Before load")
         $('#collections_holder').load('/collections/list #collections_list')
+        $.colorbox(
+            inline: true
+            href: "#collections_holder"
+        )
         console.log("After load")
         #$.colorbox({href:"/collections/list"})
         #$.get(
diff --git a/wqflask/wqflask/static/new/javascript/bar_chart.js b/wqflask/wqflask/static/new/javascript/bar_chart.js
index 60c21ec6..ab011de1 100644
--- a/wqflask/wqflask/static/new/javascript/bar_chart.js
+++ b/wqflask/wqflask/static/new/javascript/bar_chart.js
@@ -258,6 +258,10 @@
     Bar_Chart.prototype.color_by_trait = function() {
       console.log("Before load");
       $('#collections_holder').load('/collections/list #collections_list');
+      $.colorbox({
+        inline: true,
+        href: "#collections_holder"
+      });
       return console.log("After load");
     };
 
diff --git a/wqflask/wqflask/templates/show_trait_statistics_new.html b/wqflask/wqflask/templates/show_trait_statistics_new.html
index eb8228e1..6c64989f 100644
--- a/wqflask/wqflask/templates/show_trait_statistics_new.html
+++ b/wqflask/wqflask/templates/show_trait_statistics_new.html
@@ -10,7 +10,7 @@
         </select>
         {% endif %}
         {% if sample_groups[0].attributes %}
-        <div class="input-append">r
+        <div class="input-append">
             <select id="color_attribute" size=1>
                 <option value="None">None</option>
                 {% for attribute in sample_groups[0].attributes %}
-- 
cgit v1.2.3