[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety phpgw.xsl,1.16,1.17 scripts.js,1.1,1.2

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/templates/idsociety
In directory subversions:/tmp/cvs-serv5286/idsociety

Modified Files:
        phpgw.xsl scripts.js 
Log Message:
update js and css

Index: phpgw.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/phpgw.xsl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** phpgw.xsl   21 Apr 2003 00:21:09 -0000      1.16
--- phpgw.xsl   24 Apr 2003 01:34:04 -0000      1.17
***************
*** 42,55 ****
                                <title><xsl:value-of 
select="website_title"/></title>
                                <script type="text/javascript" 
language="javascript" 
src="{$webserver_url}/phpgwapi/templates/idsociety/scripts.js"></script>
                                <link rel="stylesheet" type="text/css" 
href="{$phpgw_css_file}"/>
                                <link rel="stylesheet" type="text/css" 
href="{$theme_css_file}"/>
-                               <xsl:value-of disable-output-escaping="yes" 
select="java_script"/>
                                <xsl:choose>
!                                       <xsl:when test="app_css">
                                                <style type="text/css">
                                                        
<xsl:text>&lt;!--</xsl:text>
                                                                <xsl:value-of 
disable-output-escaping="yes" select="app_css"/>
!                                                       <xsl:text>--></xsl:text>
                                                </style>
                                        </xsl:when>
                                </xsl:choose>
--- 42,71 ----
                                <title><xsl:value-of 
select="website_title"/></title>
                                <script type="text/javascript" 
language="javascript" 
src="{$webserver_url}/phpgwapi/templates/idsociety/scripts.js"></script>
+                               <xsl:choose>
+                                       <xsl:when test="app_java_script != ''">
+                                               <xsl:value-of 
disable-output-escaping="yes" select="app_java_script"/>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <xsl:choose>
+                                       <xsl:when test="app_java_script_url != 
''">
+                                               <xsl:variable 
name="app_java_script_url" select="app_java_script_url"/>
+                                               <script type="text/javascript" 
language="javascript" 
src="{$webserver_url}/{$current_app}/templates/{$app_java_script_url}"></script>
+                                       </xsl:when>
+                               </xsl:choose>
                                <link rel="stylesheet" type="text/css" 
href="{$phpgw_css_file}"/>
                                <link rel="stylesheet" type="text/css" 
href="{$theme_css_file}"/>
                                <xsl:choose>
!                                       <xsl:when test="app_css != ''">
                                                <style type="text/css">
                                                        
<xsl:text>&lt;!--</xsl:text>
                                                                <xsl:value-of 
disable-output-escaping="yes" select="app_css"/>
!                                                       
<xsl:text>--&gt;</xsl:text>
                                                </style>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <xsl:choose>
+                                       <xsl:when test="app_css_url != ''">
+                                               <xsl:variable 
name="app_css_url" select="app_css_url"/>
+                                               <link rel="stylesheet" 
type="text/css" 
href="{$webserver_url}/{$current_app}/templates/{$app_css_url}"/>
                                        </xsl:when>
                                </xsl:choose>

Index: scripts.js
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/idsociety/scripts.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** scripts.js  6 Nov 2002 23:19:27 -0000       1.1
--- scripts.js  24 Apr 2003 01:34:04 -0000      1.2
***************
*** 61,62 ****
--- 61,86 ----
                if(bottom_doc != null){ parent.bottom.location.href=bottom_doc; 
}
        }
+ 
+       var popupw;
+ 
+       function openwindow(url,width,height)
+       {
+               if (popupw)
+               {
+                       if (popupw.closed)
+                       {
+                               popupw.stop;
+                               popupw.close;
+                       }
+               }
+               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;
+               }
+       }
+ 
+       function done()
+       {
+               popupw.close()
+       }