From 65b93ae266d9a416d55206ca09e5dbff6d59b491 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Tue, 11 Aug 2020 20:36:43 +0530
Subject: [PATCH] Fixes #1397 Global search footer is fixed
---
layouts/v7/modules/Vtiger/AdvanceSearch.tpl | 81 ++++++++++++---------
layouts/v7/skins/contact/style.css | 6 ++
layouts/v7/skins/inventory/style.css | 6 ++
layouts/v7/skins/marketing/style.css | 6 ++
layouts/v7/skins/project/style.css | 6 ++
layouts/v7/skins/sales/style.css | 6 ++
layouts/v7/skins/support/style.css | 6 ++
layouts/v7/skins/tools/style.css | 6 ++
layouts/v7/skins/vtiger/style.less | 7 +-
9 files changed, 93 insertions(+), 37 deletions(-)
diff --git a/layouts/v7/modules/Vtiger/AdvanceSearch.tpl b/layouts/v7/modules/Vtiger/AdvanceSearch.tpl
index 26cab2d67..8404cce11 100644
--- a/layouts/v7/modules/Vtiger/AdvanceSearch.tpl
+++ b/layouts/v7/modules/Vtiger/AdvanceSearch.tpl
@@ -10,23 +10,29 @@
********************************************************************************/
-->*}
{strip}
- <div id="searchResults-container">
- <div class="row">
- <div class="col-lg-12 clearfix">
- <div class="pull-right overlay-close" >
- <button type="button" class="close" aria-label="Close" data-target='#overlayPage' data-dismiss="modal">
- <span aria-hidden="true" class='fa fa-close'></span>
- </button>
+ <div id="searchResults-container" class="advanceFilterContainer">
+ <div class="modal-content">
+ <div class="modal-header">
+ <div class="row">
+ <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+ <h4 class="pull-left m-xy-0" data-result="{vtranslate('LBL_SEARCH_RESULTS', $MODULE)}" data-modify="{vtranslate('LBL_SAVE_MODIFY_FILTER', $MODULE)}">
+ {vtranslate('LBL_ADVANCE_SEARCH', $MODULE)} {vtranslate('LBL_SEARCH', $MODULE)}
+ </h4>
+ </div>
+ <div class="search-action-container col-lg-6 col-md-6 col-sm-6 col-xs-6">
+ <div class=" p-r-0">
+ <button type="button" class="close" aria-label="Close" data-dismiss="modal">
+ <span aria-hidden="true" class='fa fa-close'></span>
+ </button>
+ </div>
</div>
</div>
</div>
- <div class="container-fluid">
- <div id="advanceSearchHolder" class="row">
- <div class="col-lg-2 col-md-1 hidden-xs hidden-sm"> </div>
- <div id="advanceSearchContainer" class="col-lg-8 col-md-10 col-sm-12 col-xs-12">
- <div class="row">
+ <div class="container-fluid modal-body">
+ <div id="advanceSearchHolder">
+ <div id="advanceSearchContainer">
<div class="searchModuleComponent">
- <div class="col-lg-12 col-md-12">
+{* <div class="col-lg-12 col-md-12">*}
<div class="pull-left" style="margin-right:10px;font-size:18px;">{vtranslate('LBL_SEARCH_IN',$MODULE)}</div>
<select class="select2 col-lg-3" id="searchModuleList" data-placeholder="{vtranslate('LBL_SELECT_MODULE')}">
<option></option>
@@ -34,10 +40,10 @@
<option value="{$MODULE_NAME}" {if $MODULE_NAME eq $SOURCE_MODULE}selected="selected"{/if}>{vtranslate($MODULE_NAME,$MODULE_NAME)}</option>
{/foreach}
</select>
- </div>
+{* </div>*}
</div>
<div class="clearfix"></div>
- <div class="col-lg-12">
+{* <div class="col-lg-12">*}
<div class="filterElements well filterConditionContainer" id="searchContainer" style="height: auto;">
<form name="advanceFilterForm" method="POST">
{if $SOURCE_MODULE eq 'Home'}
@@ -48,35 +54,38 @@
{/if}
</form>
</div>
- </div>
- </div>
- <div class="container-fluid">
- <div class="row">
- <div class="col-lg-4 col-md-4 col-sm-4"> </div>
- <div class="actions col-lg-8 col-md-8 col-sm-8">
- <div class="btn-toolbar">
- <div class="btn-group">
- <button class="btn btn-success" id="advanceSearchButton" {if $SOURCE_MODULE eq 'Home'} disabled="" {/if} type="submit"><strong>{vtranslate('LBL_SEARCH', $MODULE)}</strong></button>
+{* </div>*}
+ </div></div></div>
+ <div class="modal-overlay-footer clearfix padding0px border0">
+ <div class="row clearfix">
+ <div class="col-lg-5 col-md-5 col-sm-5"> </div>
+ <div class="actions col-lg-7 col-md-7 col-sm-7 p-xy-8">
+ <div class="row">
+ <div class="col-lg-2">
+ <button class="btn btn-success" id="advanceSearchButton" {if $SOURCE_MODULE eq 'Home'} disabled="" {/if} type="submit"><strong>{vtranslate('LBL_SEARCH', $MODULE)}</strong></button>
+ </div>
+ <div class="col-lg-10">
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="row">
+ {if $SAVE_FILTER_PERMITTED}
+ <button class="btn btn-success col-lg-2 marginLeft10px" {if $SOURCE_MODULE eq 'Home'} disabled="" {/if} id="advanceIntiateSave"><strong>{vtranslate('LBL_SAVE_AS_FILTER', $MODULE)}</strong></button>
+ <input class="hide col-lg-3 marginLeft10px" type="text" value="" name="viewname"/>
+ <button class="btn btn-success hide col-lg-2 marginLeft10px" {if $SOURCE_MODULE eq 'Home'} disabled="" {/if} id="advanceSave"><strong>{vtranslate('LBL_SAVE', $MODULE)}</strong></button>
+ {/if}
+ </div>
+ </div>
+ </div>
+ </div>
</div>
- <div class="btn-group ">
- {if $SAVE_FILTER_PERMITTED}
- <button class="btn btn-success hide pull-right" {if $SOURCE_MODULE eq 'Home'} disabled="" {/if} id="advanceSave"><strong>{vtranslate('LBL_SAVE', $MODULE)}</strong></button>
- <button class="btn btn-success" {if $SOURCE_MODULE eq 'Home'} disabled="" {/if} id="advanceIntiateSave"><strong>{vtranslate('LBL_SAVE_AS_FILTER', $MODULE)}</strong></button>
- <input class="hide inputElement" type="text" value="" name="viewname"/>
- {/if}
- </div>
- </div>
-
</div>
</div>
</div>
<div> </div>
</div>
<div class="col-lg-2 col-md-1 hidden-xs hidden-sm"> </div>
- </div>
- </div>
<div class="searchResults">
</div>
-</div>
+</div></div>
{/strip}
diff --git a/layouts/v7/skins/contact/style.css b/layouts/v7/skins/contact/style.css
index 5f3a225fc..f3bba03bc 100644
--- a/layouts/v7/skins/contact/style.css
+++ b/layouts/v7/skins/contact/style.css
@@ -2508,6 +2508,12 @@ th {
-o-transition: all 1s ease;
transition: all 1s ease;
}
+.advanceFilterContainer .modal-content {
+ height: 100vh;
+}
+.p-xy-8 {
+ padding: 8px !important;
+}
#advanceSearchHolder {
max-height: 0px;
overflow: hidden;
diff --git a/layouts/v7/skins/inventory/style.css b/layouts/v7/skins/inventory/style.css
index 9d151e2a4..ea92f4fcd 100644
--- a/layouts/v7/skins/inventory/style.css
+++ b/layouts/v7/skins/inventory/style.css
@@ -2508,6 +2508,12 @@ th {
-o-transition: all 1s ease;
transition: all 1s ease;
}
+.advanceFilterContainer .modal-content {
+ height: 100vh;
+}
+.p-xy-8 {
+ padding: 8px !important;
+}
#advanceSearchHolder {
max-height: 0px;
overflow: hidden;
diff --git a/layouts/v7/skins/marketing/style.css b/layouts/v7/skins/marketing/style.css
index 2279fdaa3..5add96fd9 100644
--- a/layouts/v7/skins/marketing/style.css
+++ b/layouts/v7/skins/marketing/style.css
@@ -2508,6 +2508,12 @@ th {
-o-transition: all 1s ease;
transition: all 1s ease;
}
+.advanceFilterContainer .modal-content {
+ height: 100vh;
+}
+.p-xy-8 {
+ padding: 8px !important;
+}
#advanceSearchHolder {
max-height: 0px;
overflow: hidden;
diff --git a/layouts/v7/skins/project/style.css b/layouts/v7/skins/project/style.css
index 789961602..f64f6842b 100644
--- a/layouts/v7/skins/project/style.css
+++ b/layouts/v7/skins/project/style.css
@@ -2508,6 +2508,12 @@ th {
-o-transition: all 1s ease;
transition: all 1s ease;
}
+.advanceFilterContainer .modal-content {
+ height: 100vh;
+}
+.p-xy-8 {
+ padding: 8px !important;
+}
#advanceSearchHolder {
max-height: 0px;
overflow: hidden;
diff --git a/layouts/v7/skins/sales/style.css b/layouts/v7/skins/sales/style.css
index fd6d72018..42026c685 100644
--- a/layouts/v7/skins/sales/style.css
+++ b/layouts/v7/skins/sales/style.css
@@ -2508,6 +2508,12 @@ th {
-o-transition: all 1s ease;
transition: all 1s ease;
}
+.advanceFilterContainer .modal-content {
+ height: 100vh;
+}
+.p-xy-8 {
+ padding: 8px !important;
+}
#advanceSearchHolder {
max-height: 0px;
overflow: hidden;
diff --git a/layouts/v7/skins/support/style.css b/layouts/v7/skins/support/style.css
index f966e1cfb..c5bb39b23 100644
--- a/layouts/v7/skins/support/style.css
+++ b/layouts/v7/skins/support/style.css
@@ -2508,6 +2508,12 @@ th {
-o-transition: all 1s ease;
transition: all 1s ease;
}
+.advanceFilterContainer .modal-content {
+ height: 100vh;
+}
+.p-xy-8 {
+ padding: 8px !important;
+}
#advanceSearchHolder {
max-height: 0px;
overflow: hidden;
diff --git a/layouts/v7/skins/tools/style.css b/layouts/v7/skins/tools/style.css
index d8c1d2c4c..749a55cd2 100644
--- a/layouts/v7/skins/tools/style.css
+++ b/layouts/v7/skins/tools/style.css
@@ -2508,6 +2508,12 @@ th {
-o-transition: all 1s ease;
transition: all 1s ease;
}
+.advanceFilterContainer .modal-content {
+ height: 100vh;
+}
+.p-xy-8 {
+ padding: 8px !important;
+}
#advanceSearchHolder {
max-height: 0px;
overflow: hidden;
diff --git a/layouts/v7/skins/vtiger/style.less b/layouts/v7/skins/vtiger/style.less
index b0d6e0ecb..8ba953509 100644
--- a/layouts/v7/skins/vtiger/style.less
+++ b/layouts/v7/skins/vtiger/style.less
@@ -2778,7 +2778,12 @@ strong, b, th{
-o-transition: all 1s ease;
transition : all 1s ease;
}
-
+.advanceFilterContainer .modal-content {
+ height: 100vh;
+}
+.p-xy-8 {
+ padding: 8px !important;
+}
#advanceSearchHolder {
max-height : 0px;
overflow : hidden;
--
GitLab