Skip to content
Snippets Groups Projects
Commit ff50dc3f authored by Uma's avatar Uma
Browse files

Merge branch 'commits_review' into '7.4.0'

Changes noticed missing during commit review for currency, reference and description field UI

See merge request !809
parents 8694883c 6cf0d6f5
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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')}'
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment