EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Navbar menu icons
Yurii21edade33072
diff --git a/application/Espo/Resources/metadata/app/clientNavbar.json b/application/Espo/Resources/metadata/app/clientNavbar.jsonindex bb1ecfb839..16d093d0a8 100644--- a/application/Espo/Resources/metadata/app/clientNavbar.json+++ b/application/Espo/Resources/metadata/app/clientNavbar.json@@ -35,13 +35,15 @@{"isAdminOnly": true}- ]+ ],+ "iconClass": "fas fa-gear"},"preferences": {"order": 1,"groupIndex": 1,"link": "#Preferences",- "labelTranslation": "Global.labels.Preferences"+ "labelTranslation": "Global.labels.Preferences",+ "iconClass": "fas fa-user-gear"},"about": {"order": 0,@@ -54,7 +56,8 @@"groupIndex": 10,"labelTranslation": "Global.labels.Log Out","handler": "handlers/navbar-menu",- "actionFunction": "logout"+ "actionFunction": "logout",+ "iconClass": "fas fa-arrow-right-to-bracket"}}}diff --git a/client/res/templates/site/navbar.tpl b/client/res/templates/site/navbar.tplindex b5ba752d9b..b078fe9ca0 100644--- a/client/res/templates/site/navbar.tpl+++ b/client/res/templates/site/navbar.tpl@@ -209,7 +209,17 @@{{#if link}}href="{{link}}"{{else}}role="button"{{/if}}tabindex="0"class="nav-link{{#if handler}} action{{/if}}"- >{{#if html}}{{{html}}}{{else}}{{label}}{{/if}}</a></li>+ >+ {{~#if html~}}+ {{{html}}}+ {{~else~}}+ {{~#if iconClass~}}+ <span class="item-icon {{iconClass}}"></span>+ {{~/if~}}+ <span class="item-text">{{label}}</span>+ {{~/if~}}+ </a>+ </li>{{else}}<li class="divider"></li>{{/unless}}diff --git a/client/src/views/site/navbar.js b/client/src/views/site/navbar.jsindex f6fa24f86f..782937bb4e 100644--- a/client/src/views/site/navbar.js+++ b/client/src/views/site/navbar.js@@ -1367,23 +1367,18 @@ class NavbarSiteView extends View {* @property {string} [handler]* @property {string} [actionFunction]* @property {true} [divider]+ * @property {string} [iconClass]*//*** @private*/setupMenu() {- let avatarHtml = this.getHelper().getAvatarHtml(this.getUser().id, 'small', 20, 'avatar-link');-- if (avatarHtml) {- avatarHtml += ' ';- }-/** @type {MenuDataItem[]} */this.menuDataList = [{link: `#User/view/${this.getUser().id}`,- html: avatarHtml + this.getHelper().escapeString(this.getUser().get('name')),+ html: this.composeUserMenuItemHtml(),},{divider: true}];@@ -1399,6 +1394,7 @@ class NavbarSiteView extends View {* handler?: string,* actionFunction?: string,* accessDataList?: import('utils').AccessDefs[],+ * iconClass?: string,* }>} items*/const items = this.getMetadata().get('app.clientNavbar.menuItems') || {};@@ -1452,10 +1448,23 @@ class NavbarSiteView extends View {label: this.getLanguage().translatePath(item.labelTranslation),handler: item.handler,actionFunction: item.actionFunction,+ iconClass: item.iconClass,});}}+ /**+ * @private+ * @return {string}+ */+ composeUserMenuItemHtml() {+ const avatarHtml = this.getHelper().getAvatarHtml(this.getUser().id, 'small', 20, 'avatar-link');++ const part = this.getHelper().escapeString(this.getUser().attributes.name);++ return '<span class="item-user-profile">' + avatarHtml + part + '</span>';+ }+showMoreTabs() {this.$el.find('.tab-group.tab.dropdown').removeClass('open');diff --git a/frontend/less/espo/elements/navbar.less b/frontend/less/espo/elements/navbar.lessindex a5572abeb2..4eaf95c808 100644--- a/frontend/less/espo/elements/navbar.less+++ b/frontend/less/espo/elements/navbar.less@@ -87,6 +87,20 @@}}+ .menu-container {+ > ul.dropdown-menu {+ > li {+ > a:has(> .item-user-profile) {+ padding-left: var(--10px);++ .avatar {+ margin-right: var(--8px);+ }+ }+ }+ }+ }+@media screen and (min-width: @screen-sm-min) {.tabs > .more {diff --git a/schema/metadata/app/clientNavbar.json b/schema/metadata/app/clientNavbar.jsonindex b7614b84c4..a7ab4924e7 100644--- a/schema/metadata/app/clientNavbar.json+++ b/schema/metadata/app/clientNavbar.json@@ -75,6 +75,10 @@},"accessDataList": {"$ref": "../clientDefs.json#/definitions/accessDataList"+ },+ "iconClass": {+ "type": "string",+ "description": "An icon class. As of v10.0."}}}