diff --git a/layouts/v7/modules/CustomView/EditView.tpl b/layouts/v7/modules/CustomView/EditView.tpl
index 101171e9f6b0cfbe693f769204369d20356ee695..8f96cd6e4a47895925a27d8c24c95a3a95e0d356 100644
--- a/layouts/v7/modules/CustomView/EditView.tpl
+++ b/layouts/v7/modules/CustomView/EditView.tpl
@@ -9,9 +9,10 @@
{strip}
{assign var=SELECTED_FIELDS value=$CUSTOMVIEW_MODEL->getSelectedFields()}
- <div id="filterContainer">
- <form id="CustomView">
- <div class="modal-content">
+ {assign var=MODULE_FIELDS value=$MODULE_MODEL->getFields()}
+ <div id="filterContainer" style="height:100%">
+ <form id="CustomView" style="height:100%">
+ <div class="modal-content" style="height:100%">
<div class="overlayHeader">
{if $RECORD_ID}
{assign var="TITLE" value={vtranslate('LBL_EDIT_CUSTOM',$MODULE)}}
@@ -20,8 +21,8 @@
{/if}
{include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$TITLE}
</div>
- <div class="modal-body">
- <div class="customview-content row">
+ <div class="modal-body" style="height:100%">
+ <div class="customview-content row" style="height:90%">
<input type=hidden name="record" id="record" value="{$RECORD_ID}" />
<input type="hidden" name="module" value="{$MODULE}" />
<input type="hidden" name="action" value="Save" />
@@ -36,10 +37,10 @@
<div class="form-group">
<label>{vtranslate('LBL_VIEW_NAME',$MODULE)} <span class="redColor">*</span> </label>
<div class="row">
- <div class="col-lg-5">
- <input class="form-control" type="text" id="viewname" name="viewname" value="{$CUSTOMVIEW_MODEL->get('viewname')}" data-rule-required="true" data-record-id="{$RECORD_ID}" data-rule-maxsize="100" data-rule-check-filter-duplicate='{Vtiger_Util_Helper::toSafeHTML(Zend_JSON::encode($CUSTOM_VIEWS_LIST))}'>
+ <div class="col-lg-5 col-md-5 col-sm-5">
+ <input class="form-control" type="text" data-record-id="{$RECORD_ID}" id="viewname" name="viewname" value="{$CUSTOMVIEW_MODEL->get('viewname')}" data-rule-required="true" data-rule-maxsize="100" data-rule-check-filter-duplicate='{Vtiger_Util_Helper::toSafeHTML(Zend_JSON::encode($CUSTOM_VIEWS_LIST))}'>
</div>
- <div class="col-lg-5">
+ <div class="col-lg-5 col-md-5 col-sm-5">
<label class="checkbox-inline">
<input type="checkbox" name="setdefault" value="1" {if $CUSTOMVIEW_MODEL->isDefault()} checked="checked"{/if}> {vtranslate('LBL_SET_AS_DEFAULT',$MODULE)}
</label>
@@ -98,7 +99,7 @@
selected
{/if}
>{Vtiger_Util_Helper::toSafeHTML(vtranslate($FIELD_MODEL->get('label'), $SOURCE_MODULE))}
- {if $FIELD_MODEL->isMandatory() eq true} <span>*</span> {/if}
+ {if $FIELD_MODEL->isMandatory() eq true} <span>*</span> {/if}
</option>
{/foreach}
</optgroup>
@@ -107,7 +108,7 @@
<input type="hidden" name="columnslist" value='{Vtiger_Functions::jsonEncode($SELECTED_FIELDS)}' />
<input id="mandatoryFieldsList" type="hidden" value='{Vtiger_Util_Helper::toSafeHTML(ZEND_JSON::encode($MANDATORY_FIELDS))}' />
</div>
- <div class="col-lg-2"></div>
+ <div class="col-lg-2 col-md-2 col-sm-2"></div>
</div>
<div>
<label class="filterHeaders">{vtranslate('LBL_CHOOSE_FILTER_CONDITIONS', $MODULE)} :</label>
@@ -121,7 +122,7 @@
<input type="checkbox" data-toogle-members="true" name="sharelist" value="1" {if $LIST_SHARED} checked="checked"{/if}> {vtranslate('LBL_SHARE_THIS_LIST',$MODULE)}
</label>
</div>
- <select id="memberList" class="col-lg-7 select2 members op0{if $LIST_SHARED} fadeInx{/if}" multiple="true" name="members[]" data-placeholder="{vtranslate('LBL_ADD_USERS_ROLES', $MODULE)}" style="margin-bottom: 10px;" data-rule-required="{if $LIST_SHARED}true{else}false{/if}">
+ <select id="memberList" class="col-lg-7 col-md-7 col-sm-7 select2 members op0{if $LIST_SHARED} fadeInx{/if}" multiple="true" name="members[]" data-placeholder="{vtranslate('LBL_ADD_USERS_ROLES', $MODULE)}" style="margin-bottom: 10px;" data-rule-required="{if $LIST_SHARED}true{else}false{/if}">
<optgroup label="{vtranslate('LBL_ALL',$MODULE)}">
<option value="All::Users" data-member-type="{vtranslate('LBL_ALL',$MODULE)}"
{if ($CUSTOMVIEW_MODEL->get('status') == $CV_PUBLIC_VALUE)} selected="selected"{/if}>
@@ -143,13 +144,14 @@
</select>
<input type="hidden" name="status" id="allUsersStatusValue" value=""
data-public="{$CV_PUBLIC_VALUE}" data-private="{$CV_PRIVATE_VALUE}"/>
- <div class='clearfix modal-footer-overwrite-style'>
- <div class="row clearfix">
- <div class=' textAlignCenter col-lg-12 col-md-12 col-sm-12 '>
- <button type='submit' class='btn btn-success saveButton' id="customViewSubmit">{vtranslate('LBL_SAVE', $MODULE)}</button>
- <a class='cancelLink' href="javascript:void(0);" type="reset" data-dismiss="modal">{vtranslate('LBL_CANCEL', $MODULE)}</a>
- </div>
- </div>
+
+ </div>
+ </div>
+ <div class='modal-overlay-footer clearfix border1px'>
+ <div class="row clearfix">
+ <div class=' textAlignCenter col-lg-12 col-md-12 col-sm-12 '>
+ <button type='submit' class='btn btn-success saveButton' id="customViewSubmit">{vtranslate('LBL_SAVE', $MODULE)}</button>
+ <a class='cancelLink' href="javascript:void(0);" type="reset" data-dismiss="modal">{vtranslate('LBL_CANCEL', $MODULE)}</a>
</div>
</div>
</div>
diff --git a/layouts/v7/modules/CustomView/resources/CustomView.js b/layouts/v7/modules/CustomView/resources/CustomView.js
index c0b78fcd5d21a2c5188c743d94492136cb4abad8..8f6b68d3ea197e42fac061b32b5a5c5190bae012 100644
--- a/layouts/v7/modules/CustomView/resources/CustomView.js
+++ b/layouts/v7/modules/CustomView/resources/CustomView.js
@@ -128,11 +128,10 @@ jQuery.Class("Vtiger_CustomView_Js",{
showCreateFilter : function(data){
var self = this;
- var overlayParams = {'backdrop' : 'static', 'keyboard' : false};
self.reIntialize();
- app.helper.loadPageContentOverlay(data,overlayParams).then(function(data){
+ app.helper.loadPageContentOverlay(data).then(function(data){
+ data.find('.data').css('height','100%');
var Options= {
- setHeight: jQuery('.customview-content').height() - jQuery('.modal-footer-overwrite-style').height(),
autoExpandScrollbar: true,
scrollInertia: 200,
autoHideScrollbar: true,
diff --git a/layouts/v7/modules/Settings/Roles/EditView.tpl b/layouts/v7/modules/Settings/Roles/EditView.tpl
index c9e0becd9f68f642a28f231662f49225092ad7c6..a0a1bba286641a776bb885c598fb94d996a873a4 100644
--- a/layouts/v7/modules/Settings/Roles/EditView.tpl
+++ b/layouts/v7/modules/Settings/Roles/EditView.tpl
@@ -100,8 +100,8 @@
</div>
</div>
<div class="form-group " data-content="existing">
- <div class="col-lg-3 col-md-3 col-sm-3"></div>
- <div class="controls col-sm-9">
+ <div class="fieldLabel control-label col-lg-3 col-md-3 col-sm-3"></div>
+ <div class="fieldValue controls col-lg-9 col-md-9 col-sm-9">
{assign var="ROLE_PROFILES" value=$RECORD_MODEL->getProfiles()}
<select class="select2 inputElement col-lg-12 hide" multiple="true" id="profilesList" name="profiles[]" data-placeholder="{vtranslate('LBL_CHOOSE_PROFILES',$QUALIFIED_MODULE)}" style="width: 460px" data-rule-required="true">
{foreach from=$ALL_PROFILES item=PROFILE}
diff --git a/layouts/v7/modules/Settings/Workflows/AdvanceFilterCondition.tpl b/layouts/v7/modules/Settings/Workflows/AdvanceFilterCondition.tpl
index 1da7963e01dab66f041229313c0f1de5738f1710..eaaf653d63b3187100dd6e36d99d74efc6f02c60 100644
--- a/layouts/v7/modules/Settings/Workflows/AdvanceFilterCondition.tpl
+++ b/layouts/v7/modules/Settings/Workflows/AdvanceFilterCondition.tpl
@@ -87,7 +87,7 @@
<input type="hidden" name="column_condition" value="{$CONDITION}" />
</span>
<span class="col-lg-1" style="line-height: 30px;">
- <i class="deleteCondition glyphicon glyphicon-trash" title="{vtranslate('LBL_DELETE', $MODULE)}"></i>
+ <i class="deleteCondition glyphicon glyphicon-trash cursorPointer" title="{vtranslate('LBL_DELETE', $MODULE)}"></i>
</span>
</div>
{/strip}
\ No newline at end of file
diff --git a/layouts/v7/modules/Settings/Workflows/FieldExpressions.tpl b/layouts/v7/modules/Settings/Workflows/FieldExpressions.tpl
index fbaacf68d8e98bef872c7d73fdc20388945319e5..94cda5d7fb267933c6223a4c4030bb2a299477d9 100644
--- a/layouts/v7/modules/Settings/Workflows/FieldExpressions.tpl
+++ b/layouts/v7/modules/Settings/Workflows/FieldExpressions.tpl
@@ -17,7 +17,7 @@
<div class="modal-body">
<div class="row">
<div class="col-sm-4">
- <select class="textType">
+ <select class="textType" style="min-width: 160px;">
<option data-ui="textarea" value="rawtext">{vtranslate('LBL_RAW_TEXT',$QUALIFIED_MODULE)}</option>
<option data-ui="textarea" value="fieldname">{vtranslate('LBL_FIELD_NAME',$QUALIFIED_MODULE)}</option>
<option data-ui="textarea" value="expression">{vtranslate('LBL_EXPRESSION',$QUALIFIED_MODULE)}</option>
@@ -26,7 +26,7 @@
<div class="col-sm-4 hide useFieldContainer">
<span name="{$MODULE_MODEL->get('name')}" class="useFieldElement">
{assign var=MODULE_FIELDS value=$MODULE_MODEL->getFields()}
- <select class="useField" data-placeholder="{vtranslate('LBL_USE_FIELD',$QUALIFIED_MODULE)}">
+ <select class="useField" data-placeholder="{vtranslate('LBL_USE_FIELD',$QUALIFIED_MODULE)}" style="min-width: 160px;">
<option></option>
{foreach from=$RECORD_STRUCTURE item=FIELDS}
{foreach from=$FIELDS item=MODULE_FIELD}
@@ -38,7 +38,7 @@
{if $RELATED_MODULE_MODEL neq ''}
<span name="{$RELATED_MODULE_MODEL->get('name')}" class="useFieldElement">
{assign var=MODULE_FIELDS value=$RELATED_MODULE_MODEL->getFields()}
- <select class="useField" data-placeholder="{vtranslate('LBL_USE_FIELD',$QUALIFIED_MODULE)}">
+ <select class="useField" data-placeholder="{vtranslate('LBL_USE_FIELD',$QUALIFIED_MODULE)}" style="min-width: 160px;">
<option></option>
{foreach from=$MODULE_FIELDS item=MODULE_FIELD}
<option value="{$MODULE_FIELD->getName()}">{vtranslate($MODULE_FIELD->get('label'),$QUALIFIED_MODULE)}</option>
@@ -48,7 +48,7 @@
{/if}
</div>
<div class="col-sm-4 hide useFunctionContainer">
- <select class="useFunction" data-placeholder="{vtranslate('LBL_USE_FUNCTION',$QUALIFIED_MODULE)}">
+ <select class="useFunction pull-right" data-placeholder="{vtranslate('LBL_USE_FUNCTION',$QUALIFIED_MODULE)}" style="min-width: 160px;">
<option></option>
{foreach from=$FIELD_EXPRESSIONS key=FIELD_EXPRESSION_VALUE item=FIELD_EXPRESSIONS_KEY}
<option value="{$FIELD_EXPRESSIONS_KEY}">{vtranslate($FIELD_EXPRESSION_VALUE,$QUALIFIED_MODULE)}</option>
diff --git a/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js b/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
index 4e1c752730c3255fbc6fa9c968b99e898b83c953..b73f86152a7d5dcce8bd4704ea64c0c1174888c3 100644
--- a/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
+++ b/layouts/v7/modules/Settings/Workflows/resources/AdvanceFilter.js
@@ -103,58 +103,6 @@ Vtiger_AdvanceFilter_Js('Workflows_AdvanceFilter_Js',{},{
return conditionSelectElement;
},
- getMetricFieldSpecificConditionList: function(conditionList, conditionSelected, match, fieldSelected){
- var options = '';
- var fieldDataInfo = fieldSelected.data('fieldinfo');
- var fieldModel = Vtiger_Field_Js.getInstance(fieldDataInfo, this.getModuleName());
- var picklistValues = fieldModel.data.picklistvalues;
- for(var key in conditionList) {
- //IE Browser consider the prototype properties also, it should consider has own properties only.
- if(conditionList.hasOwnProperty(key)) {
- var conditionValue = conditionList[key];
- var conditionLabel = this.getConditionLabel(conditionValue);
- if(match != null){
- if(conditionValue != 'has changed'){
- if(conditionValue.indexOf("hours since") !=-1){
- for(var key in picklistValues){
- var picklistvalue = conditionValue.replace(/%s/i, picklistValues[key]);
- options += '<option value="'+picklistvalue+'"';
- if(picklistvalue == conditionSelected){
- options += ' selected="selected" ';
- }
- options += '>'+conditionValue.replace(/%s/i, key)+'</option>';
- }
- } else {
- options += '<option value="'+conditionValue+'"';
- if(conditionValue == conditionSelected){
- options += ' selected="selected" ';
- }
- options += '>'+conditionLabel+'</option>';
- }
- }
- }else{
- if(conditionValue.indexOf("hours since %s") !=-1){
- for(var key in picklistValues){
- var picklistvalue = conditionValue.replace(/%s/i, picklistValues[key]);
- options += '<option value="'+picklistvalue+'"';
- if(picklistvalue == conditionSelected){
- options += ' selected="selected" ';
- }
- options += '>'+conditionValue.replace(/%s/i, key)+'</option>';
- }
- } else {
- options += '<option value="'+conditionValue+'"';
- if(conditionValue == conditionSelected){
- options += ' selected="selected" ';
- }
- options += '>'+conditionLabel+'</option>';
- }
- }
- }
- }
- return options;
- },
-
/**
* Function to retrieve the values of the filter
* @return : object
diff --git a/layouts/v7/skins/contact/style.css b/layouts/v7/skins/contact/style.css
index 1d40898d873abfd6e1076b5574c8a751849d66cc..ea321b08db0b9fc5f0e9f38c9270f452fdc11105 100644
--- a/layouts/v7/skins/contact/style.css
+++ b/layouts/v7/skins/contact/style.css
@@ -203,8 +203,8 @@ body {
margin-left: 1px;
}
.company-logo img {
- height: 100%;
- width: 100%;
+ max-height: 100%;
+ max-width: 100%;
}
.navbar .fa {
font-size: 15px;
diff --git a/layouts/v7/skins/inventory/style.css b/layouts/v7/skins/inventory/style.css
index 2d13b0999bd98b78f1e2411cb3bd76c1ad3f7468..19afbb1d4293c32b3b779601aa71cab250083702 100644
--- a/layouts/v7/skins/inventory/style.css
+++ b/layouts/v7/skins/inventory/style.css
@@ -203,8 +203,8 @@ body {
margin-left: 1px;
}
.company-logo img {
- height: 100%;
- width: 100%;
+ max-height: 100%;
+ max-width: 100%;
}
.navbar .fa {
font-size: 15px;
diff --git a/layouts/v7/skins/marketing/style.css b/layouts/v7/skins/marketing/style.css
index 55eb357a8fc348fb7168f50dbc6f4f5bb9f8cc2a..d1f1253ae3197fa798d02fcd2a109f84b76096a6 100644
--- a/layouts/v7/skins/marketing/style.css
+++ b/layouts/v7/skins/marketing/style.css
@@ -203,8 +203,8 @@ body {
margin-left: 1px;
}
.company-logo img {
- height: 100%;
- width: 100%;
+ max-height: 100%;
+ max-width: 100%;
}
.navbar .fa {
font-size: 15px;
diff --git a/layouts/v7/skins/marketing_and_sales/style.css b/layouts/v7/skins/marketing_and_sales/style.css
index a5f0c0a9db2cac89c2570968d5d75cf27db596ae..ba6826af561d51861db6056f169e9ee013dc9806 100644
--- a/layouts/v7/skins/marketing_and_sales/style.css
+++ b/layouts/v7/skins/marketing_and_sales/style.css
@@ -203,8 +203,8 @@ body {
margin-left: 1px;
}
.company-logo img {
- height: 100%;
- width: 100%;
+ max-height: 100%;
+ max-width: 100%;
}
.navbar .fa {
font-size: 15px;
diff --git a/layouts/v7/skins/project/style.css b/layouts/v7/skins/project/style.css
index d8095aa5da7e982a2d7acad7f34c1d32a43dcee2..e7c08a32c7ac51ead097454807af8801e013b5a4 100644
--- a/layouts/v7/skins/project/style.css
+++ b/layouts/v7/skins/project/style.css
@@ -203,8 +203,8 @@ body {
margin-left: 1px;
}
.company-logo img {
- height: 100%;
- width: 100%;
+ max-height: 100%;
+ max-width: 100%;
}
.navbar .fa {
font-size: 15px;
diff --git a/layouts/v7/skins/sales/style.css b/layouts/v7/skins/sales/style.css
index b8b4f520defc060b6f59c10028a51a7c864e8cf3..ef198b53c128cab70e60e46410dda18ac07dd7f6 100644
--- a/layouts/v7/skins/sales/style.css
+++ b/layouts/v7/skins/sales/style.css
@@ -203,8 +203,8 @@ body {
margin-left: 1px;
}
.company-logo img {
- height: 100%;
- width: 100%;
+ max-height: 100%;
+ max-width: 100%;
}
.navbar .fa {
font-size: 15px;
diff --git a/layouts/v7/skins/support/style.css b/layouts/v7/skins/support/style.css
index 311824fc876aa5dd24e190ab4b43619457470036..fbd8a0c5379fe90345db5c83171cbe876f55aa48 100644
--- a/layouts/v7/skins/support/style.css
+++ b/layouts/v7/skins/support/style.css
@@ -203,8 +203,8 @@ body {
margin-left: 1px;
}
.company-logo img {
- height: 100%;
- width: 100%;
+ max-height: 100%;
+ max-width: 100%;
}
.navbar .fa {
font-size: 15px;
diff --git a/layouts/v7/skins/tools/style.css b/layouts/v7/skins/tools/style.css
index 293fbd4a658b6fc14c728944e6a6bada0f54bb28..e029ed20a13e88ddf343bb40efcaa17d663bf7fb 100644
--- a/layouts/v7/skins/tools/style.css
+++ b/layouts/v7/skins/tools/style.css
@@ -203,8 +203,8 @@ body {
margin-left: 1px;
}
.company-logo img {
- height: 100%;
- width: 100%;
+ max-height: 100%;
+ max-width: 100%;
}
.navbar .fa {
font-size: 15px;
diff --git a/modules/Settings/Vtiger/views/Index.php b/modules/Settings/Vtiger/views/Index.php
index b516c57cbe3f2589cb3fee4e8e672733a62ca94f..e95e8046f488db1b255ec605ce07e4a081ecf19e 100644
--- a/modules/Settings/Vtiger/views/Index.php
+++ b/modules/Settings/Vtiger/views/Index.php
@@ -187,4 +187,13 @@ class Settings_Vtiger_Index_View extends Vtiger_Basic_View {
$viewer->assign('MODULE_BASIC_ACTIONS', $basicLinks);
}
}
+
+ public function getPageTitle(Vtiger_Request $request) {
+ $pageTitle = parent::getPageTitle($request);
+
+ if ($pageTitle == 'Vtiger') {
+ $pageTitle = vtranslate($request->get('parent'), $request->getModule());
+ }
+ return $pageTitle;
+ }
}