[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/templates/default scripts.js,NONE,1.1
From: |
Bettina Gille <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/templates/default scripts.js,NONE,1.1 phpgw.xsl,1.13,1.14 |
Date: |
Wed, 23 Apr 2003 21:33:53 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/templates/default
In directory subversions:/tmp/cvs-serv5263
Modified Files:
phpgw.xsl
Added Files:
scripts.js
Log Message:
update js and css
--- NEW FILE ---
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()
}
Index: phpgw.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/default/phpgw.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** phpgw.xsl 20 Apr 2003 20:41:06 -0000 1.13
--- phpgw.xsl 24 Apr 2003 01:33:51 -0000 1.14
***************
*** 24,27 ****
--- 24,28 ----
<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>
***************
*** 34,47 ****
<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><!--</xsl:text>
<xsl:value-of
disable-output-escaping="yes" select="app_css"/>
! <xsl:text>--></xsl:text>
</style>
</xsl:when>
</xsl:choose>
--- 35,65 ----
<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><!--</xsl:text>
<xsl:value-of
disable-output-escaping="yes" select="app_css"/>
!
<xsl:text>--></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>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/templates/default scripts.js,NONE,1.1 phpgw.xsl,1.13,1.14,
Bettina Gille <address@hidden> <=