Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed the height of the add record button when reloading the page #17171

Open
wants to merge 6 commits into
base: developer
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions layouts/basic/modules/Calendar/ActivityStateModal.tpl
Expand Up @@ -9,9 +9,7 @@
{\App\Language::translate('LBL_SET_RECORD_STATUS', $MODULE_NAME)}
</h5>
<div class="">
{foreach item=LINK from=$LINKS}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='detailViewBasic' BREAKPOINT='md' CLASS='c-btn-link--responsive'}
{/foreach}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$LINKS BUTTON_VIEW='detailViewBasic' BREAKPOINT='md' CLASS='c-btn-link--responsive' MODULE_NAME=$MODULE_NAME}
<button type="button" class="close" data-dismiss="modal"
aria-label="{\App\Language::translate('LBL_CLOSE')}">
<span aria-hidden="true" title="{\App\Language::translate('LBL_CLOSE')}">&times;</span>
Expand Down
4 changes: 1 addition & 3 deletions layouts/basic/modules/Calendar/Calendar/ActivityState.tpl
Expand Up @@ -11,9 +11,7 @@
{include file=\App\Layout::getTemplatePath('ActivityStateContent.tpl', $MODULE_NAME)}
<div class="o-calendar__form__actions">
<div class="d-flex flex-wrap">
{foreach item=LINK from=$LINKS}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME)}
{/foreach}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME)}
{if $RECORD->isEditable()}
<a href="#" data-url="{$RECORD->getEditViewUrl()}" data-id="{$ID}"
class="editRecord btn mt-1 btn-default mr-1"
Expand Down
28 changes: 14 additions & 14 deletions layouts/basic/modules/Calendar/Calendar/EventForm.tpl
Expand Up @@ -129,21 +129,21 @@
<div class="o-calendar__form__actions">
<div class="d-flex flex-wrap{if empty($RECORD_ID)} justify-content-center{/if}">
{if !empty($QUICKCREATE_LINKS['QUICKCREATE_VIEW_HEADER'])}
{foreach item=LINK from=$QUICKCREATE_LINKS['QUICKCREATE_VIEW_HEADER']}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='quickcreateViewHeader'}
{/foreach}
{/if}
<button type="submit" class="js-save-event btn btn-success"
title="{\App\Language::translate('LBL_SAVE', $MODULE_NAME)}" data-js="click">
<span title="{\App\Language::translate('LBL_SAVE', $MODULE_NAME)}" class="fas fa-check mr-1"></span>
{\App\Language::translate('LBL_SAVE', $MODULE_NAME)}
</button>
{if !empty($RECORD_ID) && $VIEW === 'EventForm'}
<a href="#" role="button" class="btn btn-danger js-summary-close-edit ml-auto u-h-fit">
<span title="{\App\Language::translate('LBL_CLOSE', $MODULE_NAME)}"
class="fas fa-times"></span>
</a>
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$QUICKCREATE_LINKS['QUICKCREATE_VIEW_HEADER'] BUTTON_VIEW='quickcreateViewHeader' MODULE_NAME=$MODULE_NAME SKIP_GROUP=true}
{/if}
<div class="ml-1">
<button type="submit" class="js-save-event btn btn-success"
title="{\App\Language::translate('LBL_SAVE', $MODULE_NAME)}" data-js="click">
<span title="{\App\Language::translate('LBL_SAVE', $MODULE_NAME)}" class="fas fa-check mr-1"></span>
{\App\Language::translate('LBL_SAVE', $MODULE_NAME)}
</button>
{if !empty($RECORD_ID) && $VIEW === 'EventForm'}
<a href="#" role="button" class="btn btn-danger js-summary-close-edit ml-auto u-h-fit">
<span title="{\App\Language::translate('LBL_CLOSE', $MODULE_NAME)}"
class="fas fa-times"></span>
</a>
{/if}
</div>
</div>
</div>
</div>
Expand Down
6 changes: 2 additions & 4 deletions layouts/basic/modules/Calendar/EditViewActions.tpl
Expand Up @@ -17,10 +17,8 @@
<button class="btn btn-danger mr-1" type="reset" onclick="javascript:window.history.back();">
<span class="fas fa-times mr-1"></span><strong>{\App\Language::translate('LBL_CANCEL', $MODULE)}</strong>
</button>
{if isset($EDITVIEW_LINKS['EDIT_VIEW_HEADER'])}
{foreach item=LINK from=$EDITVIEW_LINKS['EDIT_VIEW_HEADER']}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='editViewHeader'}
{/foreach}
{if !empty($EDITVIEW_LINKS['EDIT_VIEW_HEADER'])}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LIKNS=$EDITVIEW_LINKS['EDIT_VIEW_HEADER'] BUTTON_VIEW='editViewHeader' MODULE_NAME=$MODULE}
{/if}
</div>
</form>
Expand Down
8 changes: 2 additions & 6 deletions layouts/basic/modules/Documents/ListViewLeftSide.tpl
Expand Up @@ -12,19 +12,15 @@
{assign var=ONLY_ONE value=count($LINKS) eq 1}
<div class="actions">
{if $ONLY_ONE}
{foreach from=$LINKS item=LINK}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
{/foreach}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
{else}
<div class="dropright u-remove-dropdown-icon">
<button class="btn btn-sm btn-light toolsAction dropdown-toggle" type="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="fas fa-wrench" title="{\App\Language::translate('LBL_ACTIONS')}"></span>
</button>
<div class="dropdown-menu" aria-label="{\App\Language::translate('LBL_ACTIONS')}">
{foreach from=$LINKS item=LINK}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
{/foreach}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) BUTTON_VIEW='listViewBasic' SKIP_GROUP=true}
</div>
</div>
{/if}
Expand Down
8 changes: 2 additions & 6 deletions layouts/basic/modules/Documents/RelatedListLeftSide.tpl
Expand Up @@ -19,19 +19,15 @@
{assign var=ONLY_ONE value=count($LINKS) eq 1}
<div class="actions">
{if $ONLY_ONE}
{foreach from=$LINKS item=LINK}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
{/foreach}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
{else}
<div class="dropright u-remove-dropdown-icon">
<button class="btn btn-sm btn-light toolsAction dropdown-toggle" type="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="fas fa-wrench" title="{\App\Language::translate('LBL_ACTIONS')}"></span>
</button>
<div class="dropdown-menu" aria-label="{\App\Language::translate('LBL_ACTIONS')}">
{foreach from=$LINKS item=LINK}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
{/foreach}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) BUTTON_VIEW='listViewBasic' SKIP_GROUP=true}
</div>
</div>
{/if}
Expand Down
4 changes: 2 additions & 2 deletions layouts/basic/modules/OSSMailView/widgets.tpl
Expand Up @@ -55,7 +55,7 @@
'confirm' => \App\Language::translate('LBL_REMOVE_RELATION_CONFIRMATION'), 'id' => $ROW['id'], 'url'=> $RELATION_MODEL->getDeleteUrl($ROW['id'])
]
])}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) MODULE=$MODULE_NAME}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='' MODULE_NAME=$MODULE_NAME}
{/if}
{if \App\Privilege::isPermitted($MODULE_NAME, 'Delete', $ROW['id'])}
{assign var=LINK value=Vtiger_Link_Model::getInstanceFromValues(['dataUrl' => "index.php?module={$MODULE_NAME}&action=Delete&record={$ROW['id']}",
Expand All @@ -65,7 +65,7 @@
'linkdata' => ['confirm' => \App\Language::translate('LBL_DELETE_RECORD_COMPLETELY_DESC')],
'linkclass' => 'btn-xs btn-dark relationDelete entityStateBtn'
])}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) MODULE=$MODULE_NAME}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='' MODULE_NAME=$MODULE_NAME}
{/if}
{/if}
</div>
Expand Down
6 changes: 2 additions & 4 deletions layouts/basic/modules/RecycleBin/ListViewHeader.tpl
Expand Up @@ -13,10 +13,8 @@
{assign var=LINKS value=array_merge($LINKS,$LISTVIEW_LINKS['LISTVIEW'])}
{/if}
{include file=\App\Layout::getTemplatePath('ButtonViewLinks.tpl') LINKS=$LINKS TEXT_HOLDER='LBL_ACTIONS' BTN_ICON='fa fa-list' CLASS='listViewMassActions mr-sm-1 mb-1 mb-sm-0 c-btn-block-sm-down'}
{if !empty($LISTVIEW_LINKS)}
{foreach item=LINK from=$LISTVIEW_LINKS['LISTVIEWBASIC']}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='listView' CLASS='mr-sm-1 mb-1 c-btn-block-sm-down'}
{/foreach}
{if !empty($LISTVIEW_LINKS['LISTVIEWBASIC'])}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$LISTVIEW_LINKS['LISTVIEWBASIC'] BUTTON_VIEW='listView' CLASS='mr-sm-1 mb-1 c-btn-block-sm-down' MODULE_NAME=$QUALIFIED_MODULE}
{/if}
</div>
<div class="customFilterMainSpan ml-auto mx-xl-auto">
Expand Down
4 changes: 1 addition & 3 deletions layouts/basic/modules/Settings/AdminAccess/Permissions.tpl
Expand Up @@ -2,9 +2,7 @@
{strip}
<!-- tpl-Settings-AdminAccess-Permissions -->
<div class="actions mb-2">
{foreach from=$LINKS item=LINK}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $QUALIFIED_MODULE) BUTTON_VIEW='listViewBasic' MODULE_NAME=$QUALIFIED_MODULE}
{/foreach}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' BREAKPOINT='md' CLASS='c-btn-link--responsive' MODULE_NAME=$QUALIFIED_MODULE}
</div>
<form class="js-filter-form" data-js="container">
<table id="dataTableExamplePermissions" class="table table-sm table-striped display text-center mt-2 js-data-table" data-url="index.php?module=AdminAccess&parent=Settings&action=GetData&mode=access">
Expand Down
107 changes: 52 additions & 55 deletions layouts/basic/modules/Settings/Currency/ListViewContents.tpl
Expand Up @@ -11,83 +11,80 @@
-->*}
{strip}
<!-- tpl-Settings-Currency-ListViewContents -->
<input type="hidden" id="pageStartRange" value="{$PAGING_MODEL->getRecordStartRange()}"/>
<input type="hidden" id="pageEndRange" value="{$PAGING_MODEL->getRecordEndRange()}"/>
<input type="hidden" id="previousPageExist" value="{$PAGING_MODEL->isPrevPageExists()}"/>
<input type="hidden" id="nextPageExist" value="{$PAGING_MODEL->isNextPageExists()}"/>
<input type="hidden" id="totalCount" value="{$LISTVIEW_COUNT}"/>
<input type="hidden" value="{$ORDER_BY}" id="orderBy"/>
<input type="hidden" value="{$SORT_ORDER}" id="sortOrder"/>
<input type="hidden" id="totalCount" value="{$LISTVIEW_COUNT}"/>
<input type="hidden" id="pageStartRange" value="{$PAGING_MODEL->getRecordStartRange()}" />
<input type="hidden" id="pageEndRange" value="{$PAGING_MODEL->getRecordEndRange()}" />
<input type="hidden" id="previousPageExist" value="{$PAGING_MODEL->isPrevPageExists()}" />
<input type="hidden" id="nextPageExist" value="{$PAGING_MODEL->isNextPageExists()}" />
<input type="hidden" id="totalCount" value="{$LISTVIEW_COUNT}" />
<input type="hidden" value="{$ORDER_BY}" id="orderBy" />
<input type="hidden" value="{$SORT_ORDER}" id="sortOrder" />
<input type="hidden" id="totalCount" value="{$LISTVIEW_COUNT}" />
<input type='hidden' value="{$PAGE_NUMBER}" id='pageNumber'>
<input type='hidden' value="{$PAGING_MODEL->getPageLimit()}" id='pageLimit'>
<input type="hidden" value="{$LISTVIEW_ENTRIES_COUNT}" id="noOfEntries">
<div class="listViewEntriesDiv u-overflow-scroll-non-desktop" style='overflow-x:auto;'>
<span class="listViewLoadingImageBlock d-none modal" id="loadingListViewModal">
<img class="listViewLoadingImage" src="{\App\Layout::getImagePath('loading.gif')}" alt="no-image"
title="{\App\Language::translate('LBL_LOADING')}"/>
title="{\App\Language::translate('LBL_LOADING')}" />
<p class="listViewLoadingMsg">{\App\Language::translate('LBL_LOADING_LISTVIEW_CONTENTS')}........</p>
</span>
{assign var="NAME_FIELDS" value=$MODULE_MODEL->getNameFields()}
{assign var=WIDTH value={99/(count($LISTVIEW_HEADERS))}}
<table class="table tableRWD table-bordered table-sm listViewEntriesTable">
{include file=\App\Layout::getTemplatePath('ListView/TableHeader.tpl', $QUALIFIED_MODULE) EMPTY_COLUMN=1}
<tbody>
{foreach item=LISTVIEW_ENTRY from=$LISTVIEW_ENTRIES}
<tr class="listViewEntries" data-id="{$LISTVIEW_ENTRY->getId()}"
{if method_exists($LISTVIEW_ENTRY,'getDetailViewUrl')}data-recordurl="{$LISTVIEW_ENTRY->getDetailViewUrl()}"{/if}
>
<td width="1%" nowrap class="{$WIDTHTYPE}">
{if !empty($MODULE) && $MODULE eq 'CronTasks'}
<img src="{\App\Layout::getImagePath('drag.png')}" class="alignTop"
title="{\App\Language::translate('LBL_DRAG',$QUALIFIED_MODULE)}"/>
{/if}
</td>
{foreach item=LISTVIEW_HEADER from=$LISTVIEW_HEADERS}
{assign var=LISTVIEW_HEADERNAME value=$LISTVIEW_HEADER->get('name')}
{assign var=LAST_COLUMN value=$LISTVIEW_HEADER@last}
<td class="listViewEntryValue {$WIDTHTYPE}" width="{$WIDTH}%" nowrap>
{if $LISTVIEW_HEADERNAME eq 'currency_status' }
{if {$LISTVIEW_ENTRY->getDisplayValue($LISTVIEW_HEADERNAME)} eq 'Active' }
&nbsp;{\App\Language::translate('LBL_ACTIVE',$QUALIFIED_MODULE)}
{else}
&nbsp;{\App\Language::translate('LBL_INACTIVE',$QUALIFIED_MODULE)}
{foreach item=LISTVIEW_ENTRY from=$LISTVIEW_ENTRIES}
<tr class="listViewEntries" data-id="{$LISTVIEW_ENTRY->getId()}"
{if method_exists($LISTVIEW_ENTRY,'getDetailViewUrl')}data-recordurl="{$LISTVIEW_ENTRY->getDetailViewUrl()}" {/if}>
<td width="1%" nowrap class="{$WIDTHTYPE}">
{if !empty($MODULE) && $MODULE eq 'CronTasks'}
<img src="{\App\Layout::getImagePath('drag.png')}" class="alignTop"
title="{\App\Language::translate('LBL_DRAG',$QUALIFIED_MODULE)}" />
{/if}
{elseif $LISTVIEW_HEADERNAME eq 'currency_name'}
{\App\Language::translate($LISTVIEW_ENTRY->getDisplayValue('currency_code'), 'Other.Currency')}
{else}
&nbsp;{$LISTVIEW_ENTRY->getDisplayValue($LISTVIEW_HEADERNAME)}
{/if}
{if $LAST_COLUMN}
</td>
<td nowrap class="{$WIDTHTYPE}">
{assign var=LINKS value=$LISTVIEW_ENTRY->getRecordLinks()}
{if count($LINKS) > 0}
<div class="actions">
<div class="float-right">
{foreach from=$LINKS item=LINK}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $QUALIFIED_MODULE) BUTTON_VIEW='listViewBasic' MODULE=$QUALIFIED_MODULE}
{/foreach}
</div>
</div>
</td>
{foreach item=LISTVIEW_HEADER from=$LISTVIEW_HEADERS}
{assign var=LISTVIEW_HEADERNAME value=$LISTVIEW_HEADER->get('name')}
{assign var=LAST_COLUMN value=$LISTVIEW_HEADER@last}
<td class="listViewEntryValue {$WIDTHTYPE}" width="{$WIDTH}%" nowrap>
{if $LISTVIEW_HEADERNAME eq 'currency_status' }
{if {$LISTVIEW_ENTRY->getDisplayValue($LISTVIEW_HEADERNAME)} eq 'Active' }
&nbsp;{\App\Language::translate('LBL_ACTIVE',$QUALIFIED_MODULE)}
{else}
&nbsp;{\App\Language::translate('LBL_INACTIVE',$QUALIFIED_MODULE)}
{/if}
{elseif $LISTVIEW_HEADERNAME eq 'currency_name'}
{\App\Language::translate($LISTVIEW_ENTRY->getDisplayValue('currency_code'), 'Other.Currency')}
{else}
&nbsp;{$LISTVIEW_ENTRY->getDisplayValue($LISTVIEW_HEADERNAME)}
{/if}
{if $LAST_COLUMN}
</td>
<td nowrap class="{$WIDTHTYPE}">
{assign var=LINKS value=$LISTVIEW_ENTRY->getRecordLinks()}
{if count($LINKS) > 0}
<div class="actions">
<div class="float-right">
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' MODULE_NAME=$QUALIFIED_MODULE}
</div>
</div>
{/if}
</td>
{/if}
</td>
{/if}
</td>
{/foreach}
</tr>
{/foreach}
{/foreach}
</tr>
{/foreach}
</tbody>
</table>
<!--added this div for Temporarily -->
{if $LISTVIEW_ENTRIES_COUNT eq '0'}
<table class="emptyRecordsDiv">
<tbody>
<tr>
<td>
{\App\Language::translate('LBL_EQ_ZERO')} {\App\Language::translate(MODULE, $QUALIFIED_MODULE)} {\App\Language::translate('LBL_FOUND')}
</td>
</tr>
<tr>
<td>
{\App\Language::translate('LBL_EQ_ZERO')} {\App\Language::translate(MODULE, $QUALIFIED_MODULE)} {\App\Language::translate('LBL_FOUND')}
</td>
</tr>
</tbody>
</table>
{/if}
Expand Down
8 changes: 4 additions & 4 deletions layouts/basic/modules/Settings/Groups/ListTable.tpl
Expand Up @@ -3,13 +3,13 @@
<!-- tpl-Settings-Groups-ListTable -->
<div class="o-breadcrumb widget_header row mb-2">
<div class="col-md-12">
{include file=\App\Layout::getTemplatePath('BreadCrumbs.tpl', $MODULE_NAME)}
{include file=\App\Layout::getTemplatePath('BreadCrumbs.tpl', $QUALIFIED_MODULE)}
</div>
</div>
<div class="actions mb-2">
{foreach from=$LINKS item=LINK}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $QUALIFIED_MODULE) BUTTON_VIEW='listViewBasic' MODULE_NAME=$QUALIFIED_MODULE}
{/foreach}
{if !empty($LINKS)}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' MODULE_NAME=$QUALIFIED_MODULE}
{/if}
</div>
<form class="js-filter-form" data-js="container">
<table id="dataTableGroups" class="table table-sm table-striped display nowrap text-center mt-2 js-data-table u-cursor-pointer" data-url="index.php?module=Groups&parent=Settings&view=GetData">
Expand Down
Expand Up @@ -30,7 +30,7 @@
</td>
<td nowrap class="{$WIDTHTYPE} rightRecordActions listButtons {$WIDTHTYPE}">
{assign var=LINKS value=$LISTVIEW_ENTRY->getRecordLinks()}
{if count($LINKS) > 0}
{if !empty($LINKS)}
<div class="actions">
<div class="float-right">
{foreach from=$LINKS item=LINK}
Expand Down
8 changes: 3 additions & 5 deletions layouts/basic/modules/Settings/Vtiger/EditViewActions.tpl
Expand Up @@ -4,16 +4,14 @@
{assign var=SINGLE_MODULE_NAME value='SINGLE_'|cat:$MODULE}
<button class="btn btn-success js-form-submit-btn" type="submit">
<span class="fas fa-check mr-1"></span>
<strong>{\App\Language::translate('LBL_SAVE', $MODULE)}</strong>
<strong>{\App\Language::translate('LBL_SAVE', $QUALIFIED_MODULE)}</strong>
</button>
<button class="btn btn-danger ml-2" type="reset" onclick="javascript:window.history.back();">
<span class="fas fa-times mr-1"></span>
<strong>{\App\Language::translate('LBL_CANCEL', $MODULE)}</strong>
<strong>{\App\Language::translate('LBL_CANCEL', $QUALIFIED_MODULE)}</strong>
</button>
{if isset($EDITVIEW_LINKS['EDIT_VIEW_HEADER'])}
{foreach item=LINK from=$EDITVIEW_LINKS['EDIT_VIEW_HEADER']}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='editViewHeader'}
{/foreach}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$EDITVIEW_LINKS['EDIT_VIEW_HEADER'] BUTTON_VIEW='editViewHeader' MODULE_NAME=$QUALIFIED_MODULE SKIP_GROUP=true}
{/if}
</div>
</form>
Expand Down
4 changes: 1 addition & 3 deletions layouts/basic/modules/Settings/Vtiger/ListViewContents.tpl
Expand Up @@ -49,9 +49,7 @@
{if count($LINKS) > 0}
<div class="actions">
<div class="float-right">
{foreach from=$LINKS item=LINK}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $QUALIFIED_MODULE) BUTTON_VIEW='listViewBasic' MODULE_NAME=$QUALIFIED_MODULE MODULE=$QUALIFIED_MODULE}
{/foreach}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' MODULE_NAME=$QUALIFIED_MODULE}
</div>
</div>
{/if}
Expand Down
Expand Up @@ -11,9 +11,7 @@
<div class="editViewContainer tab-pane active mt-2" id="{$TYPE_API}" data-type="{$TYPE_API}">
<div class="listViewActionsDiv row">
<div class="col-md-8 tn-toolbar">
{foreach item=LINK from=$LISTVIEW_LINKS['LISTVIEWBASIC']}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
{/foreach}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$LISTVIEW_LINKS['LISTVIEWBASIC'] BUTTON_VIEW='listViewBasic' MODULE_NAME=$QUALIFIED_MODULE SKIP_GROUP=true}
</div>
<div class="col-md-4 ">
<div class="float-right">
Expand Down
Expand Up @@ -15,9 +15,9 @@
</div>
<div class="actions col-3">
<div class="float-right pr-1">
{foreach item=LINK from=$WIDGET_MODEL->getSettingsLinks()}
{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $QUALIFIED_MODULE) BUTTON_VIEW='' BTN_CLASS=""}
{/foreach}
{if !empty($WIDGET_MODEL->getSettingsLinks())}
{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$WIDGET_MODEL->getSettingsLinks() MODULE_NAME=$QUALIFIED_MODULE SKIP_GROUP=true}
{/if}
</div>
</div>
</span>
Expand Down