diff --git a/layouts/v7/modules/Accounts/DetailViewHeaderTitle.tpl b/layouts/v7/modules/Accounts/DetailViewHeaderTitle.tpl
index 77f70b1085204bfa687b905060519a572e6bb863..7b92d5ce0ead303579f156c73322edacc3fcea1f 100644
--- a/layouts/v7/modules/Accounts/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/Accounts/DetailViewHeaderTitle.tpl
@@ -22,8 +22,8 @@
{/if}
{/foreach}
{if empty($IMAGE_DETAILS)}
- <div class="name"><span><strong> <i class="vicon-accounts"></i> </strong></span></div>
- {/if}
+ <div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
+ {/if}
</div>
<div class="recordBasicInfo">
<div class="info-row" >
diff --git a/layouts/v7/modules/Calendar/TaskManagementContents.tpl b/layouts/v7/modules/Calendar/TaskManagementContents.tpl
index 56d743485b3f4dc6322d25f66b0da84c308ad153..d0e813b6a46bf1104d45185a7f0289ef39187433 100644
--- a/layouts/v7/modules/Calendar/TaskManagementContents.tpl
+++ b/layouts/v7/modules/Calendar/TaskManagementContents.tpl
@@ -60,7 +60,7 @@
{if !empty($RELATED_PARENT)}
<span class='related_account' style='margin-left: 8px;'>
{assign var=RELATED_PARENT_MODULE value=$RELATED_PARENT['module']}
- <i class="vicon-{$RELATED_PARENT_MODULE|lower}" style="font-size: 12px;"></i>
+ <span style="font-size: 12px;">{Vtiger_Module_Model::getModuleIconPath($RELATED_PARENT_MODULE)} </span>
<span class="recordName textOverflowEllipsis" style="vertical-align: middle">
<a class="quickPreview" href="index.php?module={$RELATED_PARENT_MODULE}&view=Detail&record={$RELATED_PARENT['id']}" data-id="{$RELATED_PARENT['id']}" title="{$RELATED_PARENT['display_value']}">{$RELATED_PARENT['display_value']}</a>
</span>
@@ -68,7 +68,7 @@
{/if}
{if !empty($RELATED_CONTACT['id'])}
<span class='related_contact' style='margin-left: 8px;'>
- <i class="vicon-contacts" style="font-size: 12px;"></i>
+ <span style="font-size: 12px;">{Vtiger_Module_Model::getModuleIconPath('Contacts')} </span>
<span class="recordName textOverflowEllipsis" style="vertical-align: middle">
<a class="quickPreview" href="index.php?module={$RELATED_CONTACT['module']}&view=Detail&record={$RELATED_CONTACT['id']}" data-id="{$RELATED_CONTACT['id']}" title="{$RELATED_CONTACT['display_value']}">{$RELATED_CONTACT['display_value']}</a>
</span>
diff --git a/layouts/v7/modules/Contacts/DetailViewHeaderTitle.tpl b/layouts/v7/modules/Contacts/DetailViewHeaderTitle.tpl
index 338f33e1b7981526da71e1da966cb8fb26e83ff9..321a158302c204bb9e73c8bdb1ced9e10904eff6 100644
--- a/layouts/v7/modules/Contacts/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/Contacts/DetailViewHeaderTitle.tpl
@@ -22,8 +22,8 @@
{/if}
{/foreach}
{if empty($IMAGE_DETAILS)}
- <div class="name"><span><strong> <i class="vicon-contacts"></i> </strong></span></div>
- {/if}
+ <div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
+ {/if}
</div>
<div class="recordBasicInfo">
<div class="info-row">
diff --git a/layouts/v7/modules/Documents/partials/Menubar.tpl b/layouts/v7/modules/Documents/partials/Menubar.tpl
index 053e3e8b6189260bf8e438ebeb81a1f557337abb..3dd9d5a72413780b945b1c5b89b35298d49b9b1a 100644
--- a/layouts/v7/modules/Documents/partials/Menubar.tpl
+++ b/layouts/v7/modules/Documents/partials/Menubar.tpl
@@ -1,9 +1,18 @@
+{*+**********************************************************************************
+* 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.
+*************************************************************************************}
+
{if $smarty.request.view eq 'Detail'}
<div id="modules-menu" class="modules-menu">
<ul>
<li class="active">
<a href="{$MODULE_MODEL->getListViewUrl()}">
- <i class="vicon-documents"></i>
+ {$MODULE_MODEL->getModuleIcon()}
<span>{$MODULE}</span>
</a>
</li>
diff --git a/layouts/v7/modules/Documents/partials/SidebarHeader.tpl b/layouts/v7/modules/Documents/partials/SidebarHeader.tpl
index 4be9589120b469c1ff60ac0b2ce3caf6799bf8f7..1a44242bce1631445f576181b40966e43817b057 100644
--- a/layouts/v7/modules/Documents/partials/SidebarHeader.tpl
+++ b/layouts/v7/modules/Documents/partials/SidebarHeader.tpl
@@ -13,9 +13,9 @@
'INVENTORY' => 'vicon-inventory',
'PROJECT' => 'fa-briefcase'
]}
-<div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
+<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>
+ <span>{$MODULE_MODEL->getModuleIcon()}</span>
</div>
</div>
diff --git a/layouts/v7/modules/HelpDesk/DetailViewHeaderTitle.tpl b/layouts/v7/modules/HelpDesk/DetailViewHeaderTitle.tpl
index 1c76eff7100880d6b35f83a0d1e4e2b91c98a4a5..918af0b4535e35c5725dfd4bfb31a3acca86a24c 100644
--- a/layouts/v7/modules/HelpDesk/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/HelpDesk/DetailViewHeaderTitle.tpl
@@ -13,7 +13,7 @@
<div class="col-sm-6 col-lg-6 col-md-6">
<div class="record-header clearfix">
<div class="hidden-sm hidden-xs recordImage bghelpdesk app-{$SELECTED_MENU_CATEGORY}">
- <div class="name"><span><strong> <i class="vicon-helpdesk"></i> </strong></span></div>
+ <div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
</div>
<div class="recordBasicInfo">
<div class="info-row">
diff --git a/layouts/v7/modules/Inventory/partials/LineItemsContent.tpl b/layouts/v7/modules/Inventory/partials/LineItemsContent.tpl
index 9a6ad82b3f72e14db5ede702db6643f4a0c66ae9..a5ef87a711e109bee46e0ffbe4d4f5a545c8bab4 100644
--- a/layouts/v7/modules/Inventory/partials/LineItemsContent.tpl
+++ b/layouts/v7/modules/Inventory/partials/LineItemsContent.tpl
@@ -83,17 +83,17 @@
<input type="hidden" id="lineItemType{$row_no}" name="lineItemType{$row_no}" value="{$entityType}" class="lineItemType"/>
<div class="col-lg-2">
{if $row_no eq 0}
- <i class="lineItemPopup cursorPointer vicon-services" data-popup="ServicesPopup" title="{vtranslate('Services',$MODULE)}" data-module-name="Services" data-field-name="serviceid"></i>
- <i class="lineItemPopup cursorPointer vicon-products" data-popup="ProductsPopup" title="{vtranslate('Products',$MODULE)}" data-module-name="Products" data-field-name="productid"></i>
+ <span class="lineItemPopup cursorPointer" data-popup="ServicesPopup" title="{vtranslate('Services',$MODULE)}" data-module-name="Services" data-field-name="serviceid">{Vtiger_Module_Model::getModuleIconPath('Services')}</span>
+ <span class="lineItemPopup cursorPointer" data-popup="ProductsPopup" title="{vtranslate('Products',$MODULE)}" data-module-name="Products" data-field-name="productid">{Vtiger_Module_Model::getModuleIconPath('Products')}</span>
{elseif $entityType eq '' and $PRODUCT_ACTIVE eq 'true'}
- <i class="lineItemPopup cursorPointer vicon-products" data-popup="ProductsPopup" data-module-name="Products" title="{vtranslate('Products',$MODULE)}" data-field-name="productid"></i>
+ <span class="lineItemPopup cursorPointer" data-popup="ProductsPopup" title="{vtranslate('Products',$MODULE)}" data-module-name="Products" data-field-name="productid">{Vtiger_Module_Model::getModuleIconPath('Products')}</span>
{elseif $entityType eq '' and $SERVICE_ACTIVE eq 'true'}
- <i class="lineItemPopup cursorPointer vicon-services" data-popup="ServicesPopup" data-module-name="Services" title="{vtranslate('Services',$MODULE)}" data-field-name="serviceid" ></i>
+ <span class="lineItemPopup cursorPointer" data-popup="ServicesPopup" title="{vtranslate('Services',$MODULE)}" data-module-name="Services" data-field-name="serviceid">{Vtiger_Module_Model::getModuleIconPath('Services')}</span>
{else}
{if ($entityType eq 'Services') and (!$data.$productDeleted)}
- <i class="lineItemPopup cursorPointer vicon-services" data-popup="ServicesPopup" data-module-name="Services" title="{vtranslate('Services',$MODULE)}" data-field-name="serviceid" ></i>
+ <span class="lineItemPopup cursorPointer" data-popup="ServicesPopup" title="{vtranslate('Services',$MODULE)}" data-module-name="Services" data-field-name="serviceid">{Vtiger_Module_Model::getModuleIconPath('Services')}</span>
{elseif (!$data.$productDeleted)}
- <i class="lineItemPopup cursorPointer vicon-products" data-popup="ProductsPopup" data-module-name="Products" title="{vtranslate('Products',$MODULE)}" data-field-name="productid" ></i>
+ <span class="lineItemPopup cursorPointer" data-popup="ProductsPopup" title="{vtranslate('Products',$MODULE)}" data-module-name="Products" data-field-name="productid">{Vtiger_Module_Model::getModuleIconPath('Products')}</span>
{/if}
{/if}
</div>
@@ -169,7 +169,7 @@
{assign var=PRICEBOOK_MODULE_MODEL value=Vtiger_Module_Model::getInstance('PriceBooks')}
{if $PRICEBOOK_MODULE_MODEL->isPermitted('DetailView') && $MODULE != 'PurchaseOrder'}
- <i class="priceBookPopup cursorPointer vicon-pricebooks" data-popup="Popup" data-module-name="PriceBooks" style="float:left"></i>
+ <span class="priceBookPopup cursorPointer" data-popup="Popup" title="{vtranslate('PriceBooks', $MODULE)}" data-module-name="PriceBooks" style="float:left">{Vtiger_Module_Model::getModuleIconPath('PriceBooks')}</span>
{/if}
</div>
<div style="clear:both"></div>
diff --git a/layouts/v7/modules/Invoice/DetailViewHeaderTitle.tpl b/layouts/v7/modules/Invoice/DetailViewHeaderTitle.tpl
index eca4adb7e1e3306e4c07a8b14239adfc27fd7ea1..47393217a94d54fcb943333d67311223dc71aa58 100644
--- a/layouts/v7/modules/Invoice/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/Invoice/DetailViewHeaderTitle.tpl
@@ -21,9 +21,9 @@
<img src="{vimage_path('summary_organizations.png')}" class="summaryImg"/>
{/if}
{/foreach}
- {if empty($IMAGE_DETAILS)}
- <div class="name"><span><strong><i class="vicon-invoice"></i></strong></span></div>
- {/if}
+ {if empty($IMAGE_DETAILS)}
+ <div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
+ {/if}
</div>
<div class="recordBasicInfo">
<div class="info-row" >
diff --git a/layouts/v7/modules/Leads/DetailViewHeaderTitle.tpl b/layouts/v7/modules/Leads/DetailViewHeaderTitle.tpl
index 17f3914c4c534f0312b2aaa2e6ac0a30ce59bbe9..9339f20596bf43798943cdb439d00373f6312a53 100644
--- a/layouts/v7/modules/Leads/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/Leads/DetailViewHeaderTitle.tpl
@@ -22,8 +22,8 @@
{/if}
{/foreach}
{if empty($IMAGE_DETAILS)}
- <div class="name"><span><strong><i class="vicon-leads"></i></strong></span></div>
- {/if}
+ <div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
+ {/if}
</div>
<div class="recordBasicInfo">
<div class="info-row">
diff --git a/layouts/v7/modules/Potentials/DetailViewHeaderTitle.tpl b/layouts/v7/modules/Potentials/DetailViewHeaderTitle.tpl
index 40d7e3a0d762a7c3d917de0a588ed3b6edae0378..7aba6fb1329954b12619ebdd0ae83f6c0a5d7b79 100644
--- a/layouts/v7/modules/Potentials/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/Potentials/DetailViewHeaderTitle.tpl
@@ -13,7 +13,7 @@
<div class="col-sm-6 col-lg-6 col-md-6">
<div class="record-header clearfix">
<div class="hidden-sm hidden-xs recordImage bgpotentials app-{$SELECTED_MENU_CATEGORY}">
- <div class="name"><span><strong> <i class="vicon-potentials"></i> </strong></span></div>
+ <div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
</div>
<div class="recordBasicInfo">
diff --git a/layouts/v7/modules/Products/DetailViewHeaderTitle.tpl b/layouts/v7/modules/Products/DetailViewHeaderTitle.tpl
index 06512682ab182f8161cb0b700c9776db6d5579bd..59f83579e25661afd5d25cf094e8433a9995479a 100644
--- a/layouts/v7/modules/Products/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/Products/DetailViewHeaderTitle.tpl
@@ -30,9 +30,9 @@
<img src="{vimage_path('summary_Products.png')}" class="summaryImg"/>
{/if}
{/foreach}
- {if empty($IMAGE_DETAILS)}
- <div class="name"><span><strong> <i class="vicon-products"></i> </strong></span></div>
- {/if}
+ {if empty($IMAGE_DETAILS)}
+ <div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
+ {/if}
</div>
<div class="recordBasicInfo">
diff --git a/layouts/v7/modules/PurchaseOrder/DetailViewHeaderTitle.tpl b/layouts/v7/modules/PurchaseOrder/DetailViewHeaderTitle.tpl
index ff1f18071beba5580551c334b219293a3fa0042d..a2c8da0ee510aeb95b2d5b7fea597b7de34c7413 100644
--- a/layouts/v7/modules/PurchaseOrder/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/PurchaseOrder/DetailViewHeaderTitle.tpl
@@ -22,8 +22,8 @@
{/if}
{/foreach}
{if empty($IMAGE_DETAILS)}
- <div class="name"><span><strong> <i class="vicon-purchaseorder"></i> </strong></span></div>
- {/if}
+ <div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
+ {/if}
</div>
<div class="recordBasicInfo">
<div class="info-row">
diff --git a/layouts/v7/modules/Quotes/DetailViewHeaderTitle.tpl b/layouts/v7/modules/Quotes/DetailViewHeaderTitle.tpl
index 0ebcaabdf68d7e012c966c66f7e8a8f5170e8361..9fcf58ad1b36a26641223fc23918d49f5e4768c1 100644
--- a/layouts/v7/modules/Quotes/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/Quotes/DetailViewHeaderTitle.tpl
@@ -21,9 +21,9 @@
<img src="{vimage_path('summary_organizations.png')}" class="summaryImg"/>
{/if}
{/foreach}
- {if empty($IMAGE_DETAILS)}
- <div class="name"><span><strong> <i class="vicon-quotes"></i> </strong></span></div>
- {/if}
+ {if empty($IMAGE_DETAILS)}
+ <div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
+ {/if}
</div>
<div class="recordBasicInfo">
<div class="info-row">
diff --git a/layouts/v7/modules/SalesOrder/DetailViewHeaderTitle.tpl b/layouts/v7/modules/SalesOrder/DetailViewHeaderTitle.tpl
index b2608b9abc0ae83d4ef38f7eb97466de685d6009..965261dd62dfb80b818bfcebe8501fa259d7748c 100644
--- a/layouts/v7/modules/SalesOrder/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/SalesOrder/DetailViewHeaderTitle.tpl
@@ -21,9 +21,9 @@
<img src="{vimage_path('summary_organizations.png')}" class="summaryImg"/>
{/if}
{/foreach}
- {if empty($IMAGE_DETAILS)}
- <div class="name"><span><strong> <i class="vicon-salesorder"></i> </strong></span></div>
- {/if}
+ {if empty($IMAGE_DETAILS)}
+ <div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
+ {/if}
</div>
<div class="recordBasicInfo">
<div class="info-row">
diff --git a/layouts/v7/modules/Settings/MenuEditor/Index.tpl b/layouts/v7/modules/Settings/MenuEditor/Index.tpl
index 93de1e619ced1ab970c22a5d1a0548302daf0431..da4831d49914a1fc4b92e7ad1ad0d0790d3c791d 100644
--- a/layouts/v7/modules/Settings/MenuEditor/Index.tpl
+++ b/layouts/v7/modules/Settings/MenuEditor/Index.tpl
@@ -46,7 +46,7 @@
</span>
{assign var='translatedModuleLabel' value=vtranslate($moduleModel->get('label'),$moduleName )}
<span>
- <i class="vicon-{strtolower($moduleName)} marginRight10px pull-left"></i>
+ <span class="marginRight10px pull-left">{$moduleModel->getModuleIcon()}</span>
</span>
<div class="textOverflowEllipsis marginTop10px textAlignLeft" title="{$translatedModuleLabel}">{$translatedModuleLabel}</div>
</div>
diff --git a/layouts/v7/modules/Settings/Workflows/ListViewContents.tpl b/layouts/v7/modules/Settings/Workflows/ListViewContents.tpl
index 64d50232509d88216b23e7866950b6740bf2a6d9..53b5d355113503890e0fe0c7c73180850d13ff98 100644
--- a/layouts/v7/modules/Settings/Workflows/ListViewContents.tpl
+++ b/layouts/v7/modules/Settings/Workflows/ListViewContents.tpl
@@ -127,10 +127,7 @@
{elseif $LISTVIEW_HEADERNAME eq 'module_name' && empty($SOURCE_MODULE)}
<td class="listViewEntryValue {$WIDTHTYPE}" width="{$WIDTH}%" nowrap>
{assign var="MODULE_ICON_NAME" value="{strtolower($LISTVIEW_ENTRY->get('raw_module_name'))}"}
- {if $MODULE_ICON_NAME eq 'events'}
- {assign var="MODULE_ICON_NAME" value="calendar"}
- {/if}
- <i class="vicon-{$MODULE_ICON_NAME}" title='{$LISTVIEW_ENTRY->get('module_name')}'> </i>
+ {Vtiger_Module_Model::getModuleIconPath($LISTVIEW_ENTRY->get('raw_module_name'))}
</td>
{else}
{/if}
diff --git a/layouts/v7/modules/Vendors/DetailViewHeaderTitle.tpl b/layouts/v7/modules/Vendors/DetailViewHeaderTitle.tpl
index d167c8af9a37c45dc5864ff9aadf26aafc58337d..dcde0e2a3632b192b937025bc7f1615ec990078f 100644
--- a/layouts/v7/modules/Vendors/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/Vendors/DetailViewHeaderTitle.tpl
@@ -10,55 +10,55 @@
********************************************************************************/
-->*}
{strip}
- <div class="col-lg-6 col-md-6 col-sm-6">
- <div class="record-header clearfix">
- <div class="hidden-sm hidden-xs recordImage bgvendors app-{$SELECTED_MENU_CATEGORY}">
- <div class="name"><span><strong> <i class="vicon-vendors"></i> </strong></span></div>
- </div>
- <div class="recordBasicInfo">
- <div class="info-row">
- <h4>
- <span class="recordLabel pushDown" title="{$RECORD->getName()}">
- {foreach item=NAME_FIELD from=$MODULE_MODEL->getNameFields()}
- {assign var=FIELD_MODEL value=$MODULE_MODEL->getField($NAME_FIELD)}
- {if $FIELD_MODEL->getPermissions()}
- <span class="{$NAME_FIELD}">{$RECORD->get($NAME_FIELD)}</span>
- {/if}
- {/foreach}
- </span>
- </h4>
- </div>
- {include file="DetailViewHeaderFieldsView.tpl"|vtemplate_path:$MODULE}
-
- {*
- <div class="info-row row">
- {assign var=FIELD_MODEL value=$MODULE_MODEL->getField('website')}
- <div class="col-lg-7 fieldLabel">
- <span class="website" title="{vtranslate($FIELD_MODEL->get('label'),$MODULE)} : {$RECORD->get('website')}">
- {$RECORD->getDisplayValue("website")}
- </span>
- </div>
- </div>
+ <div class="col-lg-6 col-md-6 col-sm-6">
+ <div class="record-header clearfix">
+ <div class="hidden-sm hidden-xs recordImage bgvendors app-{$SELECTED_MENU_CATEGORY}">
+ <div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
+ </div>
+ <div class="recordBasicInfo">
+ <div class="info-row">
+ <h4>
+ <span class="recordLabel pushDown" title="{$RECORD->getName()}">
+ {foreach item=NAME_FIELD from=$MODULE_MODEL->getNameFields()}
+ {assign var=FIELD_MODEL value=$MODULE_MODEL->getField($NAME_FIELD)}
+ {if $FIELD_MODEL->getPermissions()}
+ <span class="{$NAME_FIELD}">{$RECORD->get($NAME_FIELD)}</span>
+ {/if}
+ {/foreach}
+ </span>
+ </h4>
+ </div>
+ {include file="DetailViewHeaderFieldsView.tpl"|vtemplate_path:$MODULE}
- <div class="info-row row">
- {assign var=FIELD_MODEL value=$MODULE_MODEL->getField('email')}
- <div class="col-lg-7 fieldLabel">
- <span class="email" title="{vtranslate($FIELD_MODEL->get('label'),$MODULE)} : {$RECORD->get('email')}">
- {$RECORD->getDisplayValue("email")}
- </span>
- </div>
- </div>
+ {*
+ <div class="info-row row">
+ {assign var=FIELD_MODEL value=$MODULE_MODEL->getField('website')}
+ <div class="col-lg-7 fieldLabel">
+ <span class="website" title="{vtranslate($FIELD_MODEL->get('label'),$MODULE)} : {$RECORD->get('website')}">
+ {$RECORD->getDisplayValue("website")}
+ </span>
+ </div>
+ </div>
- <div class="info-row row">
- {assign var=FIELD_MODEL value=$MODULE_MODEL->getField('phone')}
- <div class="col-lg-7 fieldLabel">
- <span class="phone" title="{vtranslate($FIELD_MODEL->get('label'),$MODULE)} : {$RECORD->get('phone')}">
- {$RECORD->getDisplayValue("phone")}
- </span>
- </div>
- </div>
- *}
- </div>
- </div>
- </div>
+ <div class="info-row row">
+ {assign var=FIELD_MODEL value=$MODULE_MODEL->getField('email')}
+ <div class="col-lg-7 fieldLabel">
+ <span class="email" title="{vtranslate($FIELD_MODEL->get('label'),$MODULE)} : {$RECORD->get('email')}">
+ {$RECORD->getDisplayValue("email")}
+ </span>
+ </div>
+ </div>
+
+ <div class="info-row row">
+ {assign var=FIELD_MODEL value=$MODULE_MODEL->getField('phone')}
+ <div class="col-lg-7 fieldLabel">
+ <span class="phone" title="{vtranslate($FIELD_MODEL->get('label'),$MODULE)} : {$RECORD->get('phone')}">
+ {$RECORD->getDisplayValue("phone")}
+ </span>
+ </div>
+ </div>
+ *}
+ </div>
+ </div>
+ </div>
{/strip}
\ No newline at end of file
diff --git a/layouts/v7/modules/Vtiger/DetailViewHeaderTitle.tpl b/layouts/v7/modules/Vtiger/DetailViewHeaderTitle.tpl
index e414c299701ff036c174951dd927d463ddd45635..66ac8a4e45ac8d518fa6abd694a8ea5055ff3c28 100644
--- a/layouts/v7/modules/Vtiger/DetailViewHeaderTitle.tpl
+++ b/layouts/v7/modules/Vtiger/DetailViewHeaderTitle.tpl
@@ -14,9 +14,7 @@
{assign var=MODULE value=$MODULE_NAME}
{/if}
<div class="hidden-sm hidden-xs recordImage bg_{$MODULE} app-{$SELECTED_MENU_CATEGORY}">
- <div class="name">
- <span><strong><i class="vicon-{strtolower($MODULE)}"></i></strong></span>
- </div>
+ <div class="name"><span><strong>{$MODULE_MODEL->getModuleIcon()}</strong></span></div>
</div>
<div class="recordBasicInfo">
diff --git a/layouts/v7/modules/Vtiger/ModuleRelatedTabs.tpl b/layouts/v7/modules/Vtiger/ModuleRelatedTabs.tpl
index 7df8ada2ede51a8af2e27693454f319386e22fc8..d3bc58e83963f4bc05aab5658259e1bb3ae37b3e 100644
--- a/layouts/v7/modules/Vtiger/ModuleRelatedTabs.tpl
+++ b/layouts/v7/modules/Vtiger/ModuleRelatedTabs.tpl
@@ -51,7 +51,7 @@
{else}
<span class="tab-icon">
{assign var=RELATED_MODULE_MODEL value=Vtiger_Module_Model::getInstance($RELATEDMODULENAME)}
- <i class="vicon-{strtolower($RELATEDMODULENAME)}" ></i>
+ {$RELATED_MODULE_MODEL->getModuleIcon()}
</span>
{/if}
<span class="numberCircle hide">0</span>
@@ -76,7 +76,7 @@
{else}
<span class="tab-icon">
{assign var=RELATED_MODULE_MODEL value=Vtiger_Module_Model::getInstance($RELATEDMODULENAME)}
- <i class="vicon-{strtolower($RELATEDMODULENAME)}" ></i>
+ {$RELATED_MODULE_MODEL->getModuleIcon()}
</span>
{/if}
<span class="numberCircle hide">0</span>
@@ -107,7 +107,7 @@
{else}
{assign var=RELATED_MODULE_MODEL value=Vtiger_Module_Model::getInstance($RELATEDMODULENAME)}
<span class="tab-icon textOverflowEllipsis">
- <i class="vicon-{strtolower($RELATEDMODULENAME)}"></i>
+ {$RELATED_MODULE_MODEL->getModuleIcon()}
<span class="content"> {$DETAILVIEWRELATEDLINKLBL}</span>
</span>
{/if}
diff --git a/layouts/v7/modules/Vtiger/RecentActivities.tpl b/layouts/v7/modules/Vtiger/RecentActivities.tpl
index 852f2df3cf028e655bac0ee150209d6f17fd222b..0da6885c3a69677aadd46d28da47fb2e75db8761 100644
--- a/layouts/v7/modules/Vtiger/RecentActivities.tpl
+++ b/layouts/v7/modules/Vtiger/RecentActivities.tpl
@@ -112,14 +112,14 @@
<small title="{Vtiger_Util_Helper::formatDateTimeIntoDayString($RELATION->get('changedon'))}">
{Vtiger_Util_Helper::formatDateDiffInStrings($RELATION->get('changedon'))} </small>
</time>
- {if {$RELATED_MODULE|strtolower eq 'modcomments'}}
- {assign var="VICON_MODULES" value="vicon-chat"}
- {else}
- {assign var="VICON_MODULES" value="vicon-{$RELATED_MODULE|strtolower}"}
- {/if}
- <div class="update_icon bg-info-{$RELATED_MODULE|strtolower}">
- <i class="update_image {$VICON_MODULES}"></i>
- </div>
+ <div class="update_icon bg-info-{$RELATED_MODULE|strtolower}">
+ {if {$RELATED_MODULE|strtolower eq 'modcomments'}}
+ {assign var="VICON_MODULES" value="vicon-chat"}
+ <i class="update_image {$VICON_MODULES}"></i>
+ {else}
+ <span class="update_image">{Vtiger_Module_Model::getModuleIconPath($RELATED_MODULE)}</span>
+ {/if}
+ </div>
<div class="update_info">
<h5>
{assign var=RELATION value=$RECENT_ACTIVITY->getRelationInstance()}
diff --git a/layouts/v7/modules/Vtiger/dashboards/HistoryContents.tpl b/layouts/v7/modules/Vtiger/dashboards/HistoryContents.tpl
index 44275ba1d52e4a0407a64ac91ed4d9dfa4fbe6c7..6cce186ed8b41154f57cc30b36b9f06a22210562 100644
--- a/layouts/v7/modules/Vtiger/dashboards/HistoryContents.tpl
+++ b/layouts/v7/modules/Vtiger/dashboards/HistoryContents.tpl
@@ -35,7 +35,7 @@
{else if $MOD_NAME eq "Calendar"}
{assign var=VT_ICON value="Task"}
{/if}
- <span><i class="vicon-{strtolower($VT_ICON)} entryIcon" title={$TRANSLATED_MODULE_NAME}></i></span>
+ <span>{$HISTORY->getParent()->getModule()->getModuleIcon($VT_ICON)}</span>
</div>
<div class="col-lg-10 pull-left">
{assign var=DETAILVIEW_URL value=$PARENT->getDetailViewUrl()}
diff --git a/layouts/v7/modules/Vtiger/partials/Menubar.tpl b/layouts/v7/modules/Vtiger/partials/Menubar.tpl
index 6aa31ce053dd2b8745a97e5340409e54f83f967a..646efc9082143a1d81bc7f380f3dc994e4007958 100644
--- a/layouts/v7/modules/Vtiger/partials/Menubar.tpl
+++ b/layouts/v7/modules/Vtiger/partials/Menubar.tpl
@@ -16,7 +16,7 @@
<ul title="{$translatedModuleLabel}" class="module-qtip">
<li {if $MODULE eq $moduleName}class="active"{else}class=""{/if}>
<a href="{$moduleModel->getDefaultUrl()}&app={$SELECTED_MENU_CATEGORY}">
- <i class="vicon-{strtolower($moduleName)}"></i>
+ {$moduleModel->getModuleIcon()}
<span>{$translatedModuleLabel}</span>
</a>
</li>
diff --git a/layouts/v7/modules/Vtiger/partials/SidebarAppMenu.tpl b/layouts/v7/modules/Vtiger/partials/SidebarAppMenu.tpl
index c7bb2e137c8dd7f6298d0a0c41224067f7f30df5..0d9a812c3d741d1f5badc83793163f09ad513026 100644
--- a/layouts/v7/modules/Vtiger/partials/SidebarAppMenu.tpl
+++ b/layouts/v7/modules/Vtiger/partials/SidebarAppMenu.tpl
@@ -52,7 +52,7 @@
{assign var='translatedModuleLabel' value=vtranslate($moduleModel->get('label'),$moduleName )}
<li>
<a href="{$moduleModel->getDefaultUrl()}&app={$APP_NAME}" title="{$translatedModuleLabel}">
- <span class="vicon-{strtolower($moduleName)} module-icon"></span>
+ <span class="module-icon">{$moduleModel->getModuleIcon()}</span>
<span class="module-name textOverflowEllipsis"> {$translatedModuleLabel}</span>
</a>
</li>
@@ -66,7 +66,7 @@
{if $USER_PRIVILEGES_MODEL->hasModulePermission($MAILMANAGER_MODULE_MODEL->getId())}
<div class="menu-item app-item app-item-misc" data-default-url="index.php?module=MailManager&view=List">
<div class="menu-items-wrapper">
- <span class="app-icon-list fa vicon-mailmanager"></span>
+ <span class="app-icon-list fa">{$MAILMANAGER_MODULE_MODEL->getModuleIcon()}</span>
<span class="app-name textOverflowEllipsis"> {vtranslate('MailManager')}</span>
</div>
</div>
@@ -75,7 +75,7 @@
{if $USER_PRIVILEGES_MODEL->hasModulePermission($DOCUMENTS_MODULE_MODEL->getId())}
<div class="menu-item app-item app-item-misc" data-default-url="index.php?module=Documents&view=List">
<div class="menu-items-wrapper">
- <span class="app-icon-list fa vicon-documents"></span>
+ <span class="app-icon-list fa">{$DOCUMENTS_MODULE_MODEL->getModuleIcon()}</span>
<span class="app-name textOverflowEllipsis"> {vtranslate('Documents')}</span>
</div>
</div>
@@ -109,7 +109,7 @@
{if $EMAILTEMPLATES_MODULE_MODEL && $USER_PRIVILEGES_MODEL->hasModulePermission($EMAILTEMPLATES_MODULE_MODEL->getId())}
<li>
<a href="{$EMAILTEMPLATES_MODULE_MODEL->getDefaultUrl()}">
- <span class="fa vicon-emailtemplates module-icon"></span>
+ <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>
diff --git a/layouts/v7/modules/Vtiger/partials/Topbar.tpl b/layouts/v7/modules/Vtiger/partials/Topbar.tpl
index 50f71257254d3b461f69f3c4ee17df3cfcd84afb..8047e2c05893db48e92be27d76426698b5ae5aa7 100644
--- a/layouts/v7/modules/Vtiger/partials/Topbar.tpl
+++ b/layouts/v7/modules/Vtiger/partials/Topbar.tpl
@@ -70,7 +70,7 @@
{assign var='singularLabel' value='LBL_TASK'}
<div class="{if $hideDiv}create_restricted_{$moduleModel->getName()} hide{else}col-lg-4{/if}">
<a id="menubar_quickCreate_Events" class="quickCreateModule" data-name="Events"
- data-url="index.php?module=Events&view=QuickCreateAjax" href="javascript:void(0)"><i class="vicon-calendar pull-left"></i><span class="quick-create-module">{vtranslate('LBL_EVENT',$moduleName)}</span></a>
+ data-url="index.php?module=Events&view=QuickCreateAjax" href="javascript:void(0)">{$moduleModel->getModuleIcon('Event')}<span class="quick-create-module">{vtranslate('LBL_EVENT',$moduleName)}</span></a>
</div>
{if $count % 3 == 2}
</div>
@@ -79,7 +79,7 @@
{/if}
<div class="{if $hideDiv}create_restricted_{$moduleModel->getName()} hide{else}col-lg-4{/if}">
<a id="menubar_quickCreate_{$moduleModel->getName()}" class="quickCreateModule" data-name="{$moduleModel->getName()}"
- data-url="{$moduleModel->getQuickCreateUrl()}" href="javascript:void(0)"><i class="vicon-task pull-left"></i><span class="quick-create-module">{vtranslate($singularLabel,$moduleName)}</span></a>
+ data-url="{$moduleModel->getQuickCreateUrl()}" href="javascript:void(0)">{$moduleModel->getModuleIcon('Task')}<span class="quick-create-module">{vtranslate($singularLabel,$moduleName)}</span></a>
</div>
{if !$hideDiv}
{assign var='count' value=$count+1}
@@ -88,7 +88,7 @@
<div class="{if $hideDiv}create_restricted_{$moduleModel->getName()} hide{else}col-lg-4{/if} dropdown">
<a id="menubar_quickCreate_{$moduleModel->getName()}" class="quickCreateModuleSubmenu dropdown-toggle" data-name="{$moduleModel->getName()}" data-toggle="dropdown"
data-url="{$moduleModel->getQuickCreateUrl()}" href="javascript:void(0)">
- <i class="vicon-{strtolower($moduleName)} pull-left"></i>
+ {$moduleModel->getModuleIcon()}
<span class="quick-create-module">
{vtranslate($singularLabel,$moduleName)}
<i class="fa fa-caret-down quickcreateMoreDropdownAction"></i>
@@ -112,7 +112,7 @@
<div class="{if $hideDiv}create_restricted_{$moduleModel->getName()} hide{else}col-lg-4{/if}">
<a id="menubar_quickCreate_{$moduleModel->getName()}" class="quickCreateModule" data-name="{$moduleModel->getName()}"
data-url="{$moduleModel->getQuickCreateUrl()}" href="javascript:void(0)">
- <i class="vicon-{strtolower($moduleName)} pull-left"></i>
+ {$moduleModel->getModuleIcon()}
<span class="quick-create-module">{vtranslate($singularLabel,$moduleName)}</span>
</a>
</div>
diff --git a/layouts/v7/skins/contact/style.css b/layouts/v7/skins/contact/style.css
index 71bfcbb062f7e29771ee0ff2d74e455b7c0c01f5..80652dd9bbb9bf7b573cd365410e12ca00d10ec6 100644
--- a/layouts/v7/skins/contact/style.css
+++ b/layouts/v7/skins/contact/style.css
@@ -7309,4 +7309,59 @@ input:focus:-ms-input-placeholder {
.listViewRecordActions .quickView, .listViewRecordActions .markStar,
.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
margin-top: 4px;
+}
+.app-menu .module-icon .custom-module {
+ font-size: 14px;
+ border-radius: 4px;
+ color: #000;
+ background-color: #fff;
+ padding: 4px 10px 4px 5px !important
+}
+.menu-item .custom-module {
+ font-family: 'OpenSans-Regular', sans-serif;
+ font-size: 12px;
+ border-radius: 4px;
+ padding: 2px;
+ color: #000;
+ background-color: #fff;
+}
+.modules-menu .custom-module {
+ color: #fff;
+ margin-left: 0px;
+ display: inline;
+ border: 1px solid #fff;
+ border-radius: 4px;
+ padding: 3px 4px 3px 2px !important;
+ font-weight: bold;
+}
+#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #fff;
+ background-color: #777;
+}
+.menuEditorItem .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #000;
+ background-color: #fff;
+}
+.task-details .custom-module {
+ border-radius: 4px;
+ padding: 1px 4px;
+ color: white;
+ background-color: #777;
+}
+.related-tabs .custom-module, #relatedmenuList .custom-module {
+ border-radius: 4px;
+ color: #fff;
+ background-color: #777;
+ padding: 5px 7px;
+ font-weight: bold;
+}
+.record-header .custom-module {
+ font-size: 30px;
+}
+.moduleIcon .custom-module {
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/layouts/v7/skins/inventory/style.css b/layouts/v7/skins/inventory/style.css
index 2b8f7335a98c20c893582863fd1046b661c748a6..b362764e4f2ceefb839447b580c0c70c32ad6a96 100644
--- a/layouts/v7/skins/inventory/style.css
+++ b/layouts/v7/skins/inventory/style.css
@@ -7313,4 +7313,59 @@ input:focus:-ms-input-placeholder {
.listViewRecordActions .quickView, .listViewRecordActions .markStar,
.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
margin-top: 4px;
+}
+.app-menu .module-icon .custom-module {
+ font-size: 14px;
+ border-radius: 4px;
+ color: #000;
+ background-color: #fff;
+ padding: 4px 10px 4px 5px !important
+}
+.menu-item .custom-module {
+ font-family: 'OpenSans-Regular', sans-serif;
+ font-size: 12px;
+ border-radius: 4px;
+ padding: 2px;
+ color: #000;
+ background-color: #fff;
+}
+.modules-menu .custom-module {
+ color: #fff;
+ margin-left: 0px;
+ display: inline;
+ border: 1px solid #fff;
+ border-radius: 4px;
+ padding: 3px 4px 3px 2px !important;
+ font-weight: bold;
+}
+#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #fff;
+ background-color: #777;
+}
+.menuEditorItem .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #000;
+ background-color: #fff;
+}
+.task-details .custom-module {
+ border-radius: 4px;
+ padding: 1px 4px;
+ color: white;
+ background-color: #777;
+}
+.related-tabs .custom-module, #relatedmenuList .custom-module {
+ border-radius: 4px;
+ color: #fff;
+ background-color: #777;
+ padding: 5px 7px;
+ font-weight: bold;
+}
+.record-header .custom-module {
+ font-size: 30px;
+}
+.moduleIcon .custom-module {
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/layouts/v7/skins/marketing/style.css b/layouts/v7/skins/marketing/style.css
index 6aba6e48334bad57396d7c28a6946022b1fdd4d4..36738b771191c9789fbf0a11f174180c248e5f17 100644
--- a/layouts/v7/skins/marketing/style.css
+++ b/layouts/v7/skins/marketing/style.css
@@ -7576,3 +7576,58 @@ a.btnReport:hover {
.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
margin-top: 4px;
}
+.app-menu .module-icon .custom-module {
+ font-size: 14px;
+ border-radius: 4px;
+ color: #000;
+ background-color: #fff;
+ padding: 4px 10px 4px 5px !important
+}
+.menu-item .custom-module {
+ font-family: 'OpenSans-Regular', sans-serif;
+ font-size: 12px;
+ border-radius: 4px;
+ padding: 2px;
+ color: #000;
+ background-color: #fff;
+}
+.modules-menu .custom-module {
+ color: #fff;
+ margin-left: 0px;
+ display: inline;
+ border: 1px solid #fff;
+ border-radius: 4px;
+ padding: 3px 4px 3px 2px !important;
+ font-weight: bold;
+}
+#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #fff;
+ background-color: #777;
+}
+.menuEditorItem .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #000;
+ background-color: #fff;
+}
+.task-details .custom-module {
+ border-radius: 4px;
+ padding: 1px 4px;
+ color: white;
+ background-color: #777;
+}
+.related-tabs .custom-module, #relatedmenuList .custom-module {
+ border-radius: 4px;
+ color: #fff;
+ background-color: #777;
+ padding: 5px 7px;
+ font-weight: bold;
+}
+.record-header .custom-module {
+ font-size: 30px;
+}
+.moduleIcon .custom-module {
+ font-weight: bold;
+}
\ No newline at end of file
diff --git a/layouts/v7/skins/marketing_and_sales/style.css b/layouts/v7/skins/marketing_and_sales/style.css
index df49472b5d6e811bd06b86a6a487cae871882043..ade2138d2734cde242c55d242ef82e5a35425204 100644
--- a/layouts/v7/skins/marketing_and_sales/style.css
+++ b/layouts/v7/skins/marketing_and_sales/style.css
@@ -7313,4 +7313,59 @@ input:focus:-ms-input-placeholder {
.listViewRecordActions .quickView, .listViewRecordActions .markStar,
.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
margin-top: 4px;
+}
+.app-menu .module-icon .custom-module {
+ font-size: 14px;
+ border-radius: 4px;
+ color: #000;
+ background-color: #fff;
+ padding: 4px 10px 4px 5px !important
+}
+.menu-item .custom-module {
+ font-family: 'OpenSans-Regular', sans-serif;
+ font-size: 12px;
+ border-radius: 4px;
+ padding: 2px;
+ color: #000;
+ background-color: #fff;
+}
+.modules-menu .custom-module {
+ color: #fff;
+ margin-left: 0px;
+ display: inline;
+ border: 1px solid #fff;
+ border-radius: 4px;
+ padding: 3px 4px 3px 2px !important;
+ font-weight: bold;
+}
+#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #fff;
+ background-color: #777;
+}
+.menuEditorItem .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #000;
+ background-color: #fff;
+}
+.task-details .custom-module {
+ border-radius: 4px;
+ padding: 1px 4px;
+ color: white;
+ background-color: #777;
+}
+.related-tabs .custom-module, #relatedmenuList .custom-module {
+ border-radius: 4px;
+ color: #fff;
+ background-color: #777;
+ padding: 5px 7px;
+ font-weight: bold;
+}
+.record-header .custom-module {
+ font-size: 30px;
+}
+.moduleIcon .custom-module {
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/layouts/v7/skins/project/style.css b/layouts/v7/skins/project/style.css
index 92f3d89673492a37147d3882f30182da2c296ce1..29f5726c8c4525e4d68e9f1fd2d50e52516076be 100644
--- a/layouts/v7/skins/project/style.css
+++ b/layouts/v7/skins/project/style.css
@@ -7313,4 +7313,59 @@ input:focus:-ms-input-placeholder {
.listViewRecordActions .quickView, .listViewRecordActions .markStar,
.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
margin-top: 4px;
+}
+.app-menu .module-icon .custom-module {
+ font-size: 14px;
+ border-radius: 4px;
+ color: #000;
+ background-color: #fff;
+ padding: 4px 10px 4px 5px !important
+}
+.menu-item .custom-module {
+ font-family: 'OpenSans-Regular', sans-serif;
+ font-size: 12px;
+ border-radius: 4px;
+ padding: 2px;
+ color: #000;
+ background-color: #fff;
+}
+.modules-menu .custom-module {
+ color: #fff;
+ margin-left: 0px;
+ display: inline;
+ border: 1px solid #fff;
+ border-radius: 4px;
+ padding: 3px 4px 3px 2px !important;
+ font-weight: bold;
+}
+#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #fff;
+ background-color: #777;
+}
+.menuEditorItem .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #000;
+ background-color: #fff;
+}
+.task-details .custom-module {
+ border-radius: 4px;
+ padding: 1px 4px;
+ color: white;
+ background-color: #777;
+}
+.related-tabs .custom-module, #relatedmenuList .custom-module {
+ border-radius: 4px;
+ color: #fff;
+ background-color: #777;
+ padding: 5px 7px;
+ font-weight: bold;
+}
+.record-header .custom-module {
+ font-size: 30px;
+}
+.moduleIcon .custom-module {
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/layouts/v7/skins/sales/style.css b/layouts/v7/skins/sales/style.css
index df49472b5d6e811bd06b86a6a487cae871882043..ade2138d2734cde242c55d242ef82e5a35425204 100644
--- a/layouts/v7/skins/sales/style.css
+++ b/layouts/v7/skins/sales/style.css
@@ -7313,4 +7313,59 @@ input:focus:-ms-input-placeholder {
.listViewRecordActions .quickView, .listViewRecordActions .markStar,
.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
margin-top: 4px;
+}
+.app-menu .module-icon .custom-module {
+ font-size: 14px;
+ border-radius: 4px;
+ color: #000;
+ background-color: #fff;
+ padding: 4px 10px 4px 5px !important
+}
+.menu-item .custom-module {
+ font-family: 'OpenSans-Regular', sans-serif;
+ font-size: 12px;
+ border-radius: 4px;
+ padding: 2px;
+ color: #000;
+ background-color: #fff;
+}
+.modules-menu .custom-module {
+ color: #fff;
+ margin-left: 0px;
+ display: inline;
+ border: 1px solid #fff;
+ border-radius: 4px;
+ padding: 3px 4px 3px 2px !important;
+ font-weight: bold;
+}
+#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #fff;
+ background-color: #777;
+}
+.menuEditorItem .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #000;
+ background-color: #fff;
+}
+.task-details .custom-module {
+ border-radius: 4px;
+ padding: 1px 4px;
+ color: white;
+ background-color: #777;
+}
+.related-tabs .custom-module, #relatedmenuList .custom-module {
+ border-radius: 4px;
+ color: #fff;
+ background-color: #777;
+ padding: 5px 7px;
+ font-weight: bold;
+}
+.record-header .custom-module {
+ font-size: 30px;
+}
+.moduleIcon .custom-module {
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/layouts/v7/skins/support/style.css b/layouts/v7/skins/support/style.css
index eb0d0e11f09f6ac491def66208cf61239a8aef8d..660c736ab2b222c6673bf256f2576e85bfa11fae 100644
--- a/layouts/v7/skins/support/style.css
+++ b/layouts/v7/skins/support/style.css
@@ -7444,4 +7444,59 @@ div.flip {
.listViewRecordActions .quickView, .listViewRecordActions .markStar,
.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
margin-top: 4px;
+}
+.app-menu .module-icon .custom-module {
+ font-size: 14px;
+ border-radius: 4px;
+ color: #000;
+ background-color: #fff;
+ padding: 4px 10px 4px 5px !important
+}
+.menu-item .custom-module {
+ font-family: 'OpenSans-Regular', sans-serif;
+ font-size: 12px;
+ border-radius: 4px;
+ padding: 2px;
+ color: #000;
+ background-color: #fff;
+}
+.modules-menu .custom-module {
+ color: #fff;
+ margin-left: 0px;
+ display: inline;
+ border: 1px solid #fff;
+ border-radius: 4px;
+ padding: 3px 4px 3px 2px !important;
+ font-weight: bold;
+}
+#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #fff;
+ background-color: #777;
+}
+.menuEditorItem .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #000;
+ background-color: #fff;
+}
+.task-details .custom-module {
+ border-radius: 4px;
+ padding: 1px 4px;
+ color: white;
+ background-color: #777;
+}
+.related-tabs .custom-module, #relatedmenuList .custom-module {
+ border-radius: 4px;
+ color: #fff;
+ background-color: #777;
+ padding: 5px 7px;
+ font-weight: bold;
+}
+.record-header .custom-module {
+ font-size: 30px;
+}
+.moduleIcon .custom-module {
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/layouts/v7/skins/tools/style.css b/layouts/v7/skins/tools/style.css
index 55dd444640518737f9ee7d50a5b5739b921610e3..21ae5fb76f81fd56162af900f430d6fdee0822c1 100644
--- a/layouts/v7/skins/tools/style.css
+++ b/layouts/v7/skins/tools/style.css
@@ -7309,4 +7309,59 @@ input:focus:-ms-input-placeholder {
.listViewRecordActions .quickView, .listViewRecordActions .markStar,
.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
margin-top: 4px;
+}
+.app-menu .module-icon .custom-module {
+ font-size: 14px;
+ border-radius: 4px;
+ color: #000;
+ background-color: #fff;
+ padding: 4px 10px 4px 5px !important
+}
+.menu-item .custom-module {
+ font-family: 'OpenSans-Regular', sans-serif;
+ font-size: 12px;
+ border-radius: 4px;
+ padding: 2px;
+ color: #000;
+ background-color: #fff;
+}
+.modules-menu .custom-module {
+ color: #fff;
+ margin-left: 0px;
+ display: inline;
+ border: 1px solid #fff;
+ border-radius: 4px;
+ padding: 3px 4px 3px 2px !important;
+ font-weight: bold;
+}
+#quickCreateModules .custom-module, .workflowListContainer .custom-module, .dashBoardTabContents .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #fff;
+ background-color: #777;
+}
+.menuEditorItem .custom-module {
+ border-radius: 4px;
+ padding: 3px 5px;
+ color: #000;
+ background-color: #fff;
+}
+.task-details .custom-module {
+ border-radius: 4px;
+ padding: 1px 4px;
+ color: white;
+ background-color: #777;
+}
+.related-tabs .custom-module, #relatedmenuList .custom-module {
+ border-radius: 4px;
+ color: #fff;
+ background-color: #777;
+ padding: 5px 7px;
+ font-weight: bold;
+}
+.record-header .custom-module {
+ font-size: 30px;
+}
+.moduleIcon .custom-module {
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/modules/Calendar/models/Module.php b/modules/Calendar/models/Module.php
index f355e427b91c5355237794793e1204524ac13919..372c75d57b040ac252e383cfa55fe0f548b8809b 100644
--- a/modules/Calendar/models/Module.php
+++ b/modules/Calendar/models/Module.php
@@ -984,4 +984,12 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
public function getRelationShipActions() {
return array('ADD');
}
+
+ public function getModuleIcon($activityType) {
+ $moduleIcon = '<i class="vicon-'.strtolower($activityType).'" ></i>';
+ if ($activityType != 'Task') {
+ $moduleIcon = parent::getModuleIcon();
+ }
+ return $moduleIcon;
+ }
}
diff --git a/modules/Migration/schema/701_to_710.php b/modules/Migration/schema/701_to_710.php
index cb2cbaf98ffff85d4e61a9bb6515a84acaa5e82d..8e6be853ecbbe174318b58d67fe5f9bfbe366d18 100644
--- a/modules/Migration/schema/701_to_710.php
+++ b/modules/Migration/schema/701_to_710.php
@@ -106,6 +106,37 @@ if (defined('VTIGER_UPGRADE')) {
$em->registerHandler('vtiger.entity.aftersave', 'modules/Vtiger/handlers/FollowRecordHandler.php', 'FollowRecordHandler');
//END::Follow & unfollow features
+ //START::Differentiate custom modules from Vtiger modules
+ $vtigerTabColumns = $db->getColumnNames('vtiger_tab');
+ if (!in_array('source', $vtigerTabColumns)) {
+ $db->pquery('ALTER TABLE vtiger_tab ADD COLUMN source VARCHAR(255) DEFAULT "custom"', array());
+ }
+ $db->pquery('UPDATE vtiger_tab SET source=NULL', array());
+
+ $pkgModules = array();
+ $pkgFolder = 'pkg/vtiger/modules';
+ $pkgHandle = opendir($pkgFolder);
+
+ if ($pkgHandle) {
+ while (($pkgModuleName = readdir($pkgHandle)) !== false) {
+ $pkgModules[$pkgModuleName] = $pkgModuleName;
+
+ $moduleHandle = opendir("$pkgFolder/$pkgModuleName");
+ while (($innerModuleName = readdir($moduleHandle)) !== false) {
+ if (is_dir("$pkgFolder/$pkgModuleName/$innerModuleName")) {
+ $pkgModules[$innerModuleName] = $innerModuleName;
+ }
+ }
+ closedir($moduleHandle);
+ }
+ closedir($pkgHandle);
+ $pkgModules = array_keys($pkgModules);
+ }
+
+ $db->pquery('UPDATE vtiger_tab SET source="custom" WHERE version IS NOT NULL AND name NOT IN ('.generateQuestionMarks($pkgModules).')', $pkgModules);
+ echo '<br>Succecssfully added source column vtiger tab table<br>';
+ //END::Differentiate custom modules from Vtiger modules
+
//Update existing package modules
Install_Utils_Model::installModules();
}
\ No newline at end of file
diff --git a/modules/Vtiger/models/Module.php b/modules/Vtiger/models/Module.php
index cece6db5d36032ae7cc332c164fe954fbf1bfb49..aaea533696d4f894e04e607afac36fdfc4de3578 100644
--- a/modules/Vtiger/models/Module.php
+++ b/modules/Vtiger/models/Module.php
@@ -1986,4 +1986,27 @@ class Vtiger_Module_Model extends Vtiger_Module {
return true;
}
+ public function getModuleIcon() {
+ $moduleName = $this->getName();
+ $lowerModuleName = strtolower($moduleName);
+ $title = vtranslate($moduleName, $moduleName);
+
+ $moduleIcon = "<i class='vicon-$lowerModuleName' title='$title'></i>";
+ if ($this->source == 'custom') {
+ $moduleShortName = mb_substr(trim($title), 0, 2);
+ $moduleIcon = "<span class='custom-module' title='$title'>$moduleShortName</span>";
+ }
+
+ $imageFilePath = 'layouts/'.Vtiger_Viewer::getLayoutName()."/modules/$moduleName/$moduleName.png";
+ if (file_exists($imageFilePath)) {
+ $moduleIcon = "<img src='$imageFilePath' title='$title'/>";
+ }
+
+ return $moduleIcon;
+ }
+
+ public static function getModuleIconPath($moduleName) {
+ $moduleModel = Vtiger_Module_Model::getInstance($moduleName);
+ return $moduleModel->getModuleIcon();
+ }
}
diff --git a/schema/DatabaseSchema.xml b/schema/DatabaseSchema.xml
index 36430154cb17fca130604c56afc7f0030f7c4676..d8ac988b01eec57a5cfd115499ebc301b63c52c5 100644
--- a/schema/DatabaseSchema.xml
+++ b/schema/DatabaseSchema.xml
@@ -211,6 +211,9 @@
</field>
<field name="version" type="C" size="10" />
<field name="parent" type="C" size="30"/>
+ <field name="source" type="C" size="255">
+ <default value="custom" />
+ </field>
<index name="tab_name_idx">
<col>name</col>
diff --git a/vtlib/Vtiger/ModuleBasic.php b/vtlib/Vtiger/ModuleBasic.php
index 347d3fd4c21b59cef7065cf61340272519e93346..d63d982fbdf7333407509e9e9b9fd6e481f43b27 100644
--- a/vtlib/Vtiger/ModuleBasic.php
+++ b/vtlib/Vtiger/ModuleBasic.php
@@ -87,6 +87,7 @@ class Vtiger_ModuleBasic {
// Initialize other details too
$this->initialize2();
}
+ $this->source = $valuemap['source'];
$this->isSyncable = $valuemap['issyncable'];
$this->allowDuplicates = $valuemap['allowduplicates'];
$this->syncActionForDuplicate = $valuemap['sync_action_for_duplicates'];