diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 832e62a594..b57f169781 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -1237,6 +1237,8 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
$this->msgbox('',False,'phpgw');
}
+ $var['app_tpl'] = '';
+
switch($GLOBALS['phpgw_info']['flags']['currentapp'])
{
case 'home':
@@ -1245,6 +1247,16 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
case 'about':
$var['about'] = True;
break;
+ default:
+ $menuaction = get_var('menuaction',Array('GET'));
+ $xslt_app = get_var('xslt_app',Array('GET'));
+
+ if ($menuaction && $GLOBALS['phpgw_info']['flags']['xslt_app'])
+ {
+ $app_function = strrchr($menuaction,'.');
+ $var['app_tpl'] = substr($app_function,1,strlen($app_function));
+ }
+ break;
}
$var['lang_powered_by'] = lang('powered by');
diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index de0ab5d376..e849aaace5 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -384,6 +384,15 @@
exit;
}
}
+
+ /* dont call the xslt_app_tpl if app isnt ported to xslt */
+ switch($GLOBALS['phpgw_info']['flags']['currentapp'])
+ {
+ case 'notes':
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
+ break;
+ }
+
if($continue_app_data)
{
/* Make sure user is keeping his password in order */
diff --git a/phpgwapi/templates/default/app_delete.xsl b/phpgwapi/templates/default/app_delete.xsl
index 9c97d249e7..f78e4d531b 100644
--- a/phpgwapi/templates/default/app_delete.xsl
+++ b/phpgwapi/templates/default/app_delete.xsl
@@ -1,5 +1,9 @@
+
+
+
+
diff --git a/phpgwapi/templates/default/phpgw.xsl b/phpgwapi/templates/default/phpgw.xsl
index d619624d47..65c7bf0329 100644
--- a/phpgwapi/templates/default/phpgw.xsl
+++ b/phpgwapi/templates/default/phpgw.xsl
@@ -104,8 +104,17 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/phpgwapi/templates/idsociety/phpgw.xsl b/phpgwapi/templates/idsociety/phpgw.xsl
index e2884ff4e9..665fbf052b 100644
--- a/phpgwapi/templates/idsociety/phpgw.xsl
+++ b/phpgwapi/templates/idsociety/phpgw.xsl
@@ -23,7 +23,7 @@
-
+
@@ -155,6 +155,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/phpgwapi/templates/verdilak/phpgw.xsl b/phpgwapi/templates/verdilak/phpgw.xsl
index ff82872f80..24ed573bed 100644
--- a/phpgwapi/templates/verdilak/phpgw.xsl
+++ b/phpgwapi/templates/verdilak/phpgw.xsl
@@ -20,6 +20,7 @@
+
@@ -104,6 +105,18 @@
+
+
+
+
+
+
+
+
+
+
+
+