fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 9510 Doesn't work format RTL SOLVED

Browse Source 
- I add format fot RTL
This commit is contained in:
Brayan Osmar Pereyra Suxo
2012-08-03 18:57:48 -04:00
parent f66044c585
commit 79ffba21c3
8 changed files with 77 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gulliver/system/class.g.php
View File

@@ -1168,10 +1168,24 @@ class G
if(((in_array($browserName, $enabledBrowsers))||(in_array('ALL', $enabledBrowsers)))&&(!(in_array($browserName, $disabledBrowsers)))){
//G::pr($cssFileInfo['__ATTRIBUTES__']['file']);
$output .= file_get_contents ( $baseSkinDirectory . PATH_SEP.'css'.PATH_SEP.$cssFileInfo['__ATTRIBUTES__']['file'] );
if($cssFileInfo['__ATTRIBUTES__']['file'] == 'rtl.css') {
G::LoadClass('serverConfiguration');
$oServerConf =& serverConf::getSingleton();
if (!(defined(SYS_LANG))) {
$syss = explode('://', $_SERVER['HTTP_REFERER']);
$sysObjets = explode('/', $syss['1']);
$sysLang = $sysObjets['2'];
} else {
$sysLang = SYS_LANG;
}
if ($oServerConf->isRtl($sysLang)) {
$output .= file_get_contents ( $baseSkinDirectory . PATH_SEP.'css'.PATH_SEP.$cssFileInfo['__ATTRIBUTES__']['file'] );
}
} else {
$output .= file_get_contents ( $baseSkinDirectory . PATH_SEP.'css'.PATH_SEP.$cssFileInfo['__ATTRIBUTES__']['file'] );
}
}
}
//Remove comments..
$regex = array(
"`^([\t\s]+)`ism"=>'',

6
gulliver/system/class.headPublisher.php
View File

@@ -302,7 +302,11 @@ class headPublisher {
//$head .= $this->getExtJsStylesheets();
$head .= $this->getExtJsScripts();
$head .= $this->getExtJsVariablesScript();
if (SYS_LANG == 'ar' || SYS_LANG == 'he' || SYS_LANG == 'en') {
$head .= " <script type='text/javascript' src='/js/ext/extjs_rtl.js'></script>\n";
}
return $head;
}

10
workflow/engine/classes/class.serverConfiguration.php
View File

@@ -54,6 +54,7 @@ class serverConf {
private $lanDirection;
private $lanLanguage;
public $workspaces = array();
public $rtlLang = array('ar','he','es');
public function __construct() {
@@ -401,6 +402,15 @@ class serverConf {
return null;
}
}
function isRtl ($lang = SYS_LANG) {
$lang = substr($lang, 0, 2);
if (in_array($lang, $this->rtlLang)) {
return true;
} else {
return false;
}
}
}

15
workflow/engine/skinEngine/base/config.xml
View File

@@ -11,40 +11,45 @@
</information>
<cssFiles>
<skin>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="form.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
<cssFile file="sprite.css" enabledBrowsers="ALL" disabledBrowsers="ie7"></cssFile>
<cssFile file="xmlcolors.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="jscolors.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
</skin>
<blank>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="form.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
<cssFile file="sprite.css" enabledBrowsers="ALL" disabledBrowsers="ie7"></cssFile>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
</blank>
<raw>
</raw>
<submenu>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="form.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
<cssFile file="sprite.css" enabledBrowsers="ALL" disabledBrowsers="ie7"></cssFile>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
</submenu>
<tracker>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="form.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
<cssFile file="sprite.css" enabledBrowsers="ALL" disabledBrowsers="ie7"></cssFile>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
</tracker>
<extjs>
<cssFile file="xtheme-gray.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="xtheme-gray.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="pmos-xtheme-gray.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
<cssFile file="sprite.css" enabledBrowsers="ALL" disabledBrowsers="ie7"></cssFile>
<cssFile file="xmlcolors.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="jscolors.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
</extjs>
</cssFiles>
</skinConfiguration>

7
workflow/engine/skinEngine/base/layout-extjs.html
View File

@@ -1,10 +1,13 @@
<html>
<!-- turn on quirks mode for IE -->
{typeDocument}
<head>
<meta http-equiv="X-UA-Compatible" content="IE=8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
{header}
</head>
<body>
<body {dirBody}>
{bodyTemplate}
</body>
</html>

25
workflow/engine/skinEngine/skinEngine.php
View File

@@ -240,13 +240,34 @@ class SkinEngine
$templateFile = $this->layoutFile['dirname'] . PATH_SEP . $this->layoutFileExtjs['basename'];
}
$typeDocument = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
$template = new TemplatePower($templateFile);
$template->prepare();
$template->assign('header', $header);
$template->assign('styles', $styles);
$template->assign('bodyTemplate', $body);
$oServerConf =& serverConf::getSingleton();
if ($oServerConf->isRtl(SYS_LANG)) {
$template->assign('dirBody', 'dir="RTL"');
$iexplores = array(
'IE=10' => '(MSIE 10\.[0-9]+)',
'IE=9' => '(MSIE 9\.[0-9]+)',
'IE=8' => '(MSIE 8\.[0-9]+)',
'IE=7' => '(MSIE 7\.[0-9]+)',
'IE=6' => '(MSIE 6\.[0-9]+)'
);
foreach ($iexplores as $browser => $pattern) {
if (preg_match('/'.$pattern.'/', $_SERVER['HTTP_USER_AGENT'])) {
$typeDocument = '<meta http-equiv="X-UA-Compatible" content="'. $browser .'"/>';
}
}
}
$template->assign('typeDocument', $typeDocument);
echo $template->getOutputContent();
}

5
workflow/engine/skinEngine/uxmodern/config.xml
View File

@@ -11,6 +11,7 @@
</information>
<cssFiles>
<skin>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="form.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
@@ -19,6 +20,7 @@
<cssFile file="jscolors.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
</skin>
<blank>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="form.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
@@ -27,18 +29,21 @@
<raw>
</raw>
<submenu>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="form.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
<cssFile file="sprite.css" enabledBrowsers="ALL" disabledBrowsers="ie7"></cssFile>
</submenu>
<tracker>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="style.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="form.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>
<cssFile file="sprite.css" enabledBrowsers="ALL" disabledBrowsers="ie7"></cssFile>
</tracker>
<extjs>
<cssFile file="rtl.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="xtheme-gray.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="pmos-xtheme-gray.css" enabledBrowsers="ALL" disabledBrowsers=""></cssFile>
<cssFile file="sprite_ie7.css" enabledBrowsers="ie7" disabledBrowsers="ALL"></cssFile>

5
workflow/engine/skinEngine/uxmodern/layout-extjs.html
View File

@@ -1,5 +1,5 @@
<!-- turn on quirks mode for IE -->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
{typeDocument}
<head>
<meta http-equiv="X-UA-Compatible" content="IE=8" />
@@ -7,7 +7,8 @@
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
{header}
</head>
<body>
<body {dirBody}>
{bodyTemplate}
cochalo
</body>
</html>