From fb0668ec54eac5b6fb82a733164cdab11d11ff4d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 1 Jul 2011 11:32:09 +0000 Subject: [PATCH] some EPL specific differences to trunk --- phpgwapi/inc/class.egw_framework.inc.php | 2 +- phpgwapi/setup/tables_update.inc.php | 2 ++ phpgwapi/templates/default/images/logo.png | Bin 5339 -> 8704 bytes .../inc/class.preferences_hooks.inc.php | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 43e7db4db6..25f6e9af43 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -219,7 +219,7 @@ abstract class egw_framework } $var['powered_by'] = lang('Powered by').' Stylite\'s'. ' EGroupware'. - ' Community Version '.$GLOBALS['egw_info']['server']['versions']['phpgwapi']; + ' Version '.$GLOBALS['egw_info']['server']['versions']['phpgwapi']; return $var; } diff --git a/phpgwapi/setup/tables_update.inc.php b/phpgwapi/setup/tables_update.inc.php index 618c6b1da0..84db84164b 100644 --- a/phpgwapi/setup/tables_update.inc.php +++ b/phpgwapi/setup/tables_update.inc.php @@ -308,6 +308,8 @@ function phpgwapi_upgrade1_9_010() $prefs->add($app, 'document_dir', $dir, 'default'); } $prefs->save_repository(false, 'default'); + // mount EPL document dir "under" /templates + egw_vfs::mount('stylite.merge://default/templates?merge=stylite/printtemplates&lang=1','/templates'); egw_vfs::$is_root = false; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.011'; diff --git a/phpgwapi/templates/default/images/logo.png b/phpgwapi/templates/default/images/logo.png index e25c1e8b1865390a1c76eb2482c9427f7f95cbda..baea5fba3679d78ad8e8630bc795eaeb50e887bc 100644 GIT binary patch literal 8704 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 literal 5339 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 diff --git a/preferences/inc/class.preferences_hooks.inc.php b/preferences/inc/class.preferences_hooks.inc.php index 11450781f0..71b57a50f2 100644 --- a/preferences/inc/class.preferences_hooks.inc.php +++ b/preferences/inc/class.preferences_hooks.inc.php @@ -126,7 +126,7 @@ class preferences_hooks 'help' => 'A template defines the layout of eGroupWare and it contains icons for each application.', 'xmlrpc' => True, 'admin' => False, - 'forced' => 'idots', + 'forced' => file_exists(EGW_SERVER_ROOT.'/jdots') ? 'jdots' : 'idots', ), 'theme' => array( 'type' => 'select', @@ -136,7 +136,7 @@ class preferences_hooks 'help' => 'A theme defines the colors and fonts used by the template.', 'xmlrpc' => True, 'admin' => False, - 'forced' => 'idots', + 'forced' => file_exists(EGW_SERVER_ROOT.'/jdots') ? 'jdots' : 'idots', ), 'navbar_format' => array( 'type' => 'select',