From bcaecc2c2230c83678810dd36ed12f8388cc7543 Mon Sep 17 00:00:00 2001
From: noefp <noeisneo@gmail.com>
Date: Thu, 12 Dec 2013 19:01:20 +0000
Subject: [PATCH] import js libraries

---
 mason/tools/expression/input.mas | 83 ++++++++++++++++++++++++----------------
 mason/tools/vigs/input.mas       | 14 +------
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/mason/tools/expression/input.mas b/mason/tools/expression/input.mas
index 48f449e33..da56b4d6f 100644
--- a/mason/tools/expression/input.mas
+++ b/mason/tools/expression/input.mas
@@ -69,16 +69,6 @@
     <p id="exp_title"></p>
     <p id="exp_dbxref"></p>
     <p id="exp_pub"></p>
-    <table id="exp_info_table" cellpadding="2" cellspacing="2" width="100%"></table>
-    <br/>
-</&>
-
-
-<&| /page/info_section.mas, title=>"Interactive Control Panel", collapsible => 1, collapsed => 0, is_subsection=>"1" &>
-    Choose a experiment:&nbsp; &nbsp; <select id="exp_list"></select>
-    <br/>
-    <br/>
-    <br/>
 </&>
 
 
@@ -86,6 +76,15 @@
 <div id="my_stage"></div>
 </&>
 
+<&| /page/info_section.mas, title=>"Interactive Control Panel", collapsible => 1, collapsed => 0, is_subsection=>"1" &>
+    Choose a experiment:&nbsp; &nbsp; 
+	<select id="exp_list">
+		<option>BTI Slyc RNA-Seq</option>
+		<option>Other experiment</option>
+	</select>
+    <br/>
+</&>
+
 
 <&| /page/info_section.mas, title=>"Bar Graph", collapsible => 1, collapsed => 0, is_subsection=>"1" &>
 	<!-- <div id="chart_margins" style="width: 700px; height: 400px;">
@@ -96,10 +95,15 @@
 </&>
 
 
-<&| /page/info_section.mas, title=>"Experiment Data", collapsible => 1, collapsed => 0, is_subsection=>"1" &>
+<&| /page/info_section.mas, title=>"Experiment Expression Data", collapsible => 1, collapsed => 0, is_subsection=>"1" &>
     <table id="exp_table" cellpadding="2" cellspacing="2" width="100%"></table>
 </&>
 
+<&| /page/info_section.mas, title=>"Experiment Sample Info", collapsible => 1, collapsed => 0, is_subsection=>"1" &>
+	<table id="exp_info_table" cellpadding="2" cellspacing="2" width="100%"></table>
+	<br/>
+</&>
+
 
 </div>
 
@@ -210,11 +214,11 @@ jQuery(document).ready(function () {
 		    var experiment_info = "";
 		    //alert("data: "+data_array.length);
 	        expression_table_info += "<tr style='text-align:center;'><th>Experiment</th><th>Replicates</th><th>FPKM</th><th>FPKM_lo</th><th>FPKM_hi</th></tr>";
-	        experiment_info += "<tr style='text-align:center;'><th>Experiment Conditions</th><th>Description</th><th>External Link</th></tr>";
+	        experiment_info += "<tr style='text-align:center;'><th>Sample</th><th>Description</th><th>External Link</th></tr>";
 
 		    for (var i=0; i<data_array.length; i=i+1) {
 		        experiment_info += "<tr><td><a href='/gem/experiment.pl?id="+data_array[i]["id"]+"' target='_blank'>"+data_array[i]["name"]+"</a></td>";
-			    experiment_info += "<td style='text-align:center;'>"+data_array[i]["exp_description"]+"</td>";
+			    experiment_info += "<td style='text-align:left;'>"+data_array[i]["exp_description"]+"</td>";
 			    experiment_info += "<td style='text-align:center;'>"+data_array[i]["exp_links"]+"</td>";
 
 		        expression_table_info += "<tr><td>"+data_array[i]["name"]+"</td>";
@@ -391,27 +395,40 @@ function dump(arr,level) {
 
 
 
-    function display_pictures() {
-        var stage = new Kinetic.Stage({
-    	    container: "my_stage",
-      	    width: 700,
-      	    height: 600
-    	});
-    	var layer = new Kinetic.Layer();
-        var plantObj = new Image();
-    	plantObj.src = "/static/documents/img/expression_tool/black_tomato_plant.png";
+	function display_pictures() {
+		var stage = new Kinetic.Stage({
+			container: "my_stage",
+			width: 700,
+			height: 600
+		});
+		var layer = new Kinetic.Layer();
+		var plantObj = new Image();
+		// var fruit_img = new Image();
+		plantObj.src = "/static/documents/img/expression_tool/expression_example.png";
+		// fruit_img.src = "/static/documents/img/expression_tool/tomato_fruit_1.png";
 
-        // tomato plant img
-      	var tomato_plant = new Kinetic.Image({
-            image: plantObj,
-            x: 0,
-            y: 0,
-            width: 210,
-            height: 300,
-        });
-        layer.add(tomato_plant);
-      	stage.add(layer);
-    }
+		// tomato plant img
+		var tomato_plant = new Kinetic.Image({
+			image: plantObj,
+			x: 0,
+			y: 0,
+			width: 690,
+			height: 570,
+		});
+
+		// // tomato fruit img
+		// var tomato_fruit = new Kinetic.Image({
+		// 	image: fruit_img,
+		// 	x: 40,
+		// 	y: 410,
+		// 	width: 130,
+		// 	height: 120,
+		// });
+
+		layer.add(tomato_plant);
+		// layer.add(tomato_fruit);
+		stage.add(layer);
+	}
 
 });
 
diff --git a/mason/tools/vigs/input.mas b/mason/tools/vigs/input.mas
index ce8c34175..2c5d42e0a 100644
--- a/mason/tools/vigs/input.mas
+++ b/mason/tools/vigs/input.mas
@@ -1,15 +1,4 @@
 
-<!-- <script src="http://code.jquery.com/jquery-1.9.1.js"></script> -->
-<!-- <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script> -->
-
-<!-- javascript-->
-
-<script src="/js/jqueryui/jquery-1.9.1.js"></script>
-<script src="/js/jqueryui/jquery-ui.js"></script>
-<script src="/js/tools/vigs.js" type="text/javascript"></script>
-<script src="/js/jquery/iframe-post-form.js" type="text/javascript"></script>
-
-
 <%args>
 
 @databases
@@ -18,7 +7,8 @@ $f_size => 0
 
 </%args>
 
-<& /util/import_javascript.mas, classes => ['Text.Markup', 'sprintf', 'jquery', 'jqueryui', 'jquery.iframe-post-form','CXGN.List'] &>
+<!-- import javascript libraries-->
+<& /util/import_javascript.mas, classes => ['Text.Markup', 'sprintf', 'jquery', 'jqueryui', 'jquery.iframe-post-form', 'CXGN.List', 'tools/vigs'] &>
 
 <& /page/page_title.mas, title=>"VIGS Tool" &>
 
-- 
2.11.4.GIT