Merge remote-tracking branch 'origin/master' into pm_wysiwyg

2013-01-02 10:24:37 -04:00
parent 7568f5602f f80039cf75
commit 5edf63eed4
20 changed files with 89 additions and 208 deletions
--- a/gulliver/js/common/core/common.js
+++ b/gulliver/js/common/core/common.js
@@ -2022,7 +2022,8 @@ function removeValue(id){

 function datePicker4(obj, id, mask, startDate, endDate, showTIme, idIsoDate)
 {
-  __lastMask__ = mask;
+    var aux = id.replace(/[\[\]]/g, '_');
+  __lastMasks__[aux] = mask;

  if (showTIme=='false') {
    showTIme = false;
--- a/gulliver/js/form/core/form.js
+++ b/gulliver/js/form/core/form.js
@@ -1106,12 +1106,20 @@ function G_Text(form, element, name)
          newValue += currentValue.substring(cursorEnd, currentValue.length);
          newCursor = cursorStart - 1;
          break;
-        case 46:
        case 45:
-          newValue  = currentValue.substring(0, cursorStart);
-          newValue += currentValue.substring(cursorEnd + 1, currentValue.length);
-          newCursor = cursorStart;
-          break;
+        case 46:
+            if (me.validate != "Email") {
+                newValue  = currentValue.substring(0, cursorStart);
+                newValue += currentValue.substring(cursorEnd + 1, currentValue.length);
+                newCursor = cursorStart;
+            } else {
+                newKey = String.fromCharCode(keyCode);
+                newValue  = currentValue.substring(0, cursorStart);
+                newValue += newKey;
+                newValue += currentValue.substring(cursorEnd, currentValue.length);
+                newCursor = cursorStart + 1;
+            }
+            break;
        case 256:
          newValue  = currentValue.substring(0, cursorStart);
          newValue += '.';
@@ -1173,10 +1181,16 @@ function G_Text(form, element, name)
      case 8: case 46:  //BACKSPACE OR DELETE
      case 35: case 36: //HOME OR END
      case 37: case 38: case 39: case 40: // ARROW KEYS
-        if (me.validate == 'NodeName' && ((pressKey == 8) || (pressKey == 46))) {
-          return true;
+        if ((pressKey == 8 || pressKey == 46) && me.validate == "NodeName") {
+            return true;
        }
+
+        if (pressKey == 46 && me.validate == "Email") {
+            return true;
+        }
+
        me.applyMask(pressKey);
+
        if ((pressKey == 8 || pressKey == 46) && (me.validate != 'Login' && me.validate != 'NodeName')) me.sendOnChange();
        me.checkBrowser();
        if (me.browser.name == 'Chrome' || me.browser.name == 'Safari'){
@@ -1276,7 +1290,7 @@ function G_Text(form, element, name)
      //pressKey = window.event ? event.keyCode : event.which;
      var pressKey = (window.event)? window.event.keyCode : event.which;

-      if (me.mType == 'date') me.validate = 'Int';
+      //if (me.mType == 'date') me.validate = 'Int';

      keyValid = true;
      updateOnChange = true;
@@ -1357,7 +1371,10 @@ function G_Text(form, element, name)

      if (keyValid){
        //APPLY MASK
-        if ((me.validate == "Login" || me.validate == "NodeName") && me.mask == "") return true;
+        if ((me.validate == "Login" || me.validate == "NodeName") && me.mask == "") {
+            return true;
+        }
+
        if (pressKey == 46){
          me.applyMask(256); //This code send [.] period to the mask
        }
@@ -1365,7 +1382,9 @@ function G_Text(form, element, name)
          me.applyMask(pressKey);
        }

-        if (updateOnChange) me.sendOnChange();
+        if (updateOnChange) {
+            me.sendOnChange();
+        }
      }

      if (me.browser.name == 'Firefox') {
@@ -1473,10 +1492,9 @@ function G_Text(form, element, name)
        }
      }

-      if(this.validate=="Email")
-      {
-        //var pat=/^[\w\_\-\.ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â§ÃƒÆ’Ã†â€™Ãƒâ€ Ã¢â‚¬â„¢ÃƒÆ’Ã¢â‚¬Å¡Ãƒâ€šÃ‚Â±]{2,255}@[\w\_\-]{2,255}\.[a-z]{1,3}\.?[a-z]{0,3}$/;
-        var pat=/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,6})+$/;
+      if (this.validate == "Email") {
+        var pat = /^\w+(?:[\.-]?\w+)*@\w+(?:[\.-]?\w+)*\.\w{2,6}$/;
+
        if(!pat.test(this.element.value))
        {
          //old|if(this.required=="0"&&this.element.value=="") {
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
--- a/gulliver/js/widgets/js-calendar/js-calendar.js
+++ b/gulliver/js/widgets/js-calendar/js-calendar.js
--- a/gulliver/methods/defaultAjax.php
+++ b/gulliver/methods/defaultAjax.php
@@ -111,13 +111,12 @@ for ($r = 0; $r < sizeof( $newValues ); $r ++) {
            foreach ($v[$_POST['row']] as $k1 => $v1) {
                $myDependentFields = subDependencies( $k1, $G_FORM, $aux, $_POST['grid'] );
                $_SESSION[$G_FORM->id][$_POST['grid']][$_POST['row']][$k1] = $v1;
+                $G_FORM->values[$_POST['grid']][$_POST['row']][$k1] = $v1;
            }
        }
        $dependentFields = array_merge( $dependentFields, $myDependentFields );
    }
 }
-if (isset( $_POST['grid'] ))
-    $G_FORM->values = isset( $_SESSION[$G_FORM->id] ) ? $_SESSION[$G_FORM->id] : array ();

 $dependentFields = array_unique( $dependentFields );

--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -6260,6 +6260,21 @@ class Cases
            }
        }

