From 3d832c971d2d249796cb31982fb06185a5358263 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Fri, 19 Apr 2013 19:30:41 +0000 Subject: [PATCH 1/4] Changes for DocSystem Changes for DocSystem with PARTNER_FLAG --- workflow/engine/methods/setup/skin_Ajax.php | 34 +++++++++++++-------- workflow/engine/templates/setup/skinList.js | 9 +++++- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php index 58cacc255..d19c6c5a9 100755 --- a/workflow/engine/methods/setup/skin_Ajax.php +++ b/workflow/engine/methods/setup/skin_Ajax.php @@ -45,25 +45,33 @@ function skinList () G::loadClass( 'system' ); $skinList = System::getSkingList(); - $wildcard = ''; if (isset( $_REQUEST['activeskin'] )) { $wildcard = '@'; } + + $classicSkin = ''; + if (defined('PARTNER_FLAG')) { + $classicSkin = '00000000000000000000000000000001'; + } + foreach ($skinList['skins'] as $key => $value) { - if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') { - if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) { - $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' ); - $value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME']; - $value['SKIN_WORKSPACE'] = $wildcard . $value['SKIN_WORKSPACE']; - $value['SKIN_DESCRIPTION'] = $wildcard . $value['SKIN_DESCRIPTION']; - $value['SKIN_AUTHOR'] = $wildcard . $value['SKIN_AUTHOR']; - $value['SKIN_CREATEDATE'] = $wildcard . $value['SKIN_CREATEDATE']; - $value['SKIN_MODIFIEDDATE'] = $wildcard . $value['SKIN_MODIFIEDDATE']; - } else { - $value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' ); + if ($value['SKIN_ID'] != $classicSkin) { + if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') { + if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) { + $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' ); + $value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME']; + $value['SKIN_WORKSPACE'] = $wildcard . $value['SKIN_WORKSPACE']; + $value['SKIN_DESCRIPTION'] = $wildcard . $value['SKIN_DESCRIPTION']; + $value['SKIN_AUTHOR'] = $wildcard . $value['SKIN_AUTHOR']; + $value['SKIN_CREATEDATE'] = $wildcard . $value['SKIN_CREATEDATE']; + $value['SKIN_MODIFIEDDATE'] = $wildcard . $value['SKIN_MODIFIEDDATE']; + } else { + $value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' ); + } + + $skinListArray['skins'][] = $value; } - $skinListArray['skins'][] = $value; } } $skinListArray['currentSkin'] = $skinList['currentSkin']; diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js index cdf40f906..5d43f5e1a 100755 --- a/workflow/engine/templates/setup/skinList.js +++ b/workflow/engine/templates/setup/skinList.js @@ -132,7 +132,13 @@ Ext.onReady(function(){ rowSelected = infoGrid.getSelectionModel().getSelected(); if((rowSelected.data.SKIN_FOLDER_ID)&&((rowSelected.data.SKIN_FOLDER_ID!="classic"))){ exportButton.enable(); - deleteButton.enable(); + + if (rowSelected.data.SKIN_STATUS!='Inactive') { + deleteButton.disable(); + } else { + deleteButton.enable(); + } + }else{ exportButton.disable(); deleteButton.disable(); @@ -363,6 +369,7 @@ showdate = function (value){ selectedSkin = function (value){ if(gotWildCard(value)){ + deleteButton.disable(); return setBoldItalic(value.substring(1)); } return value; From 4aaead8051f7060adfc7ca6271df7ea74aa34de9 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Fri, 19 Apr 2013 21:48:10 +0000 Subject: [PATCH 2/4] Labels Added for DocSystem Labels Added for DocSystem --- workflow/engine/templates/setup/systemInfo.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/workflow/engine/templates/setup/systemInfo.js b/workflow/engine/templates/setup/systemInfo.js index 645e30622..0c81b3517 100644 --- a/workflow/engine/templates/setup/systemInfo.js +++ b/workflow/engine/templates/setup/systemInfo.js @@ -76,8 +76,7 @@ systemInfo.application = { bodyStyle: "padding: 10px; font: 0.80em arial;", width: 250, height: 300, - - html: _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION") + _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2") + html: _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION") +'

'+ _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2") +'

'+ _("ID_PROCESSMAKER_REQUIREMENTS_OPENSSL_OPTIONAL") +'

'+ _("ID_PROCESSMAKER_REQUIREMENTS_LDAP_OPTIONAL") }); var frmfsCenter = new Ext.form.FieldSet({ From 338abc715485104e2c92b6e52fba148765a84d33 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Mon, 22 Apr 2013 10:04:57 -0400 Subject: [PATCH 3/4] DOCSYSTEM Arreglo para setlocale para windows Arreglo para setlocale para windows --- .../engine/classes/class.configuration.php | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php index 40ed01f23..7ab70e9c7 100755 --- a/workflow/engine/classes/class.configuration.php +++ b/workflow/engine/classes/class.configuration.php @@ -532,12 +532,30 @@ class Configurations // extends Configuration } $langLocate = SYS_LANG; - if (SYS_LANG == 'es') { - $langLocate = 'es_ES'; - } else if (strlen(SYS_LANG) > 2) { - $langLocate = str_replace('-', '_', SYS_LANG); + if (G::toLower(PHP_OS) == 'linux') { + if (SYS_LANG == 'es') { + $langLocate = 'es_ES'; + } else if (strlen(SYS_LANG) > 2) { + $langLocate = str_replace('-', '_', SYS_LANG); + } else { + $langLocate = 'en_US'; + } } else { - $langLocate = 'en_US'; + switch (SYS_LANG) { + case 'es': + case 'es_ES': + $langLocate = 'ESN'; + break; + case 'pt': + case 'pt-BR': + $langLocate = 'PTB'; + break; + case 'en': + case 'en': + default: + $langLocate = 'EST'; + break; + } } setlocale(LC_TIME, $langLocate); From 3f4e328cf833b8a46d30a67d9431c08157bec2ad Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Mon, 22 Apr 2013 10:18:27 -0400 Subject: [PATCH 4/4] DOCSYSTEM Arreglo en setlocale para windows Arreglo en setlocale para windows --- workflow/engine/classes/class.configuration.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php index 7ab70e9c7..b3a7fa60b 100755 --- a/workflow/engine/classes/class.configuration.php +++ b/workflow/engine/classes/class.configuration.php @@ -532,7 +532,7 @@ class Configurations // extends Configuration } $langLocate = SYS_LANG; - if (G::toLower(PHP_OS) == 'linux') { + if (G::toLower(PHP_OS) == 'linux' || G::toLower(PHP_OS) == 'darwin') { if (SYS_LANG == 'es') { $langLocate = 'es_ES'; } else if (strlen(SYS_LANG) > 2) { @@ -551,7 +551,7 @@ class Configurations // extends Configuration $langLocate = 'PTB'; break; case 'en': - case 'en': + case 'en_US': default: $langLocate = 'EST'; break;