extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-13 08:50:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

some EPL specific differences to trunk

Browse Source
This commit is contained in:
Ralf Becker 2011-07-01 11:32:09 +00:00
parent aee4ea4724
commit fb0668ec54
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -219,7 +219,7 @@ abstract class egw_framework
} }
$var['powered_by'] = lang('Powered by').' <a href="http://www.stylite.de/" target="_blank">Stylite\'s</a>'. $var['powered_by'] = lang('Powered by').' <a href="http://www.stylite.de/" target="_blank">Stylite\'s</a>'.
' <a href="'.egw::link('/about.php','','about').'">EGroupware</a>'. ' <a href="'.egw::link('/about.php','','about').'">EGroupware</a>'.
' Community Version '.$GLOBALS['egw_info']['server']['versions']['phpgwapi']; ' Version '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'];
return $var; return $var;
} }

2
phpgwapi/setup/tables_update.inc.php
View File

@ -308,6 +308,8 @@ function phpgwapi_upgrade1_9_010()
$prefs->add($app, 'document_dir', $dir, 'default'); $prefs->add($app, 'document_dir', $dir, 'default');
} }
$prefs->save_repository(false, '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; egw_vfs::$is_root = false;
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.011'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.9.011';

BIN
phpgwapi/templates/default/images/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

4
preferences/inc/class.preferences_hooks.inc.php
View File

@ -126,7 +126,7 @@ class preferences_hooks
'help' => 'A template defines the layout of eGroupWare and it contains icons for each application.', 'help' => 'A template defines the layout of eGroupWare and it contains icons for each application.',
'xmlrpc' => True, 'xmlrpc' => True,
'admin' => False, 'admin' => False,
'forced' => 'idots', 'forced' => file_exists(EGW_SERVER_ROOT.'/jdots') ? 'jdots' : 'idots',
), ),
'theme' => array( 'theme' => array(
'type' => 'select', 'type' => 'select',
@ -136,7 +136,7 @@ class preferences_hooks
'help' => 'A theme defines the colors and fonts used by the template.', 'help' => 'A theme defines the colors and fonts used by the template.',
'xmlrpc' => True, 'xmlrpc' => True,
'admin' => False, 'admin' => False,
'forced' => 'idots', 'forced' => file_exists(EGW_SERVER_ROOT.'/jdots') ? 'jdots' : 'idots',
), ),
'navbar_format' => array( 'navbar_format' => array(
'type' => 'select', 'type' => 'select',