+        // Group Ad Hoc
+        $oTasks = new Tasks();
+        $aAux = $oTasks->getGroupsOfTask($TAS_UID, 2);
+        $row = array();
+        $groups = new Groups();
+        foreach ($aAux as $aGroup) {
+            $aUsers = $groups->getUsersOfGroup($aGroup['GRP_UID']);
+            foreach ($aUsers as $aUser) {
+                if ($aUser['USR_UID'] != $USR_UID) {
+                    $row[] = $aUser['USR_UID'];
+                }
+            }
+        }
+
+        // User Ad Hoc
        $aAux = $oTasks->getUsersOfTask($TAS_UID, 2);
        foreach ($aAux as $aUser) {
            if ($aUser['USR_UID'] != $USR_UID) {
--- a/workflow/engine/classes/class.configuration.php
+++ b/workflow/engine/classes/class.configuration.php
@@ -667,7 +667,7 @@ class Configurations // extends Configuration
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 120 );
-                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 120, "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 120, "sortable" => true);
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 80);
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_DELEGATION_DATE") : "**ID_DELEGATION_DATE**", "dataIndex" => "DEL_DELEGATE_DATE", "width" => 80);
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_DUE_DATE") : "**ID_DUE_DATE**", "dataIndex" => "DEL_TASK_DUE_DATE", "width" => 80);
@@ -703,7 +703,7 @@ class Configurations // extends Configuration
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
-                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 90, "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 90, "sortable" => true);
                //$caseColumns[] = array("header" => "Sent By", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 110);
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_PRIORITY") : "**ID_PRIORITY**", "dataIndex" => "DEL_PRIORITY", "width" => 50);
@@ -740,7 +740,7 @@ class Configurations // extends Configuration
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CASE") : "**ID_CASE**", "dataIndex" => "APP_TITLE", "width" => 150);
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_PROCESS") : "**ID_PROCESS**", "dataIndex" => "APP_PRO_TITLE", "width" => 120);
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_TASK") : "**ID_TASK**", "dataIndex" => "APP_TAS_TITLE", "width" => 120);
-                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 90, "sortable" => false);
+                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_CURRENT_USER") : "**ID_CURRENT_USER**", "dataIndex" => "APP_CURRENT_USER", "width" => 90, "sortable" => true);
                //$caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_SENT_BY") : "**ID_SENT_BY**", "dataIndex" => "APP_DEL_PREVIOUS_USER", "width" => 90);
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_LAST_MODIFY") : "**ID_LAST_MODIFY**", "dataIndex" => "APP_UPDATE_DATE", "width" => 110);
                $caseColumns[] = array("header" => ($translation == 1)? G::LoadTranslation("ID_STATUS") : "**ID_STATUS**", "dataIndex" => "APP_STATUS", "width" => 50);
