Merge pull request #1591 from brayanpereyra/master

DOC SYSTEM Arreglos de templates y etiquetas

workflow/engine/methods/services/login_getStarted.php

@@ -22,7 +22,19 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 $G_PUBLISH = new Publisher();
-$oTemplatePower = new TemplatePower( PATH_TPL . 'services/login_getStarted.html' );
+
+$fileGetStart = PATH_SKINS . SYS_SKIN . PATH_SEP . 'login_getStarted.html';
+if (!file_exists($fileGetStart)) {
+    $fileGetStart = PATH_SKIN_ENGINE . SYS_SKIN . PATH_SEP . 'login_getStarted.html';
+    if (!file_exists($fileGetStart)) {
+        $fileGetStart = PATH_CUSTOM_SKINS . SYS_SKIN . PATH_SEP . 'login_getStarted.html';
+        if (!file_exists($fileGetStart)) {
+            $fileGetStart = PATH_TPL . 'services/login_getStarted.html';
+        }
+    }
+}
+
+$oTemplatePower = new TemplatePower( $fileGetStart );
 $oTemplatePower->prepare();
 /*
 $oTemplatePower->newBlock('users');

workflow/engine/skinEngine/skinEngine.php

@@ -363,11 +363,27 @@ class SkinEngine
 
       if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
         $freeOfChargeText = "";
-        if (! defined('SKIP_FREE_OF_CHARGE_TEXT')) {
+        if (! defined('SKIP_FREE_OF_CHARGE_TEXT'))
         $freeOfChargeText = "Supplied free of charge with no support, certification, warranty, <br>maintenance nor indemnity by Colosa and its Certified Partners.";
-        }
+        if(class_exists('pmLicenseManager')) $freeOfChargeText="";
+
+        $fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
+        if (file_exists($fileFooter)) {
+          $footer .= file_get_contents($fileFooter);
+        } else {
+          $fileFooter = PATH_SKIN_ENGINE . SYS_SKIN . PATH_SEP . 'footer.html';
+          if (file_exists($fileFooter)) {
+            $footer .= file_get_contents($fileFooter);
+          } else {
+            $fileFooter = PATH_CUSTOM_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
+            if (file_exists($fileFooter)) {
+              $footer .= file_get_contents($fileFooter);
+            } else {
               $footer .= "<br />Copyright &copy; 2003-" . date('Y') . " <a href=\"http://www.colosa.com\" alt=\"Colosa, Inc.\" target=\"_blank\">Colosa, Inc.</a> All rights reserved.<br /> $freeOfChargeText " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"><img src=\"/images/PowerdbyProcessMaker.png\" border=\"0\" /></a>";
             }
+          }
+        }
+      }
 
       $oMenu = new Menu();
       $menus = $oMenu->generateArrayForTemplate($G_MAIN_MENU, 'SelectedMenu', 'mainMenu', $G_MENU_SELECTED, $G_ID_MENU_SELECTED);
@@ -463,7 +479,22 @@ class SkinEngine
       $footer = '';
 
       if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
-        $footer .= "<br />Copyright &copy; 2003-" . date('Y') . " Colosa, Inc. All rights reserved.";
+        $fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
+        if (file_exists($fileFooter)) {
+          $footer .= file_get_contents($fileFooter);
+        } else {
+          $fileFooter = PATH_SKIN_ENGINE . SYS_SKIN . PATH_SEP . 'footer.html';
+          if (file_exists($fileFooter)) {
+            $footer .= file_get_contents($fileFooter);
+          } else {
+            $fileFooter = PATH_CUSTOM_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
+            if (file_exists($fileFooter)) {
+              $footer .= file_get_contents($fileFooter);
+            } else {
+              $footer .= "<br />Copyright &copy; 2003-" . date('Y') . " <a href=\"http://www.colosa.com\" alt=\"Colosa, Inc.\" target=\"_blank\">Colosa, Inc.</a> All rights reserved.<br /> $freeOfChargeText " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"><img src=\"/images/PowerdbyProcessMaker.png\" border=\"0\" /></a>";
+            }
+          }
+        }
       }
 
       //menu
@@ -635,13 +666,28 @@ class SkinEngine
       $footer = '';
 
       if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
-
         $freeOfChargeText = "";
         if (! defined('SKIP_FREE_OF_CHARGE_TEXT'))
         $freeOfChargeText = "Supplied free of charge with no support, certification, warranty, <br>maintenance nor indemnity by Colosa and its Certified Partners.";
         if(class_exists('pmLicenseManager')) $freeOfChargeText="";
+
+        $fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
+        if (file_exists($fileFooter)) {
+          $footer .= file_get_contents($fileFooter);
+        } else {
+          $fileFooter = PATH_SKIN_ENGINE . SYS_SKIN . PATH_SEP . 'footer.html';
+          if (file_exists($fileFooter)) {
+            $footer .= file_get_contents($fileFooter);
+          } else {
+            $fileFooter = PATH_CUSTOM_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
+            if (file_exists($fileFooter)) {
+              $footer .= file_get_contents($fileFooter);
+            } else {
               $footer .= "<br />Copyright &copy; 2003-" . date('Y') . " <a href=\"http://www.colosa.com\" alt=\"Colosa, Inc.\" target=\"_blank\">Colosa, Inc.</a> All rights reserved.<br /> $freeOfChargeText " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"><img src=\"/images/PowerdbyProcessMaker.png\" border=\"0\" /></a>";
             }
+          }
+        }
+      }
 
       $oMenu = new Menu();
       $menus = $oMenu->generateArrayForTemplate($G_MAIN_MENU, 'SelectedMenu', 'mainMenu', $G_MENU_SELECTED, $G_ID_MENU_SELECTED);

workflow/engine/templates/installer/main.js

@@ -42,10 +42,19 @@ Ext.onReady(function(){
 
 function finishInstallation()
 {
+  Ext.MessageBox.show({
+    msg: _('ID_INSTALLING_WORKSPACE'),
+    progressText: 'Saving...',
+    width:300,
+    wait:true,
+    waitConfig: {interval:200},
+    animEl: 'mb7'
+  });
   wizard.showLoadMask(true, _('ID_FINISH'));
   Ext.Ajax.request({
     url: 'createWorkspace',
     success: function(response){
+      Ext.MessageBox.hide();
       var response = Ext.util.JSON.decode(response.responseText);
       Ext.getCmp('finish_message').setValue(getFieldOutput(response.message, response.result));
       wizard.showLoadMask(false);
@@ -76,7 +85,7 @@ function finishInstallation()
         })
       }
     },
-    failure: function(){wizard.showLoadMask(false);},
+    failure: function(){Ext.MessageBox.hide(); wizard.showLoadMask(false);},
     params: {
       'db_engine'     : Ext.getCmp('db_engine'    ).getValue(),
       'db_hostname'   : Ext.getCmp('db_hostname'  ).getValue(),