Skip to content
Browse files

Modify to use bootstrap_curator cont'd

  • Loading branch information...
1 parent e04b028 commit 713cad65f85051efa2f87e4714b99fef355d4e3a John Lee committed
Showing with 47 additions and 36 deletions.
  1. +3 −1 curator_data/traitAdd.php
  2. +4 −2 login/edit_line.php
  3. +4 −1 login/edit_pedigree.php
  4. +5 −3 login/edit_traits.php
  5. +5 −3 login/traitAdd.php
  6. +4 −2 logout.php
  7. +22 −24 pedigree/line_selection.php
View
4 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();
View
6 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'] . 'curator_data/boot_test.php');
+include($config['root_dir'] . 'includes/bootstrap_curator.inc');
+//include($config['root_dir'] . 'curator_data/boot_test.php');
connect();
loginTest();
View
5 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();
View
8 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');?>
View
8 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'] . 'curator_data/boot_test.php');
+include($config['root_dir'] . 'includes/bootstrap_curator.inc');
+//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');?>
View
6 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");?>
View
46 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");
- count = document.lines.elements.length;
+ //alert ("hi");
+ count = document.lines.elements.length;
for (i=0; i < count; i++)
{
- if(document.lines.elements[i].checked == 0)
- {document.lines.elements[i].checked = 1; }
- // else {document.lines.elements[i].checked = 1;}
+ if(document.lines.elements[i].checked == 0) {
+ document.lines.elements[i].checked = 1;
+ }
+ // else {document.lines.elements[i].checked = 1;}
}
- 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;}
- }
- }
-
-
+ 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;}
+ }
+}
</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) )

0 comments on commit 713cad6

Please sign in to comment.
Something went wrong with that request. Please try again.