--- a/workflow/engine/classes/class.spool.php
+++ b/workflow/engine/classes/class.spool.php
@@ -151,6 +151,8 @@ class spoolRun
            $this->status = strtolower( $aData['app_msg_status'] );
        }

+        $aData["contentTypeIsHtml"] = (isset($aData["contentTypeIsHtml"]))? $aData["contentTypeIsHtml"] : true;
+
        $this->setData($sUID, $aData["app_msg_subject"], $aData["app_msg_from"], $aData["app_msg_to"], $aData["app_msg_body"], $aData["app_msg_date"], $aData["app_msg_cc"], $aData["app_msg_bcc"], $aData["app_msg_template"], $aData["app_msg_attach"], $aData["contentTypeIsHtml"]);
    }

--- a/workflow/engine/classes/class.toolBar.php
+++ b/workflow/engine/classes/class.toolBar.php
@@ -162,7 +162,7 @@ class XmlForm_Field_toolButton extends XmlForm_Field
                    $criteria = processMap::getDynaformsCriteria($this->owner->values['PRO_UID']);
                    $dataset = DynaformPeer::doSelectRS($criteria);
                    if ($dataset->getRecordCount() > 0) {
-                        $html .= '<span style="font-size: 8pt;margin-left: 20px;">' . G::LoadTranslation('ID_EDITING_DYNAFORM');
+                        $html .= '<span style="display:inline-block; font-size: 8pt;margin-left: 5px;margin-bottom: 3px;">' . G::LoadTranslation('ID_DYNAFORM');
                        $html .= ': <select id="_dynaformsList_" onchange="window.location = \'dynaforms_Editor?PRO_UID=' . $this->owner->values['PRO_UID'];
                        $html .= '&DYN_UID=\' + this.value;" class="module_app_input___gray">';
                        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -179,8 +179,8 @@ class XmlForm_Field_toolButton extends XmlForm_Field
                return $html;
                break;
            case 'class':
-                $html = '<a href="#" onclick="' . $this->onclick . '" onmouseover="backImage(this, \'url(/images/dynamicForm/hover.gif) no-repeat\')" onmouseout="backImage(this, \'\')"  style="width:25px;height:25px;margin-bottom:3px">
-                 <div class="' . $this->class . '" title="' . strip_tags( $this->label ) . '" style="width:25px;height:25px;margin-bottom:3px"></div>
+                $html = '<a href="#" onclick="' . $this->onclick . '" onmouseover="backImage(this, \'url(/images/dynamicForm/hover.gif) no-repeat\')" onmouseout="backImage(this, \'\')"  style="height:25px;margin-bottom:3px">
+                 <div class="' . $this->class . '" title="' . strip_tags( $this->label ) . '" style="height:25px;margin-bottom:3px"></div>
               </a>';
                return $html;

--- a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js
+++ b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js
@@ -265,50 +265,6 @@ var dynaformEditor={
    url='dynaforms_Saveas';
    popupWindow('Save as', url+'?DYN_UID='+this.dynUid+'&AA='+this.A , 500, 350);
  },
-  importForm:function(){
-    panelImportDyna = new leimnud.module.panel();
-    panelImportDyna.options={
-      limit    : true,
-      size     : {w:650,h:160},
-      position : {x:0,y:0,center:true},
-      title    : '',
-      theme    : 'processmaker',
-      statusBar: false,
-      control  : {drag:false,resize:true,close:false},
-      fx       : {opacity:true,rolled:false,modal:true}
-    };
-    panelImportDyna.setStyle = {modal: {
-      backgroundColor: 'white'
-    }};
-    panelImportDyna.make();
-    panelImportDyna.addContent('<div id="importAjax" align="center"><img src="/images/ext/default/grid/loading.gif" /></div>');
-    var oRPC = new leimnud.module.rpc.xmlhttp({
-      url   : '../dynaforms/fieldsHandlerAjax',
-      async : false,
-      method: 'POST',
-      args  : 'request=showImportForm' + '&DYN_UID=' + this.dynUid
-    });
-    oRPC.make();
-    document.getElementById('importAjax').style.display = 'none';
-    panelImportDyna.addContent(oRPC.xmlhttp.responseText);
-  },
-  importation:function(uidDynaSelect){
-    document.getElementById('importAjax').style.display = 'block';
-    document.getElementById('importForm').style.display = 'none';
-    var oRPC = new leimnud.module.rpc.xmlhttp({
-      url   : '../dynaforms/fieldsHandlerAjax',
-      async : false,
-      method: 'POST',
-      args  : 'request=importation' + '&DYN_UID=' + this.dynUid + '&FILE=' + uidDynaSelect
-    });
-    oRPC.make();
-    resp = oRPC.xmlhttp.responseText;
-    if (resp == 'success') {
-        location.reload(true);
-    } else {
-        alert("Error: " + resp);
-    }
-  },
  close:function()
  {
    if (!sessionPersits()) {
@@ -474,7 +430,7 @@ var dynaformEditor={
        parserfile: ["parsexml.js", "parsecss.js", "tokenizejavascript.js", "parsejavascript.js",
                     "../contrib/php/js/tokenizephp.js", "../contrib/php/js/parsephp.js",
                     "../contrib/php/js/parsephphtmlmixed.js"],
-        stylesheet: ["css/xmlcolors.css", "css/jscolors.css", "css/csscolors.css", "contrib/php/css/phpcolors.css"],
+        stylesheet: ["css/xmlcolors.css", "css/jscolors.css"],
        path: "js/",
        lineNumbers: true,
        continuousScanning: 500
--- a/workflow/engine/methods/dynaforms/fieldsHandlerAjax.php
+++ b/workflow/engine/methods/dynaforms/fieldsHandlerAjax.php
@@ -94,118 +94,6 @@ switch ($request) {
            $o->remove( '___pm_boot_strap___' );
        }
        break;
-    case 'showImportForm':
-        require_once 'classes/model/Dynaform.php';
-        require_once 'classes/model/Content.php';
-        $uidDynafom = $_POST['DYN_UID'];
-
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->clearSelectColumns();
-        $oCriteria->addSelectColumn( DynaformPeer::DYN_FILENAME );
-        $oCriteria->addAsColumn( 'DYNA_NAME', 'C_DYNA.CON_VALUE' );
-        $oCriteria->addAsColumn( 'PROC_NAME', 'C_PROC.CON_VALUE' );
-
-        $oCriteria->addAlias("C_DYNA", "CONTENT");
-        $oCriteria->addAlias("C_PROC", "CONTENT");
-
-        $arrayCondition = array();
-        $arrayCondition[] = array(DynaformPeer::DYN_UID, "C_DYNA.CON_ID");
-        $oCriteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
-
-        $arrayCondition = array();
-        $arrayCondition[] = array(DynaformPeer::PRO_UID, "C_PROC.CON_ID");
-        $oCriteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
-
-        $oCriteria->add( 'C_DYNA.CON_LANG', SYS_LANG );
-        $oCriteria->add( 'C_DYNA.CON_CATEGORY', 'DYN_TITLE' );
-
-        $oCriteria->add( 'C_PROC.CON_LANG', SYS_LANG );
-        $oCriteria->add( 'C_PROC.CON_CATEGORY', 'PRO_TITLE' );
-
-        $oCriteria->add( DynaformPeer::DYN_UID, $uidDynafom, Criteria::NOT_EQUAL);
-
-        $oCriteria->addAscendingOrderByColumn ('PROC_NAME');
-        $oCriteria->addAscendingOrderByColumn ('DYNA_NAME');
-        $oDataset = DynaformPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-        $oDataset->next();
-        $aRow = $oDataset->getRow();
-
-
-        $select = '<select name="form[IMPORT_DYNA]" id="form[IMPORT_DYNA]"  width="600" style="width: 600px" class="module_app_input___gray">';
-        $selectGroup = '';
-        while (is_array( $aRow )) {
-            if ($selectGroup != $aRow['PROC_NAME']) {
-                if ($selectGroup != '') {
-                    $select .= '</optgroup>';
-                }
-                $selectGroup = $aRow['PROC_NAME'];
-                $select .= '<optgroup label="' . $aRow['PROC_NAME'] . '">';
-            }
-            $select .= '<option value="' . $aRow['DYN_FILENAME'] . '">' . $aRow['DYNA_NAME'] . '</option>';
-            $oDataset->next();
-            $aRow = $oDataset->getRow();
-        }
-
-        $select .= '</optgroup></select>';
-        $html = '<div id="importForm"><table width="100%" cellspacing="3" cellpadding="3" border="0">
-                    <tbody>
-                        <tr>
-                            <td align="" colspan="2" style="background: none repeat scroll 0 0 #E0E7EF; border-bottom: 1px solid #C3D1DF;
-                                color: #000000; font-weight: bold; padding-left: 5px; text-shadow: 0 1px 0 #FFFFFF;
-                                font: 8px">
-                                <span>' . G::LoadTranslation('ID_SELECT_DYNAFORM_IMPORT') . '</span>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="25%" style="font: 11px/180% sans-serif,MiscFixed; color: #808080; text-align: right;">
-                                <label for="form[IMPORT_DYNA]">' . G::LoadTranslation('ID_DYNAFORM') . '</label>
-                            </td>
-                            <td width="75%" class="FormFieldContent">' . $select . '
-                            </td>
-                        </tr>
-                        <tr>
-                            <td align="center" colspan="2" class="FormButton">
-                                <input type="button" onclick="if (confirm(&#39;' . G::LoadTranslation('ID_CONFIRM_IMPORT_DYNAFORM') . '&#39;)) { dynaformEditor.importation(document.getElementById(&#39;form[IMPORT_DYNA]&#39;).value); }" value="' . G::LoadTranslation('ID_IMPORT') . '" class="module_app_button___gray " style=""> &nbsp;
-                                <input type="button" onclick="panelImportDyna.remove();" value="' . G::LoadTranslation('ID_CANCEL') . '" class="module_app_button___gray " style="">
-                            </td>
-                        </tr>
-                    </tbody>
-                </table><div>';
-        echo $html;
-        break;
-    case 'importation':
-        require_once 'classes/model/Dynaform.php';
-        $uidDynafom = $_POST['DYN_UID'];
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->clearSelectColumns();
-        $oCriteria->addSelectColumn( DynaformPeer::DYN_FILENAME );
-        $oCriteria->add( DynaformPeer::DYN_UID, $uidDynafom, Criteria::EQUAL);
-        $oDataset = DynaformPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-        $oDataset->next();
-        $aRow = $oDataset->getRow();
-
-        $dynaFile = PATH_DYNAFORM . $aRow['DYN_FILENAME'] . '.xml';
-        $importFile = PATH_DYNAFORM . $_POST['FILE'] . '.xml';
-
-        $importFp = fopen ($importFile, "r+");
-        $fileText = fread($importFp, filesize($importFile));
-        fclose ( $importFp );
-        $newFile = str_replace($_POST['FILE'], $aRow['DYN_FILENAME'], $fileText);
-
-        $dynaFileTmp = PATH_DYNAFORM . $aRow['DYN_FILENAME'] . '_tmp0.xml';
-        $dynafmFp = fopen ($dynaFileTmp,"w+");
-        fwrite ( $dynafmFp, $newFile);
-        fclose ( $dynafmFp );
-
-        /*
-        $dynafmFp = fopen ($dynaFile,"w+");
-        fwrite ( $dynafmFp, $newFile);
-        fclose ( $dynafmFp );
-        */
-        echo 'success';
-        break;
    default:
        echo 'no request param.';
 }
--- a/workflow/engine/methods/dynaforms/fields_Save.php
+++ b/workflow/engine/methods/dynaforms/fields_Save.php
@@ -115,10 +115,10 @@ if (file_exists(PATH_XMLFORM . 'dynaforms/fields/' . $type . '.xml')) {
        //      }
    }
    if ($type === 'grid') {
-        if (!isset($_POST['form']['PME_ADDROW'])) {
+        if (!isset($_POST['form']['PME_ADDROW']) || $_POST['form']['PME_ADDROW'] == '') {
            $_POST['form']['PME_ADDROW'] = '0';
        }
-        if (!isset($_POST['form']['PME_DELETEROW'])) {
+        if (!isset($_POST['form']['PME_DELETEROW']) || $_POST['form']['PME_DELETEROW'] == '') {
            $_POST['form']['PME_DELETEROW'] = '0';
        }
    }
@@ -245,7 +245,7 @@ $oDataset = $oSession->Execute('SELECT * FROM dynaForm WHERE NOT( XMLNODE_NAME =
 $iMaximun = $oDataset->count();
 while ($aRow = $oDataset->Read()) {
    $aFields[] = array('XMLNODE_NAME' => $aRow['XMLNODE_NAME'],
-        'TYPE' => $aRow['TYPE'],
+        'TYPE' => isset($aRow['TYPE']) ? $aRow['TYPE'] : '',
        'UP' => ($i > 0 ? G::LoadTranslation('ID_UP') : ''),
        'DOWN' => ($i < $iMaximun - 1 ? G::LoadTranslation('ID_DOWN') : ''),
        'row__' => ($i + 1));
@@ -261,4 +261,3 @@ if (isset($sType) && $sType === 'javascript') {
    $editor = new dynaformEditorAjax($_POST);
    $editor->set_javascript($A, $fieldName, $sCode);
 }
- 
--- a/workflow/engine/methods/setup/skin_Ajax.php
+++ b/workflow/engine/methods/setup/skin_Ajax.php
@@ -52,7 +52,7 @@ function skinList ()
        $wildcard = '@';
    }
    foreach ($skinList['skins'] as $key => $value) {
-        if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs') {
+        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'];
--- a/workflow/engine/skinEngine/base/css/sprite.css
+++ b/workflow/engine/skinEngine/base/css/sprite.css
@@ -30,7 +30,7 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/

 .button_menu_ext{padding-left:20px !important;height:18px !important;}
 .button_large_ext{padding-left:20px !important;height:32px !important;}
-.button_toolbar{padding-left:20px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 3px 1px 3px;line-height:25px}
+.button_toolbar{padding-left:18px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 2px 1px 3px;line-height:25px}
 .ss_accept{background-position:0 0 !important}
 .ss_add{background-position:0 -19px !important}
 .ss_anchor{background-position:0 -37px !important}
--- a/workflow/engine/skinEngine/uxmodern/css/sprite.css
+++ b/workflow/engine/skinEngine/uxmodern/css/sprite.css
@@ -30,7 +30,7 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/

 .button_menu_ext{padding-left:20px !important;height:18px !important;}
 .button_large_ext{padding-left:20px !important;height:32px !important;}
-.button_toolbar{padding-left:20px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 3px 1px 3px;line-height:25px}
+.button_toolbar{padding-left:18px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 2px 1px 3px;line-height:25px}
 .ss_accept{background-position:0 0 !important}
 .ss_add{background-position:0 -19px !important}
 .ss_anchor{background-position:0 -37px !important}
--- a/workflow/engine/skinEngine/uxs/css/sprite.css
+++ b/workflow/engine/skinEngine/uxs/css/sprite.css
@@ -30,7 +30,7 @@ Sprite modificado de http://ajaxbestiary.com/Labs/SilkSprite/

 .button_menu_ext{padding-left:20px !important;height:18px !important;}
 .button_large_ext{padding-left:20px !important;height:32px !important;}
-.button_toolbar{padding-left:20px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 3px 1px 3px;line-height:25px}
+.button_toolbar{padding-left:18px !important;height:18px !important;font-size:15px;cursor:pointer;margin:0 2px 1px 3px;line-height:25px}
 .ss_accept{background-position:0 0 !important}
 .ss_add{background-position:0 -19px !important}
 .ss_anchor{background-position:0 -37px !important}
--- a/workflow/engine/templates/toolbar.html
+++ b/workflow/engine/templates/toolbar.html
@@ -8,14 +8,15 @@
 		  <tr>
 {php}$this->assign('cols', 0);{/php}
 {foreach from=$form->fields item=field index=abc}
+{if ($field->type!='private')}
 <td>
 {if ($field->type==='javascript')}
 {elseif ($field->type==='phpvariable')}
-{elseif ($field->type==='private')}
 {elseif ($field->type==='')}
 {else}
 {* elseif ($field->type==='link') || ($field->type==='menu') *}{$field->field}{/if}
-</td> 
+</td>
+{/if}
 {/foreach}

 {php}
--- a/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
+++ b/workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
@@ -2,16 +2,13 @@
 <dynaForm name="fields_Toolbar" version="1.0" type="toolbar" align="left" width="100%">
  <PRO_UID type="private" />
  <DYN_UID type="private" />
-  <separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
+  <!--<separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>-->
  <saveDyna type="toolButton" class="ss_sprite button_toolbar ss_disk" onclick="dynaformEditor.save()" home="public_html" buttonType="class">
    <en>Save</en>
  </saveDyna>
  <saveasDyna type="toolButton" class="ss_sprite button_toolbar ss_disk_multiple" onclick="dynaformEditor.save_as()" buttonType="class">
    <en>Save as</en>
  </saveasDyna>
-  <importDyna type="toolButton" class="ss_sprite button_toolbar ss_application_side_expand" onclick="dynaformEditor.importForm()" buttonType="class">
-    <en>Import</en>
-  </importDyna>
  <!--.-->
  <separator2 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html"  buttonStyle=""/>
  <text type="toolButton" class="ss_sprite button_toolbar ss_textfield" onclick="fieldsAdd('text')" buttonType="class">
--- a/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
+++ b/workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
@@ -2,7 +2,7 @@
 <dynaForm name="fields_Toolbar" version="1.0" type="toolbar" align="left" width="894px">
  <PRO_UID type="private" />
  <DYN_UID type="private" />
-  <separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
+  <!--<separator1 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>-->
  <saveDyna type="toolButton" class="ss_sprite button_toolbar ss_disk" onclick="dynaformEditor.save()" buttonType="class">
    <en>Save</en>
  </saveDyna>
--- a/workflow/public_html/images/dynamicForm/hover.gif
+++ b/workflow/public_html/images/dynamicForm/hover.gif