[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] etemplate inc/class.uietemplate.inc.php templat...
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] etemplate inc/class.uietemplate.inc.php templat... |
Date: |
Sun, 04 Feb 2007 13:53:48 +0000 |
CVSROOT: /sources/phpgroupware
Module name: etemplate
Changes by: Sigurd Nes <sigurdne> 07/02/04 13:53:48
Modified files:
inc : class.uietemplate.inc.php
Added files:
templates/base : app_data.xsl
Log message:
enable the xslt-variant (there are issues with UTF-8 (ok for
iso-8859-1))
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.uietemplate.inc.php?cvsroot=phpgroupware&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/etemplate/templates/base/app_data.xsl?cvsroot=phpgroupware&rev=1.1
Patches:
Index: inc/class.uietemplate.inc.php
===================================================================
RCS file: /sources/phpgroupware/etemplate/inc/class.uietemplate.inc.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- inc/class.uietemplate.inc.php 30 Sep 2006 07:10:52 -0000 1.71
+++ inc/class.uietemplate.inc.php 4 Feb 2007 13:53:48 -0000 1.72
@@ -5,7 +5,7 @@
* @author Ralf Becker <address@hidden>
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
* @package etemplate
-* @version $Id: class.uietemplate.inc.php,v 1.71 2006/09/30 07:10:52 skwashd
Exp $
+* @version $Id: class.uietemplate.inc.php,v 1.72 2007/02/04 13:53:48 sigurdne
Exp $
*/
include_once(PHPGW_INCLUDE_ROOT .
'/etemplate/inc/class.boetemplate.inc.php');
@@ -47,7 +47,8 @@
$this->boetemplate($name,$load_via);
- $this->stable = true;
+ //$this->stable = true;
+ $this->stable = $a <= 0 && $b <= 9 && $c <= 16 &&
!is_object($GLOBALS['phpgw']->xslttpl);
}
/**
@@ -185,6 +186,8 @@
else
{
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('body_data' => $html));
+
$GLOBALS['phpgw']->xslttpl->add_file('app_data');
+ $GLOBALS['phpgw']->xslttpl->pparse();
}
}
Index: templates/base/app_data.xsl
===================================================================
RCS file: templates/base/app_data.xsl
diff -N templates/base/app_data.xsl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/base/app_data.xsl 4 Feb 2007 13:53:48 -0000 1.1
@@ -0,0 +1,33 @@
+<!-- $Id: app_data.xsl,v 1.1 2007/02/04 13:53:48 sigurdne Exp $ -->
+
+ <xsl:template match="phpgw">
+ <xsl:variable name="webserver_url"><xsl:value-of
select="webserver_url"/></xsl:variable>
+ <script type="text/javascript" language="javascript"
src="{$webserver_url}/phpgwapi/templates/default/default_scripts.js"></script>
+ <xsl:choose>
+ <xsl:when test="app_java_script != ''">
+ <script type="text/javascript"
language="javascript">
+ <xsl:value-of
disable-output-escaping="yes" select="app_java_script"/>
+ </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>
+ <table width="100%" height="100%" cellspacing="0"
cellpadding="0">
+ <tr>
+ <td width="100%" height="100%" valign="top"
align="center" class="app_body">
+ <xsl:choose>
+ <xsl:when test="msgbox_data">
+ <xsl:call-template
name="msgbox"/>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:value-of
disable-output-escaping="yes" select="body_data"/>
+ </td>
+ </tr>
+ </table>
+ </xsl:template>
+
+
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] etemplate inc/class.uietemplate.inc.php templat...,
Sigurd Nes <=