diff --git a/index.php b/index.php
index 124345d36a..8bfb53e977 100755
--- a/index.php
+++ b/index.php
@@ -70,6 +70,9 @@
{
// eval("\$GLOBALS['obj']->$method();");
execmethod($GLOBALS['HTTP_GET_VARS']['menuaction']);
+
+ $GLOBALS['phpgw']->common->stop_xslt_capture(); // send captured output to the xslttpl
+
unset($app);
unset($obj);
unset($class);
diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index d3e313a558..d067445ff0 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -694,7 +694,6 @@
{
$GLOBALS['phpgw_info']['server']['template_set'] = 'default';
}
-
/******** start temporarily code **************************************/
/* this just makes sure the template set is updated to the new format */
if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'].'/phpgw.xsl'))
@@ -1073,7 +1072,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
function framework()
{
$this->navbar();
-
+
$css = $this->get_css_url();
$var = array
(
@@ -1084,7 +1083,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
'phpgw_body' => $phpgw_body
);
- $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] = 'idsociety';
$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi') . SEP . 'phpgw');
switch ($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'])
@@ -1112,16 +1110,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
$GLOBALS['strip_portion'] = $GLOBALS['phpgw_info']['server']['webserver_url'].'/';
}
- $var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url'];
- $var['prefs_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url'];
- $var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url'];
- $var['about_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url'];
-
- $var['home_title'] = $GLOBALS['phpgw_info']['navbar']['home']['title'];
- $var['prefs_title'] = $GLOBALS['phpgw_info']['navbar']['preferences']['title'];
- $var['logout_title'] = $GLOBALS['phpgw_info']['navbar']['logout']['title'];
- $var['about_title'] = $GLOBALS['phpgw_info']['navbar']['about']['title'];
-
if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home')
{
$var['home_img'] = $this->image('phpgwapi','welcome2');
@@ -1163,8 +1151,27 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
$var['logo_img'] = $this->image('phpgwapi','logo2');
$var['nav_bar_left_top_bg_img'] = $this->image('phpgwapi','nav_bar_left_top_bg');
+ break;
+
+ case 'verdilak':
+ $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
+ $var['logo_img'] = $this->image('phpgwapi','logo');
+ $var['home_img'] = $this->image('phpgwapi','welcome-'.($app=='home' ? 'red' : 'grey'));
+ $var['prefs_img'] = $this->image('phpgwapi','preferences-'.($app=='preferences' ? 'red' : 'grey'));
+ $var['logout_img'] = $this->image('phpgwapi','logout-grey');
+ $var['about_img'] = $this->image('phpgwapi','help');
+ $var['greybar'] = $this->image('phpgwapi','greybar.jpg');
break;
}
+ $var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url'];
+ $var['prefs_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url'];
+ $var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url'];
+ $var['about_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url'];
+
+ $var['home_title'] = $GLOBALS['phpgw_info']['navbar']['home']['title'];
+ $var['prefs_title'] = $GLOBALS['phpgw_info']['navbar']['preferences']['title'];
+ $var['logout_title'] = $GLOBALS['phpgw_info']['navbar']['logout']['title'];
+ $var['about_title'] = $GLOBALS['phpgw_info']['navbar']['about']['title'];
if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
{
@@ -1180,22 +1187,22 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
. $this->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date'];
- while ($app = each($GLOBALS['phpgw_info']['navbar']))
+ while (list($app,$data) = each($GLOBALS['phpgw_info']['navbar']))
{
- if ($app[0] != 'home' && $app[0] != 'preferences' && $app[0] != 'about' && $app[0] != 'logout')
+ if ($app != 'home' && $app != 'preferences' && $app != 'about' && $app != 'logout')
{
$var['applications'][] = array
(
- 'icon' => $app[1]['icon'],
- 'title' => $app[1]['title'],
- 'img_src_over' => $app[1]['icon_hover'],
- 'url' => $app[1]['url'],
- 'name' => str_replace('-','_',$app[0])
+ 'icon' => $data['icon'],
+ 'title' => $data['title'],
+ 'img_src_over' => $data['icon_hover'],
+ 'url' => $data['url'],
+ 'name' => str_replace('-','_',$app)
);
- if($app[1]['icon_hover'] != '')
+ if($data['icon_hover'] != '')
{
- $GLOBALS['phpgw_info']['flags']['preload_images'][] = $app[1]['icon_hover'];
+ $GLOBALS['phpgw_info']['flags']['preload_images'][] = $data['icon_hover'];
}
}
}
@@ -1415,6 +1422,8 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
{
/* So far I dont have use for $forceheader and $forcenavbar */
/* I only allow this to be run once by using the constant */
+
+ /* not longer needed für xslttpl and would require to load the phpgw template
if(!defined('PHPGW_HEADER_RAN'))
{
define('PHPGW_HEADER_RAN',True);
@@ -1424,6 +1433,7 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
$GLOBALS['phpgw']->template->set_block('phpgw','phpgw_head_javascript');
$GLOBALS['phpgw']->template->pfp('out','phpgw_main_start');
}
+ */
}
/*!
@@ -1465,6 +1475,32 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
}
}
+ function start_xslt_capture()
+ {
+ if (!isset($GLOBALS['phpgw_info']['xslt_capture']))
+ {
+ $GLOBALS['phpgw_info']['xslt_capture'] = True;
+ ob_start(); // capture the output
+ }
+ }
+
+ /* Note: need to be run BEFORE exit is called, as buffers get flushed automatically before
+ * any registered shutdown-functions (eg. phpgw_footer) gets called
+ */
+ function stop_xslt_capture()
+ {
+ if (isset($GLOBALS['phpgw_info']['xslt_capture']))
+ {
+ unset($GLOBALS['phpgw_info']['xslt_capture']);
+ $output = ob_get_contents(); // get captured output
+ ob_end_clean(); // stop capture and clean output-buffer
+ if (!empty($output))
+ {
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('body_data' => $output));
+ }
+ }
+ }
+
function phpgw_footer()
{
if(!defined('PHPGW_FOOTER_RAN'))
@@ -1476,8 +1512,11 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
!@$GLOBALS['phpgw_info']['flags']['noappfooter'])
{
+ $this->start_xslt_capture(); // if index already turned it off
$this->phpgw_appfooter();
}
+ $this->stop_xslt_capture();
+
$GLOBALS['phpgw']->xslttpl->pp();
$GLOBALS['phpgw']->db->disconnect();
@@ -1496,41 +1535,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
}
}
- /*function phpgw_footer()
- {
- if(!defined('PHPGW_FOOTER_RAN'))
- {
- define('PHPGW_FOOTER_RAN',True);
- if (!isset($GLOBALS['phpgw_info']['flags']['nodisplay']) || !$GLOBALS['phpgw_info']['flags']['nodisplay'])
- {
- if($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
- $GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
- $GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
- !@$GLOBALS['phpgw_info']['flags']['noappfooter'])
- {
- $this->phpgw_appfooter();
- }
- $this->phpgw_header();
- $GLOBALS['phpgw']->template->pfp('out','phpgw_main_end');
- }
-
- $GLOBALS['phpgw']->db->disconnect();
-
- //Clean up mcrypt
- if (@is_object($GLOBALS['phpgw']->crypto))
- {
- $GLOBALS['phpgw']->crypto->cleanup();
- unset($GLOBALS['phpgw']->crypto);
- }
-
- if (DEBUG_TIMER)
- {
- $GLOBALS['debug_timer_stop'] = perfgetmicrotime();
- echo 'Page loaded in ' . ($GLOBALS['debug_timer_stop'] - $GLOBALS['debug_timer_start']) . ' seconds.';
- }
- }
- }*/
-
function hex2bin($data)
{
$len = strlen($data);
diff --git a/phpgwapi/inc/class.xslttemplates.inc.php b/phpgwapi/inc/class.xslttemplates.inc.php
index 7377af75b8..4b9ae78bcd 100644
--- a/phpgwapi/inc/class.xslttemplates.inc.php
+++ b/phpgwapi/inc/class.xslttemplates.inc.php
@@ -163,7 +163,14 @@
{
while(list($key,$val) = each($value))
{
- $this->vars[$name][$key] = $val;
+ if (!is_array($val) && !is_array($this->vars[$name][$key]))
+ {
+ $this->vars[$name][$key] .= $val;
+ }
+ else
+ {
+ $this->vars[$name][$key] = array_merge($this->vars[$name][$key],$val);
+ }
}
}
//_debug_array($this->vars);
diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index b5af402d00..261de5ab15 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -35,6 +35,8 @@
include(PHPGW_API_INC.'/common_functions.inc.php');
+ function parse_navbar() {} // just for compatibility with apps, which should run under 0.9.14 too
+
/*!
@function lang
@abstract function to handle multilanguage support
@@ -267,12 +269,16 @@
define('PHPGW_ACL_PRIVATE',16);
define('PHPGW_ACL_GROUP_MANAGERS',32);
+ /****************************************************************************\
+ * Forcing all non-cooperating apps to send there output through the xslt-tpl *
+ \****************************************************************************/
+ $GLOBALS['phpgw']->common->start_xslt_capture();
+
/****************************************************************************\
* Forcing the footer to run when the rest of the script is done. *
\****************************************************************************/
- $footer_common = &$GLOBALS['phpgw']->common;
- register_shutdown_function(array(&$footer_common, 'phpgw_footer'));
-
+ register_shutdown_function(array($GLOBALS['phpgw']->common, 'phpgw_footer'));
+
/****************************************************************************\
* Stuff to use if logging in or logging out *
\****************************************************************************/
diff --git a/phpgwapi/templates/default/about.xsl b/phpgwapi/templates/default/about.xsl
index 92df0bc5cb..c0e94b535c 100644
--- a/phpgwapi/templates/default/about.xsl
+++ b/phpgwapi/templates/default/about.xsl
@@ -46,7 +46,7 @@
-
+
|
@@ -57,6 +57,15 @@
+
+
+
+ |
+
+
+
+ |
+
@@ -66,18 +75,34 @@
|
- |
- |
-
-
- |
-
-
-
-
-
-
+
+ |
+
+
|
+
+
+
+ |
+ |
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+ |
+
+
+
diff --git a/phpgwapi/templates/idsociety/phpgw.xsl b/phpgwapi/templates/idsociety/phpgw.xsl
index d3ef00a9a8..e2884ff4e9 100644
--- a/phpgwapi/templates/idsociety/phpgw.xsl
+++ b/phpgwapi/templates/idsociety/phpgw.xsl
@@ -8,7 +8,7 @@
-
+
@@ -161,8 +161,8 @@
-
-
+ |
+
diff --git a/phpgwapi/templates/verdilak/css/fancy.css b/phpgwapi/templates/verdilak/css/fancy.css
new file mode 100644
index 0000000000..22ccfcab92
--- /dev/null
+++ b/phpgwapi/templates/verdilak/css/fancy.css
@@ -0,0 +1,66 @@
+body,p,td,th,table,input,form,option
+{
+ color: #000000;
+}
+
+a:link,a:active,a:visited
+{
+ color: #336699;
+}
+
+a:hover
+{
+ color: #cc0000;
+}
+
+.info
+{
+ color: #000000;
+}
+
+.login,.portal,.about
+{
+ background-color: #FFE4C4;
+ border-color: #000000;
+}
+
+.portal_text
+{
+ color: #FFFFFF;
+}
+
+.th_bright,.app_header
+{
+ background-color: #AABBCC;
+}
+
+.row_on
+{
+ background-color: #EEEEFF;
+}
+
+.row_off
+{
+ background-color: #FFFFEE;
+}
+
+.th,.navbar
+{
+ background-color: #FFE4C4;
+}
+
+.cal_today
+{
+ background-color: #D0DCE0;
+}
+
+.cal_dayview
+{
+ background-color: #C0C0C0;
+}
+
+.email_folder
+{
+ background-color: #7090FF;
+ color: #FFFFFF;
+}
diff --git a/phpgwapi/templates/verdilak/css/phpgw.css b/phpgwapi/templates/verdilak/css/phpgw.css
index 9b7e9a84e1..081451b311 100644
--- a/phpgwapi/templates/verdilak/css/phpgw.css
+++ b/phpgwapi/templates/verdilak/css/phpgw.css
@@ -82,3 +82,14 @@ table.login
{
font-weight: bold;
}
+
+.left
+{
+ background-image: url(../images/navbar_filler.jpg);
+}
+
+.navbar
+{
+ background-image: url(../images/bg_filler.png);
+}
+
diff --git a/phpgwapi/templates/verdilak/footer.tpl b/phpgwapi/templates/verdilak/footer.tpl
deleted file mode 100644
index b22633d098..0000000000
--- a/phpgwapi/templates/verdilak/footer.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-
- |
-
-
-
-
- |
-
-
-
-
-
diff --git a/phpgwapi/templates/verdilak/head.inc.php b/phpgwapi/templates/verdilak/head.inc.php
deleted file mode 100644
index 49915617b8..0000000000
--- a/phpgwapi/templates/verdilak/head.inc.php
+++ /dev/null
@@ -1,48 +0,0 @@
-public_functions) && $GLOBALS[$class]->public_functions['css'])
- {
- $app_css = $GLOBALS[$class]->css();
- }
- }
-
- $bodyheader = ' bgcolor="' . $GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
- . $GLOBALS['phpgw_info']['theme']['alink'] . '" link="' . $GLOBALS['phpgw_info']['theme']['link'] . '" vlink="'
- . $GLOBALS['phpgw_info']['theme']['vlink'] . '"';
-
- if (! $GLOBALS['phpgw_info']['server']['htmlcompliant'])
- {
- $bodyheader .= ' topmargin="0" bottommargin="0" marginheight="0" marginwidth="0" leftmargin="0" rightmargin="0"';
- }
-
- $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
- $tpl->set_unknowns('remove');
- $tpl->set_file(array('head' => 'head.tpl'));
- $var = Array (
- 'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
- 'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
- 'charset' => lang('charset'),
- 'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
- 'website_title' => $GLOBALS['phpgw_info']['server']['site_title'],
- 'body_tags' => $bodyheader,
- 'app_css' => $app_css
- );
- $tpl->set_var($var);
- $tpl->pfp('out','head');
- unset($tpl);
-?>
diff --git a/phpgwapi/templates/verdilak/head.tpl b/phpgwapi/templates/verdilak/head.tpl
deleted file mode 100644
index 82c0973a21..0000000000
--- a/phpgwapi/templates/verdilak/head.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-{website_title}
-
-
-
diff --git a/phpgwapi/templates/verdilak/login.tpl b/phpgwapi/templates/verdilak/login.tpl
deleted file mode 100644
index 7b476aa4c1..0000000000
--- a/phpgwapi/templates/verdilak/login.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-{website_title} - Login
-
-
-
-
-{lang_message}
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
- |
-
-
- |
-
-
-
-
-
diff --git a/phpgwapi/templates/verdilak/login_denylogin.tpl b/phpgwapi/templates/verdilak/login_denylogin.tpl
deleted file mode 100644
index d678da7e46..0000000000
--- a/phpgwapi/templates/verdilak/login_denylogin.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
- Opps! You caught us in the middle of a system upgrade. Please, check back with us shortly.
- |
-
-
-
-
diff --git a/phpgwapi/templates/verdilak/login_selectdomain.tpl b/phpgwapi/templates/verdilak/login_selectdomain.tpl
deleted file mode 100644
index f6c422fea5..0000000000
--- a/phpgwapi/templates/verdilak/login_selectdomain.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-{website_title} - Login
-
-
-
-
-{lang_message}
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
-
-
- |
-
-
- |
-
-
-
-
-
diff --git a/phpgwapi/templates/verdilak/navbar.inc.php b/phpgwapi/templates/verdilak/navbar.inc.php
deleted file mode 100644
index 0bc031f2b8..0000000000
--- a/phpgwapi/templates/verdilak/navbar.inc.php
+++ /dev/null
@@ -1,145 +0,0 @@
-set_file(
- array(
- 'navbar' => 'navbar.tpl'
- )
- );
-
- $var['img_root'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/verdilak/images';
- $var['table_bg_color'] = $GLOBALS['phpgw_info']['theme']['navbar_bg'];
- $applications = '';
- while ($app = each($GLOBALS['phpgw_info']['navbar']))
- {
- if ($app[1]['title'] != 'Home' && $app[1]['title'] != 'preferences' && ! ereg('About',$app[1]['title']) && $app[1]['title'] != 'Logout')
- {
- if ($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] != 'text')
- {
- $title = '';
- }
-
- if ($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] != 'icons')
- {
- $title .= '
' . lang($app[1]['title']);
- }
- $applications .= '
';
- unset($title);
- }
- }
- $var['applications'] = $applications;
-
- if (isset($GLOBALS['phpgw_info']['theme']['special_logo']))
- {
- $var['logo'] = $GLOBALS['phpgw_info']['theme']['special_logo'];
- }
- else
- {
- $var['logo'] = 'logo.gif';
- }
-
- $var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url'];
- $var['preferences_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url'];
- $var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url'];
- $var['help_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url'];
-
- $ir = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/verdilak/images';
- if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home')
- {
- $var['welcome_img'] = $ir . '/welcome-red.gif';
- }
- else
- {
- $var['welcome_img'] = $ir . '/welcome-grey.gif';
- }
-
- if ($phpgw_info['flags']['currentapp'] == 'preferences')
- {
- $var['preferences_img'] = $ir . '/preferences-red.gif';
- }
- else
- {
- $var['preferences_img'] = $ir . '/preferences-grey.gif';
- }
- $var['logout_img'] = $ir . '/logout-grey.gif';
-
- $var['powered_by'] = lang('Powered by phpGroupWare version x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
-
- if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
- {
- $db = $GLOBALS['phpgw']->db;
- $db->query("select count(session_id) from phpgw_sessions where session_flags != 'A'");
- $db->next_record();
- $var['current_users'] = ' '
- . lang('Current users') . ': ' . $db->f(0) . '';
- }
- $now = time();
- $var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
- . lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
- . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
-// . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
-// . $GLOBALS['phpgw']->common->show_date($now,'d, Y');
-
- // Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
- // to get rid of duplicate code.
- if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
- {
- $api_messages = lang('You are required to change your password during your first login')
- . '
Click this image on the navbar: ';
- }
- else if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < time() - (86400*30))
- {
- $api_messages = lang('it has been more then x days since you changed your password',30);
- }
-
- // This is gonna change
- if (isset($cd))
- {
- $var['messages'] = $api_messages . '
' . checkcode($cd);
- }
- $tpl->set_var($var);
- $tpl->pfp('out','navbar');
- return;
- }
-
- function parse_navbar_end()
- {
- $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
-
- $tpl->set_file(
- array(
- 'footer' => 'footer.tpl'
- )
- );
- $var = Array(
- 'img_root' => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/verdilak/images',
- 'table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
- 'version' => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
- );
- $tpl->set_var($var);
- $GLOBALS['phpgw']->hooks->process('navbar_end');
- echo $tpl->pfp('out','footer');
- }
diff --git a/phpgwapi/templates/verdilak/navbar.tpl b/phpgwapi/templates/verdilak/navbar.tpl
deleted file mode 100755
index a914bb4bce..0000000000
--- a/phpgwapi/templates/verdilak/navbar.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
- {applications}
- |
-
-
-
-
- {current_users}
- |
-
- {powered_by}
- |
-
-
-
-
-
-{messages}
-
diff --git a/phpgwapi/templates/verdilak/navbar_app.tpl b/phpgwapi/templates/verdilak/navbar_app.tpl
deleted file mode 100644
index 6f639d7274..0000000000
--- a/phpgwapi/templates/verdilak/navbar_app.tpl
+++ /dev/null
@@ -1 +0,0 @@
- | {value} |
diff --git a/phpgwapi/templates/verdilak/phpgw.xsl b/phpgwapi/templates/verdilak/phpgw.xsl
new file mode 100644
index 0000000000..09e93167c8
--- /dev/null
+++ b/phpgwapi/templates/verdilak/phpgw.xsl
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
|