Merge branch 'master' of bitbucket.org:colosa/processmaker

2015-05-15 10:02:27 -04:00
parent c976e25d74 f0ca394df7
commit cc35e46fb1
27 changed files with 205 additions and 27 deletions
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -2820,7 +2820,7 @@ function PMFAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendM
 function PMFAddAttachmentToArray($arrayData, $index, $value, $suffix = " Copy({i})")
 {
    if (isset($suffix) && $suffix == "") {
-        $suffix = " Copy ({i})";
+        $suffix = " Copy({i})";
    }

    $newIndex = $index;
--- a/workflow/engine/templates/admin/uxUsersList.js
+++ b/workflow/engine/templates/admin/uxUsersList.js
@@ -35,7 +35,7 @@ Ext.onReady(function(){
    ctCls:'pm_search_text_field',
    allowBlank: true,
    width: 150,
-    emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
+    emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
    listeners: {
      specialkey: function(f,e){
        if (e.getKey() == e.ENTER) {
@@ -353,7 +353,7 @@ Ext.onReady(function(){
    ctCls:'pm_search_text_field',
    allowBlank: true,
    width: 150,
-    emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
+    emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
    listeners: {
      specialkey: function(f,e){
        if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/app/main.js
+++ b/workflow/engine/templates/app/main.js
@@ -213,13 +213,18 @@ function openCaseNotesWindow(appUid1, delIndex, modalSw, appTitle, proUid, taskU
          growMin: 40,
          growMax: 80,
          maxLengthText : 500,
-          allowBlank :true,
+          allowBlank :false,
          selectOnFocus :true,
          enableKeyEvents: true,
          listeners : {
            scope : this,
            keyup : updateTextCtr,
-            keydown: updateTextCtr
+            keydown: updateTextCtr,
+            'change': function(field, newVal, oldVal){
+                var textAreaValue = newVal.replace(/^\s+/,'').replace(/\s+$/,'');
+                field.setValue(textAreaValue.trim());
+                Ext.getCmp('caseNoteText').focus(false, 200);
+            }
          }
        })
      ],
--- a/workflow/engine/templates/authSources/authSourcesList.js
+++ b/workflow/engine/templates/authSources/authSourcesList.js
@@ -107,7 +107,7 @@ Ext.onReady(function(){
        ctCls:'pm_search_text_field',
        allowBlank: true,
        width: 150,
-        emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
+        emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
        listeners: {
          specialkey: function(f,e){
            if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/cases/casesSchedulerLog.js
+++ b/workflow/engine/templates/cases/casesSchedulerLog.js
@@ -61,7 +61,7 @@ Ext.onReady(function(){
    ctCls:'pm_search_text_field',
    allowBlank: true,
    width: 150,
-    emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
+    emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
    listeners: {
      specialkey: function(f,e){
        if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/emailServer/emailServer.js
+++ b/workflow/engine/templates/emailServer/emailServer.js
@@ -932,7 +932,7 @@ emailServer.application = {
        var txtSearch = new Ext.form.TextField({
            id: "txtSearch",

-            emptyText: _("ID_ENTER_SEARCH_TERM"),
+            emptyText: _("ID_EMPTY_SEARCH"),
            width: 150,
            allowBlank: true,

--- a/workflow/engine/templates/groups/groupsList.js
+++ b/workflow/engine/templates/groups/groupsList.js
@@ -107,7 +107,7 @@ Ext.onReady(function(){
    ctCls:'pm_search_text_field',
    allowBlank: true,
    width: 150,
-    emptyText: _('ID_ENTER_SEARCH_TERM'),
+    emptyText: _('ID_EMPTY_SEARCH'),
    listeners: {
      specialkey: function(f,e){
        if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/pmTables/data.js
+++ b/workflow/engine/templates/pmTables/data.js
@@ -90,7 +90,7 @@ Ext.onReady(function(){
    ctCls:'pm_search_text_field',
    allowBlank: true,
    width: 150,
-    emptyText: _('ID_ENTER_SEARCH_TERM'),
+    emptyText: _('ID_EMPTY_SEARCH'),
    listeners: {
      specialkey: function(f,e){
        if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/pmTables/edit.js
+++ b/workflow/engine/templates/pmTables/edit.js
@@ -568,7 +568,7 @@ Ext.onReady(function(){
        ctCls:'pm_search_text_field',
        allowBlank: true,
        width: 110,
-        emptyText: _('ID_ENTER_SEARCH_TERM'),
+        emptyText: _('ID_EMPTY_SEARCH'),
        listeners: {
          specialkey: function(f,e){
            if (e.getKey() == e.ENTER) {
@@ -583,7 +583,7 @@ Ext.onReady(function(){
        ctCls:'pm_search_text_field',
        allowBlank: true,
        width: 110,
-        emptyText: _('ID_ENTER_SEARCH_TERM'),
+        emptyText: _('ID_EMPTY_SEARCH'),
        listeners: {
          specialkey: function(f,e){
            if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/pmTables/editReport.js
+++ b/workflow/engine/templates/pmTables/editReport.js
@@ -172,7 +172,7 @@ Ext.onReady(function(){
          ctCls:'pm_search_text_field',
          allowBlank: true,
          width: 220,
-          emptyText: _('ID_ENTER_SEARCH_TERM'),
+          emptyText: _('ID_EMPTY_SEARCH'),
          listeners: {
            specialkey: function(f,e){
              if (e.getKey() == e.ENTER) {
@@ -696,7 +696,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
        ctCls:'pm_search_text_field',
        allowBlank: true,
        width: 110,
-        emptyText: _('ID_ENTER_SEARCH_TERM'),
+        emptyText: _('ID_EMPTY_SEARCH'),
        listeners: {
          specialkey: function(f,e){
            if (e.getKey() == e.ENTER) {
@@ -711,7 +711,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
        ctCls:'pm_search_text_field',
        allowBlank: true,
        width: 110,
-        emptyText: _('ID_ENTER_SEARCH_TERM'),
+        emptyText: _('ID_EMPTY_SEARCH'),
        listeners: {
          specialkey: function(f,e){
            if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/pmTables/list.js
+++ b/workflow/engine/templates/pmTables/list.js
@@ -164,7 +164,7 @@ Ext.onReady(function(){
      ctCls:'pm_search_text_field',
      allowBlank: true,
      width: 150,
-      emptyText: _('ID_ENTER_SEARCH_TERM'),
+      emptyText: _('ID_EMPTY_SEARCH'),
      listeners: {
        specialkey: function(f,e){
          if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/processCategory/processCategoryList.js
+++ b/workflow/engine/templates/processCategory/processCategoryList.js
@@ -100,7 +100,7 @@ Ext.onReady(function(){
    ctCls:'pm_search_text_field',
    allowBlank: true,
    width: 150,
-    emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
+    emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
    listeners: {
      specialkey: function(f,e){
        if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/processes/main.js
+++ b/workflow/engine/templates/processes/main.js
@@ -360,7 +360,7 @@ Ext.onReady(function(){
        ctCls:'pm_search_text_field',
        allowBlank: true,
        width: 150,
-        emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
+        emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
        listeners: {
          specialkey: function(f,e){
            if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/reportTables/edit.js
+++ b/workflow/engine/templates/reportTables/edit.js
@@ -367,7 +367,7 @@ Ext.onReady(function(){
        ctCls:'pm_search_text_field',
        allowBlank: true,
        width: 110,
-        emptyText: _('ID_ENTER_SEARCH_TERM'),
+        emptyText: _('ID_EMPTY_SEARCH'),
        listeners: {
          specialkey: function(f,e){
            if (e.getKey() == e.ENTER) {
@@ -382,7 +382,7 @@ Ext.onReady(function(){
        ctCls:'pm_search_text_field',
        allowBlank: true,
        width: 110,
-        emptyText: _('ID_ENTER_SEARCH_TERM'),
+        emptyText: _('ID_EMPTY_SEARCH'),
        listeners: {
          specialkey: function(f,e){
            if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/reportTables/main.js
+++ b/workflow/engine/templates/reportTables/main.js
@@ -129,7 +129,7 @@ Ext.onReady(function(){
      ctCls:'pm_search_text_field',
      allowBlank: true,
      width: 150,
-      emptyText: _('ID_ENTER_SEARCH_TERM'),
+      emptyText: _('ID_EMPTY_SEARCH'),
      listeners: {
        specialkey: function(f,e){
          if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/roles/rolesList.js
+++ b/workflow/engine/templates/roles/rolesList.js
@@ -114,7 +114,7 @@ Ext.onReady(function(){
    ctCls:'pm_search_text_field',
    allowBlank: true,
    width: 150,
-    emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
+    emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
    listeners: {
      specialkey: function(f,e){
        if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/setup/calendarList.js
+++ b/workflow/engine/templates/setup/calendarList.js
@@ -108,7 +108,7 @@ Ext.onReady(function(){
        ctCls:'pm_search_text_field',
        allowBlank: true,
        width: 150,
-        emptyText: _('ID_ENTER_SEARCH_TERM'),
+        emptyText: _('ID_EMPTY_SEARCH'),
        listeners: {
          specialkey: function(f,e){
            if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/setup/skinList.js
+++ b/workflow/engine/templates/setup/skinList.js
@@ -104,7 +104,7 @@ Ext.onReady(function(){
    ctCls:'pm_search_text_field',
    allowBlank: true,
    width: 150,
-    emptyText: _('ID_ENTER_SEARCH_TERM'),
+    emptyText: _('ID_EMPTY_SEARCH'),
    listeners: {
      specialkey: function(f,e){
        if (e.getKey() == e.ENTER) {
--- a/workflow/engine/templates/users/usersList.js
+++ b/workflow/engine/templates/users/usersList.js
@@ -140,7 +140,7 @@ Ext.onReady(function(){
    ctCls:'pm_search_text_field',
    allowBlank: true,
    width: 100,
-    emptyText: _('ID_ENTER_SEARCH_TERM'),//'enter search term',
+    emptyText: _('ID_EMPTY_SEARCH'),//'enter search term',
    listeners: {
      specialkey: function(f,e){
        if (e.getKey() == e.ENTER) {
--- a/workflow/engine/xmlform/cases/cases_Scheduler_Options.xml
+++ b/workflow/engine/xmlform/cases/cases_Scheduler_Options.xml
@@ -12,6 +12,29 @@
  <PAGED_TABLE_ID type="private"/>
  <PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
  <JS type="javascript"><![CDATA[
+
+add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
+function add_placeholder (id, placeholder) {
+	var el = document.getElementById(id);
+	el.placeholder = placeholder;
+ 
+    el.onfocus = function () {
+		if(this.value == this.placeholder) {
+			this.value = '';
+			el.style.cssText  = '';
+		}
+    };
+ 
+    el.onblur = function () {
+		if(this.value.length == 0) {
+			this.value = this.placeholder;
+			el.style.cssText = 'color:#A9A9A9;';
+		}
+    };
+ 
+	el.onblur();
+}
+
 function $_GET(q,s) {
    s = (s) ? s : self.location.search;
    var re = new RegExp('&'+q+'=([^&]*)','i');
--- a/workflow/engine/xmlform/dbConnections/dbConnections_Options.xml
+++ b/workflow/engine/xmlform/dbConnections/dbConnections_Options.xml
@@ -8,6 +8,27 @@
  <PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
  <SEARCH_FILTER_FORM type="private"/>
  <js type="javascript" replaceTags="1"><![CDATA[
-var currentPagedTable = @#PAGED_TABLE_ID;
+  add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
+  function add_placeholder (id, placeholder) {
+   	var el = document.getElementById(id);
+   	el.placeholder = placeholder;
+     
+    el.onfocus = function () {
+    	if(this.value == this.placeholder) {
+    	  this.value = '';
+    	  el.style.cssText  = '';
+    	}
+     };
+     
+    el.onblur = function () {
+  	  if(this.value.length == 0) {
+    	  this.value = this.placeholder;
+    	  el.style.cssText = 'color:#A9A9A9;';
+        }
+    };
+     
+  	el.onblur();
+  }  
+  var currentPagedTable = @#PAGED_TABLE_ID;
 ]]></js>
 </dynaForm>
--- a/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml
+++ b/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml
@@ -13,6 +13,27 @@
  <dynaformsFlatEditor type="private" defaultValue="../dynaforms/dynaforms_FlatEditor"/>
  <dynaformsDelete type="private" defaultValue="../dynaforms/dynaforms_Delete"/>
  <js type="javascript" replaceTags="1"><![CDATA[
+  add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
+  function add_placeholder (id, placeholder) {
+	var el = document.getElementById(id);
+	el.placeholder = placeholder;
+ 
+    el.onfocus = function () {
+		if(this.value == this.placeholder) {
+			this.value = '';
+			el.style.cssText  = '';
+		}
+    };
+ 
+    el.onblur = function () {
+		if(this.value.length == 0) {
+			this.value = this.placeholder;
+			el.style.cssText = 'color:#A9A9A9;';
+		}
+    };
+ 
+	el.onblur();
+  }
  function dynaformAdd(){
    popupWindow("@G::LoadTranslation(ID_NEW_DYNAFORM)", "@G::encryptlink(@#dynaformsChoseType)?PRO_UID=@%PRO_UID" , 500, 225);
 	//popupWindow('@G::LoadTranslation(ID_NEW_DYNAFORM)', '@G::encryptlink(@#dynaformsNewPlugin)?PRO_UID=@%PRO_UID' , 500, 350);
--- a/workflow/engine/xmlform/inputdocs/inputdocs_Options.xml
+++ b/workflow/engine/xmlform/inputdocs/inputdocs_Options.xml
@@ -9,6 +9,27 @@
  <inputdocsEdit type="private" defaultValue="../inputdocs/inputdocs_Edit"/>
  <inputdocsDelete type="private" defaultValue="../inputdocs/inputdocs_Delete"/>
  <js type="javascript" replaceTags="1"><![CDATA[
+add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
+  function add_placeholder (id, placeholder) {
+    	var el = document.getElementById(id);
+    	el.placeholder = placeholder;
+     
+        el.onfocus = function () {
+    		if(this.value == this.placeholder) {
+    			this.value = '';
+    			el.style.cssText  = '';
+    		}
+        };
+     
+        el.onblur = function () {
+    		if(this.value.length == 0) {
+    			this.value = this.placeholder;
+    			el.style.cssText = 'color:#A9A9A9;';
+    		}
+        };
+     
+    	el.onblur();
+  }    
 var currentPagedTable = @#PAGED_TABLE_ID;
  function inputdocsAdd(){//alert('@G::encryptlink(@#inputdocsEdit)?PRO_UID=@%PRO_UID');
 		popupWindow('@G::LoadTranslation(ID_NEW_INPUTDOCS)', '@G::encryptlink(@#inputdocsEdit)?PRO_UID=@%PRO_UID' , 500, 410);
--- a/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml
@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dynaForm type="xmlmenu"><MNU_ADD type="link" value="" link="#" onclick="outputdocsAdd(); return false;" colAlign="left" colWidth="100"><en><![CDATA[New]]></en></MNU_ADD><PAGED_TABLE_ID type="private"/><PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/><PRO_UID type="private"/><![CDATA[>
 ]]><outputdocs_New type="private" defaultValue="../outputdocs/outputdocs_New"/><outputdocs_Edit type="private" defaultValue="../outputdocs/outputdocs_Edit"/><outputdocs_Properties type="private" defaultValue="../outputdocs/outputdocs_Properties"/><outputdocs_Delete type="private" defaultValue="../outputdocs/outputdocs_Delete"/><js type="javascript" replaceTags="1"><![CDATA[
+add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
+function add_placeholder (id, placeholder) {
+	var el = document.getElementById(id);
+	el.placeholder = placeholder;
+ 
+    el.onfocus = function () {
+		if(this.value == this.placeholder) {
+			this.value = '';
+			el.style.cssText  = '';
+		}
+    };
+ 
+    el.onblur = function () {
+		if(this.value.length == 0) {
+			this.value = this.placeholder;
+			el.style.cssText = 'color:#A9A9A9;';
+		}
+    };
+ 
+	el.onblur();
+}
 var currentPagedTable = @#PAGED_TABLE_ID;
 var outputdocsEditor;

--- a/workflow/engine/xmlform/processes/processes_availableProcessesUserOptions.xml
+++ b/workflow/engine/xmlform/processes/processes_availableProcessesUserOptions.xml
@@ -4,5 +4,28 @@
 >
 <PAGED_TABLE_ID type="private"/>
 <PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
+ <JS type="javascript"><![CDATA[
+  add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
+  function add_placeholder (id, placeholder){
+   	var el = document.getElementById(id);
+   	el.placeholder = placeholder;
+     
+    el.onfocus = function () {
+    	if(this.value == this.placeholder) {
+    	  this.value = '';
+    	  el.style.cssText  = '';
+    	}
+     };
+     
+    el.onblur = function () {
+  	  if(this.value.length == 0) {
+    	  this.value = this.placeholder;
+    	  el.style.cssText = 'color:#A9A9A9;';
+        }
+    };
+     
+  	el.onblur();
+  }
+]]></JS>

 </dynaForm> 
--- a/workflow/engine/xmlform/triggers/triggers_Options.xml
+++ b/workflow/engine/xmlform/triggers/triggers_Options.xml
@@ -19,6 +19,27 @@
  <PAGED_TABLE_ID type="private"/>
  <PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
  <JS type="javascript" replaceTags="1"><![CDATA[
+  add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
+  function add_placeholder (id, placeholder){
+   	var el = document.getElementById(id);
+   	el.placeholder = placeholder;
+     
+    el.onfocus = function () {
+    	if(this.value == this.placeholder) {
+    	  this.value = '';
+    	  el.style.cssText  = '';
+    	}
+     };
+     
+    el.onblur = function () {
+  	  if(this.value.length == 0) {
+    	  this.value = this.placeholder;
+    	  el.style.cssText = 'color:#A9A9A9;';
+        }
+    };
+     
+  	el.onblur();
+  }
  var windowWidth = 600;
  var windowHeight = 460;

--- a/workflow/engine/xmlform/users/users_Searchx.xml
+++ b/workflow/engine/xmlform/users/users_Searchx.xml
@@ -5,5 +5,27 @@

 <PAGED_TABLE_ID type="private"/>
 <PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
-
+ <JS type="javascript"><![CDATA[
+  add_placeholder("form[PAGED_TABLE_FAST_SEARCH]","@G::LoadTranslation(ID_EMPTY_SEARCH)");
+  function add_placeholder (id, placeholder){
+   	var el = document.getElementById(id);
+   	el.placeholder = placeholder;
+     
+    el.onfocus = function () {
+    	if(this.value == this.placeholder) {
+    	  this.value = '';
+    	  el.style.cssText  = '';
+    	}
+     };
+     
+    el.onblur = function () {
+  	  if(this.value.length == 0) {
+    	  this.value = this.placeholder;
+    	  el.style.cssText = 'color:#A9A9A9;';
+        }
+    };
+     
+  	el.onblur();
+  }
+]]></JS>
 </dynaForm>