[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.40,1.41 overlib.js,1.3,1.4

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv7600/inc

Modified Files:
        class.bocommon.inc.php overlib.js 
Log Message:
no message

Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** class.bocommon.inc.php      28 Apr 2003 10:26:44 -0000      1.40
--- class.bocommon.inc.php      3 May 2003 17:27:16 -0000       1.41
***************
*** 595,599 ****
                                
$menu['sublink_drawing']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidrawing.index');
                                $menu['sublang_drawing']=lang('Drawing');
!                               
$menu['sublink_gabnr']=$GLOBALS['phpgw']->link('/property/list_gabnr.php');
                                $menu['sublang_gabnr']=lang('gabnr');
  
--- 595,599 ----
                                
$menu['sublink_drawing']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidrawing.index');
                                $menu['sublang_drawing']=lang('Drawing');
!                               
$menu['sublink_gabnr']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uigab.index');
                                $menu['sublang_gabnr']=lang('gabnr');
  

Index: overlib.js
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/overlib.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** overlib.js  6 Jan 2003 08:30:40 -0000       1.3
--- overlib.js  3 May 2003 17:27:16 -0000       1.4
***************
*** 1,7 ****
  
//\//////////////////////////////////////////////////////////////////////////////////
! //\  overLIB 3.50  --  This notice must remain untouched at all times.
! //\  Copyright Erik Bosrup 1998-2001. All rights reserved.
  //\
! //\  By Erik Bosrup (address@hidden).  Last modified 2001-08-28.
  //\  Portions by Dan Steinman (dansteinman.com). Additions by other people are
  //\  listed on the overLIB homepage.
--- 1,7 ----
  
//\//////////////////////////////////////////////////////////////////////////////////
! //\  overLIB 3.51  --  This notice must remain untouched at all times.
! //\  Copyright Erik Bosrup 1998-2002. All rights reserved.
  //\
! //\  By Erik Bosrup (address@hidden).  Last modified 2002-11-01.
  //\  Portions by Dan Steinman (dansteinman.com). Additions by other people are
  //\  listed on the overLIB homepage.
***************
*** 243,247 ****
  
  // Default icon to place next to the popups caption.
! if (typeof ol_caption == 'undefined') { var ol_capicon = ""; }
  
  // Default frame. We default to current frame if there is no frame defined.
--- 243,247 ----
  
  // Default icon to place next to the popups caption.
! if (typeof ol_capicon == 'undefined') { var ol_capicon = ""; }
  
  // Default frame. We default to current frame if there is no frame defined.
***************
*** 252,256 ****
  
  // Default javascript funktion. By default there is none.
! if (typeof ol_function == 'undefined') { var ol_function = Function(); }
  
  // Default timeout. By default there is no timeout.
--- 252,256 ----
  
  // Default javascript funktion. By default there is none.
! if (typeof ol_function == 'undefined') { var ol_function = null; }
  
  // Default timeout. By default there is no timeout.
***************
*** 294,308 ****
  // Unit to be used for the text padding above
  // Only used if CSS inline styles are being used (ol_css = CSSSTYLE)
! // Options include "px", "%", "in", "cm" and more
  if (typeof ol_padunit == 'undefined') { var ol_padunit = "px";}
  
  // Unit to be used for height of popup
  // Only used if CSS inline styles are being used (ol_css = CSSSTYLE)
! // Options include "px", "%", "in", "cm" and more
  if (typeof ol_heightunit == 'undefined') { var ol_heightunit = "px";}
  
  // Unit to be used for width of popup
  // Only used if CSS inline styles are being used (ol_css = CSSSTYLE)
! // Options include "px", "%", "in", "cm" and more
  if (typeof ol_widthunit == 'undefined') { var ol_widthunit = "px";}
  
--- 294,308 ----
  // Unit to be used for the text padding above
  // Only used if CSS inline styles are being used (ol_css = CSSSTYLE)
! // Options include "px", "%", "in", "cm"
  if (typeof ol_padunit == 'undefined') { var ol_padunit = "px";}
  
  // Unit to be used for height of popup
  // Only used if CSS inline styles are being used (ol_css = CSSSTYLE)
! // Options include "px", "%", "in", "cm"
  if (typeof ol_heightunit == 'undefined') { var ol_heightunit = "px";}
  
  // Unit to be used for width of popup
  // Only used if CSS inline styles are being used (ol_css = CSSSTYLE)
! // Options include "px", "%", "in", "cm"
  if (typeof ol_widthunit == 'undefined') { var ol_widthunit = "px";}
  
***************
*** 429,433 ****
  var o3_timerid = 0;
  var o3_allowmove = 0;
! var o3_function = Function();
  var o3_delay = 0;
  var o3_delayid = 0;
--- 429,433 ----
  var o3_timerid = 0;
  var o3_allowmove = 0;
! var o3_function = null; 
  var o3_delay = 0;
  var o3_delayid = 0;
***************
*** 469,483 ****
  // Our layer
  var over = null;
! 
  
  // Decide browser version
! var ns4 = (document.layers)? true:false;
  var ns6 = (document.getElementById)? true:false;
  var ie4 = (document.all)? true:false;
  var ie5 = false;
  
  // Microsoft Stupidity Check(tm).
  if (ie4) {
        if ((navigator.userAgent.indexOf('MSIE 5') > 0) || 
(navigator.userAgent.indexOf('MSIE 6') > 0)) {
                ie5 = true;
        }
--- 469,491 ----
  // Our layer
  var over = null;
! var fnRef;
  
  // Decide browser version
! var ns4 = (navigator.appName == 'Netscape' && parseInt(navigator.appVersion) 
== 4);
  var ns6 = (document.getElementById)? true:false;
  var ie4 = (document.all)? true:false;
+ if (ie4) var docRoot = 'document.body';
  var ie5 = false;
+ if (ns4) {
+       var oW = window.innerWidth;
+       var oH = window.innerHeight;
+       window.onresize = function () {if 
(oW!=window.innerWidth||oH!=window.innerHeight) location.reload();}
+ }
+ 
  
  // Microsoft Stupidity Check(tm).
  if (ie4) {
        if ((navigator.userAgent.indexOf('MSIE 5') > 0) || 
(navigator.userAgent.indexOf('MSIE 6') > 0)) {
+               if(document.compatMode && document.compatMode == 'CSS1Compat') 
docRoot = 'document.documentElement';
                ie5 = true;
        }
***************
*** 582,589 ****
--- 590,599 ----
        o3_closestyle = ol_closestyle;
        o3_closeweight = ol_closeweight;
+       fnRef = '';
        
  
        // Special for frame support, over must be reset...
        if ( (ns4) || (ie4) || (ns6) ) {
+               if (over) cClick();
                o3_frame = ol_frame;
                if (ns4) over = o3_frame.document.overDiv
***************
*** 594,607 ****
        
        // What the next argument is expected to be.
!       var parsemode = -1;
        
        var ar = arguments;
  
        for (i = 0; i < ar.length; i++) {
  
                if (parsemode < 0) {
!                       // Arg is maintext, unless INARRAY
!                       if (ar[i] == INARRAY) {
!                               o3_text = ol_texts[ar[++i]];
                        } else {
                                o3_text = ar[i];
--- 604,619 ----
        
        // What the next argument is expected to be.
!       var parsemode = -1, udf, v = null;
        
        var ar = arguments;
+       udf = (!ar.length ? 1 : 0);
  
        for (i = 0; i < ar.length; i++) {
  
                if (parsemode < 0) {
!                       // Arg is maintext, unless its a PARAMETER
!                       if (typeof ar[i] == 'number') {
!                               udf = (ar[i] == FUNCTION ? 0 : 1);
!                               i--;
                        } else {
                                o3_text = ar[i];
***************
*** 611,615 ****
                } else {
                        // Note: NS4 doesn't like switch cases with vars.
!                       if (ar[i] == INARRAY) { o3_text = ol_texts[ar[++i]]; 
continue; }
                        if (ar[i] == CAPARRAY) { o3_cap = ol_caps[ar[++i]]; 
continue; }
                        if (ar[i] == STICKY) { o3_sticky = 1; continue; }
--- 623,627 ----
                } else {
                        // Note: NS4 doesn't like switch cases with vars.
!                       if (ar[i] == INARRAY) { udf = 0; o3_text = 
ol_texts[ar[++i]]; continue; }
                        if (ar[i] == CAPARRAY) { o3_cap = ol_caps[ar[++i]]; 
continue; }
                        if (ar[i] == STICKY) { o3_sticky = 1; continue; }
***************
*** 628,633 ****
                        if (ar[i] == BORDER) { o3_border = ar[++i]; continue; }
                        if (ar[i] == STATUS) { o3_status = ar[++i]; continue; }
!                       if (ar[i] == AUTOSTATUS) { o3_autostatus = 1; continue; 
}
!                       if (ar[i] == AUTOSTATUSCAP) { o3_autostatus = 2; 
continue; }
                        if (ar[i] == HEIGHT) { o3_height = ar[++i]; 
o3_aboveheight = ar[i]; continue; } // Same param again.
                        if (ar[i] == CLOSETEXT) { o3_close = ar[++i]; continue; 
}
--- 640,645 ----
                        if (ar[i] == BORDER) { o3_border = ar[++i]; continue; }
                        if (ar[i] == STATUS) { o3_status = ar[++i]; continue; }
!                       if (ar[i] == AUTOSTATUS) { o3_autostatus = 
(o3_autostatus == 1) ? 0 : 1; continue; }
!                       if (ar[i] == AUTOSTATUSCAP) { o3_autostatus = 
(o3_autostatus == 2) ? 0 : 2; continue; }
                        if (ar[i] == HEIGHT) { o3_height = ar[++i]; 
o3_aboveheight = ar[i]; continue; } // Same param again.
                        if (ar[i] == CLOSETEXT) { o3_close = ar[++i]; continue; 
}
***************
*** 651,655 ****
                        if (ar[i] == FRAME) { opt_FRAME(ar[++i]); continue; }
                        if (ar[i] == TIMEOUT) { o3_timeout = ar[++i]; continue; 
}
!                       if (ar[i] == FUNCTION) { opt_FUNCTION(ar[++i]); 
continue; }
                        if (ar[i] == DELAY) { o3_delay = ar[++i]; continue; }
                        if (ar[i] == HAUTO) { o3_hauto = (o3_hauto == 0) ? 1 : 
0; continue; }
--- 663,667 ----
                        if (ar[i] == FRAME) { opt_FRAME(ar[++i]); continue; }
                        if (ar[i] == TIMEOUT) { o3_timeout = ar[++i]; continue; 
}
!                       if (ar[i] == FUNCTION) { udf = 0; if (typeof ar[i+1] != 
'number') v = ar[++i]; opt_FUNCTION(v); continue; } 
                        if (ar[i] == DELAY) { o3_delay = ar[++i]; continue; }
                        if (ar[i] == HAUTO) { o3_hauto = (o3_hauto == 0) ? 1 : 
0; continue; }
***************
*** 681,695 ****
                }
        }
  
        if (o3_delay == 0) {
!               return overlib350();
        } else {
!               o3_delayid = setTimeout("overlib350()", o3_delay);
! 
!               if (o3_sticky) {
!                       return false;
!               } else {
!                       return true;
!               }
        }
  }
--- 693,703 ----
                }
        }
+       if (udf && o3_function) o3_text = o3_function();
  
        if (o3_delay == 0) {
!               return overlib351();
        } else {
!               o3_delayid = setTimeout("overlib351()", o3_delay);
!               return false;
        }
  }
***************
*** 719,728 ****
  
  
////////////////////////////////////////////////////////////////////////////////////
! // OVERLIB 3.50 FUNCTION
  
////////////////////////////////////////////////////////////////////////////////////
  
  
  // This function decides what it is we want to display and how we want it 
done.
! function overlib350() {
  
        // Make layer content
--- 727,736 ----
  
  
////////////////////////////////////////////////////////////////////////////////////
! // OVERLIB 3.51 FUNCTION
  
////////////////////////////////////////////////////////////////////////////////////
  
  
  // This function decides what it is we want to display and how we want it 
done.
! function overlib351() {
  
        // Make layer content
***************
*** 776,779 ****
--- 784,791 ----
        // We want it to stick!
        if (o3_sticky) {
+               if (o3_timerid > 0) {
+                       clearTimeout(o3_timerid);
+                       o3_timerid = 0;
+               }
                o3_showingsticky = 1;
                o3_removecounter = 0;
***************
*** 795,799 ****
  
        // Initiate a timer for timeout
!       if (o3_timeout > 0) {          
                if (o3_timerid > 0) clearTimeout(o3_timerid);
                o3_timerid = setTimeout("cClick()", o3_timeout);
--- 807,811 ----
  
        // Initiate a timer for timeout
!       if (o3_timeout > 0) {
                if (o3_timerid > 0) clearTimeout(o3_timerid);
                o3_timerid = setTimeout("cClick()", o3_timeout);
***************
*** 804,813 ****
  
        // Stickies should stay where they are. 
!       if (o3_sticky) {
!               o3_allowmove = 0;
!               return false;
!       } else {
!               return true;
!       }
  }
  
--- 816,822 ----
  
        // Stickies should stay where they are. 
!       if (o3_sticky) o3_allowmove = 0;
! 
!       return (o3_status != '');
  }
  
***************
*** 840,850 ****
  
        if (close != "") {
!               if (o3_css == CSSCLASS) closing = "<TD ALIGN=RIGHT><A 
HREF=\"/\" "+closeevent+"=\"return cClick();\" 
class=\""+o3_closefontclass+"\">"+close+"</A></TD>";
!               if (o3_css == CSSSTYLE) closing = "<TD ALIGN=RIGHT><A 
HREF=\"/\" "+closeevent+"=\"return cClick();\" style=\"color: 
"+o3_closecolor+"; font-family: "+o3_closefont+"; font-size: 
"+o3_closesize+o3_closesizeunit+"; text-decoration: "+o3_closedecoration+"; 
font-weight: "+o3_closeweight+"; 
font-style:"+o3_closestyle+";\">"+close+"</A></TD>";
!               if (o3_css == CSSOFF) closing = "<TD ALIGN=RIGHT><A HREF=\"/\" 
"+closeevent+"=\"return cClick();\"><FONT COLOR=\""+o3_closecolor+"\" 
FACE=\""+o3_closefont+"\" SIZE=\""+o3_closesize+"\">"+close+"</FONT></A></TD>";
        }
  
        if (o3_css == CSSCLASS) txt = "<TABLE WIDTH="+o3_width+" BORDER=0 
CELLPADDING="+o3_border+" CELLSPACING=0 class=\""+o3_bgclass+"\"><TR><TD><TABLE 
WIDTH=100% BORDER=0 CELLPADDING=0 CELLSPACING=0><TR><TD><FONT 
class=\""+o3_captionfontclass+"\">"+o3_capicon+title+"</FONT></TD>"+closing+"</TR></TABLE><TABLE
 WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=0 
class=\""+o3_fgclass+"\"><TR><TD VALIGN=TOP><FONT 
class=\""+o3_textfontclass+"\">"+text+"</FONT></TD></TR></TABLE></TD></TR></TABLE>";
!       if (o3_css == CSSSTYLE) txt = "<TABLE WIDTH="+o3_width+" BORDER=0 
CELLPADDING="+o3_border+" CELLSPACING=0 style=\"background-color: 
"+o3_bgcolor+"; background-image: url("+o3_bgbackground+"); height: 
"+o3_height+o3_heightunit+";\"><TR><TD><TABLE WIDTH=100% BORDER=0 CELLPADDING=0 
CELLSPACING=0><TR><TD><FONT style=\"font-family: "+o3_captionfont+"; color: 
"+o3_capcolor+"; font-size: "+o3_captionsize+o3_captionsizeunit+"; font-weight: 
"+o3_captionweight+"; font-style: 
"+o3_captionstyle+";\">"+o3_capicon+title+"</FONT></TD>"+closing+"</TR></TABLE><TABLE
 WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=0 style=\"color: "+o3_fgcolor+"; 
background-color: "+o3_fgcolor+"; height: 
"+o3_height+o3_heightunit+";\"><TR><TD VALIGN=TOP><FONT style=\"font-family: 
"+o3_textfont+"; color: "+o3_textcolor+"; font-size: 
"+o3_textsize+o3_textsizeunit+"; text-decoration: "+o3_textdecoration+"; 
font-weight: "+o3_textweight+"; 
font-style:"+o3_textstyle+"\">"+text+"</FONT></TD></TR></TABLE></TD></TR></TABLE>";
        if (o3_css == CSSOFF) txt = "<TABLE WIDTH="+o3_width+" BORDER=0 
CELLPADDING="+o3_border+" CELLSPACING=0 "+o3_bgcolor+" "+o3_bgbackground+" 
"+o3_height+"><TR><TD><TABLE WIDTH=100% BORDER=0 CELLPADDING=0 
CELLSPACING=0><TR><TD><B><FONT COLOR=\""+o3_capcolor+"\" 
FACE=\""+o3_captionfont+"\" 
SIZE=\""+o3_captionsize+"\">"+o3_capicon+title+"</FONT></B></TD>"+closing+"</TR></TABLE><TABLE
 WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=0 "+o3_fgcolor+" 
"+o3_fgbackground+" "+o3_height+"><TR><TD VALIGN=TOP><FONT 
COLOR=\""+o3_textcolor+"\" FACE=\""+o3_textfont+"\" 
SIZE=\""+o3_textsize+"\">"+text+"</FONT></TD></TR></TABLE></TD></TR></TABLE>";
  
--- 849,859 ----
  
        if (close != "") {
!               if (o3_css == CSSCLASS) closing = "<TD ALIGN=RIGHT><A 
HREF=\"javascript:return "+fnRef+"cClick();\" "+closeevent+"=\"return " + fnRef 
+ "cClick();\" class=\""+o3_closefontclass+"\">"+close+"</A></TD>";
!               if (o3_css == CSSSTYLE) closing = "<TD ALIGN=RIGHT><A 
HREF=\"javascript:return "+fnRef+"cClick();\" "+closeevent+"=\"return " + fnRef 
+ "cClick();\" style=\"color: "+o3_closecolor+"; font-family: "+o3_closefont+"; 
font-size: "+o3_closesize+o3_closesizeunit+"; text-decoration: 
"+o3_closedecoration+"; font-weight: "+o3_closeweight+"; 
font-style:"+o3_closestyle+";\">"+close+"</A></TD>";
!               if (o3_css == CSSOFF) closing = "<TD ALIGN=RIGHT><A 
HREF=\"javascript:return "+fnRef+"cClick();\" "+closeevent+"=\"return " + fnRef 
+ "cClick();\"><FONT COLOR=\""+o3_closecolor+"\" FACE=\""+o3_closefont+"\" 
SIZE=\""+o3_closesize+"\">"+close+"</FONT></A></TD>";
        }
  
        if (o3_css == CSSCLASS) txt = "<TABLE WIDTH="+o3_width+" BORDER=0 
CELLPADDING="+o3_border+" CELLSPACING=0 class=\""+o3_bgclass+"\"><TR><TD><TABLE 
WIDTH=100% BORDER=0 CELLPADDING=0 CELLSPACING=0><TR><TD><FONT 
class=\""+o3_captionfontclass+"\">"+o3_capicon+title+"</FONT></TD>"+closing+"</TR></TABLE><TABLE
 WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=0 
class=\""+o3_fgclass+"\"><TR><TD VALIGN=TOP><FONT 
class=\""+o3_textfontclass+"\">"+text+"</FONT></TD></TR></TABLE></TD></TR></TABLE>";
!       if (o3_css == CSSSTYLE) txt = "<TABLE WIDTH="+o3_width+" BORDER=0 
CELLPADDING="+o3_border+" CELLSPACING=0 style=\"background-color: 
"+o3_bgcolor+"; background-image: url("+o3_bgbackground+"); height: 
"+o3_height+o3_heightunit+";\"><TR><TD><TABLE WIDTH=100% BORDER=0 CELLPADDING=0 
CELLSPACING=0><TR><TD><FONT style=\"font-family: "+o3_captionfont+"; color: 
"+o3_capcolor+"; font-size: "+o3_captionsize+o3_captionsizeunit+"; font-weight: 
"+o3_captionweight+"; font-style: "+o3_captionstyle+"; text-decoration: " + 
o3_captiondecoration + 
";\">"+o3_capicon+title+"</FONT></TD>"+closing+"</TR></TABLE><TABLE WIDTH=100% 
BORDER=0 CELLPADDING=2 CELLSPACING=0 style=\"color: "+o3_fgcolor+"; 
background-color: "+o3_fgcolor+"; height: 
"+o3_height+o3_heightunit+";\"><TR><TD VALIGN=TOP><FONT style=\"font-family: 
"+o3_textfont+"; color: "+o3_textcolor+"; font-size: 
"+o3_textsize+o3_textsizeunit+"; text-decoration: "+o3_textdecoration+"; 
font-weight: "+o3_textweight+"; 
font-style:"+o3_textstyle+"\">"+text+"</FONT></TD></TR></TABLE></TD></TR></TABLE>";
        if (o3_css == CSSOFF) txt = "<TABLE WIDTH="+o3_width+" BORDER=0 
CELLPADDING="+o3_border+" CELLSPACING=0 "+o3_bgcolor+" "+o3_bgbackground+" 
"+o3_height+"><TR><TD><TABLE WIDTH=100% BORDER=0 CELLPADDING=0 
CELLSPACING=0><TR><TD><B><FONT COLOR=\""+o3_capcolor+"\" 
FACE=\""+o3_captionfont+"\" 
SIZE=\""+o3_captionsize+"\">"+o3_capicon+title+"</FONT></B></TD>"+closing+"</TR></TABLE><TABLE
 WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=0 "+o3_fgcolor+" 
"+o3_fgbackground+" "+o3_height+"><TR><TD VALIGN=TOP><FONT 
COLOR=\""+o3_textcolor+"\" FACE=\""+o3_textfont+"\" 
SIZE=\""+o3_textsize+"\">"+text+"</FONT></TD></TR></TABLE></TD></TR></TABLE>";
  
***************
*** 855,863 ****
  // Sets the background picture, padding and lots more. :)
  function ol_content_background(text, picture, hasfullhtml) {
        if (hasfullhtml) {
                txt = text;
        } else {
!               if (o3_css == CSSCLASS) txt = "<TABLE 
WIDTH="+o3_width+o3_widthunit+" BORDER=0 CELLPADDING=0 CELLSPACING=0 
HEIGHT="+o3_height+o3_heightunit+"><TR><TD COLSPAN=3 
HEIGHT="+o3_padyt+o3_padunit+"></TD></TR><TR><TD 
WIDTH="+o3_padxl+o3_padunit+"></TD><TD VALIGN=TOP 
WIDTH="+(o3_width-o3_padxl-o3_padxr)+o3_padunit+"><FONT 
class=\""+o3_textfontclass+"\">"+text+"</FONT></TD><TD 
WIDTH="+o3_padxr+o3_padunit+"></TD></TR><TR><TD COLSPAN=3 
HEIGHT="+o3_padyb+o3_padunit+"></TD></TR></TABLE>";
!               if (o3_css == CSSSTYLE) txt = "<TABLE 
WIDTH="+o3_width+o3_widthunit+" BORDER=0 CELLPADDING=0 CELLSPACING=0 
HEIGHT="+o3_height+o3_heightunit+"><TR><TD COLSPAN=3 
HEIGHT="+o3_padyt+o3_padunit+"></TD></TR><TR><TD 
WIDTH="+o3_padxl+o3_padunit+"></TD><TD VALIGN=TOP 
WIDTH="+(o3_width-o3_padxl-o3_padxr)+o3_padunit+"><FONT style=\"font-family: 
"+o3_textfont+"; color: "+o3_textcolor+"; font-size: 
"+o3_textsize+o3_textsizeunit+";\">"+text+"</FONT></TD><TD 
WIDTH="+o3_padxr+o3_padunit+"></TD></TR><TR><TD COLSPAN=3 
HEIGHT="+o3_padyb+o3_padunit+"></TD></TR></TABLE>";
                if (o3_css == CSSOFF) txt = "<TABLE WIDTH="+o3_width+" BORDER=0 
CELLPADDING=0 CELLSPACING=0 HEIGHT="+o3_height+"><TR><TD COLSPAN=3 
HEIGHT="+o3_padyt+"></TD></TR><TR><TD WIDTH="+o3_padxl+"></TD><TD VALIGN=TOP 
WIDTH="+(o3_width-o3_padxl-o3_padxr)+"><FONT FACE=\""+o3_textfont+"\" 
COLOR=\""+o3_textcolor+"\" SIZE=\""+o3_textsize+"\">"+text+"</FONT></TD><TD 
WIDTH="+o3_padxr+"></TD></TR><TR><TD COLSPAN=3 
HEIGHT="+o3_padyb+"></TD></TR></TABLE>";
        }
--- 864,878 ----
  // Sets the background picture, padding and lots more. :)
  function ol_content_background(text, picture, hasfullhtml) {
+       var txt;
        if (hasfullhtml) {
                txt = text;
        } else {
!               var pU, hU, wU;
!               pU = (o3_padunit == '%' ? '%' : '');
!               hU = (o3_heightunit == '%' ? '%' : '');
!               wU = (o3_widthunit == '%' ? '%' : '');
! 
!               if (o3_css == CSSCLASS) txt = "<TABLE WIDTH="+o3_width+" 
BORDER=0 CELLPADDING=0 CELLSPACING=0 HEIGHT="+o3_height+"><TR><TD COLSPAN=3 
HEIGHT="+o3_padyt+"></TD></TR><TR><TD WIDTH="+o3_padxl+"></TD><TD VALIGN=TOP 
WIDTH="+(o3_width-o3_padxl-o3_padxr)+"><FONT 
class=\""+o3_textfontclass+"\">"+text+"</FONT></TD><TD 
WIDTH="+o3_padxr+"></TD></TR><TR><TD COLSPAN=3 
HEIGHT="+o3_padyb+"></TD></TR></TABLE>";
!               if (o3_css == CSSSTYLE) txt = "<TABLE WIDTH="+o3_width+wU+" 
BORDER=0 CELLPADDING=0 CELLSPACING=0 HEIGHT="+o3_height+hU+"><TR><TD COLSPAN=3 
HEIGHT="+o3_padyt+pU+"></TD></TR><TR><TD WIDTH="+o3_padxl+pU+"></TD><TD 
VALIGN=TOP WIDTH="+(o3_width-o3_padxl-o3_padxr)+pU+"><FONT style=\"font-family: 
"+o3_textfont+"; color: "+o3_textcolor+"; font-size: 
"+o3_textsize+o3_textsizeunit+";\">"+text+"</FONT></TD><TD 
WIDTH="+o3_padxr+pU+"></TD></TR><TR><TD COLSPAN=3 
HEIGHT="+o3_padyb+pU+"></TD></TR></TABLE>";
                if (o3_css == CSSOFF) txt = "<TABLE WIDTH="+o3_width+" BORDER=0 
CELLPADDING=0 CELLSPACING=0 HEIGHT="+o3_height+"><TR><TD COLSPAN=3 
HEIGHT="+o3_padyt+"></TD></TR><TR><TD WIDTH="+o3_padxl+"></TD><TD VALIGN=TOP 
WIDTH="+(o3_width-o3_padxl-o3_padxr)+"><FONT FACE=\""+o3_textfont+"\" 
COLOR=\""+o3_textcolor+"\" SIZE=\""+o3_textsize+"\">"+text+"</FONT></TD><TD 
WIDTH="+o3_padxr+"></TD></TR><TR><TD COLSPAN=3 
HEIGHT="+o3_padyb+"></TD></TR></TABLE>";
        }
***************
*** 869,872 ****
--- 884,888 ----
  function set_background(pic) {
        if (pic == "") {
+               if (ns4) over.background.src = null;
                if (ie4) over.backgroundImage = "none";
                if (ns6) over.style.backgroundImage = "none";
***************
*** 913,920 ****
                placeX = o3_fixx;
        } else {
!               winoffset = (ie4) ? o3_frame.document.body.scrollLeft : 
o3_frame.pageXOffset;
!               if (ie4) iwidth = o3_frame.document.body.clientWidth;
!               if (ns4) iwidth = o3_frame.innerWidth; // was screwed in 
mozilla, fixed now?
!               if (ns6) iwidth = o3_frame.outerWidth;
                
                // If HAUTO, decide what to use.
--- 929,935 ----
                placeX = o3_fixx;
        } else {
!               winoffset = (ie4) ? eval('o3_frame.'+docRoot+'.scrollLeft') : 
o3_frame.pageXOffset;
!               if (ie4) iwidth = eval('o3_frame.'+docRoot+'.clientWidth');
!               if (ns4 || ns6) iwidth = o3_frame.innerWidth;
                
                // If HAUTO, decide what to use.
***************
*** 930,933 ****
--- 945,949 ----
                if (o3_hpos == CENTER) { // Center
                        placeX = o3_x+o3_offsetx-(o3_width/2);
+                       if (placeX < winoffset) placeX = winoffset;
                }
                if (o3_hpos == RIGHT) { // Right
***************
*** 963,973 ****
                placeY = o3_fixy;
        } else {
!               scrolloffset = (ie4) ? o3_frame.document.body.scrollTop : 
o3_frame.pageYOffset;
  
                // If VAUTO, decide what to use.
                if (o3_vauto == 1) {
!                       if (ie4) iheight = o3_frame.document.body.clientHeight;
!                       if (ns4) iheight = o3_frame.innerHeight;
!                       if (ns6) iheight = o3_frame.outerHeight;
  
                        iheight = (eval(iheight)) / 2;
--- 979,988 ----
                placeY = o3_fixy;
        } else {
!               scrolloffset = (ie4) ? eval('o3_frame.'+docRoot+'.scrollTop') : 
o3_frame.pageYOffset;
  
                // If VAUTO, decide what to use.
                if (o3_vauto == 1) {
!                       if (ie4) iheight = 
eval('o3_frame.'+docRoot+'.clientHeight');
!                       if (ns4 || ns6) iheight = o3_frame.innerHeight;
  
                        iheight = (eval(iheight)) / 2;
***************
*** 1018,1022 ****
        if ( (ns4) || (ns6) ) {o3_x=e.pageX; o3_y=e.pageY;}
        if (ie4) {o3_x=event.x; o3_y=event.y;}
!       if (ie5) {o3_x=event.x+o3_frame.document.body.scrollLeft; 
o3_y=event.y+o3_frame.document.body.scrollTop;}
        
        if (o3_allowmove == 1) {
--- 1033,1037 ----
        if ( (ns4) || (ns6) ) {o3_x=e.pageX; o3_y=e.pageY;}
        if (ie4) {o3_x=event.x; o3_y=event.y;}
!       if (ie5) {o3_x=eval('event.x+o3_frame.'+docRoot+'.scrollLeft'); 
o3_y=eval('event.y+o3_frame.'+docRoot+'.scrollTop');}
        
        if (o3_allowmove == 1) {
***************
*** 1035,1039 ****
  
  // Makes sure target frame has overLIB
! function compatibleframe(frameid) {        
        if (ns4) {
                if (typeof frameid.document.overDiv =='undefined') return false;
--- 1050,1054 ----
  
  // Makes sure target frame has overLIB
! function compatibleframe(frameid) {
        if (ns4) {
                if (typeof frameid.document.overDiv =='undefined') return false;
***************
*** 1058,1067 ****
        txt += "\n";
        
!         if (ns4) {
!                 var lyr = o3_frame.document.overDiv.document
! 
!                 lyr.write(txt)
!                 lyr.close()
!         } else if (ie4) {
                o3_frame.document.all["overDiv"].innerHTML = txt
        } else if (ns6) {
--- 1073,1081 ----
        txt += "\n";
        
!       if (ns4) {
!               var lyr = o3_frame.document.overDiv.document
!               lyr.write(txt)
!               lyr.close()
!       } else if (ie4) {
                o3_frame.document.all["overDiv"].innerHTML = txt
        } else if (ns6) {
***************
*** 1078,1083 ****
  // Make an object visible
  function showObject(obj) {
!         if (ns4) obj.visibility = "show";
!         else if (ie4) obj.visibility = "visible";
        else if (ns6) obj.style.visibility = "visible";
  }
--- 1092,1097 ----
  // Make an object visible
  function showObject(obj) {
!       if (ns4) obj.visibility = "show";
!       else if (ie4) obj.visibility = "visible";
        else if (ns6) obj.style.visibility = "visible";
  }
***************
*** 1085,1097 ****
  // Hides an object
  function hideObject(obj) {
!         if (ns4) obj.visibility = "hide";
!         else if (ie4) obj.visibility = "hidden";
        else if (ns6) obj.style.visibility = "hidden";
!         
        if (o3_timerid > 0) clearTimeout(o3_timerid);
        if (o3_delayid > 0) clearTimeout(o3_delayid);
        o3_timerid = 0;
        o3_delayid = 0;
!         self.status = "";
  }
  
--- 1099,1111 ----
  // Hides an object
  function hideObject(obj) {
!       if (ns4) obj.visibility = "hide";
!       else if (ie4) obj.visibility = "hidden";
        else if (ns6) obj.style.visibility = "hidden";
! 
        if (o3_timerid > 0) clearTimeout(o3_timerid);
        if (o3_delayid > 0) clearTimeout(o3_delayid);
        o3_timerid = 0;
        o3_delayid = 0;
!       self.status = "";
  }
  
***************
*** 1099,1104 ****
  function repositionTo(obj,xL,yL) {
        if ( (ns4) || (ie4) ) {
!               obj.left = xL;
!               obj.top = yL;
        } else if (ns6) {
                obj.style.left = xL + "px";
--- 1113,1118 ----
  function repositionTo(obj,xL,yL) {
        if ( (ns4) || (ie4) ) {
!               obj.left = (ie4 ? xL + 'px' : xL);
!               obj.top = (ie4 ? yL + 'px' : yL);
        } else if (ns6) {
                obj.style.left = xL + "px";
***************
*** 1107,1110 ****
--- 1121,1138 ----
  }
  
+ function getFrameRef(thisFrame, ofrm) {
+       var retVal = '';
+       for (var i=0; i<thisFrame.length; i++) {
+               if (thisFrame[i].length > 0) { 
+                       retVal = getFrameRef(thisFrame[i],ofrm);
+                       if (retVal == '') continue;
+               } else if (thisFrame[i] != ofrm) continue;
+               
+               retVal = '['+i+']' + retVal;
+               break;
+       }
+       
+       return retVal;
+ }
  
  
***************
*** 1118,1122 ****
  // Defines which frame we should point to.
  function opt_FRAME(frm) {
!         o3_frame = compatibleframe(frm) ? frm : ol_frame;
  
        if ( (ns4) || (ie4 || (ns6)) ) {
--- 1146,1174 ----
  // Defines which frame we should point to.
  function opt_FRAME(frm) {
!       o3_frame = compatibleframe(frm) ? frm : ol_frame;
! 
!       if (o3_frame != ol_frame) {
!               var tFrm = getFrameRef(top.frames, o3_frame);
!               var sFrm = getFrameRef(top.frames, ol_frame);
! 
!               if (sFrm.length == tFrm.length) { 
!                       l = tFrm.lastIndexOf('['); 
!                       if (l) {
!                               while(sFrm.substring(0,l) != 
tFrm.substring(0,l)) l = tFrm.lastIndexOf('[',l-1);
!                               tFrm = tFrm.substr(l);
!                               sFrm = sFrm.substr(l);
!                       }
!               }
!                       
!               var cnt = 0, p = '', str = tFrm;
!                       
!               while((k = str.lastIndexOf('[')) != -1) {
!                       cnt++;
!                       str = str.substring(0,k);
!               }
! 
!               for (var i=0; i<cnt; i++) p = p + 'parent.';
!               fnRef = p + 'frames' + sFrm + '.';
!       }
  
        if ( (ns4) || (ie4 || (ns6)) ) {
***************
*** 1131,1135 ****
  // Calls an external function
  function opt_FUNCTION(callme) {
!       o3_text = callme()
        return 0;
  }
--- 1183,1187 ----
  // Calls an external function
  function opt_FUNCTION(callme) {
!       o3_text = (callme ? callme() : (o3_function ? o3_function() : 'No 
Function'));
        return 0;
  }