From 33df0c18716040d944086c4054bf2dc2242d47f6 Mon Sep 17 00:00:00 2001
From: akshath <akshath.t@vtiger.com>
Date: Thu, 29 Oct 2020 13:14:22 +0530
Subject: [PATCH] Fix for #1454 - In Edit View currency type fields do not line
up.
---
layouts/v7/modules/Vtiger/resources/Field.js | 8 ++++----
layouts/v7/modules/Vtiger/uitypes/Currency.tpl | 4 ++--
layouts/v7/skins/vtiger/style.less | 11 ++++++++++-
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/layouts/v7/modules/Vtiger/resources/Field.js b/layouts/v7/modules/Vtiger/resources/Field.js
index 5bbed20b1..43587a9a0 100644
--- a/layouts/v7/modules/Vtiger/resources/Field.js
+++ b/layouts/v7/modules/Vtiger/resources/Field.js
@@ -475,7 +475,7 @@ Vtiger_Field_Js('Vtiger_Date_Field_Js',{},{
*/
getUi : function() {
//wrappig with another div for consistency
- var html = '<div class="referencefield-wrapper"><div class="input-group date">'+
+ var html = '<div class=""><div class="input-group date">'+
'<input class="inputElement dateField form-control" type="text" data-rule-date="true" data-format="'+ this.getDateFormat() +'" name="'+ this.getName() +'" value="'+ this.getValue() + '" />'+
'<span class="input-group-addon"><i class="fa fa-calendar"></i></span>'+
'</div></div>';
@@ -495,9 +495,9 @@ Vtiger_Field_Js('Vtiger_Currency_Field_Js',{},{
getUi : function() {
//wrappig with another div for consistency
- var html = '<div class="referencefield-wrapper"><div class="input-group">'+
+ var html = '<div class=""><div class="input-group">'+
'<span class="input-group-addon" id="basic-addon1">'+this.getCurrencySymbol()+'</span>'+
- '<input class="inputElement" type="text" name="'+ this.getName() +'" data-rule-currency="true" value="'+ this.getValue() + '" />'+
+ '<input class="inputElement width100per" type="text" name="'+ this.getName() +'" data-rule-currency="true" value="'+ this.getValue() + '" />'+
'</div></div>';
var element = jQuery(html);
return this.addValidationToElement(element);
@@ -560,7 +560,7 @@ Vtiger_Field_Js('Vtiger_Time_Field_Js',{},{
* @return - input text field
*/
getUi : function() {
- var html = '<div class="referencefield-wrapper">'+'<div class="input-group time">'+
+ var html = '<div class="">'+'<div class="input-group time">'+
'<input class="timepicker-default form-control inputElement" type="text" data-format="'+ this.getTimeFormat() +'" name="'+ this.getName() +'" value="'+ this.getValue() + '" />'+
'<span class="input-group-addon"><i class="fa fa-clock-o"></i></span>'+
'</div>'+'</div>';
diff --git a/layouts/v7/modules/Vtiger/uitypes/Currency.tpl b/layouts/v7/modules/Vtiger/uitypes/Currency.tpl
index 2b7ca02d7..fb79b4245 100644
--- a/layouts/v7/modules/Vtiger/uitypes/Currency.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/Currency.tpl
@@ -16,8 +16,8 @@
{assign var="FIELD_NAME" value=$FIELD_MODEL->getFieldName()}
{/if}
{if $FIELD_MODEL->get('uitype') eq '71'}
-<div class="input-group">
- <span class="input-group-addon">{$USER_MODEL->get('currency_symbol')}</span>
+<div class="input-group inputElement">
+ <span class="input-group-addon input-group-addon-right">{$USER_MODEL->get('currency_symbol')}</span>
<input id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" type="text" class="inputElement currencyField" name="{$FIELD_NAME}"
value="{$FIELD_MODEL->getEditViewDisplayValue($FIELD_MODEL->get('fieldvalue'))}" {if !empty($SPECIAL_VALIDATOR)}data-validator='{Zend_Json::encode($SPECIAL_VALIDATOR)}'{/if}
{if $FIELD_INFO["mandatory"] eq true} data-rule-required = "true" {/if} data-rule-currency='true'
diff --git a/layouts/v7/skins/vtiger/style.less b/layouts/v7/skins/vtiger/style.less
index bb8ce4247..6a6beb2e4 100644
--- a/layouts/v7/skins/vtiger/style.less
+++ b/layouts/v7/skins/vtiger/style.less
@@ -2679,6 +2679,12 @@ strong, b, th{
border-left:1px solid #ddd;
}
+.input-group.inputElement .input-group-addon-right{
+ border:none;
+ border-left:0px;
+ border-right:1px solid #ddd;
+}
+
.fieldBlockContainer textarea.inputElement{
height : auto;
}
@@ -6292,6 +6298,9 @@ hr{
.width75per{
width: 75%;
}
+.width100per{
+ width: 100% !important;
+}
#_mbox_pwd{
padding: 3px 8px;
}
@@ -6896,7 +6905,7 @@ div.tooltip-inner{
width:80% !important;
}
.input-group-addon{
- line-height: 1.5;
+ line-height: inherit;
border-width: thin;
}
.input-group{
--
GitLab