diff --git a/layouts/v7/modules/Calendar/ModuleHeader.tpl b/layouts/v7/modules/Calendar/ModuleHeader.tpl
index 45767bad4dfddf8656b9c4da3618e9a36ad1652e..5161c6cb2294564bec7d923ff0cf684a1d9fd9a2 100644
--- a/layouts/v7/modules/Calendar/ModuleHeader.tpl
+++ b/layouts/v7/modules/Calendar/ModuleHeader.tpl
@@ -23,7 +23,7 @@
{assign var=DEFAULT_FILTER_URL value=$MODULE_MODEL->getListViewUrlWithAllFilter()}
{/if}
{/if}
- <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}&app={$SELECTED_MENU_CATEGORY}'><h4 class="module-title pull-left text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4> </a>
+ <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}&app={$SELECTED_MENU_CATEGORY}'><h4 class="module-title pull-left text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4></a>
{if $smarty.session.lvs.$MODULE.viewname}
{assign var=VIEWID value=$smarty.session.lvs.$MODULE.viewname}
{/if}
@@ -36,18 +36,18 @@
{/if}
{/foreach}
{/foreach}
- <p class="current-filter-name filter-name pull-left cursorPointer" title="{$CVNAME}"><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a href='{$MODULE_MODEL->getListViewUrl()}&viewname={$VIEWID}&app={$SELECTED_MENU_CATEGORY}'> {$CVNAME} </a> </p>
+ <p class="current-filter-name filter-name pull-left cursorPointer" title="{$CVNAME}"> <span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a href='{$MODULE_MODEL->getListViewUrl()}&viewname={$VIEWID}&app={$SELECTED_MENU_CATEGORY}'> {$CVNAME} </a></p>
{/if}
{assign var=SINGLE_MODULE_NAME value='SINGLE_'|cat:$MODULE}
{if $RECORD and $smarty.request.view eq 'Edit'}
- <p class="current-filter-name filter-name pull-left "><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a title="{$RECORD->get('label')}"> {vtranslate('LBL_EDITING', $MODULE)} : {$RECORD->get('label')} </a></p>
+ <p class="current-filter-name filter-name pull-left "><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a title="{$RECORD->get('label')}"> {vtranslate('LBL_EDITING', $MODULE)} : {$RECORD->get('label')} </a></p>
{else if $smarty.request.view eq 'Edit'}
- <p class="current-filter-name filter-name pull-left "><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a> {vtranslate('LBL_ADDING_NEW', $MODULE)} </a></p>
+ <p class="current-filter-name filter-name pull-left "><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a> {vtranslate('LBL_ADDING_NEW', $MODULE)} </a></p>
{/if}
{if $smarty.request.view eq 'Detail'}
- <p class="current-filter-name filter-name pull-left"><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a title="{$RECORD->get('label')}"> {$RECORD->get('label')} </a></p>
+ <p class="current-filter-name filter-name pull-left"><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a title="{$RECORD->get('label')}"> {$RECORD->get('label')} </a></p>
{/if}
</div>
<div class="col-lg-5 col-md-5 pull-right">
@@ -62,7 +62,7 @@
{else}
onclick="Vtiger_Import_Js.triggerImportAction('{$BASIC_ACTION->getUrl()}')"
{/if}>
- <div class="fa {$BASIC_ACTION->getIcon()}" aria-hidden="true"></div>
+ <div class="fa {$BASIC_ACTION->getIcon()}" aria-hidden="true"></div>
{vtranslate($BASIC_ACTION->getLabel(), $MODULE)}
</button>
</li>
@@ -74,7 +74,7 @@
{else}
onclick='window.location.href="{$BASIC_ACTION->getUrl()}&app={$SELECTED_MENU_CATEGORY}"'
{/if}>
- <div class="fa {$BASIC_ACTION->getIcon()}" aria-hidden="true"></div>
+ <div class="fa {$BASIC_ACTION->getIcon()}" aria-hidden="true"></div>
{vtranslate($BASIC_ACTION->getLabel(), $MODULE)}
</button>
</li>
diff --git a/layouts/v7/modules/Campaigns/RelatedList.tpl b/layouts/v7/modules/Campaigns/RelatedList.tpl
index c3a57d6f7c034ab0d0dae2292058762589f19edb..f8e47b4588be7bf4294b7e755c0c1dc7a2e66d49 100644
--- a/layouts/v7/modules/Campaigns/RelatedList.tpl
+++ b/layouts/v7/modules/Campaigns/RelatedList.tpl
@@ -62,7 +62,7 @@
onclick="{$RELATED_LINK->getUrl()}"
{/if}
{if ($IS_SELECT_BUTTON neq true) && ($IS_SEND_EMAIL_BUTTON neq true)}name="addButton"{/if}
- {if $IS_SEND_EMAIL_BUTTON eq true} disabled="disabled" {/if}>{if ($IS_SELECT_BUTTON neq true) && ($IS_SEND_EMAIL_BUTTON neq true)}<i class="fa fa-plus"></i>{/if} {$RELATED_LINK->getLabel()}</button>
+ {if $IS_SEND_EMAIL_BUTTON eq true} disabled="disabled" {/if}>{if ($IS_SELECT_BUTTON neq true) && ($IS_SEND_EMAIL_BUTTON neq true)}<i class="fa fa-plus"></i>{/if} {$RELATED_LINK->getLabel()}</button>
{/if}
</div>
{/foreach}
diff --git a/layouts/v7/modules/Documents/DocumentsRelatedList.tpl b/layouts/v7/modules/Documents/DocumentsRelatedList.tpl
index 46fce2d8b1a90483f01aacea1b4d2e0f797ac75a..198e27e95c01d890640382ae81cc9dde3951c2cd 100644
--- a/layouts/v7/modules/Documents/DocumentsRelatedList.tpl
+++ b/layouts/v7/modules/Documents/DocumentsRelatedList.tpl
@@ -54,7 +54,7 @@
<div class="col-sm-3">
<div class="dropdown">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
- <span class="fa fa-plus" title="{vtranslate('LBL_NEW_DOCUMENT', $MODULE)}"></span> {vtranslate('LBL_NEW_DOCUMENT', $RELATED_MODULE_NAME)} <span class="caret"></span>
+ <span class="fa fa-plus" title="{vtranslate('LBL_NEW_DOCUMENT', $MODULE)}"></span> {vtranslate('LBL_NEW_DOCUMENT', $RELATED_MODULE_NAME)} <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li class="dropdown-header"><i class="fa fa-upload"></i> {vtranslate('LBL_FILE_UPLOAD', $RELATED_MODULE_NAME)}</li>
diff --git a/layouts/v7/modules/Documents/ModuleHeader.tpl b/layouts/v7/modules/Documents/ModuleHeader.tpl
index fdbc8d1eedf77f2d94e4b26fee030e8ad5810988..c22873917a2fae87bddb6aaee19b63de95c5f16d 100644
--- a/layouts/v7/modules/Documents/ModuleHeader.tpl
+++ b/layouts/v7/modules/Documents/ModuleHeader.tpl
@@ -25,7 +25,7 @@
{assign var=DEFAULT_FILTER_URL value=$MODULE_MODEL->getListViewUrlWithAllFilter()}
{/if}
{/if}
- <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}&app={$SELECTED_MENU_CATEGORY}'><h4 class="module-title pull-left textOverflowEllipsis text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4> </a>
+ <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}&app={$SELECTED_MENU_CATEGORY}'><h4 class="module-title pull-left textOverflowEllipsis text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4></a>
{if $smarty.session.lvs.$MODULE.viewname}
{assign var=VIEWID value=$smarty.session.lvs.$MODULE.viewname}
{/if}
@@ -38,16 +38,16 @@
{/if}
{/foreach}
{/foreach}
- <p class="current-filter-name filter-name pull-left cursorPointer" title="{$CVNAME}"><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a href='{$MODULE_MODEL->getListViewUrl()}&viewname={$VIEWID}'> {$CVNAME} </a> </p>
+ <p class="current-filter-name filter-name pull-left cursorPointer" title="{$CVNAME}"> <span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a href='{$MODULE_MODEL->getListViewUrl()}&viewname={$VIEWID}'> {$CVNAME} </a> </p>
{/if}
{assign var=SINGLE_MODULE_NAME value='SINGLE_'|cat:$MODULE}
{if $RECORD and $smarty.request.view eq 'Edit'}
- <p class="current-filter-name filter-name pull-left "><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a title="{$RECORD->get('label')}"> {vtranslate('LBL_EDITING', $MODULE)} : {$RECORD->get('label')} </a></p>
+ <p class="current-filter-name filter-name pull-left "><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a title="{$RECORD->get('label')}"> {vtranslate('LBL_EDITING', $MODULE)} : {$RECORD->get('label')} </a></p>
{else if $smarty.request.view eq 'Edit'}
- <p class="current-filter-name filter-name pull-left "><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a> {vtranslate('LBL_ADDING_NEW', $MODULE)} </a></p>
+ <p class="current-filter-name filter-name pull-left "><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a> {vtranslate('LBL_ADDING_NEW', $MODULE)} </a></p>
{/if}
{if $smarty.request.view eq 'Detail'}
- <p class="current-filter-name filter-name pull-left"><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a title="{$RECORD->get('label')}"> {$RECORD->get('label')} </a></p>
+ <p class="current-filter-name filter-name pull-left"><span class="fa fa-angle-right pull-left" aria-hidden="true"></span><a title="{$RECORD->get('label')}"> {$RECORD->get('label')} </a></p>
{/if}
</div>
<div class="col-lg-5 col-md-5 pull-right ">
@@ -58,7 +58,7 @@
<li>
<div>
<button type="button" class="btn btn-default module-buttons dropdown-toggle" data-toggle="dropdown">
- <span class="fa fa-plus" title="{vtranslate('LBL_NEW_DOCUMENT', $MODULE)}"></span> {vtranslate('LBL_NEW_DOCUMENT', $MODULE)} <span class="caret"></span>
+ <span class="fa fa-plus" title="{vtranslate('LBL_NEW_DOCUMENT', $MODULE)}"></span> {vtranslate('LBL_NEW_DOCUMENT', $MODULE)} <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li class="dropdown-header"><i class="fa fa-upload"></i> {vtranslate('LBL_FILE_UPLOAD', $MODULE)}</li>
diff --git a/layouts/v7/modules/Inventory/partials/LineItemsEdit.tpl b/layouts/v7/modules/Inventory/partials/LineItemsEdit.tpl
index c0af62ed33c6dccbf4971038c9f912d5b0bb13ea..ebaa0c37711f5af3cd5cebed2baa554bc3691eab 100644
--- a/layouts/v7/modules/Inventory/partials/LineItemsEdit.tpl
+++ b/layouts/v7/modules/Inventory/partials/LineItemsEdit.tpl
@@ -213,13 +213,13 @@
{elseif $PRODUCT_ACTIVE eq 'true'}
<div class="btn-group">
<button type="button" class="btn btn-default" id="addProduct" data-module-name="Products">
- <i class="fa fa-plus"></i><strong> {vtranslate('LBL_ADD_PRODUCT',$MODULE)}</strong>
+ <i class="fa fa-plus"></i><strong> {vtranslate('LBL_ADD_PRODUCT',$MODULE)}</strong>
</button>
</div>
{elseif $SERVICE_ACTIVE eq 'true'}
<div class="btn-group">
<button type="button" class="btn btn-default" id="addService" data-module-name="Services">
- <i class="fa fa-plus"></i><strong> {vtranslate('LBL_ADD_SERVICE',$MODULE)}</strong>
+ <i class="fa fa-plus"></i><strong> {vtranslate('LBL_ADD_SERVICE',$MODULE)}</strong>
</button>
</div>
{/if}
diff --git a/layouts/v7/modules/Portal/ModuleHeader.tpl b/layouts/v7/modules/Portal/ModuleHeader.tpl
index 5d29cd0f9c9636d029f34bdfab58ad2511cbf3ee..28a544b64c8af5117666fd29814ce3bd5767986a 100644
--- a/layouts/v7/modules/Portal/ModuleHeader.tpl
+++ b/layouts/v7/modules/Portal/ModuleHeader.tpl
@@ -20,10 +20,10 @@
{else}
{assign var=DEFAULT_FILTER_URL value=$MODULE_MODEL->getListViewUrlWithAllFilter()}
{/if}
- <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}'><h4 class="module-title pull-left text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4></a>
+ <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}'><h4 class="module-title pull-left text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4></a>
</span>
<span>
- <p class="current-filter-name pull-left"> <span class="fa fa-angle-right" aria-hidden="true"></span> {$VIEW} </p>
+ <p class="current-filter-name pull-left"> <span class="fa fa-angle-right" aria-hidden="true"></span> {$VIEW} </p>
</span>
{if $VIEWID}
{foreach item=FILTER_TYPES from=$CUSTOM_VIEWS}
@@ -35,7 +35,7 @@
{/foreach}
{/foreach}
<span>
- <p class="current-filter-name filter-name pull-left"> <span class="fa fa-angle-right" aria-hidden="true"></span> {$CVNAME} </p>
+ <p class="current-filter-name filter-name pull-left"><span class="fa fa-angle-right" aria-hidden="true"></span> {$CVNAME} </p>
</span>
{/if}
</div>
@@ -45,7 +45,7 @@
{assign var=BASIC_ACTION value=$MODULE_BASIC_ACTIONS}
<li>
<button class="btn btn-default addBookmark addButton module-buttons" >
- <i class="fa fa-plus"></i> {vtranslate('LBL_ADD_BOOKMARK',$MODULE)}</i>
+ <i class="fa fa-plus"></i> {vtranslate('LBL_ADD_BOOKMARK',$MODULE)}</i>
</button>
</li>
</ul>
diff --git a/layouts/v7/modules/Products/PriceBookProductPopup.tpl b/layouts/v7/modules/Products/PriceBookProductPopup.tpl
index f94ee303a40ad48f661f0ec66632e8ca819d9fb3..44aacf54302c968575c62d6b617d1cc1370afbdc 100644
--- a/layouts/v7/modules/Products/PriceBookProductPopup.tpl
+++ b/layouts/v7/modules/Products/PriceBookProductPopup.tpl
@@ -44,7 +44,7 @@
<center>
<footer>
<button class="btn btn-success addProducts" type="submit">
- <i class="fa fa-plus"></i>
+ <i class="fa fa-plus"></i>
<strong>{vtranslate('LBL_ADD_TO_PRICEBOOKS', $MODULE)}</strong>
</button>
<a class="cancelLink" data-dismiss="modal">{vtranslate('LBL_CANCEL', $MODULE)}</a>
diff --git a/layouts/v7/modules/Products/ProductsPopup.tpl b/layouts/v7/modules/Products/ProductsPopup.tpl
index 2216490ad6972ede2fb132d4a4bdfd20c837296b..861a02ce295ede37d090cac2ea0a1026a251c0cf 100644
--- a/layouts/v7/modules/Products/ProductsPopup.tpl
+++ b/layouts/v7/modules/Products/ProductsPopup.tpl
@@ -43,7 +43,7 @@
<center>
<footer>
<button class="btn btn-success addProducts" type="submit">
- <i class="fa fa-plus"></i>
+ <i class="fa fa-plus"></i>
<strong>{vtranslate('LBL_ADD_TO_PRODUCTS',$MODULE)}</strong>
</button>
<a class="cancelLink" data-dismiss="modal">{vtranslate('LBL_CANCEL', $MODULE)}</a>
diff --git a/layouts/v7/modules/Reports/ModuleHeader.tpl b/layouts/v7/modules/Reports/ModuleHeader.tpl
index 5954a671ec2e06505216fb40678cb1ed950f5fea..2e5d57fec1199b5113c82d548770016156968e15 100644
--- a/layouts/v7/modules/Reports/ModuleHeader.tpl
+++ b/layouts/v7/modules/Reports/ModuleHeader.tpl
@@ -22,15 +22,18 @@
{else}
{assign var=DEFAULT_FILTER_URL value=$MODULE_MODEL->getListViewUrlWithAllFilter()}
{/if}
- <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}'><h4 class="module-title pull-left"> {vtranslate($MODULE, $MODULE)} </h4></a>
+ <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}'><h4 class="module-title pull-left"> {vtranslate($MODULE, $MODULE)} </h4></a>
</span>
<span>
- <p class="current-filter-name pull-left"> <span class="fa fa-angle-right" aria-hidden="true"></span>
+ <p class="current-filter-name pull-left">
+ <span class="fa fa-angle-right" aria-hidden="true"></span>
+
{if $VIEW eq 'Detail' or $VIEW eq 'ChartDetail'}
- {$REPORT_NAME}
+ {$REPORT_NAME}
{else}
- {$VIEW}
+ {$VIEW}
{/if}
+
</p>
</span>
{if $VIEWNAME}
@@ -45,7 +48,7 @@
{assign var=FOLDERNAME value=vtranslate('LBL_ALL_REPORTS', $MODULE)}
{/if}
<span>
- <p class="current-filter-name filter-name pull-left"> <span class="fa fa-angle-right" aria-hidden="true"></span> {$FOLDERNAME} </p>
+ <p class="current-filter-name filter-name pull-left"><span class="fa fa-angle-right" aria-hidden="true"></span> {$FOLDERNAME} </p>
</span>
{/if}
</span>
@@ -57,7 +60,7 @@
{if $childLinks && $LISTVIEW_BASICACTION->get('linklabel') == 'LBL_ADD_RECORD'}
<span class="btn-group">
<button class="btn btn-default dropdown-toggle module-buttons" data-toggle="dropdown" id="{$MODULE}_listView_basicAction_Add">
- <i class="fa fa-plus"></i>
+ <i class="fa fa-plus"></i>
{vtranslate($LISTVIEW_BASICACTION->getLabel(), $MODULE)}
<i class="caret icon-white"></i>
</button>
diff --git a/layouts/v7/modules/Rss/ModuleHeader.tpl b/layouts/v7/modules/Rss/ModuleHeader.tpl
index abaabfd1d5135397b0dfebda6d98154dc9597804..3f9180b97925ff8a74bdaecbe5a3721669cdde9a 100644
--- a/layouts/v7/modules/Rss/ModuleHeader.tpl
+++ b/layouts/v7/modules/Rss/ModuleHeader.tpl
@@ -22,10 +22,10 @@
{else}
{assign var=DEFAULT_FILTER_URL value=$MODULE_MODEL->getListViewUrlWithAllFilter()}
{/if}
- <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}'><h4 class="module-title pull-left text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4></a>
+ <a title="{vtranslate($MODULE, $MODULE)}" href='{$DEFAULT_FILTER_URL}'><h4 class="module-title pull-left text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4></a>
</span>
<span>
- <p class="current-filter-name pull-left"> <span class="fa fa-angle-right" aria-hidden="true"></span> {$VIEW} </p>
+ <p class="current-filter-name pull-left"> <span class="fa fa-angle-right" aria-hidden="true"></span> {$VIEW} </p>
</span>
{if $VIEWID}
{foreach item=FILTER_TYPES from=$CUSTOM_VIEWS}
@@ -37,7 +37,7 @@
{/foreach}
{/foreach}
<span>
- <p class="current-filter-name filter-name pull-left"> <span class="fa fa-angle-right" aria-hidden="true"></span> {$CVNAME} </p>
+ <p class="current-filter-name filter-name pull-left"> <span class="fa fa-angle-right" aria-hidden="true"></span> {$CVNAME} </p>
</span>
{/if}
</div>
@@ -47,7 +47,7 @@
{assign var=BASIC_ACTION value=$MODULE_BASIC_ACTIONS}
<li>
<button class="btn btn-default rssAddButton module-buttons" >
- <i class="fa fa-plus"></i> {vtranslate('LBL_FEED_SOURCE',$MODULE)}</i>
+ <i class="fa fa-plus"></i> {vtranslate('LBL_FEED_SOURCE',$MODULE)}</i>
</button>
</li>
</ul>
diff --git a/layouts/v7/modules/Settings/LayoutEditor/FieldCreate.tpl b/layouts/v7/modules/Settings/LayoutEditor/FieldCreate.tpl
index 226f493f2ef78c1905587c16f85baa1b9d47501d..db9c43a4e8630bfd386a164c8a998f9b1dfa9351 100644
--- a/layouts/v7/modules/Settings/LayoutEditor/FieldCreate.tpl
+++ b/layouts/v7/modules/Settings/LayoutEditor/FieldCreate.tpl
@@ -173,7 +173,7 @@
</div>
<div class="form-group col-sm-6">
<label class="control-label fieldLabel col-sm-7">
- <i class="fa fa-plus"></i> {vtranslate('LBL_QUICK_CREATE',$QUALIFIED_MODULE)}
+ <i class="fa fa-plus"></i> {vtranslate('LBL_QUICK_CREATE',$QUALIFIED_MODULE)}
</label>
<div class="controls col-sm-5">
{if $FIELD_MODEL->isQuickCreateOptionDisabled()}
diff --git a/layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl b/layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl
index 1bc3c81c1b1a39b1fabdbaec710db89952bef8bf..edff2721b7df09d16dc74f8e0d94dcb9d578ba7f 100644
--- a/layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl
+++ b/layouts/v7/modules/Settings/LayoutEditor/FieldsList.tpl
@@ -16,7 +16,7 @@
<div class="row fieldsListContainer" style="padding:1% 0">
<div class="col-sm-6">
<button class="btn btn-default addButton addCustomBlock" type="button">
- <i class="fa fa-plus"></i>
+ <i class="fa fa-plus"></i>
{vtranslate('LBL_ADD_CUSTOM_BLOCK', $QUALIFIED_MODULE)}
</button>
</div>
@@ -61,7 +61,7 @@
{if $BLOCK_MODEL->isAddCustomFieldEnabled()}
<button class="btn btn-default addButton btn-sm addCustomField" type="button">
- <i class="fa fa-plus"></i> {vtranslate('LBL_ADD_CUSTOM_FIELD', $QUALIFIED_MODULE)}
+ <i class="fa fa-plus"></i> {vtranslate('LBL_ADD_CUSTOM_FIELD', $QUALIFIED_MODULE)}
</button>
{/if}
{if $BLOCK_MODEL->isActionsAllowed()}
@@ -254,7 +254,7 @@
{vtranslate('LBL_ADD_NEW_FIELD_HERE',$QUALIFIED_MODULE)}
</span>
<span class="col-sm-4" style="margin-top: 7%;margin-left: -15%;">
- <button class="btn btn-default btn-sm addButton" style="padding: 2px 15px;"><i class="fa fa-plus"></i> {vtranslate('LBL_ADD',$QUALIFIED_MODULE)}</button>
+ <button class="btn btn-default btn-sm addButton"><i class="fa fa-plus"></i> {vtranslate('LBL_ADD',$QUALIFIED_MODULE)}</button>
</span>
</li>
{/if}
@@ -427,7 +427,7 @@
{vtranslate('LBL_ADD_NEW_FIELD_HERE',$QUALIFIED_MODULE)}
</span>
<span class="col-sm-4" style="margin-top: 7%;margin-left: -15%;">
- <button class="btn btn-default btn-sm addButton" style="padding: 2px 15px;"><i class="fa fa-plus"></i> {vtranslate('LBL_ADD',$QUALIFIED_MODULE)}</button>
+ <button class="btn btn-default btn-sm addButton"><i class="fa fa-plus"></i> {vtranslate('LBL_ADD',$QUALIFIED_MODULE)}</button>
</span>
</li>
{/if}
@@ -458,7 +458,7 @@
data-on-text="{vtranslate('LBL_YES', $QUALIFIED_MODULE)}" data-off-text="{vtranslate('LBL_NO', $QUALIFIED_MODULE)}" data-on-color="primary" data-block-id="{$BLOCK_MODEL->get('id')}"/>
</span>
<button class="btn btn-default addButton addCustomField" type="button">
- <i class="fa fa-plus"></i> {vtranslate('LBL_ADD_CUSTOM_FIELD', $QUALIFIED_MODULE)}
+ <i class="fa fa-plus"></i> {vtranslate('LBL_ADD_CUSTOM_FIELD', $QUALIFIED_MODULE)}
</button>
<button class="inActiveFields addButton btn btn-default btn-sm">{vtranslate('LBL_SHOW_HIDDEN_FIELDS', $QUALIFIED_MODULE)}</button>
<button class="deleteCustomBlock addButton btn btn-default btn-sm">{vtranslate('LBL_DELETE_CUSTOM_BLOCK', $QUALIFIED_MODULE)}</button>
@@ -472,7 +472,7 @@
{vtranslate('LBL_ADD_NEW_FIELD_HERE',$QUALIFIED_MODULE)}
</span>
<span class="col-sm-4" style="margin-top: 7%;margin-left: -15%;">
- <button class="btn btn-default btn-sm addButton" style="padding: 2px 15px;"><i class="fa fa-plus"></i> {vtranslate('LBL_ADD',$QUALIFIED_MODULE)}</button>
+ <button class="btn btn-default btn-sm addButton"><i class="fa fa-plus"></i> {vtranslate('LBL_ADD',$QUALIFIED_MODULE)}</button>
</span>
</li>
</ul>
diff --git a/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl b/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl
index 9a96978c33a69ac370b02a6be8449acc0d7cd8d6..43f60b6275832aea9a0d3048f4291316059b072e 100644
--- a/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl
+++ b/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl
@@ -17,7 +17,7 @@
<a title="{vtranslate('Home', $MODULE)}" href='index.php?module=Vtiger&parent=Settings&view=Index'>
<h4 class="module-title pull-left text-uppercase">{vtranslate('LBL_HOME', $MODULE)} </h4>
</a>
- <span class="fa fa-angle-right pull-left {if $VIEW eq 'Index' && $MODULE eq 'Vtiger'} hide {/if}" aria-hidden="true" style="padding-top: 12px;padding-left: 5px;"></span>
+ <span class="fa fa-angle-right pull-left {if $VIEW eq 'Index' && $MODULE eq 'Vtiger'} hide {/if}" aria-hidden="true" style="padding-top: 12px;padding-left: 5px; padding-right: 5px;"></span>
{/if}
{if $MODULE neq 'Vtiger' or $smarty.request.view neq 'Index'}
{if $ACTIVE_BLOCK['block']}
@@ -38,7 +38,7 @@
{assign var=URL value=$URL|cat:'&parent='|cat:$smarty.request.parent}
{/if}
{/if}
- <span class="current-filter-name settingModuleName filter-name pull-left">
+ <span class="current-filter-name settingModuleName filter-name pull-left">
{if $smarty.request.view eq 'Calendar'}
{if $smarty.request.mode eq 'Edit'}
<a href="{"index.php?module="|cat:$smarty.request.module|cat:'&parent='|cat:$smarty.request.parent|cat:'&view='|cat:$smarty.request.view}">
diff --git a/layouts/v7/modules/Vtiger/ListViewHeader.tpl b/layouts/v7/modules/Vtiger/ListViewHeader.tpl
index 93ed81f647830ad517eef109e837a3790d22038e..77e9eccf82348dd29ae11e68aad53547211900cb 100644
--- a/layouts/v7/modules/Vtiger/ListViewHeader.tpl
+++ b/layouts/v7/modules/Vtiger/ListViewHeader.tpl
@@ -13,9 +13,9 @@
<div class="module-action-bar clearfix">
<div class="module-action-content clearfix row">
<div class="col-lg-4 col-md-4 col-sm-4">
- <h3 class="module-title pull-left"> {vtranslate($MODULE, $MODULE)} </h3>
+ <h3 class="module-title pull-left"> {vtranslate($MODULE, $MODULE)} </h3>
<div>
- <p class="current-filter-name pull-left"><span class="fa fa-chevron-right" aria-hidden="true"></span> {$VIEW} </p>
+ <p class="current-filter-name pull-left"><span class="fa fa-chevron-right" aria-hidden="true"></span> {$VIEW} </p>
</div>
</div>
<div class="col-lg-4 col-md-4 col-sm-4">
diff --git a/modules/Settings/Vtiger/models/CompanyDetails.php b/modules/Settings/Vtiger/models/CompanyDetails.php
index fc4a38c8bd98c1da8b858d2e8250043560d4896d..f41aa8582844464f75947b44d5eeb0336420d0c1 100644
--- a/modules/Settings/Vtiger/models/CompanyDetails.php
+++ b/modules/Settings/Vtiger/models/CompanyDetails.php
@@ -147,17 +147,6 @@ class Settings_Vtiger_CompanyDetails_Model extends Settings_Vtiger_Module_Model
array_push($params, $db->getUniqueID($this->baseTable));
}
$db->pquery($query, $params);
-
- $companyName = $this->get('organizationname');
- $companyName = preg_replace(array("/>/", "/</", "/&/", "/'/", '/""/', '/gt;/', '/lt;/', '/;/'), '', $companyName);
- $fileContent = file_get_contents('portal/config.inc.php');
- $pattern = '/\$companyName[\s]+=([^;]+);/';
- $replacedValue = sprintf("\$%s = '%s';", 'companyName', $companyName);
- $fileContent = preg_replace($pattern, $replacedValue, $fileContent);
- $fp = fopen('portal/config.inc.php', 'w');
- fwrite($fp, $fileContent);
- fclose($fp);
- // End
}
/**
diff --git a/modules/Vtiger/views/Basic.php b/modules/Vtiger/views/Basic.php
index d7535a9f8322fc45040e20fd82b2b3dfd9ae9ede..0f38dc8c09f86951f1be15adcee791c1bfb661d2 100644
--- a/modules/Vtiger/views/Basic.php
+++ b/modules/Vtiger/views/Basic.php
@@ -55,7 +55,7 @@ abstract class Vtiger_Basic_View extends Vtiger_Footer_View {
foreach ($menuGroupedByParent as $parentCategory => $menuList) {
if($parentCategory == 'ANALYTICS') continue;
if(count($menuList) > 0) {
- if(array_key_exists($selectedModule, $menuList)) {
+ if(array_key_exists($selectedModule, $menuList) && $parentCategory) {
$moduleFound = true;
$selectedModuleMenuCategory = $parentCategory;
}
diff --git a/packages/vtiger/optional/EmailTemplates.zip b/packages/vtiger/optional/EmailTemplates.zip
index 38722111e1d3111312ad9b477bb7505b06f163e8..e3f763e0e5347950531c3b36b6b2898bc51cdfda 100644
Binary files a/packages/vtiger/optional/EmailTemplates.zip and b/packages/vtiger/optional/EmailTemplates.zip differ
diff --git a/packages/vtiger/optional/RecycleBin.zip b/packages/vtiger/optional/RecycleBin.zip
index 649ef9d8316479f7c4a7da3eae7dc7479206d750..64afe2df3fd51c9ac02cb04156943bcc78c4274b 100644
Binary files a/packages/vtiger/optional/RecycleBin.zip and b/packages/vtiger/optional/RecycleBin.zip differ
diff --git a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/ModuleHeader.tpl b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/ModuleHeader.tpl
index eb26c0dd5fec521cd0c6e7bca59488b297f3ca34..70bf6ccbc8d3ccc22ae4fb5700874fff9f82cece 100644
--- a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/ModuleHeader.tpl
+++ b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/ModuleHeader.tpl
@@ -13,20 +13,21 @@
<div class="col-lg-5 col-md-5 module-breadcrumb">
{assign var=MODULE_MODEL value=Vtiger_Module_Model::getInstance($MODULE)}
<a title="{vtranslate($MODULE, $MODULE)}" href='{$MODULE_MODEL->getDefaultUrl()}'>
- <h4 class="module-title pull-left text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4>
+ <h4 class="module-title pull-left text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4>
</a>
<p class="current-filter-name filter-name pull-left cursorPointer">
<span class="fa fa-angle-right pull-left" aria-hidden="true"></span>
{if $smarty.request.view eq 'List'}
{vtranslate('LBL_FILTER', $MODULE)}
{/if}
+
{if $smarty.request.view eq 'Detail'}
- <a title="{$RECORD->get('templatename')}"> {$RECORD->get('templatename')} </a>
+ <a title="{$RECORD->get('templatename')}"> {$RECORD->get('templatename')} </a>
{/if}
{if $RECORD and $smarty.request.view eq 'Edit'}
- <a title="{$RECORD->get('templatename')}"> {vtranslate('LBL_EDITING', $MODULE)} : {$RECORD->get('templatename')} </a>
+ <a title="{$RECORD->get('templatename')}"> {vtranslate('LBL_EDITING', $MODULE)} : {$RECORD->get('templatename')} </a>
{else if $smarty.request.view eq 'Edit'}
- <a> {vtranslate('LBL_ADDING_NEW', $MODULE)} </a>
+ <a> {vtranslate('LBL_ADDING_NEW', $MODULE)} </a>
{/if}
</p>
</div>
diff --git a/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/ModuleHeader.tpl b/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/ModuleHeader.tpl
index 34876d2512bcdcda6ebe8be7158f1e3f2a3714c9..2da851d1f7542cc4050e89d8c34e5e6831ba78ff 100644
--- a/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/ModuleHeader.tpl
+++ b/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/ModuleHeader.tpl
@@ -12,13 +12,13 @@
<div class="module-action-content clearfix">
<span class="col-lg-7 col-md-7 module-breadcrumb module-breadcrumb-{$smarty.request.view}">
<span>
- <h4 title="{vtranslate($MODULE, $MODULE)}" class="module-title pull-left text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4>
+ <h4 title="{vtranslate($MODULE, $MODULE)}" class="module-title pull-left text-uppercase"> {vtranslate($MODULE, $MODULE)} </h4>
</span>
<span>
- <p class="current-filter-name pull-left"> <span class="fa fa-angle-right" aria-hidden="true"></span> {$VIEW} </p>
+ <p class="current-filter-name pull-left"><span class="fa fa-angle-right" aria-hidden="true"></span> {$VIEW} </p>
</span>
<span>
- <p class="current-filter-name pull-left textOverflowEllipsis" style="width:250px;"> <span class="fa fa-angle-right" aria-hidden="true"></span> {vtranslate($SOURCE_MODULE,$SOURCE_MODULE)} </p>
+ <p class="current-filter-name pull-left textOverflowEllipsis" style="width:250px;"><span class="fa fa-angle-right" aria-hidden="true"></span> {vtranslate($SOURCE_MODULE,$SOURCE_MODULE)} </p>
</span>
</span>
</div>