From 310aa4070e770abc9a9f8a5e62d325056ce768bd Mon Sep 17 00:00:00 2001 From: Uma <uma.s@vtiger.com> Date: Tue, 18 Aug 2020 17:36:09 +0530 Subject: [PATCH] Fixes #1289 butting up headers has been addressed --- .../modules/Settings/LayoutEditor/Index.tpl | 2 +- .../modules/Settings/Vtiger/ModuleHeader.tpl | 54 +++++++++++-------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/layouts/v7/modules/Settings/LayoutEditor/Index.tpl b/layouts/v7/modules/Settings/LayoutEditor/Index.tpl index 36dfbaa1c..a8dc2ae85 100644 --- a/layouts/v7/modules/Settings/LayoutEditor/Index.tpl +++ b/layouts/v7/modules/Settings/LayoutEditor/Index.tpl @@ -9,7 +9,7 @@ {* modules/Settings/LayoutEditor/views/Index.php *} {strip} - <div class="container-fluid main-scroll" id="layoutEditorContainer"> + <div class="container-fluid main-scroll paddingTop15" id="layoutEditorContainer"> <input id="selectedModuleName" type="hidden" value="{$SELECTED_MODULE_NAME}" /> <input class="selectedTab" type="hidden" value="{$SELECTED_TAB}"> <input class="selectedMode" type="hidden" value="{$MODE}"> diff --git a/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl b/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl index 4057fd09b..385534609 100644 --- a/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl +++ b/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl @@ -44,34 +44,40 @@ <a href="{"index.php?module="|cat:$smarty.request.module|cat:'&parent='|cat:$smarty.request.parent|cat:'&view='|cat:$smarty.request.view}"> {vtranslate({$PAGETITLE}, $QUALIFIED_MODULE)} </a> - <span class="fa fa-angle-right" aria-hidden="true"></span> - {vtranslate('LBL_EDITING', $MODULE)} : {vtranslate({$PAGETITLE}, $QUALIFIED_MODULE)} {vtranslate('LBL_OF',$QUALIFIED_MODULE)} {$USER_MODEL->getName()} + <a href=""> + <span class="fa fa-angle-right" aria-hidden="true"></span> + {vtranslate('LBL_EDITING', $MODULE)} : {vtranslate({$PAGETITLE}, $QUALIFIED_MODULE)} {vtranslate('LBL_OF',$QUALIFIED_MODULE)} {$USER_MODEL->getName()} + </a> {else} - {vtranslate({$PAGETITLE}, $QUALIFIED_MODULE)} <span class="fa fa-angle-right" aria-hidden="true"></span> {$USER_MODEL->getName()} + <a href="">{vtranslate({$PAGETITLE}, $QUALIFIED_MODULE)} <span class="fa fa-angle-right" aria-hidden="true"></span> {$USER_MODEL->getName()}</a> {/if} {else if $smarty.request.view neq 'List' and $smarty.request.module eq 'Users'} {if $smarty.request.view eq 'PreferenceEdit'} <a href="{"index.php?module="|cat:$smarty.request.module|cat:'&parent='|cat:$smarty.request.parent|cat:'&view=PreferenceDetail&record='|cat:$smarty.request.record}"> {vtranslate($ACTIVE_BLOCK['block'], $QUALIFIED_MODULE)} </a> - <span class="fa fa-angle-right" aria-hidden="true"></span> - {vtranslate('LBL_EDITING', $MODULE)} : {$USER_MODEL->getName()} + <a href=""> + <span class="fa fa-angle-right" aria-hidden="true"></span> + {vtranslate('LBL_EDITING', $MODULE)} : {$USER_MODEL->getName()} + </a> {else if $smarty.request.view eq 'Edit' or $smarty.request.view eq 'Detail'} <a href="{$URL}"> {if $smarty.request.extensionModule}{$smarty.request.extensionModule}{else}{vtranslate({$PAGETITLE}, $QUALIFIED_MODULE)}{/if} </a> - <span class="fa fa-angle-right" aria-hidden="true"></span> - {if $smarty.request.view eq 'Edit'} - {if $RECORD} - {vtranslate('LBL_EDITING', $MODULE)} : {$RECORD->getName()} - {else} - {vtranslate('LBL_ADDING_NEW', $MODULE)} - {/if} - {else} - {$RECORD->getName()} - {/if} + <a href=""> + <span class="fa fa-angle-right" aria-hidden="true"></span> + {if $smarty.request.view eq 'Edit'} + {if $RECORD} + {vtranslate('LBL_EDITING', $MODULE)} : {$RECORD->getName()} + {else} + {vtranslate('LBL_ADDING_NEW', $MODULE)} + {/if} + {else} + {$RECORD->getName()} + {/if} + </a> {else} - {$USER_MODEL->getName()} + <a href="">{$USER_MODEL->getName()}</a> {/if} {else if $URL and $URL|strpos:$smarty.request.view eq ''} <a href="{$URL}"> @@ -81,13 +87,15 @@ {vtranslate({$PAGETITLE}, $QUALIFIED_MODULE)} {/if} </a> - <span class="fa fa-angle-right" aria-hidden="true"></span> - {if $RECORD} - {if $smarty.request.view eq 'Edit'} - {vtranslate('LBL_EDITING', $MODULE)} : - {/if} - {$RECORD->getName()} - {/if} + <a href=""> + <span class="fa fa-angle-right" aria-hidden="true"></span> + {if $RECORD} + {if $smarty.request.view eq 'Edit'} + {vtranslate('LBL_EDITING', $MODULE)} : + {/if} + {$RECORD->getName()} + {/if} + </a> {else} {if $smarty.request.extensionModule}{$smarty.request.extensionModule}{else}{vtranslate({$PAGETITLE}, $QUALIFIED_MODULE)}{/if} {/if} -- GitLab