phpgroupware-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] phpgwapi/templates/default default_scripts.js, 1.1, 1

From: Bettina Gille <address@hidden>
Subject: [Phpgroupware-cvs] phpgwapi/templates/default default_scripts.js, 1.1, 1.2 phpgw_header.xsl, 1.8, 1.9
Date: Tue, 11 Nov 2003 16:41:52 +0000 
Update of /cvsroot/phpgroupware/phpgwapi/templates/default
In directory subversions:/tmp/cvs-serv28904/default

Modified Files:
        default_scripts.js phpgw_header.xsl 
Log Message:
addressmaster

Index: default_scripts.js
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/default/default_scripts.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** default_scripts.js  11 Nov 2003 13:42:00 -0000      1.1
--- default_scripts.js  11 Nov 2003 16:41:50 -0000      1.2
***************
*** 14,18 ****
  
        var popupw;
- 
        function openwindow(url,width,height)
        {
--- 14,17 ----
***************
*** 25,33 ****
                        }
                }
!               popupw = window.open(url, "popupWindow","width=" + width + 
",height=" + height + 
",location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=no");
                if (popupw.opener == null)
                {
                        popupw.opener = window;
                }
        }
  
--- 24,38 ----
                        }
                }
!               popupw = window.open(url,"popupWindow","width=" + width + 
",height=" + height + 
",location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=no");
                if (popupw.opener == null)
                {
                        popupw.opener = window;
                }
+       }
+ 
+       self.name="first_Window";
+       function openpopup(url)
+       {
+               
Window1=window.open(url,"Search","width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes");
        }
  

Index: phpgw_header.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/default/phpgw_header.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** phpgw_header.xsl    6 Nov 2003 17:19:14 -0000       1.8
--- phpgw_header.xsl    11 Nov 2003 16:41:50 -0000      1.9
***************
*** 5,8 ****
--- 5,9 ----
        <xsl:variable name="theme_css_file" select="theme_css_file"/>
        <xsl:variable name="current_app" select="current_app"/>
+       <xsl:variable name="webserver_url" select="webserver_url"/>
        <xsl:variable name="app_tpl" select="app_tpl"/>
                <html>
***************
*** 17,20 ****
--- 18,22 ----
                                <link rel="stylesheet" type="text/css" 
href="{$phpgw_css_file}"/>
                                <link rel="stylesheet" type="text/css" 
href="{$theme_css_file}"/>
+                               <script type="text/javascript" 
language="javascript" 
src="{$webserver_url}/phpgwapi/templates/default/default_scripts.js"></script>
                                <xsl:choose>
                                        <xsl:when test="app_java_script != ''">
reply via email to
[Prev in Thread] Current Thread [Next in Thread]