[basedb-cvs] basedb/include/web hyb_common.inc.php,1.11,1.12 probe_common.inc.php,1.2,1.3

[<tr...@us...>]

Update of /cvsroot/basedb/basedb/include/web
In directory sc8-pr-cvs1:/tmp/cvs-serv4457/include/web

Modified Files:
	hyb_common.inc.php probe_common.inc.php 
Log Message:
Fixes soon after 1.2.0RC2...

Index: hyb_common.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/hyb_common.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** hyb_common.inc.php	13 Feb 2003 11:36:52 -0000	1.11
--- hyb_common.inc.php	13 Feb 2003 22:29:36 -0000	1.12
***************
*** 136,140 ****
  			return "Unable to use image for JPEG: image not found";
  		$ch = $img->getChannels();
! 		if($ch != -1 && $ch != 1 && $ch != 2)
  			return "Unable to use image for JPEG: can't handle its channel(s)";
  		else if(!$img->takeOverUseForJpeg())
--- 136,140 ----
  			return "Unable to use image for JPEG: image not found";
  		$ch = $img->getChannels();
! 		if($ch != 1 && $ch != 2 && $ch != IMAGE_CHANNEL_BOTH)
  			return "Unable to use image for JPEG: can't handle its channel(s)";
  		else if(!$img->takeOverUseForJpeg())
***************
*** 213,218 ****
  				"',".($un ? 1 : 0).")\">".
  				($un ? "Undelete" : "Delete")."</a>]";
! 
! 			if($a["channels"] > 0)
  			{
  				$func[] = "[<a href='javascript:useForJpeg($a[id])'>".
--- 213,218 ----
  				"',".($un ? 1 : 0).")\">".
  				($un ? "Undelete" : "Delete")."</a>]";
! 			
! 			if($ch == 1 || $ch == 2 || $ch == IMAGE_CHANNEL_BOTH)
  			{
  				$func[] = "[<a href='javascript:useForJpeg($a[id])'>".

Index: probe_common.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/probe_common.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** probe_common.inc.php	30 Dec 2002 22:09:17 -0000	1.2
--- probe_common.inc.php	13 Feb 2003 22:29:36 -0000	1.3
***************
*** 36,41 ****
  	$bgcolor ^= 1;
  	$w =& $wells[$wellid];
! 	if($wellid == $curWell) echo "<tr class=pink>";
! 	else echo "<tr bgcolor=$tdbg[$bgcolor]>";
  
  	$plink = html($w["name"]);
--- 36,43 ----
  	$bgcolor ^= 1;
  	$w =& $wells[$wellid];
! 	if($wellid == $curWell)
! 		echo "<tr class=pink>";
! 	else
! 		echo "<tr bgcolor=$tdbg[$bgcolor]>";
  
  	$plink = html($w["name"]);
***************
*** 50,54 ****
  		"<td>".html($w["bacterialGrowth"])."</td>".
  		"<td>".html($w["comment"])."</td></tr>\n";
! 	if(!isset($children[$wellid])) return;
  	$c =& $children[$wellid];
  	for($i = 0; $i < count($c); $i++)
--- 52,57 ----
  		"<td>".html($w["bacterialGrowth"])."</td>".
  		"<td>".html($w["comment"])."</td></tr>\n";
! 	if(!isset($children[$wellid]))
! 		return;
  	$c =& $children[$wellid];
  	for($i = 0; $i < count($c); $i++)