diff --git a/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js b/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
index 76ed5b4fb9fe661414276d135be50f29267e1318..837650c3a679f8e8e46e48f814f9536916fe1ae4 100644
--- a/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
+++ b/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
@@ -290,7 +290,7 @@ Vtiger_Date_Field_Js('Workflows_Date_Field_Js',{},{
var dateSpecificConditions = this.get('dateSpecificConditions');
if(comparatorSelectedOptionVal.length > 0) {
if(comparatorSelectedOptionVal == 'between' || comparatorSelectedOptionVal == 'custom'){
- var html = '<div class="date"><input class="dateField" data-calendar-type="range" name="'+ this.getName() +'" data-date-format="'+ this.getDateFormat() +'" type="text" ReadOnly="true" value="'+ this.getValue() + '"></div>';
+ var html = '<div class="date"><input class="dateField inputElement" style="width:auto;" data-calendar-type="range" name="'+ this.getName() +'" data-date-format="'+ this.getDateFormat() +'" type="text" ReadOnly="true" value="'+ this.getValue() + '"></div>';
var element = jQuery(html);
return this.addValidationToElement(element);
} else if(this._specialDateComparator(comparatorSelectedOptionVal)) {
@@ -341,7 +341,7 @@ Vtiger_Date_Field_Js('Workflows_Datetime_Field_Js',{},{
getUi : function() {
var comparatorSelectedOptionVal = this.get('comparatorElementVal');
if(this._specialDateTimeComparator(comparatorSelectedOptionVal)) {
- var html = '<input name="'+ this.getName() +'" type="text" value="'+this.getValue()+'" data-validator="[{name:PositiveNumber}]"><input type="hidden" name="valuetype" value="'+this.get('workflow_valuetype')+'" />';
+ var html = '<input name="'+ this.getName() +'" class="inputElement" type="text" value="'+this.getValue()+'" data-validator="[{name:PositiveNumber}]"><input type="hidden" name="valuetype" value="'+this.get('workflow_valuetype')+'" />';
var element = jQuery(html);
} else if(comparatorSelectedOptionVal == 'is today' || comparatorSelectedOptionVal == 'is tomorrow' || comparatorSelectedOptionVal == 'is yesterday') {
// show nothing
@@ -435,7 +435,7 @@ Vtiger_Field_Js('Vtiger_Boolean_Field_Js',{},{
Vtiger_Owner_Field_Js('Workflows_Owner_Field_Js',{},{
getUi : function() {
- var html = '<select class="col-lg-12 select2" name="'+ this.getName() +'">';
+ var html = '<select class="inputElement select2" name="'+ this.getName() +'">';
html += '<option value=""> </option>';
var pickListValues = this.getPickListValues();
var selectedOption = this.getValue();
@@ -493,7 +493,7 @@ Vtiger_Picklist_Field_Js('Workflows_Picklist_Field_Js',{},{
var pickListValue = pickListValues[key];
pickListValuesArrayFlip[pickListValue] = key;
}
- var html = '<input type="hidden" class="col-lg-12 select2" name="'+ this.getName() +'" id="'+ this.getName() +'">';
+ var html = '<input type="hidden" class="inputElement select2" name="'+ this.getName() +'" id="'+ this.getName() +'">';
var selectContainer = jQuery(html).val(selectedOption);
selectContainer.data('tags', tagsArray).data('picklistvalues', pickListValuesArrayFlip).data('maximumSelectionSize', 1);
selectContainer.data('placeholder', app.vtranslate('JS_PLEASE_SELECT_ATLEAST_ONE_OPTION')).data('closeOnSelect', true);
@@ -504,7 +504,7 @@ Vtiger_Picklist_Field_Js('Workflows_Picklist_Field_Js',{},{
Vtiger_Multipicklist_Field_Js('Workflows_Multipicklist_Field_Js', {}, {
- getUi: function () {
+ getUi : function () {
var selectedOptions = new Array();
var selectedRawOption = app.htmlDecode(this.getValue());
if (selectedRawOption) {
diff --git a/layouts/v7/modules/Vtiger/resources/AdvanceFilter.js b/layouts/v7/modules/Vtiger/resources/AdvanceFilter.js
index dc9dc1198d1ebca81fc9f798dfce5578a9e6b5ce..b49f4b5b8fa9ca19e88108f011c86ef277374163 100644
--- a/layouts/v7/modules/Vtiger/resources/AdvanceFilter.js
+++ b/layouts/v7/modules/Vtiger/resources/AdvanceFilter.js
@@ -678,7 +678,7 @@ Vtiger_Picklist_Field_Js('AdvanceFilter_Picklist_Field_Js',{},{
getUi : function(){
var comparatorSelectedOptionVal = this.get('comparatorElementVal');
if(comparatorSelectedOptionVal == 'e' || comparatorSelectedOptionVal =='n'){
- var html = '<select class="select2 col-lg-12" multiple name="'+ this.getName() +'[]">';
+ var html = '<select class="select2 inputElement" multiple name="'+ this.getName() +'[]">';
var pickListValues = this.getPickListValues();
var selectedOption = app.htmlDecode(this.getValue());
var selectedOptionsArray = selectedOption.split(',')
@@ -739,7 +739,7 @@ Vtiger_Multipicklist_Field_Js('AdvanceFilter_Multipicklist_Field_Js',{},{
var pickListValue = pickListValues[key];
pickListValuesArrayFlip[pickListValue] = key;
}
- var html = '<input type="hidden" class="row-fluid col-lg-12 select2" name="'+ this.getName() +'[]">';
+ var html = '<input type="hidden" class="row-fluid inputElement select2" name="'+ this.getName() +'[]">';
var selectContainer = jQuery(html).val(selectedOption);
selectContainer.data('tags', tagsArray).data('picklistvalues', pickListValuesArrayFlip);
this.addValidationToElement(selectContainer);
@@ -755,7 +755,7 @@ Vtiger_Owner_Field_Js('AdvanceFilter_Owner_Field_Js',{},{
getUi : function(){
var comparatorSelectedOptionVal = this.get('comparatorElementVal');
if(comparatorSelectedOptionVal == 'e' || comparatorSelectedOptionVal =='n'){
- var html = '<select class="select2 col-lg-12 row-fluid" multiple name="'+ this.getName() +'[]">';
+ var html = '<select class="select2 inputElement row-fluid" multiple name="'+ this.getName() +'[]">';
var pickListValues = this.getPickListValues();
var selectedOption = app.htmlDecode(this.getValue());
var selectedOptionsArray = selectedOption.split(',')
@@ -826,7 +826,7 @@ Vtiger_Date_Field_Js('AdvanceFilter_Date_Field_Js',{},{
var comparatorSelectedOptionVal = this.get('comparatorElementVal');
var dateSpecificConditions = this.get('dateSpecificConditions');
if(comparatorSelectedOptionVal == 'bw' || comparatorSelectedOptionVal == 'custom'){
- var html = '<div class="date"><input class="dateField" data-calendar-type="range" name="'+ this.getName() +'" data-date-format="'+ this.getDateFormat() +'" type="text" value="'+ this.getValue() + '"></div>';
+ var html = '<div class="date"><input class="inputElement dateField" style="width:auto;" data-calendar-type="range" name="'+ this.getName() +'" data-date-format="'+ this.getDateFormat() +'" type="text" value="'+ this.getValue() + '"></div>';
var element = jQuery(html);
var dateFieldUi = element.find('.dateField');
if(dateFieldUi.val().indexOf(',') !== -1) {
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index f5af7db95f4f7eae1a5fb31d59c7015d449a2fd7..b8a8221c71fdbd0ebf2a2101600e31acaefd8686 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/resources/Field.js b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/resources/Field.js
index 2a84107b365bcb99c3a65b0c007bf1947875c112..f61049420e73d66876bb395539e8c26ef5dde78d 100644
--- a/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/resources/Field.js
+++ b/pkg/vtiger/modules/Webforms/layouts/v7/modules/Settings/Webforms/resources/Field.js
@@ -22,7 +22,7 @@ Vtiger_Field_Js('Webforms_Multipicklist_Field_Js',{},{
* @return - select element and chosen element
*/
getUi : function() {
- var html = '<select class="select2" multiple name="'+ this.getName() +'[]" style="width:60%">';
+ var html = '<select class="select2 inputElement" multiple name="'+ this.getName() +'[]" style="width:60%">';
var pickListValues = this.getPickListValues();
var selectedOption = this.getValue();
if(selectedOption !== null) {
@@ -58,7 +58,7 @@ Vtiger_Field_Js('Webforms_Picklist_Field_Js',{},{
* @return - select element and chosen element
*/
getUi : function() {
- var html = '<select class="select2" name="'+ this.getName() +'" style="width:220px">';
+ var html = '<select class="select2 inputElement" name="'+ this.getName() +'" style="width:220px">';
var pickListValues = this.getPickListValues();
var selectedOption = this.getValue();
for(var option in pickListValues) {
@@ -91,7 +91,7 @@ Vtiger_Field_Js('Webforms_Date_Field_Js',{},{
getUi : function() {
var html = '<div class="input-append">'+
'<div class="date">'+
- '<input class="dateField" type="text" name="'+ this.getName() +'" data-date-format="'+ this.getDateFormat() +'" value="'+ this.getValue() + '" />'+
+ '<input class="dateField inputElement" style="width:auto;" type="text" name="'+ this.getName() +'" data-date-format="'+ this.getDateFormat() +'" value="'+ this.getValue() + '" />'+
'<span class="add-on"><i class="icon-calendar"></i></span>'+
'</div>'+
'</div>';
@@ -112,7 +112,7 @@ Vtiger_Field_Js('Webforms_Currency_Field_Js',{},{
getUi : function() {
var html = '<div class="input-prepend">'+
'<span class="add-on">'+ this.getCurrencySymbol()+'</span>'+
- '<input type="text" name="'+ this.getName() +'" value="'+ this.getValue() + '" class="input-medium" style="width:210px" data-decimal-separator="'+this.getData().decimalSeparator+'" data-group-separator="'+this.getData().groupSeparator+'"/>'+
+ '<input type="text" name="'+ this.getName() +'" value="'+ this.getValue() + '" class="input-medium inputElement" style="width:210px" data-decimal-separator="'+this.getData().decimalSeparator+'" data-group-separator="'+this.getData().groupSeparator+'"/>'+
'</div>';
var element = jQuery(html);
return this.addValidationToElement(element);
@@ -127,7 +127,7 @@ Vtiger_Field_Js('Vtiger_Percentage_Field_Js',{},{
*/
getUi : function() {
var html = '<div class="input-append row-fluid">'+
- '<input type="number" class="input-medium" min="0" max="100" name="'+this.getName() +'" value="'+ this.getValue() + '" step="any"/>'+
+ '<input type="number" class="input-medium inputElement" min="0" max="100" name="'+this.getName() +'" value="'+ this.getValue() + '" step="any"/>'+
'<span class="add-on">%</span>'+
'</div>';
var element = jQuery(html);
@@ -143,7 +143,7 @@ Vtiger_Field_Js('Webforms_Time_Field_Js',{},{
*/
getUi : function() {
var html = '<div class="input-append time">'+
- '<input class="timepicker-default" type="text" name="'+ this.getName() +'" value="'+ this.getValue() + '" />'+
+ '<input class="timepicker-default inputElement" type="text" name="'+ this.getName() +'" value="'+ this.getValue() + '" />'+
'<span class="add-on"><i class="icon-time"></i></span>'+
'</div>';
var element = jQuery(html);
@@ -212,7 +212,7 @@ Vtiger_Field_Js('Webforms_Image_Field_Js',{},{
* @return - input text field
*/
getUi : function() {
- var html = '<input class="input-large" type="text" name="'+ this.getName() +'" readonly />';
+ var html = '<input class="input-large inputElement" type="text" name="'+ this.getName() +'" readonly />';
var element = jQuery(html);
return this.addValidationToElement(element);
}