From 6cf0d6f549cf0d28a3d28443ab0a9a48de21f52f Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Wed, 16 Jun 2021 04:52:40 +0530
Subject: [PATCH] Changes noticed missing during commit review for currency,
reference and description field UI
---
layouts/v7/modules/Vtiger/resources/Field.js | 4 ++--
layouts/v7/modules/Vtiger/uitypes/Currency.tpl | 4 ++--
layouts/v7/skins/vtiger/style.less | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/layouts/v7/modules/Vtiger/resources/Field.js b/layouts/v7/modules/Vtiger/resources/Field.js
index 43587a9a0..3c5bda8be 100644
--- a/layouts/v7/modules/Vtiger/resources/Field.js
+++ b/layouts/v7/modules/Vtiger/resources/Field.js
@@ -187,7 +187,7 @@ Vtiger_Field_Js('Vtiger_Reference_Field_Js',{},{
getUi : function(){
var referenceModules = this.getReferenceModules();
var value = this.getValue();
- var html = '<div class="referencefield-wrapper';
+ var html = '<div class="';
if(value){
html += ' selected';
} else {
@@ -497,7 +497,7 @@ Vtiger_Field_Js('Vtiger_Currency_Field_Js',{},{
//wrappig with another div for consistency
var html = '<div class=""><div class="input-group">'+
'<span class="input-group-addon" id="basic-addon1">'+this.getCurrencySymbol()+'</span>'+
- '<input class="inputElement width100per" type="text" name="'+ this.getName() +'" data-rule-currency="true" value="'+ this.getValue() + '" />'+
+ '<input class="inputElement" type="text" name="'+ this.getName() +'" data-rule-currency="true" value="'+ this.getValue() + '" />'+
'</div></div>';
var element = jQuery(html);
return this.addValidationToElement(element);
diff --git a/layouts/v7/modules/Vtiger/uitypes/Currency.tpl b/layouts/v7/modules/Vtiger/uitypes/Currency.tpl
index fb79b4245..c09bc6800 100644
--- a/layouts/v7/modules/Vtiger/uitypes/Currency.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/Currency.tpl
@@ -27,8 +27,8 @@
/>
</div>
{else if ($FIELD_MODEL->get('uitype') eq '72') && ($FIELD_NAME eq 'unit_price')}
- <div class="input-group" style="float:none;">
- <span class="input-group-addon" id="baseCurrencySymbol">{$BASE_CURRENCY_SYMBOL}</span>
+ <div class="input-group inputElement" style="float:none;">
+ <span class="input-group-addon input-group-addon-right" id="baseCurrencySymbol">{$BASE_CURRENCY_SYMBOL}</span>
<input id="{$MODULE}-editview-fieldname-{$FIELD_NAME}" type="text" class="inputElement unitPrice currencyField" name="{$FIELD_NAME}"
value="{$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'))}" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if}
data-decimal-separator='{$USER_MODEL->get('currency_decimal_separator')}' data-group-separator='{$USER_MODEL->get('currency_grouping_separator')}' data-number-of-decimal-places='{$USER_MODEL->get('no_of_currency_decimals')}'
diff --git a/layouts/v7/skins/vtiger/style.less b/layouts/v7/skins/vtiger/style.less
index 4bb5b466e..7053467c3 100644
--- a/layouts/v7/skins/vtiger/style.less
+++ b/layouts/v7/skins/vtiger/style.less
@@ -6923,7 +6923,6 @@ div.tooltip-inner{
}
.summaryViewEntries .inputElement.form-control,
.detailview-table .inputElement.form-control{
- width:80%;
max-width: 300px;
}
.detailview-table input[type="checkbox"]{ //TN-#34172
--
GitLab