From 1e03cebdd8ae826e1bbd19a0efb163fbcf8af29f Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Mon, 1 Oct 2012 11:19:47 -0400 Subject: [PATCH 1/6] BUG Move "Enable HTML Editing" checkbox, "Restore Original HTML" SOLVED - Move "Enable HTML Editing" checkbox, "Restore Original HTML" and "Refresh view" buttons to top of "HTML" tab in DynaForm Editor - Buttons are moved to the top --- .../engine/xmlform/dynaforms/dynaforms_HtmlEditor.html | 8 ++++---- .../engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html index 06352fb69..dd36667a1 100755 --- a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html +++ b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.html @@ -6,16 +6,16 @@ - - - - + + + + diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml index 02cbbda2d..1cff5a631 100755 --- a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml +++ b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml @@ -5,10 +5,6 @@ - -HTML View - - Enable HTML Editing @@ -21,6 +17,10 @@ Refresh View + +HTML View + + HTML Code From dd1b914ee8624977709deb86cd7f64478fd732a5 Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Mon, 1 Oct 2012 14:36:55 -0400 Subject: [PATCH 2/6] BUG Move "Enable HTML Editing" checkbox, "Restore Original HTML" SOLVED - Move "Enable HTML Editing" checkbox, "Restore Original HTML" and "Refresh view" buttons to top of "HTML" tab in DynaForm Editor. - Added messageBox of alert. --- .../xmlform/dynaforms/dynaforms_HtmlEditor.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml index 1cff5a631..bb743aeec 100755 --- a/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml +++ b/workflow/engine/xmlform/dynaforms/dynaforms_HtmlEditor.xml @@ -73,7 +73,18 @@ getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").onclick=function() { /*getField("ENABLETEMPLATE","dynaforms_Properties").checked=this.checked; dynaformEditor.saveProperties();*/ - dynaformEditor.setEnableTemplate( this.checked ); + if (getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").checked == true) { + new leimnud.module.app.confirm().make( + { + label: "@G::LoadTranslation(ID_MSG_ENABLE_HTML_EDITING)", + size:{ w: 350, h: 150 }, + action: function() { }, + cancel: function() { + getField("PME_HTML_ENABLETEMPLATE","dynaforms_HtmlEditor").checked = false; + } + }); + dynaformEditor.setEnableTemplate( this.checked ); + } } ]]> From 7cc1da974eeb696a8e7852cb39bf8dde16848fef Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 1 Oct 2012 18:02:24 -0400 Subject: [PATCH 3/6] BUG 9871 PM 2.0.44 testing 2 se Borran los datos en pmtables con chrome SOLVED - Unnecesary text-transform style in the table name field and field name - Deleted the unnecesary text-transform style --- workflow/engine/templates/pmTables/edit.js | 2 -- workflow/engine/templates/pmTables/editReport.js | 7 ------- 2 files changed, 9 deletions(-) diff --git a/workflow/engine/templates/pmTables/edit.js b/workflow/engine/templates/pmTables/edit.js index fc93caa18..5be0aaeb2 100755 --- a/workflow/engine/templates/pmTables/edit.js +++ b/workflow/engine/templates/pmTables/edit.js @@ -160,7 +160,6 @@ Ext.onReady(function(){ editor: { xtype: 'textfield', allowBlank: true, - style:'text-transform: uppercase', listeners:{ change: function(f,e){ this.setValue(this.getValue().toUpperCase()); @@ -546,7 +545,6 @@ Ext.onReady(function(){ emptyText: _("ID_SET_A_TABLE_NAME"), width: 250, stripCharsRe: /(\W+)/g, - style:'text-transform: uppercase', listeners:{ change: function(){ this.setValue(this.getValue().toUpperCase()) diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js index aa8a29e0a..b2860ac62 100755 --- a/workflow/engine/templates/pmTables/editReport.js +++ b/workflow/engine/templates/pmTables/editReport.js @@ -277,13 +277,7 @@ Ext.onReady(function(){ editor: { xtype: 'textfield', allowBlank: true, - style:'text-transform: uppercase', listeners:{ - /*specialkey: function(f,e){ - if(e.getKey()==e.ENTER){ - this.setValue(this.getValue().toUpperCase()); - } - }*/ change: function(f,e){ this.setValue(this.getValue().toUpperCase()); } @@ -797,7 +791,6 @@ Ext.onReady(function(){ emptyText: _("ID_SET_A_TABLE_NAME"), width: 250, stripCharsRe: /(\W+)/g, - style:'text-transform: uppercase', listeners:{ change: function(){ this.setValue(this.getValue().toUpperCase()); From d83dceb3418b8f94e56adbd5ca6cefad6130df20 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Tue, 2 Oct 2012 10:45:03 -0400 Subject: [PATCH 4/6] =?UTF-8?q?BUG=209720=20Proceso=20de=20actualizaci?= =?UTF-8?q?=C3=B3e=20ProcessMaker=20es=20lento=20IMPROVEMENT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ProcessMaker update process is slow for query. - Was optimized queries and was modified the rebuild "Table content". --- workflow/engine/classes/model/Content.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/model/Content.php b/workflow/engine/classes/model/Content.php index f997ac050..a6923dd00 100755 --- a/workflow/engine/classes/model/Content.php +++ b/workflow/engine/classes/model/Content.php @@ -276,7 +276,7 @@ class Content extends BaseContent { * * @param array $langs */ - function regenerateContent($langId) + function regenerateContent($langs) { //Search the language $key = array_search('en',$langs); From c7765e2e80c058b5caf37ba82e94ac16d5e1f3f4 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Tue, 2 Oct 2012 12:15:08 -0400 Subject: [PATCH 5/6] Improvement in the style for the login box in uxmodern --- .../skinEngine/uxmodern/css/xtheme-gray.css | 6 +-- workflow/engine/templates/main/login.js | 43 ++++++++++--------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/workflow/engine/skinEngine/uxmodern/css/xtheme-gray.css b/workflow/engine/skinEngine/uxmodern/css/xtheme-gray.css index 0071bb68c..963600dd2 100644 --- a/workflow/engine/skinEngine/uxmodern/css/xtheme-gray.css +++ b/workflow/engine/skinEngine/uxmodern/css/xtheme-gray.css @@ -1478,15 +1478,15 @@ body.x-body-masked .x-window-plain .x-window-mc { body.x-pm-login-body{ width: 100%; } -body.x-pm-login-body div.x-window{ +body.x-pm-login-body div.x-window-login{ /*!important needed to change position, not appearance. Not allows JavaScrpit change Position.*/ - left: 50% !important; + left: 50% !important; margin-left: -185px !important; /*Left Location for Login Box. Must be a half from the width of login Box.*/ margin-top: -120px !important; /*Top Location for Login Box. Must be a half from height of login Box.*/ overflow: auto !important; position: absolute !important; top: 50% !important; -} +} body.x-pm-login-body div.x-ie-shadow, body.x-pm-login-body div.x-shadow{ /*Disappears the shadow Login Box.*/ display: none !important; diff --git a/workflow/engine/templates/main/login.js b/workflow/engine/templates/main/login.js index e007b6d3f..ee2121609 100644 --- a/workflow/engine/templates/main/login.js +++ b/workflow/engine/templates/main/login.js @@ -1,7 +1,7 @@ /* * ProcessMaker Login * Created on date Jul 15, 2011 - * + * * @author Erik Amaru Ortiz */ @@ -40,7 +40,7 @@ var Login = function() { enableVirtualKeyboard : false, enableForgotPassword : false, fieldsWidth : 200, - + /** Init method */ init : function() { new Ext.KeyMap(document, { @@ -49,18 +49,18 @@ var Login = function() { Login.submit(); } }); - + Ext.QuickTips.init(); Ext.form.Field.prototype.msgTarget = 'side'; this.enableVirtualKeyboard = virtualKeyboad; this.enableForgotPassword = forgotPasswd; - + this.initComponents(); - + this.window.show(); Ext.getCmp('userTxt').focus(true, 1000); - + if (typeof errMsg != 'undefined') { Ext.msgBoxSlider.msgTopCenter('alert', 'ERROR', errMsg, 10); } @@ -87,27 +87,27 @@ Login.initComponents = function() fieldLabel: _('ID_USER'), allowBlank: false } - + var usernameTxt = { id : 'usernameTxt', name : 'username', fieldLabel: _('ID_USER'), allowBlank: false } - + var emailTxt = { id : 'emailTxt', name : 'email', fieldLabel: _('ID_EMAIL'), allowBlank: false } - + var passwordTxt = { fieldLabel: _('ID_PASSWORD'), name : 'form[USR_PASSWORD]', inputType : 'password', allowBlank: false, - + validationEvent : this.enableVirtualKeyboard == true ? 'blur' : 'keyup', enableKeyEvents : true, width: this.fieldsWidth, //this.enableVirtualKeyboard == true ? 183 : this.fieldsWidth, @@ -116,7 +116,7 @@ Login.initComponents = function() languageSelection: true }, plugins: this.enableVirtualKeyboard == true ? new Ext.ux.plugins.VirtualKeyboard() : null, - + listeners: { render: function() { this.capsWarningTooltip = new Ext.ToolTip({ @@ -132,7 +132,7 @@ Login.initComponents = function() this.disable(); }); }, - + keypress: { fn: function(field, e) { if(this.forceVirtualKeyboard) { @@ -161,7 +161,7 @@ Login.initComponents = function() } } } - + /*, listeners : { specialkey: function(f,e){ @@ -171,7 +171,7 @@ Login.initComponents = function() } }*/ } - + var forgotPasswordLink = { xtype: 'box', autoEl: { @@ -251,7 +251,7 @@ Login.initComponents = function() this.form = new Ext.FormPanel(formConfig); - + this.forgotPasswordForm = new Ext.FormPanel({ id : 'fp-form', labelWidth: 80, @@ -282,7 +282,7 @@ Login.initComponents = function() handler: Login.restore }] }); - + this.forgotPasswordForm = new Ext.FormPanel({ id : 'fp-form', labelWidth: 80, @@ -315,6 +315,7 @@ Login.initComponents = function() }); this.window = new Ext.Window({ + cls: 'x-window-login', layout: 'fit', title: _('LOGIN'), width: 380, @@ -332,7 +333,7 @@ Login.initComponents = function() items: [] }) }); - + this.fpWindow = new Ext.Window({ layout: 'fit', title: _('ID_FORGOT_PASSWORD'), @@ -405,7 +406,7 @@ Login.restore = function() Login.sendFpRequest = function() { Ext.getCmp('login-statusbar2').showBusy(); - + if (!Login.forgotPasswordForm.getForm().isValid()) { Ext.getCmp('login-statusbar2').setStatus({ text: _('ID_VALIDATION_ERRORS'), @@ -414,7 +415,7 @@ Login.sendFpRequest = function() }); return; } - + Login.forgotPasswordForm.getForm().submit({ method: 'POST', waitTitle: '', @@ -449,7 +450,7 @@ Login.sendFpRequest = function() //Login.form.getForm().reset(); } }); - + } @@ -469,7 +470,7 @@ Login.submit = function() Ext.getCmp('login-statusbar').showBusy(); - + if (!Login.form.getForm().isValid()) { Ext.getCmp('login-statusbar').setStatus({ text: _('ID_VALIDATION_ERRORS'), From fa0f6b695a69536a0db389409eac3fe66fd8c5c4 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Tue, 2 Oct 2012 12:20:59 -0400 Subject: [PATCH 6/6] Improvement in the layout for the skin uxmodern, related to the bug 9759 --- workflow/engine/skinEngine/uxmodern/layout.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/workflow/engine/skinEngine/uxmodern/layout.html b/workflow/engine/skinEngine/uxmodern/layout.html index 42b2faf43..c937d8bf9 100644 --- a/workflow/engine/skinEngine/uxmodern/layout.html +++ b/workflow/engine/skinEngine/uxmodern/layout.html @@ -19,7 +19,7 @@ {if $user_logged neq ''} {$msgVer} {if $switch_interface} - + {/if} {$logout}  
{$HTML}{$form.HTML}
{$form.PME_HTML_ENABLETEMPLATE}{$PME_HTML_ENABLETEMPLATE}{$form.PME_REFRESH_VIEW}{$form.PME_RESTORE_HTML}
{$HTML}{$form.HTML}
{$HTML2} {$form.HTML2}
- {if $footer neq ''}
@@ -73,7 +72,6 @@
- {/if} \ No newline at end of file