diff --git a/layouts/v7/modules/Calendar/partials/SidebarHeader.tpl b/layouts/v7/modules/Calendar/partials/SidebarHeader.tpl
index f61af13a48c3d0cd62041e52681c4ed5a123ca52..4752aee628b43a0711d4dc226115d4d2943a0a1d 100644
--- a/layouts/v7/modules/Calendar/partials/SidebarHeader.tpl
+++ b/layouts/v7/modules/Calendar/partials/SidebarHeader.tpl
@@ -6,13 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{strtoupper(vtranslate("LBL_CALENDAR",$MODULE))}">
<span class="app-indicator-icon fa fa-calendar"></span>
diff --git a/layouts/v7/modules/Documents/partials/SidebarHeader.tpl b/layouts/v7/modules/Documents/partials/SidebarHeader.tpl
index 2c68620021ca92ad0d90c9c4f80d419b4bbdd5e8..d38ee103e5f795fea618fc75d2de5f98fc885ad8 100644
--- a/layouts/v7/modules/Documents/partials/SidebarHeader.tpl
+++ b/layouts/v7/modules/Documents/partials/SidebarHeader.tpl
@@ -6,13 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY} moduleIcon">
<div class="row" title="{vtranslate("Documents",$MODULE)}">
<span class="app-indicator-icon fa vicon-documents"></span>
diff --git a/layouts/v7/modules/Portal/IndexViewPreProcess.tpl b/layouts/v7/modules/Portal/IndexViewPreProcess.tpl
index ebb454adab16c40dfcefdf0cc26d379e8b341d27..03cf1b46d5f57467303dda4d102fe3ccbaa49ae0 100644
--- a/layouts/v7/modules/Portal/IndexViewPreProcess.tpl
+++ b/layouts/v7/modules/Portal/IndexViewPreProcess.tpl
@@ -6,24 +6,28 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{* modules/Vtiger/views/Index.php *}
-{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
-{include file="modules/Vtiger/partials/Topbar.tpl"}
+{strip}
+ {include file="modules/Vtiger/partials/Topbar.tpl"}
-<div class="container-fluid app-nav">
- <div class="row">
- {include file="modules/Portal/SidebarHeader.tpl"}
- {include file="ModuleHeader.tpl"|vtemplate_path:$MODULE}
- </div>
-</div>
-</nav>
-<div id='overlayPageContent' class='fade modal overlayPageContent content-area overlay-container-60' tabindex='-1' role='dialog' aria-hidden='true'>
- <div class="data">
- </div>
- <div class="modal-dialog">
- </div>
-</div>
-<div class="main-container main-container-{$MODULE}">
-
- <div class="listViewPageDiv content-area full-width" id="listViewContent">
+ <div class="container-fluid app-nav">
+ <div class="row">
+ {include file="modules/Portal/SidebarHeader.tpl"}
+ {include file="ModuleHeader.tpl"|vtemplate_path:$MODULE}
+ </div>
+ </div>
+ </nav>
+ <div id='overlayPageContent' class='fade modal overlayPageContent content-area overlay-container-60' tabindex='-1' role='dialog' aria-hidden='true'>
+ <div class="data">
+ </div>
+ <div class="modal-dialog">
+ </div>
+ </div>
+ <div class="main-container main-container-{$MODULE}">
+ <div id="modnavigator" class="module-nav">
+ <div class="hidden-xs hidden-sm mod-switcher-container">
+ {include file="partials/Menubar.tpl"|vtemplate_path:$MODULE}
+ </div>
+ </div>
+ <div class="listViewPageDiv content-area full-width" id="listViewContent">
+{/strip}
\ No newline at end of file
diff --git a/layouts/v7/modules/Portal/ListViewHeader.tpl b/layouts/v7/modules/Portal/ListViewHeader.tpl
index 01ebde46203ab75ae0b98b6b444f2a7a2d065982..04a1cb1f4bf92c1c1487fe01664738a6508f5a48 100644
--- a/layouts/v7/modules/Portal/ListViewHeader.tpl
+++ b/layouts/v7/modules/Portal/ListViewHeader.tpl
@@ -10,6 +10,5 @@
{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
{strip}
- <div class="col-sm-12 col-xs-12" id="portalListViewPage">
-
- {strip}
\ No newline at end of file
+ <div id="portalListViewPage">
+{/strip}
\ No newline at end of file
diff --git a/layouts/v7/modules/Portal/SidebarHeader.tpl b/layouts/v7/modules/Portal/SidebarHeader.tpl
index 670dc02b3cfd63f61fa6f72022c33a6460dcee56..8ccbd66fab0add1e64695f1fae43a03f17f40008 100644
--- a/layouts/v7/modules/Portal/SidebarHeader.tpl
+++ b/layouts/v7/modules/Portal/SidebarHeader.tpl
@@ -6,13 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
- ]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{vtranslate("Portal",$MODULE)}">
<span class="app-indicator-icon fa fa-desktop"></span>
diff --git a/layouts/v7/modules/Reports/partials/SidebarHeader.tpl b/layouts/v7/modules/Reports/partials/SidebarHeader.tpl
index 3cd99fe19da03a413007ae533f22dc1a76750da3..abb6909f893f010ebc803733169c51c44be05204 100644
--- a/layouts/v7/modules/Reports/partials/SidebarHeader.tpl
+++ b/layouts/v7/modules/Reports/partials/SidebarHeader.tpl
@@ -6,14 +6,9 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
-]}
-
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
+
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{strtoupper(vtranslate($MODULE, $MODULE))}">
<span class="app-indicator-icon fa fa-bar-chart"></span>
diff --git a/layouts/v7/modules/Rss/ListViewContents.tpl b/layouts/v7/modules/Rss/ListViewContents.tpl
index ed70b3d9e991b18383defc738f1d18fc0ee71f26..f7ef336cecb2c134ce52ce0699da78f650a9d906 100644
--- a/layouts/v7/modules/Rss/ListViewContents.tpl
+++ b/layouts/v7/modules/Rss/ListViewContents.tpl
@@ -1,66 +1,64 @@
{*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.1
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is: vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************}
+* The contents of this file are subject to the vtiger CRM Public License Version 1.1
+* ("License"); You may not use this file except in compliance with the License
+* The Original Code is: vtiger CRM Open Source
+* The Initial Developer of the Original Code is vtiger.
+* Portions created by vtiger are Copyright (C) vtiger.
+* All Rights Reserved.
+************************************************************************************}
{* modules/Rss/views/List.php *}
{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
{strip}
-<div class="listViewContentDiv" id="listViewContents">
-<div class="col-sm-12 col-xs-12">
-{assign var=LEFTPANELHIDE value=$CURRENT_USER_MODEL->get('leftpanelhide')}
-<div class="essentials-toggle" title="{vtranslate('LBL_LEFT_PANEL_SHOW_HIDE', 'Vtiger')}">
- <span class="essentials-toggle-marker fa {if $LEFTPANELHIDE eq '1'}fa-chevron-right{else}fa-chevron-left{/if} cursorPointer"></span>
-</div>
-<input type="hidden" id="sourceModule" value="{$SOURCE_MODULE}" />
-<div class="listViewEntriesDiv">
- <span class="listViewLoadingImageBlock hide modal" id="loadingListViewModal">
- <img class="listViewLoadingImage" src="{vimage_path('loading.gif')}" alt="no-image" title="{vtranslate('LBL_LOADING', $MODULE)}"/>
- <p class="listViewLoadingMsg">{vtranslate('LBL_LOADING_LISTVIEW_CONTENTS', $MODULE)}........</p>
- </span>
- <div class="feedContainer">
- {if $RECORD}
- <input id="recordId" type="hidden" value="{$RECORD->getId()}">
- <div class="row-fluid">
- <span class="btn-toolbar pull-right">
- <span class="btn-group">
- <button id="deleteButton" class="btn btn-default"> <strong>{vtranslate('LBL_DELETE', $MODULE)}</strong></button>
- </span>
- <span class="btn-group">
- <button id="makeDefaultButton" class="btn btn-default"> <strong>{vtranslate('LBL_SET_AS_DEFAULT', $MODULE)}</strong></button>
- </span>
- </span>
- <span class="row-fluid" id="rssFeedHeading">
- <h3> {vtranslate('LBL_FEEDS_LIST_FROM',$MODULE)} : {$RECORD->getName()} </h3>
- </span>
- </div>
- <div class="table-container feedListContainer" style="overflow: auto;">
- {include file='RssFeedContents.tpl'|@vtemplate_path:$MODULE}
- </div>
- {else}
- <table class="table-container emptyRecordsDiv">
- <tbody>
- <tr>
- <td>
- {assign var=SINGLE_MODULE value="SINGLE_$MODULE"}
- {vtranslate('LBL_NO')} {vtranslate($MODULE, $MODULE)} {vtranslate('LBL_FOUND')}. {vtranslate('LBL_CREATE')}<a class="rssAddButton" href="#" data-href="{$QUICK_LINKS['SIDEBARLINK'][0]->getUrl()}"> {vtranslate($SINGLE_MODULE, $MODULE)}</a>
- </td>
- </tr>
- </tbody>
- </table>
- {/if}
- </div>
-</div>
-<br>
-<div class="feedFrame">
-</div>
-</div>
- <div id="scroller_wrapper" class="bottom-fixed-scroll">
- <div id="scroller" class="scroller-div"></div>
- </div>
-</div>
+ <div class="listViewContentDiv" id="listViewContents">
+ <div class="col-sm-12 col-xs-12">
+ {assign var=LEFTPANELHIDE value=$CURRENT_USER_MODEL->get('leftpanelhide')}
+ <div class="essentials-toggle" title="{vtranslate('LBL_LEFT_PANEL_SHOW_HIDE', 'Vtiger')}">
+ <span class="essentials-toggle-marker fa {if $LEFTPANELHIDE eq '1'}fa-chevron-right{else}fa-chevron-left{/if} cursorPointer"></span>
+ </div>
+ <input type="hidden" id="sourceModule" value="{$SOURCE_MODULE}" />
+ <div class="listViewEntriesDiv">
+ <span class="listViewLoadingImageBlock hide modal" id="loadingListViewModal">
+ <img class="listViewLoadingImage" src="{vimage_path('loading.gif')}" alt="no-image" title="{vtranslate('LBL_LOADING', $MODULE)}"/>
+ <p class="listViewLoadingMsg">{vtranslate('LBL_LOADING_LISTVIEW_CONTENTS', $MODULE)}........</p>
+ </span>
+ <div class="feedContainer">
+ {if $RECORD}
+ <input id="recordId" type="hidden" value="{$RECORD->getId()}">
+ <div class="row-fluid detailViewButtoncontainer">
+ <span class="btn-toolbar pull-right">
+ <span class="btn-group">
+ <button id="deleteButton" class="btn btn-default"> {vtranslate('LBL_DELETE', $MODULE)}</button>
+ <button id="makeDefaultButton" class="btn btn-default"> {vtranslate('LBL_SET_AS_DEFAULT', $MODULE)}</button>
+ </span>
+ </span>
+ <span class="row-fluid" id="rssFeedHeading">
+ <h3> {vtranslate('LBL_FEEDS_LIST_FROM',$MODULE)} : {$RECORD->getName()} </h3>
+ </span>
+ </div>
+ <div class="table-container feedListContainer" style="overflow: auto;">
+ {include file='RssFeedContents.tpl'|@vtemplate_path:$MODULE}
+ </div>
+ {else}
+ <table class="table-container emptyRecordsDiv">
+ <tbody>
+ <tr>
+ <td>
+ {assign var=SINGLE_MODULE value="SINGLE_$MODULE"}
+ {vtranslate('LBL_NO')} {vtranslate($MODULE, $MODULE)} {vtranslate('LBL_FOUND')}. {vtranslate('LBL_CREATE')}<a class="rssAddButton" href="#" data-href="{$QUICK_LINKS['SIDEBARLINK'][0]->getUrl()}"> {vtranslate($SINGLE_MODULE, $MODULE)}</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ {/if}
+ </div>
+ </div>
+ <br>
+ <div class="feedFrame">
+ </div>
+ </div>
+ <div id="scroller_wrapper" class="bottom-fixed-scroll">
+ <div id="scroller" class="scroller-div"></div>
+ </div>
+ </div>
{/strip}
diff --git a/layouts/v7/modules/Rss/partials/SidebarHeader.tpl b/layouts/v7/modules/Rss/partials/SidebarHeader.tpl
index bf83fd1a53ece0af140b0c23f729157c2870c523..9fb2b634ce8a11d63322bbac2cd8476388311efa 100644
--- a/layouts/v7/modules/Rss/partials/SidebarHeader.tpl
+++ b/layouts/v7/modules/Rss/partials/SidebarHeader.tpl
@@ -6,13 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div id="appnavigator" class="col-sm-12 col-xs-12 app-switcher-container app-{$SELECTED_MENU_CATEGORY}">
<a id="menu-toggle" class="menu-toggle" href="#">
<span class="icon-bar"></span>
diff --git a/layouts/v7/modules/Settings/ExtensionStore/partials/SidebarHeader.tpl b/layouts/v7/modules/Settings/ExtensionStore/partials/SidebarHeader.tpl
index 8dacc81dd7d222ae71ef14d28be9301835b1ec1d..fd4ad4ae874ec975575fdb7f82ce8292d2bda408 100644
--- a/layouts/v7/modules/Settings/ExtensionStore/partials/SidebarHeader.tpl
+++ b/layouts/v7/modules/Settings/ExtensionStore/partials/SidebarHeader.tpl
@@ -6,14 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
- ]}
-
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container extensionstore app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{vtranslate('LBL_EXTENSION_STORE', 'Settings:ExtensionStore')}">
<span class="app-indicator-icon cursorPointer fa fa-shopping-cart"></span>
diff --git a/layouts/v7/modules/Settings/MenuEditor/Index.tpl b/layouts/v7/modules/Settings/MenuEditor/Index.tpl
index da4831d49914a1fc4b92e7ad1ad0d0790d3c791d..14bbcc3a78b45a7e15546f7783f0275ededa51bb 100644
--- a/layouts/v7/modules/Settings/MenuEditor/Index.tpl
+++ b/layouts/v7/modules/Settings/MenuEditor/Index.tpl
@@ -9,13 +9,7 @@
{* modules/Settings/MenuEditor/views/Index.php *}
{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'INVENTORY' => 'vicon-inventory',
- 'SUPPORT' => 'fa-life-ring',
- 'PROJECT' => 'fa-briefcase'
-]}
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div class="listViewPageDiv detailViewContainer col-sm-12" id="listViewContent">
<div class="col-sm-12">
<div class="row">
diff --git a/layouts/v7/modules/Settings/Vtiger/SidebarHeader.tpl b/layouts/v7/modules/Settings/Vtiger/SidebarHeader.tpl
index 0fdcc9f4a3ef7aedaf14d213e381989dfdbc474c..7459dc13ab9b4ff7488541e20dba3d08c2a692b4 100644
--- a/layouts/v7/modules/Settings/Vtiger/SidebarHeader.tpl
+++ b/layouts/v7/modules/Settings/Vtiger/SidebarHeader.tpl
@@ -6,13 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{vtranslate("LBL_SETTINGS",$MODULE)}">
<span class="app-indicator-icon fa fa-cog"></span>
diff --git a/layouts/v7/modules/Users/UsersSidebarHeader.tpl b/layouts/v7/modules/Users/UsersSidebarHeader.tpl
index 30bc1d272ef569c03d402be0aaaf41040f9a602a..b5350c6e12e36f997c1b3674511cf094aa85134e 100644
--- a/layouts/v7/modules/Users/UsersSidebarHeader.tpl
+++ b/layouts/v7/modules/Users/UsersSidebarHeader.tpl
@@ -6,13 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{vtranslate("LBL_SETTINGS",$MODULE)}">
<span class="app-indicator-icon cursorPointer fa fa-cog"></span>
diff --git a/layouts/v7/modules/Vtiger/partials/Sidebar.tpl b/layouts/v7/modules/Vtiger/partials/Sidebar.tpl
index fee799a06ea3344d9edcb287c785e466d27c935a..421a0c280822cd9f57e0ba8a5e4910900456a4b8 100644
--- a/layouts/v7/modules/Vtiger/partials/Sidebar.tpl
+++ b/layouts/v7/modules/Vtiger/partials/Sidebar.tpl
@@ -8,12 +8,7 @@
************************************************************************************}
{strip}
- {assign var="APP_IMAGE_MAP" value=[ 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
-]}
+ {assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div id="sidebar" class="col-lg-3">
<div id="appnavigator" class="row app-nav">
<div class="col-sm-12 col-xs-12 app-switcher-container app-{$SELECTED_MENU_CATEGORY}">
diff --git a/layouts/v7/modules/Vtiger/partials/SidebarAppMenu.tpl b/layouts/v7/modules/Vtiger/partials/SidebarAppMenu.tpl
index 0d9a812c3d741d1f5badc83793163f09ad513026..fbe89b8218ffa9685bda1603e74e8764e0b0592e 100644
--- a/layouts/v7/modules/Vtiger/partials/SidebarAppMenu.tpl
+++ b/layouts/v7/modules/Vtiger/partials/SidebarAppMenu.tpl
@@ -90,59 +90,6 @@
</div>
{/if}
{/if}
- <div class="dropdown app-modules-dropdown-container dropdown-compact">
- {foreach item=APP_MENU_MODEL from=$APP_GROUPED_MENU.$APP_NAME}
- {assign var=FIRST_MENU_MODEL value=$APP_MENU_MODEL}
- {if $APP_MENU_MODEL}
- {break}
- {/if}
- {/foreach}
- <div class="menu-item app-item dropdown-toggle app-item-misc" data-app-name="TOOLS" id="TOOLS_modules_dropdownMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
- <div class="menu-items-wrapper app-menu-items-wrapper">
- <span class="app-icon-list fa fa-ellipsis-h"></span>
- <span class="app-name textOverflowEllipsis"> {vtranslate("LBL_MORE")}</span>
- <span class="fa fa-chevron-right pull-right"></span>
- </div>
- </div>
- <ul class="dropdown-menu app-modules-dropdown dropdown-modules-compact" aria-labelledby="{$APP_NAME}_modules_dropdownMenu" data-height="0.34">
- {assign var=EMAILTEMPLATES_MODULE_MODEL value=Vtiger_Module_Model::getInstance('EmailTemplates')}
- {if $EMAILTEMPLATES_MODULE_MODEL && $USER_PRIVILEGES_MODEL->hasModulePermission($EMAILTEMPLATES_MODULE_MODEL->getId())}
- <li>
- <a href="{$EMAILTEMPLATES_MODULE_MODEL->getDefaultUrl()}">
- <span class="fa module-icon">{$EMAILTEMPLATES_MODULE_MODEL->getModuleIcon()}</span>
- <span class="module-name textOverflowEllipsis"> {vtranslate($EMAILTEMPLATES_MODULE_MODEL->getName(), $EMAILTEMPLATES_MODULE_MODEL->getName())}</span>
- </a>
- </li>
- {/if}
- {assign var=RECYCLEBIN_MODULE_MODEL value=Vtiger_Module_Model::getInstance('RecycleBin')}
- {if $RECYCLEBIN_MODULE_MODEL && $USER_PRIVILEGES_MODEL->hasModulePermission($RECYCLEBIN_MODULE_MODEL->getId())}
- <li>
- <a href="{$RECYCLEBIN_MODULE_MODEL->getDefaultUrl()}">
- <span class="fa fa-trash module-icon"></span>
- <span class="module-name textOverflowEllipsis"> {vtranslate('Recycle Bin')}</span>
- </a>
- </li>
- {/if}
- {assign var=RSS_MODULE_MODEL value=Vtiger_Module_Model::getInstance('Rss')}
- {if $RSS_MODULE_MODEL && $USER_PRIVILEGES_MODEL->hasModulePermission($RSS_MODULE_MODEL->getId())}
- <li>
- <a href="index.php?module=Rss&view=List">
- <span class="fa fa-rss module-icon"></span>
- <span class="module-name textOverflowEllipsis">{vtranslate($RSS_MODULE_MODEL->getName(), $RSS_MODULE_MODEL->getName())}</span>
- </a>
- </li>
- {/if}
- {assign var=PORTAL_MODULE_MODEL value=Vtiger_Module_Model::getInstance('Portal')}
- {if $PORTAL_MODULE_MODEL && $USER_PRIVILEGES_MODEL->hasModulePermission($PORTAL_MODULE_MODEL->getId())}
- <li>
- <a href="index.php?module=Portal&view=List">
- <span class="fa fa-desktop module-icon"></span>
- <span class="module-name textOverflowEllipsis"> {vtranslate('Portal')}</span>
- </a>
- </li>
- {/if}
- </ul>
- </div>
{if $USER_MODEL->isAdminUser()}
<div class="dropdown app-modules-dropdown-container dropdown-compact">
<div class="menu-item app-item dropdown-toggle app-item-misc" data-app-name="TOOLS" id="TOOLS_modules_dropdownMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-default-url="{if $USER_MODEL->isAdminUser()}index.php?module=Vtiger&parent=Settings&view=Index{else}index.php?module=Users&view=Settings{/if}">
diff --git a/layouts/v7/modules/Vtiger/partials/SidebarHeader.tpl b/layouts/v7/modules/Vtiger/partials/SidebarHeader.tpl
index 7480109ae47b7b4210479490ec768945d949d864..fd90692f530aa5b347d138f2f3aab0c3b50a7c3c 100644
--- a/layouts/v7/modules/Vtiger/partials/SidebarHeader.tpl
+++ b/layouts/v7/modules/Vtiger/partials/SidebarHeader.tpl
@@ -7,13 +7,7 @@
* All Rights Reserved.
************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
- ]}
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{if $MODULE eq 'Home' || !$MODULE} {vtranslate('LBL_DASHBOARD')} {else}{$SELECTED_MENU_CATEGORY}{/if}">
diff --git a/layouts/v7/modules/Vtiger/partials/Topbar.tpl b/layouts/v7/modules/Vtiger/partials/Topbar.tpl
index 8047e2c05893db48e92be27d76426698b5ae5aa7..fc673fa3ebb9f7fd8591a1d2037ce09f49c04854 100644
--- a/layouts/v7/modules/Vtiger/partials/Topbar.tpl
+++ b/layouts/v7/modules/Vtiger/partials/Topbar.tpl
@@ -10,12 +10,7 @@
{strip}
{include file="modules/Vtiger/Header.tpl"}
- {assign var="APP_IMAGE_MAP" value=[ 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase' ]}
-
+ {assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<nav class="navbar navbar-default navbar-fixed-top app-fixed-navbar">
<div class="container-fluid global-nav">
<div class="row">
diff --git a/layouts/v7/skins/vtiger/style.less b/layouts/v7/skins/vtiger/style.less
index 6d69a697cde61dec44344527d17e5dd6d4d20a6b..c1e6e9c0f6d86b4fcb043b7a782e108de9a95a47 100644
--- a/layouts/v7/skins/vtiger/style.less
+++ b/layouts/v7/skins/vtiger/style.less
@@ -1237,7 +1237,6 @@ input[type="password"].inputElement{
background-color: @white;
border: 1px solid @lightColorBorder;
margin:5px 0 10px;
- color: #ccc;
padding: 5px 10px;
}
.search-folders:focus,
@@ -7504,25 +7503,20 @@ li.select2-search-choice div{
border-left: 1px solid @lightColorBorder;
}
.main-container-Documents .module-nav,
-.main-container-RecycleBin .module-nav,
.main-container-Reports .module-nav {
width: 0;
}
.main-container-Documents .mod-switcher-container,
-.main-container-RecycleBin .mod-switcher-container,
.main-container-Reports .mod-switcher-container {
width: 0;
}
.main-container-Documents .sidebar-essentials,
-.main-container-RecycleBin .sidebar-essentials,
.main-container-Reports .sidebar-essentials {
width: 283px;
left: 0;
}
.main-container-Documents .full-width,
-.main-container-RecycleBin .full-width,
-.main-container-Reports .full-width,
-.main-container-Portal .full-width {
+.main-container-Reports .full-width {
padding-left: 0px !important;
}
diff --git a/modules/Migration/schema/701_to_710.php b/modules/Migration/schema/701_to_710.php
index 2c2ff3de0c73c367d1281f47f83fae3eed680ef2..6e62b7b19c9acf03af2311be4c5cb0861eaf0262 100644
--- a/modules/Migration/schema/701_to_710.php
+++ b/modules/Migration/schema/701_to_710.php
@@ -215,6 +215,19 @@ if (defined('VTIGER_UPGRADE')) {
echo '<br>Succesfully centralize user field table for easy query with context of user across module<br>';
//END::Centralize user field table for easy query with context of user across module
+ //START::Adding new parent TOOLS in menu
+ $appsList = array('TOOLS' => array('Rss', 'Portal'));
+ foreach ($appsList as $app => $appModules) {
+ foreach ($appModules as $moduleName) {
+ $moduleModel = Vtiger_Module_Model::getInstance($moduleName);
+ if ($moduleModel) {
+ Settings_MenuEditor_Module_Model::addModuleToApp($moduleName, $app);
+ }
+ }
+ }
+ echo '<br>Succesfully added RSS, Email Templates for new parent TOOLS<br>';
+ //END::Adding new parent TOOLS in menu
+
//Update existing package modules
Install_Utils_Model::installModules();
diff --git a/modules/Vtiger/models/MenuStructure.php b/modules/Vtiger/models/MenuStructure.php
index 81d5c8ef0be462c566134de7ecdfa2e356170dee..9c9cc96b291a7234f3700c70a5a6ddb2a008cd19 100644
--- a/modules/Vtiger/models/MenuStructure.php
+++ b/modules/Vtiger/models/MenuStructure.php
@@ -161,7 +161,7 @@ class Vtiger_MenuStructure_Model extends Vtiger_Base_Model {
}
public static function getIgnoredModules() {
- return array('Calendar', 'Documents', 'MailManager', 'Rss', 'Portal', 'RecycleBin', 'SMSNotifier', 'EmailTemplates', 'Reports');
+ return array('Calendar', 'Documents', 'MailManager', 'SMSNotifier', 'Reports');
}
function regroupMenuByParent($menuGroupedByParent) {
@@ -215,7 +215,8 @@ class Vtiger_MenuStructure_Model extends Vtiger_Base_Model {
'MARKETING_AND_SALES' => 'MARKETING',
'INVENTORY' => 'INVENTORY',
'SUPPORT' => 'SUPPORT',
- 'TOOLS' => 'PROJECT'
+ 'PROJECT' => 'PROJECT',
+ 'TOOLS' => 'TOOLS'
);
return $oldToNewAppMap;
}
@@ -225,6 +226,17 @@ class Vtiger_MenuStructure_Model extends Vtiger_Base_Model {
* @return <array>
*/
public static function getAppMenuList(){
- return array('MARKETING','SALES','INVENTORY','SUPPORT','PROJECT');
+ return array('MARKETING','SALES','INVENTORY','SUPPORT','PROJECT','TOOLS');
+ }
+
+ public static function getAppIcons() {
+ $appImageIcons = array( 'MARKETING' => 'fa-users',
+ 'SALES' => 'fa-dot-circle-o',
+ 'SUPPORT' => 'fa-life-ring',
+ 'INVENTORY' => 'vicon-inventory',
+ 'PROJECT' => 'fa-briefcase',
+ 'TOOLS' => 'fa-wrench'
+ );
+ return $appImageIcons;
}
}
diff --git a/packages/vtiger/mandatory/MailManager.zip b/packages/vtiger/mandatory/MailManager.zip
index e56f22c20dc73fefeef2503bdcc6131e36d5e7ba..515130f950db4d738b21f07a62f0076fb02a647c 100644
Binary files a/packages/vtiger/mandatory/MailManager.zip and b/packages/vtiger/mandatory/MailManager.zip differ
diff --git a/packages/vtiger/optional/EmailTemplates.zip b/packages/vtiger/optional/EmailTemplates.zip
index e3f763e0e5347950531c3b36b6b2898bc51cdfda..34810d6da2b7defe87fb64ce555a02544aa5f02b 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 64afe2df3fd51c9ac02cb04156943bcc78c4274b..d7f3b14302c832258115d35701cdde24238c9c69 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/DetailViewFullContents.tpl b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/DetailViewFullContents.tpl
index 78f4143e1f29186c3cfe7b81437ec565e32ce172..39dfe6a28ff8bf4489734167bfcb63ae0015b9fc 100644
--- a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/DetailViewFullContents.tpl
+++ b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/DetailViewFullContents.tpl
@@ -1,53 +1,52 @@
{*+**********************************************************************************
* The contents of this file are subject to the vtiger CRM Public License Version 1.1
* ("License"); You may not use this file except in compliance with the License
-* The Original Code is: vtiger CRM Open Source
+* The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
+
{strip}
- <input id="recordId" type="hidden" value="{$RECORD->getId()}" />
- <div class="col-sm-12 col-xs-12">
- {include file="DetailViewHeader.tpl"|vtemplate_path:$MODULE}
- <div class="detailview-content container-fluid">
- <div class="details row">
- <div class="block">
- {assign var=WIDTHTYPE value=$USER_MODEL->get('rowheight')}
- <div>
- <h4>{vtranslate('Email Template - Properties of ', $MODULE_NAME)} " {$RECORD->get('templatename')} "</h4>
- </div>
- <hr>
- <table class="table detailview-table no-border">
- <tbody>
- <tr>
- <td class="fieldLabel {$WIDTHTYPE}"><label class="muted marginRight10px">{vtranslate('Templatename', $MODULE_NAME)}</label></td>
- <td class="fieldValue {$WIDTHTYPE}">{$RECORD->get('templatename')}</td>
- </tr>
- <tr>
- <td class="fieldLabel {$WIDTHTYPE}"><label class="muted marginRight10px">{vtranslate('Description', $MODULE_NAME)}</label></td>
- <td class="fieldValue {$WIDTHTYPE}">{nl2br($RECORD->get('description'))}</td>
- </tr>
- <tr>
- <td class="fieldLabel {$WIDTHTYPE}"><label class="muted marginRight10px">{vtranslate('LBL_MODULE_NAME', $MODULE_NAME)}</label></td>
- <td class="fieldValue {$WIDTHTYPE}">{if $RECORD->get('module')} {vtranslate($RECORD->get('module'), $RECORD->get('module'))}{/if}</td>
- </tr>
- <tr>
- <td class="fieldLabel {$WIDTHTYPE}"><label class="muted marginRight10px">{vtranslate('Subject',$MODULE_NAME)}</label></td>
- <td class="fieldValue {$WIDTHTYPE}">{$RECORD->get('subject')}</td>
- </tr>
- <tr>
- <td class="fieldLabel {$WIDTHTYPE}"><label class="muted marginRight10px">{vtranslate('Message',$MODULE_NAME)}</label></td>
- <td class="fieldValue {$WIDTHTYPE}">
- <iframe id="TemplateIFrame" style="height:400px;" class="col-sm-12 col-xs-12 overflowScrollBlock"></iframe>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- </div>
- </div>
+ <input id="recordId" type="hidden" value="{$RECORD->getId()}" />
+ {include file="DetailViewHeader.tpl"|vtemplate_path:$MODULE}
+ <div class="detailview-content container-fluid">
+ <div class="details row">
+ <div class="block">
+ {assign var=WIDTHTYPE value=$USER_MODEL->get('rowheight')}
+ <div>
+ <h4>{vtranslate('Email Template - Properties of ', $MODULE_NAME)} " {$RECORD->get('templatename')} "</h4>
+ </div>
+ <hr>
+ <table class="table detailview-table no-border">
+ <tbody>
+ <tr>
+ <td class="fieldLabel {$WIDTHTYPE}"><label class="muted marginRight10px">{vtranslate('Templatename', $MODULE_NAME)}</label></td>
+ <td class="fieldValue {$WIDTHTYPE}">{$RECORD->get('templatename')}</td>
+ </tr>
+ <tr>
+ <td class="fieldLabel {$WIDTHTYPE}"><label class="muted marginRight10px">{vtranslate('Description', $MODULE_NAME)}</label></td>
+ <td class="fieldValue {$WIDTHTYPE}">{nl2br($RECORD->get('description'))}</td>
+ </tr>
+ <tr>
+ <td class="fieldLabel {$WIDTHTYPE}"><label class="muted marginRight10px">{vtranslate('LBL_MODULE_NAME', $MODULE_NAME)}</label></td>
+ <td class="fieldValue {$WIDTHTYPE}">{if $RECORD->get('module')} {vtranslate($RECORD->get('module'), $RECORD->get('module'))}{/if}</td>
+ </tr>
+ <tr>
+ <td class="fieldLabel {$WIDTHTYPE}"><label class="muted marginRight10px">{vtranslate('Subject',$MODULE_NAME)}</label></td>
+ <td class="fieldValue {$WIDTHTYPE}">{$RECORD->get('subject')}</td>
+ </tr>
+ <tr>
+ <td class="fieldLabel {$WIDTHTYPE}"><label class="muted marginRight10px">{vtranslate('Message',$MODULE_NAME)}</label></td>
+ <td class="fieldValue {$WIDTHTYPE}">
+ <iframe id="TemplateIFrame" style="height:400px;" class="col-sm-12 col-xs-12 overflowScrollBlock"></iframe>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</div>
</div>
-</div>
{/strip}
diff --git a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/DetailViewPreProcess.tpl b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/DetailViewPreProcess.tpl
index 3ec822c2573ef52520ac7dd63ae9cd3f7ed01102..b9b1f8879c44f074d8235519bdcdc72217ea22a8 100644
--- a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/DetailViewPreProcess.tpl
+++ b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/DetailViewPreProcess.tpl
@@ -1,28 +1,34 @@
{*+**********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.1
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is: vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- ************************************************************************************}
+* The contents of this file are subject to the vtiger CRM Public License Version 1.1
+* ("License"); You may not use this file except in compliance with the License
+* The Original Code is: vtiger CRM Open Source
+* The Initial Developer of the Original Code is vtiger.
+* Portions created by vtiger are Copyright (C) vtiger.
+* All Rights Reserved.
+************************************************************************************}
{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
{include file="modules/Vtiger/partials/Topbar.tpl"}
<div class="container-fluid app-nav">
- <div class="row">
- {include file="partials/SidebarHeader.tpl"|vtemplate_path:$MODULE}
- {include file="ModuleHeader.tpl"|vtemplate_path:$MODULE}
- </div>
+ <div class="row">
+ {include file="partials/SidebarHeader.tpl"|vtemplate_path:$MODULE}
+ {include file="ModuleHeader.tpl"|vtemplate_path:$MODULE}
+ </div>
+</div>
+</nav>
+<div id='overlayPageContent' class='fade modal overlayPageContent content-area overlay-container-60' tabindex='-1' role='dialog' aria-hidden='true'>
+ <div class="data">
+ </div>
+ <div class="modal-dialog">
+ </div>
</div>
-</nav>
- <div id='overlayPageContent' class='fade modal overlayPageContent content-area overlay-container-60' tabindex='-1' role='dialog' aria-hidden='true'>
- <div class="data">
- </div>
- <div class="modal-dialog">
- </div>
- </div>
<div class="container-fluid main-container">
- <div class="row">
- <div class="detailViewContainer viewContent clearfix">
\ No newline at end of file
+ <div class="row">
+ <div id="modnavigator" class="module-nav detailViewModNavigator clearfix">
+ <div class="hidden-xs hidden-sm mod-switcher-container">
+ {include file="partials/Menubar.tpl"|vtemplate_path:$MODULE}
+ </div>
+ </div>
+ <div class="detailViewContainer viewContent clearfix">
+ <div class="content-area container-fluid">
diff --git a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/EditView.tpl b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/EditView.tpl
index 39be94b0143ab7925152373a8e67628c28b66cc6..82d2854cf844cfe89391f430d1b2a9ec74c0653f 100644
--- a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/EditView.tpl
+++ b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/EditView.tpl
@@ -1,7 +1,7 @@
{*+**********************************************************************************
* The contents of this file are subject to the vtiger CRM Public License Version 1.1
* ("License"); You may not use this file except in compliance with the License
-* The Original Code is: vtiger CRM Open Source
+* The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
@@ -9,9 +9,14 @@
{strip}
<div class="main-container clearfix">
- <div class="editViewPageDiv full-width">
- <div class="col-sm-12 col-xs-12 ">
- <form id="EditView" class="form-horizontal recordEditView" name="EditView" method="post" action="index.php">
+ <div id="modnavigator" class="module-nav editViewModNavigator">
+ <div class="hidden-xs hidden-sm mod-switcher-container">
+ {include file="partials/Menubar.tpl"|vtemplate_path:$MODULE}
+ </div>
+ </div>
+ <div class="editViewPageDiv viewContent">
+ <div class="col-sm-12 col-xs-12 content-area">
+ <form id="EditView" class="form-horizontal recordEditView" name="EditView" method="post" action="index.php">
<div class="editViewHeader">
<div class='row'>
<div class="col-lg-12 col-md-12 col-lg-pull-0">
diff --git a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/ListViewPreProcess.tpl b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/ListViewPreProcess.tpl
index 3c19bd62779b1debaf1c108301aed9f8dbe65daa..9d8d32d65790d3ef6ff83908d77fba86b4544624 100644
--- a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/ListViewPreProcess.tpl
+++ b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/ListViewPreProcess.tpl
@@ -1,29 +1,33 @@
{*+**********************************************************************************
* The contents of this file are subject to the vtiger CRM Public License Version 1.1
* ("License"); You may not use this file except in compliance with the License
-* The Original Code is: vtiger CRM Open Source
+* The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{* modules/Vtiger/views/List.php *}
-{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
-{include file="modules/Vtiger/partials/Topbar.tpl"}
+{strip}
+ {include file="modules/Vtiger/partials/Topbar.tpl"}
-<div class="container-fluid app-nav">
- <div class="row">
- {include file="partials/SidebarHeader.tpl"|vtemplate_path:$MODULE}
- {include file="ModuleHeader.tpl"|vtemplate_path:$MODULE}
- </div>
-</div>
-</nav>
- <div id='overlayPageContent' class='fade modal overlayPageContent content-area overlay-container-60' tabindex='-1' role='dialog' aria-hidden='true'>
- <div class="data">
- </div>
- <div class="modal-dialog">
- </div>
- </div>
-<div class="main-container main-container-{$MODULE}">
- <br>
- <div class="listViewPageDiv full-width" id="listViewContent">
+ <div class="container-fluid app-nav">
+ <div class="row">
+ {include file="partials/SidebarHeader.tpl"|vtemplate_path:$MODULE}
+ {include file="ModuleHeader.tpl"|vtemplate_path:$MODULE}
+ </div>
+ </div>
+ </nav>
+ <div id='overlayPageContent' class='fade modal overlayPageContent content-area overlay-container-60' tabindex='-1' role='dialog' aria-hidden='true'>
+ <div class="data">
+ </div>
+ <div class="modal-dialog">
+ </div>
+ </div>
+ <div class="main-container main-container-{$MODULE}">
+ <div id="modnavigator" class="module-nav">
+ <div class="hidden-xs hidden-sm mod-switcher-container">
+ {include file="partials/Menubar.tpl"|vtemplate_path:$MODULE}
+ </div>
+ </div>
+ <div class="listViewPageDiv content-area full-width" id="listViewContent">
+{/strip}
\ No newline at end of file
diff --git a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/partials/SidebarHeader.tpl b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/partials/SidebarHeader.tpl
index 3c9c19be329a32aed8acdad660e4cfe390142c61..aa71267d4f7fc56ddc82ffbc343866938e9f0cfa 100644
--- a/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/partials/SidebarHeader.tpl
+++ b/pkg/vtiger/modules/EmailTemplates/layouts/v7/modules/EmailTemplates/partials/SidebarHeader.tpl
@@ -7,13 +7,7 @@
* All Rights Reserved.
************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
- ]}
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{vtranslate($MODULE,$MODULE)}">
diff --git a/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/partials/SidebarHeader.tpl b/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/partials/SidebarHeader.tpl
index 44750af37b8315d2aa2a7c63ec901e602b2c254c..7e9ccb5ed240f0ce7ffa922c5ed57be945c14c78 100644
--- a/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/partials/SidebarHeader.tpl
+++ b/pkg/vtiger/modules/MailManager/layouts/v7/modules/MailManager/partials/SidebarHeader.tpl
@@ -6,13 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{strtoupper(vtranslate($MODULE, $MODULE))}">
<span class="app-indicator-icon fa vicon-mailmanager"></span>
diff --git a/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/partials/SidebarHeader.tpl b/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/partials/SidebarHeader.tpl
index 4b1d669c990e74bbc7bb623b2d43619de7e2f720..6fe9cbc3b4615b82e9218320114cc1219e9342bf 100644
--- a/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/partials/SidebarHeader.tpl
+++ b/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/partials/SidebarHeader.tpl
@@ -6,13 +6,8 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
- 'MARKETING' => 'fa-users',
- 'SALES' => 'fa-dot-circle-o',
- 'SUPPORT' => 'fa-life-ring',
- 'INVENTORY' => 'vicon-inventory',
- 'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
<div class="row" title="{strtoupper(vtranslate($MODULE, $MODULE))}">
<span class="app-indicator-icon fa fa-trash"></span>