Merge remote branch 'upstream/master' into BUG-10852

workflow/engine/classes/class.configuration.php

@@ -532,6 +532,7 @@ class Configurations // extends Configuration
                 }
 
                 $langLocate = SYS_LANG;
+                if (G::toLower(PHP_OS) == 'linux' || G::toLower(PHP_OS) == 'darwin') {
                     if (SYS_LANG == 'es') {
                         $langLocate = 'es_ES';
                     } else if (strlen(SYS_LANG) > 2) {
@@ -539,6 +540,23 @@ class Configurations // extends Configuration
                     } else {
                         $langLocate = 'en_US';
                     }
+                } else {
+                    switch (SYS_LANG) {
+                        case 'es':
+                        case 'es_ES':
+                            $langLocate = 'ESN';
+                            break;
+                        case 'pt':
+                        case 'pt-BR':
+                            $langLocate = 'PTB';
+                            break;
+                        case 'en':
+                        case 'en_US':
+                        default:
+                            $langLocate = 'EST';
+                            break;
+                    }
+                }
 
                 setlocale(LC_TIME, $langLocate);
                 $dateTime = utf8_encode(strftime($newCreation, mktime(0, 0, 0, $m, $d, $y)));

workflow/engine/methods/setup/skin_Ajax.php

@@ -45,12 +45,18 @@ 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_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' );
@@ -63,9 +69,11 @@ function skinList ()
                 } else {
                     $value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' );
                 }
+                
                 $skinListArray['skins'][] = $value;
             }
         }
+    }
     $skinListArray['currentSkin'] = $skinList['currentSkin'];
     echo G::json_encode( $skinListArray );
 }

workflow/engine/templates/pmTables/editReport.js

@@ -920,6 +920,15 @@ function createReportTable()
     return false;
   }
   
+  //validate process
+  if(Ext.getCmp('PROCESS').getValue().trim() == '') {
+    Ext.getCmp('PROCESS').focus();
+    PMExt.error(_('ID_ERROR'), _('ID_PROCESS_IS_REQUIRED'), function(){
+      Ext.getCmp('PROCESS').focus();
+    });
+    return false;
+  }
+
   // validate table name length
   if(tableName.length < 4) {
     PMExt.error(_('ID_ERROR'), _('ID_TABLE_NAME_TOO_SHORT'), function(){

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();
+          
+          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;

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") +'<br><br>'+ _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2") +'<br><br>'+ _("ID_PROCESSMAKER_REQUIREMENTS_OPENSSL_OPTIONAL") +'<br><br>'+ _("ID_PROCESSMAKER_REQUIREMENTS_LDAP_OPTIONAL")
-            html: _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION") + _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2")
         });
 
         var frmfsCenter = new Ext.form.FieldSet({