From ab89629ec4868334ead26e4a2181316b6592d035 Mon Sep 17 00:00:00 2001
From: "marcelo.cuiza" <marcelo.cuiza@colosa.com>
Date: Tue, 9 Jun 2015 14:36:43 -0400
Subject: [PATCH 1/2] PM-2348,PM-2469,PM-2470
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Designer > BPMN Designer: Estandarizar la funcionalidad del botóCancel'

Se agrego funcionalidad para IE
---
 .../jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php
index c5673c616..b71a3b12a 100644
--- a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php
+++ b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmSimpleUploader/uploader.php
@@ -67,10 +67,12 @@ function displayUploadForm()
     $html = "
     <div id=\"containerDataForm\">
         <form method=\"post\" enctype=\"multipart/form-data\" action=\"uploader.php?" . $_SERVER["QUERY_STRING"] . "&q=upload\" onsubmit=\"return validateForm();\">
+            <br/>
             File:&nbsp;
             <input type=\"file\" id=\"File1\" name=\"upload_file\" />&nbsp;(*.html, *.htm)
-            <br/><br/>
+            <br/>
             <input type=\"submit\" name=\"Upload File\" value=\"Upload File\" style=\"border: 1px solid #1ba385; float: right; margin-top: 30px; margin-right: -4px; font-size: 10px; display: inline-block; text-decoration: none; padding: 8px 24px; -moz-border-radius: 2px; -ms-border-radius: 2px; -o-border-radius: 2px; background-color: #1fbc99; color: white;\" />
+            <input type=\"button\" onclick=\"tinyMCEPopup.close();\"name=\"Cancel\" value=\"Cancel\" style=\"border: 1px solid #e14333; float: right; margin-top: 30px; margin-right: 8px; font-size: 10px; display: inline-block; text-decoration: none; padding: 8px 24px; -moz-border-radius: 2px; -ms-border-radius: 2px; -o-border-radius: 2px; background-color: #e4655f; color: white;\" />
         </form>
     </div>
 

From c246476b9ef126ba1c0082a2ce5a66c6ddca6314 Mon Sep 17 00:00:00 2001
From: "marcelo.cuiza" <marcelo.cuiza@colosa.com>
Date: Wed, 10 Jun 2015 15:53:18 -0400
Subject: [PATCH 2/2] PM-2615
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Personal Information: No se despliega la informacióel usuario en toda la pantalla

Se corrigio la asignacion del atributo height de la ventana para su correcta visualizacion.
---
 workflow/engine/templates/users/usersLoad.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/templates/users/usersLoad.php b/workflow/engine/templates/users/usersLoad.php
index b85953d3f..c001b855f 100644
--- a/workflow/engine/templates/users/usersLoad.php
+++ b/workflow/engine/templates/users/usersLoad.php
@@ -28,7 +28,7 @@
   {
     oCasesFrame    = document.getElementById('frameMain');
     oClientWinSize = getClientWindowSize();
-    height         = oClientWinSize.height - 105;
+    height         = oClientWinSize.height - 70 + "px";
     oCasesFrame.style.height = height;
   }
   function getStyle(targetElement,styleProp)