From 2ca9f8bf9b396265ea73c1ba084ef287a7e320c1 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Mon, 8 Apr 2013 14:21:54 -0400 Subject: [PATCH] BUG 10911 "'Right click' not works on Designer tab in IE10." SOLVED - "Right click" not works on Designer tab in IE10. - Solved problem, added tag meta for "Compatibility mode" in IE10 * Available from version ProcessMaker-2.5 --- workflow/engine/skinEngine/base/layout.html | 9 +++---- .../engine/skinEngine/simplified/layout.html | 9 +++---- workflow/engine/skinEngine/skinEngine.php | 26 ++++++++++++++++--- .../engine/skinEngine/uxmodern/layout.html | 9 +++---- workflow/engine/skinEngine/uxs/layout.html | 11 ++++---- 5 files changed, 39 insertions(+), 25 deletions(-) diff --git a/workflow/engine/skinEngine/base/layout.html b/workflow/engine/skinEngine/base/layout.html index c937d8bf9..66fc025a1 100644 --- a/workflow/engine/skinEngine/base/layout.html +++ b/workflow/engine/skinEngine/base/layout.html @@ -1,10 +1,9 @@ - - - - {$header} - + {$meta} + + + {$header} diff --git a/workflow/engine/skinEngine/simplified/layout.html b/workflow/engine/skinEngine/simplified/layout.html index a640e85d2..a7479c297 100644 --- a/workflow/engine/skinEngine/simplified/layout.html +++ b/workflow/engine/skinEngine/simplified/layout.html @@ -1,10 +1,9 @@ - - - - {$header} - + {$meta} + + + {$header}
diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index 7470f6708..f99d9127d 100755 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -274,6 +274,10 @@ class SkinEngine } if ($sw == 1) { + if ($ie == 10) { + $ie = 8; + } + $doctype = null; $meta = ""; } @@ -390,7 +394,7 @@ class SkinEngine $smarty->assign('workspace', defined('SYS_SYS')?SYS_SYS: ''); $uws = (isset($_SESSION['USR_ROLENAME']) && $_SESSION['USR_ROLENAME'] != '')? strtolower(G::LoadTranslation('ID_WORKSPACE_USING')): G::LoadTranslation('ID_WORKSPACE_USING'); $smarty->assign('workspace_label', $uws); - + G::LoadClass( "configuration" ); $conf = new Configurations(); if (defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) { @@ -603,7 +607,19 @@ class SkinEngine } else { $smarty->template_dir = $this->layoutFile['dirname']; - $header = ''; + + $meta = null; + $header = null; + + if (preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)) { + $ie = intval($arrayMatch[1]); + + if ($ie == 10) { + $ie = 8; + + $meta = ""; + } + } if (isset($oHeadPublisher)) { if (defined('SYS_SYS')) { @@ -613,6 +629,9 @@ class SkinEngine $header .= $oHeadPublisher->getExtJsStylesheets($this->cssFileName); } + $smarty->assign("meta", $meta); + $smarty->assign("header", $header); + $footer = ''; if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) { @@ -647,7 +666,7 @@ class SkinEngine $smarty->assign('workspace', defined('SYS_SYS')?SYS_SYS: ''); $uws = (isset($_SESSION['USR_ROLENAME']) && $_SESSION['USR_ROLENAME'] != '')? strtolower(G::LoadTranslation('ID_WORKSPACE_USING')): G::LoadTranslation('ID_WORKSPACE_USING'); $smarty->assign('workspace_label', $uws); - + G::LoadClass( "configuration" ); $conf = new Configurations(); if ( defined('SYS_SYS') && $conf->exists("ENVIRONMENT_SETTINGS")) { @@ -677,7 +696,6 @@ class SkinEngine } $smarty->assign('linklogout', $logout); - $smarty->assign('header', $header); $smarty->assign('footer', $footer); $smarty->assign('tpl_menu', PATH_TEMPLATE . 'menu.html'); $smarty->assign('tpl_submenu', PATH_TEMPLATE . 'submenu.html'); diff --git a/workflow/engine/skinEngine/uxmodern/layout.html b/workflow/engine/skinEngine/uxmodern/layout.html index c937d8bf9..66fc025a1 100644 --- a/workflow/engine/skinEngine/uxmodern/layout.html +++ b/workflow/engine/skinEngine/uxmodern/layout.html @@ -1,10 +1,9 @@ - - - - {$header} - + {$meta} + + + {$header}
diff --git a/workflow/engine/skinEngine/uxs/layout.html b/workflow/engine/skinEngine/uxs/layout.html index c45b6fe14..e19068311 100644 --- a/workflow/engine/skinEngine/uxs/layout.html +++ b/workflow/engine/skinEngine/uxs/layout.html @@ -1,10 +1,9 @@ - - - - {$header} - + {$meta} + + + {$header}
@@ -19,7 +18,7 @@ {if $user_logged neq ''} {$msgVer} {if $switch_interface} - + {/if} {$logout}