From 80e055e7393582c43eb0a1785561c1071161b206 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Thu, 28 Aug 2014 14:22:03 -0400
Subject: [PATCH 1/2] IMPROVEMENT labels plugins

- A validation was added when the file does not exist .po in the language specified.
---
 workflow/engine/classes/model/Translation.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/model/Translation.php b/workflow/engine/classes/model/Translation.php
index 2b1df119e..01e608303 100755
--- a/workflow/engine/classes/model/Translation.php
+++ b/workflow/engine/classes/model/Translation.php
@@ -288,7 +288,12 @@ class Translation extends BaseTranslation
         }
 
         if (!file_exists(PATH_PLUGINS . $plugin . PATH_SEP . 'translations' . PATH_SEP . $plugin . '.' . $languageId . '.po')) {
-            return;
+            if (!file_exists(PATH_PLUGINS . $plugin . PATH_SEP . 'translations' . PATH_SEP . $plugin . '.en.po')) {
+                return;
+            }
+            $languageFile = PATH_PLUGINS . $plugin . PATH_SEP . 'translations' . PATH_SEP . $plugin . '.en.po' ;
+        } else {
+            $languageFile = PATH_PLUGINS . $plugin . PATH_SEP . 'translations' . PATH_SEP . $plugin . '.' . $languageId . '.po' ;
         }
         $translation = Array ();
         $translationJS = Array ();
@@ -304,7 +309,7 @@ class Translation extends BaseTranslation
         foreach ($translations as $key => $row) {
             $translation[$key] = $row;
         }
-        $languageFile = PATH_PLUGINS . $plugin . PATH_SEP . 'translations' . PATH_SEP . $plugin . '.' . $languageId . '.po' ;
+
         G::LoadSystem( 'i18n_po' );
         $POFile = new i18n_PO( $languageFile );
         $POFile->readInit();

From a6ac05059aaa5ff13a091b4cec4036fa768a8cfc Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Wed, 3 Sep 2014 13:41:00 -0400
Subject: [PATCH 2/2] BUG-14022 Cut frame with user experience mobile,
 switchable SOLVED

- Style not allowed.
- A validation was added for version ie 10-11 in file index.html
---
 gulliver/system/class.g.php                                | 4 ++--
 workflow/engine/skinEngine/simplified/templates/index.html | 5 ++---
 workflow/engine/templates/home/index.html                  | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 60bb98839..b88654655 100755
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -4385,7 +4385,7 @@ class G
         }
 
         // Next get the name of the useragent yes seperately and for good reason
-        if (preg_match( '/MSIE/i', $u_agent ) && ! preg_match( '/Opera/i', $u_agent )) {
+        if ((preg_match('~Trident/7.0; rv:11.0~',$_SERVER["HTTP_USER_AGENT"]) || preg_match( '/MSIE/i', $u_agent )) && ! preg_match( '/Opera/i', $u_agent )) {
             $bname = 'Internet Explorer';
             $ub = "MSIE";
         } elseif (preg_match( '/Firefox/i', $u_agent )) {
@@ -4419,7 +4419,7 @@ class G
             if (strripos( $u_agent, "Version" ) < strripos( $u_agent, $ub )) {
                 $version = $matches['version'][0];
             } else {
-                $version = $matches['version'][1];
+                $version = isset($matches['version'][1]) ? $matches['version'][1] : '';
             }
         } else {
             $version = $matches['version'][0];
diff --git a/workflow/engine/skinEngine/simplified/templates/index.html b/workflow/engine/skinEngine/simplified/templates/index.html
index 8d663b5fe..6c548b895 100644
--- a/workflow/engine/skinEngine/simplified/templates/index.html
+++ b/workflow/engine/skinEngine/simplified/templates/index.html
@@ -31,13 +31,12 @@
     var h = $(window).height() - 42;
     $('iframe').height(h);
     //IE V10-V11
-    if (navigator.appVersion.indexOf("MSIE 1") != -1) {
+    if ((navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) {
       h = $('iframe').attr('style');
       $('iframe').attr('style', h+' padding-top : 40px;');
     }
-
   }
-  
+
   function redirect(url)
   {
     var $iframe = $('#iframex');
diff --git a/workflow/engine/templates/home/index.html b/workflow/engine/templates/home/index.html
index 749c9c045..ac16e3a99 100644
--- a/workflow/engine/templates/home/index.html
+++ b/workflow/engine/templates/home/index.html
@@ -33,11 +33,10 @@
     var h = $(window).height() - 42;
     $('iframe').height(h);
     //IE V10-V11
-    if (navigator.appVersion.indexOf("MSIE 1") != -1) {
+    if ((navigator.appVersion.indexOf("MSIE 1") != -1) || (!!(navigator.userAgent.match(/Trident/) && !navigator.userAgent.match(/MSIE/)))) {
       h = $('iframe').attr('style');
       $('iframe').attr('style', h+' padding-top : 40px;');
     }
-
   }
 
   function redirect(url)