Modify to use bootstrap_curator cont'd

Dave-Matthews · Dec 20, 2010 · 713cad6 · 713cad6
1 parent e04b028
commit 713cad6
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 36 deletions.
diff --git a/curator_data/traitAdd.php b/curator_data/traitAdd.php
@@ -1,9 +1,11 @@
 <?php
+// 12/14/2010 JLee  Change to use curator bootstrap
+
 require 'config.php';
 /*
  * Logged in page initialization
  */
-include($config['root_dir'] . 'includes/bootstrap.inc');
+include($config['root_dir'] . 'includes/bootstrap_curator.inc');
 
 connect();
 loginTest();

diff --git a/login/edit_line.php b/login/edit_line.php
@@ -1,10 +1,12 @@
 <?php
+// 12/14/2010 JLee  Change to use curator bootstrap
+
 require 'config.php';
 /*
  * Logged in page initialization
  */
-include($config['root_dir'] . 'includes/bootstrap.inc');
+include($config['root_dir'] . 'includes/bootstrap_curator.inc');
-include($config['root_dir'] . 'curator_data/boot_test.php');
+//include($config['root_dir'] . 'curator_data/boot_test.php');
 
 connect();
 loginTest();

diff --git a/login/edit_pedigree.php b/login/edit_pedigree.php
@@ -1,9 +1,12 @@
 <?php
+
+// 12/14/2010 JLee  Change to use curator bootstrap
+
 require 'config.php';
 /*
  * Logged in page initialization
  */
-include($config['root_dir'] . 'includes/bootstrap.inc');
+include($config['root_dir'] . 'includes/bootstrap_curator.inc');
 include($config['root_dir'] . 'curator_data/boot_test.php');
 
 connect();

diff --git a/login/edit_traits.php b/login/edit_traits.php
@@ -1,12 +1,14 @@
 <?php
+// 12/14/2010 JLee  Change to use curator bootstrap
+
 require 'config.php';
-include($config['root_dir'] . 'curator_data/boot_test.php');
+//include($config['root_dir'] . 'curator_data/boot_test.php');
 
 
 /*
  * Logged in page initialization
  */
-include($config['root_dir'] . 'includes/bootstrap.inc');
+include($config['root_dir'] . 'includes/bootstrap_curator.inc');
 
 connect();
 //loginTest();
@@ -114,4 +116,4 @@
 </div>
 </div>
 
-<?php include($config['root_dir'] . 'theme/footer.php');?>
+<?php include($config['root_dir'] . 'theme/footer.php');?>
diff --git a/login/traitAdd.php b/login/traitAdd.php
@@ -1,10 +1,12 @@
 <?php
+// 12/14/2010 JLee  Change to use curator bootstrap
+
 require 'config.php';
 /*
  * Logged in page initialization
  */
-include($config['root_dir'] . 'includes/bootstrap.inc');
+include($config['root_dir'] . 'includes/bootstrap_curator.inc');
-include($config['root_dir'] . 'curator_data/boot_test.php');
+//include($config['root_dir'] . 'curator_data/boot_test.php');
 
 connect();
 loginTest();
@@ -202,4 +204,4 @@
 </div>
 </div>
 
-<?php include($config['root_dir'] . '/theme/footer.php');?>
+<?php include($config['root_dir'] . '/theme/footer.php');?>
diff --git a/logout.php b/logout.php
@@ -1,5 +1,7 @@
 <?php
-include("includes/bootstrap.inc");
+// 12/14/2010 JLee  Change to use curator bootstrap
+
+include("includes/bootstrap_curator.inc");
 connect();
 $row = loadUser($_SESSION['username']);
 ob_start();
@@ -30,4 +32,4 @@
 
 <meta http-equiv="refresh" content="2;url=index.php" />
 
-<?php include("theme/footer.php");?>
+<?php include("theme/footer.php");?>
diff --git a/pedigree/line_selection.php b/pedigree/line_selection.php
@@ -70,33 +70,30 @@
 //var test = new Array("<?/*php echo $selLines*/?>");
 //test1 =  test.length;
 // Select All
-            function exclude_all() {
+function exclude_all() {
 
-            //alert ("hi");
+    //alert ("hi");
-            	count = document.lines.elements.length;
+   	count = document.lines.elements.length;
     for (i=0; i < count; i++) 
 	{
-    if(document.lines.elements[i].checked == 0)
+		if(document.lines.elements[i].checked == 0) {
-    	{document.lines.elements[i].checked = 1; }
+			document.lines.elements[i].checked = 1; 
-   // else {document.lines.elements[i].checked = 1;}
+		}
+   		// else {document.lines.elements[i].checked = 1;}
 	}
 
-          document.lines.btn1.checked = "checked";                     
+	document.lines.btn1.checked = "checked";                     
-            }
+}
-
-            function exclude_none()
-            {
-            count = document.lines.elements.length;
-    for (i=0; i < count; i++) 
-	{
-    if(document.lines.elements[i].checked == 1)
-    	{document.lines.elements[i].checked = 0; }
-    //else {document.lines.elements[i].checked = 1;}
-	}
-            }
-
-
 
+function exclude_none() {
+	count = document.lines.elements.length;
+    for (i=0; i < count; i++) {
+		if(document.lines.elements[i].checked == 1) {
+			document.lines.elements[i].checked = 0; 
+		}
+		//else {document.lines.elements[i].checked = 1;}
+	}	
+}
 </script>
 
 <style type="text/css">
@@ -316,11 +313,12 @@ function exclude_none()
     var_dump($lineStr);
     var_dump($test); */
    // var_dump($breedingCode);
+
 
    // var_dump ($breedingProgram);
     //var_dump ($breedingCode);
 
-/* 
+/* 
     var_dump($breedingProgram);
     var_dump($growthHabit);
     var_dump($primaryEndUse); 
@@ -341,8 +339,8 @@ function exclude_none()
       $hull = ".";     
 		
 		if (count($primaryEndUse) < 1)
-      $primaryEndUse = ".";   
+      $primaryEndUse = ".";   
-
+
 */
 
     if ( (strlen($linename) < 1) AND (strlen($hull) < 1) AND (strlen($rowType) < 1) AND (count($breedingProgram) == 0) AND  (count($growthHabit) == 0) AND (count($primaryEndUse) == 0)  )