mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
added language direction flag to the html tag for the idots and jerry template:
it can be set now by translating the phrase 'language_direction_rtl' to 'rtl' for a specific language
This commit is contained in:
parent
31ceecd94e
commit
71c1959c40
@ -55,7 +55,7 @@
|
||||
</script>';
|
||||
}
|
||||
|
||||
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
|
||||
$tpl = CreateObject('phpgwapi.Template',EGW_TEMPLATE_DIR);
|
||||
$tpl->set_unknowns('remove');
|
||||
$tpl->set_file(array('_head' => 'head.tpl'));
|
||||
$tpl->set_block('_head','head');
|
||||
@ -74,20 +74,21 @@
|
||||
if($app!='wiki') $robots ='<meta name="robots" content="none" />';
|
||||
|
||||
$var = Array(
|
||||
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
||||
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
||||
'img_icon' => EGW_IMAGES_DIR . '/favicon.ico',
|
||||
'img_shortcut' => EGW_IMAGES_DIR . '/favicon.ico',
|
||||
'pngfix' => $pngfix,
|
||||
'slider_effects' => $slider_effects,
|
||||
'simple_show_hide' => $simple_show_hide,
|
||||
'lang_code' => $lang_code,
|
||||
'charset' => $GLOBALS['phpgw']->translation->charset(),
|
||||
'charset' => $GLOBALS['egw']->translation->charset(),
|
||||
'font_family' => $GLOBALS['egw_info']['theme']['font'],
|
||||
'website_title' => strip_tags($GLOBALS['egw_info']['server']['site_title']. ($app ? " [$app]" : '')),
|
||||
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
|
||||
'body_tags' => $bodyheader .' '. $GLOBALS['egw']->common->get_body_attribs(),
|
||||
'theme_css' => $theme_css,
|
||||
'css' => $GLOBALS['phpgw']->common->get_css(),
|
||||
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
|
||||
'meta_robots' => $robots
|
||||
'css' => $GLOBALS['egw']->common->get_css(),
|
||||
'java_script' => $GLOBALS['egw']->common->get_java_script(),
|
||||
'meta_robots' => $robots,
|
||||
'dir_code' => lang('language_direction_rtl') != 'rtl' ? '' : ' dir="rtl"',
|
||||
);
|
||||
$tpl->set_var($var);
|
||||
$tpl->pfp('out','head');
|
||||
|
@ -1,5 +1,5 @@
|
||||
<!-- BEGIN head --><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
||||
<html xml:lang="{lang_code}" xmlns="http://www.w3.org/1999/xhtml">
|
||||
<html xml:lang="{lang_code}" xmlns="http://www.w3.org/1999/xhtml"{dir_code}>
|
||||
|
||||
<head>
|
||||
<title>{website_title}</title>
|
||||
|
@ -12,7 +12,7 @@
|
||||
/* $Id$ */
|
||||
|
||||
// get used language code
|
||||
$lang_code = 'en';
|
||||
$lang_code = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
|
||||
|
||||
$bodyheader = ' bgcolor="' . $GLOBALS['egw_info']['theme']['bg_color'] . '" alink="'
|
||||
. $GLOBALS['egw_info']['theme']['alink'] . '" link="' . $GLOBALS['egw_info']['theme']['link'] . '" vlink="'
|
||||
@ -59,7 +59,7 @@
|
||||
$foldertree_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/js/foldertree/foldertree.js';
|
||||
$js_foldertree = '<script src="'.$foldertree_src.'" type="text/javascript"></script>';
|
||||
|
||||
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
|
||||
$tpl = CreateObject('phpgwapi.Template',EGW_TEMPLATE_DIR);
|
||||
$tpl->set_unknowns('remove');
|
||||
$tpl->set_file(array('_head' => 'head.tpl'));
|
||||
$tpl->set_block('_head','head');
|
||||
@ -74,20 +74,21 @@
|
||||
$app = isset($GLOBALS['egw_info']['apps'][$app]) ? $GLOBALS['egw_info']['apps'][$app]['title'] : lang($app);
|
||||
}
|
||||
$var = Array(
|
||||
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
||||
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
||||
'img_icon' => EGW_IMAGES_DIR . '/favicon.ico',
|
||||
'img_shortcut' => EGW_IMAGES_DIR . '/favicon.ico',
|
||||
'pngfix' => $pngfix,
|
||||
'slider_effects'=> $slider_effects,
|
||||
'simple_show_hide'=> $simple_show_hide,
|
||||
'lang_code'=> $lang_code,
|
||||
'charset' => $GLOBALS['phpgw']->translation->charset(),
|
||||
'charset' => $GLOBALS['egw']->translation->charset(),
|
||||
'font_family' => $GLOBALS['egw_info']['theme']['font'],
|
||||
'website_title' => $GLOBALS['egw_info']['server']['site_title'] . ($app ? " [$app]" : ''),
|
||||
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
|
||||
'body_tags' => $bodyheader .' '. $GLOBALS['egw']->common->get_body_attribs(),
|
||||
'theme_css' => $theme_css,
|
||||
'css' => $GLOBALS['phpgw']->common->get_css(),
|
||||
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
|
||||
'css' => $GLOBALS['egw']->common->get_css(),
|
||||
'java_script' => $GLOBALS['egw']->common->get_java_script(),
|
||||
'js_foldertree' => $js_foldertree,
|
||||
'dir_code' => lang('language_direction_rtl') != 'rtl' ? '' : ' dir="rtl"',
|
||||
);
|
||||
$tpl->set_var($var);
|
||||
$tpl->pfp('out','head');
|
||||
|
@ -1,5 +1,5 @@
|
||||
<!-- BEGIN head --><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
||||
<html xml:lang="{lang_code}" xmlns="http://www.w3.org/1999/xhtml">
|
||||
<html xml:lang="{lang_code}" xmlns="http://www.w3.org/1999/xhtml"{dir_code}>
|
||||
<head>
|
||||
<title>{website_title}</title>
|
||||
<meta http-equiv="content-type" content="text/html; charset={charset}" />
|
||||
|
Loading…
Reference in New Issue
Block a user