phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: phpgwapi/templates/verdilak phpgw.xsl,1.7,1.8


From: Bettina Gille <address@hidden>
Subject: [Phpgroupware-cvs] CVS: phpgwapi/templates/verdilak phpgw.xsl,1.7,1.8
Date: Wed, 23 Apr 2003 21:34:06 -0400

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

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

Index: phpgw.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/verdilak/phpgw.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** phpgw.xsl   20 Apr 2003 20:41:07 -0000      1.7
--- phpgw.xsl   24 Apr 2003 01:34:04 -0000      1.8
***************
*** 26,29 ****
--- 26,30 ----
        <xsl:variable name="app_tpl" select="app_tpl"/>
        <xsl:variable name="current_app" select="current_app"/>
+       <xsl:variable name="webserver_url"><xsl:value-of 
select="webserver_url"/></xsl:variable>
                <html>
                        <head>
***************
*** 36,49 ****
                                <link rel="shortcut icon" href="favicon.ico"/>
                                <title><xsl:value-of 
select="website_title"/></title>
                                <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>
--- 37,67 ----
                                <link rel="shortcut icon" href="favicon.ico"/>
                                <title><xsl:value-of 
select="website_title"/></title>
+                               <script type="text/javascript" 
language="javascript" 
src="{$webserver_url}/phpgwapi/templates/default/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>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]