espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

navbar fixes

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-07-25 15:44:36 +03:00
parent 023b5a977a
commit f0dc216994
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/res/templates/site/navbar.tpl
+28 -8
View File
@@ -160,26 +160,46 @@
<li class="nav navbar-nav navbar-form global-search-container">
{{{globalSearch}}}
</li>
<li class="dropdown notifications-badge-container">
{{{notificationsBadge}}}
</li>
{{#if enableQuickCreate}}
<li class="dropdown hidden-xs quick-create-container">
<a id="nav-quick-create-dropdown" class="dropdown-toggle" data-toggle="dropdown" href="#" title="{{translate 'Create'}}"><i class="fas fa-plus"></i></a>
<a
id="nav-quick-create-dropdown"
class="dropdown-toggle"
data-toggle="dropdown"
href="#"
title="{{translate 'Create'}}"
><i class="fas fa-plus"></i></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="nav-quick-create-dropdown">
<li class="dropdown-header">{{translate 'Create'}}</li>
{{#each quickCreateList}}
<li><a href="#{{./this}}/create" data-name="{{./this}}" data-action="quick-create">{{translate this category='scopeNames'}}</a></li>
<li><a
href="#{{./this}}/create"
data-name="{{./this}}"
data-action="quick-create"
>{{translate this category='scopeNames'}}</a></li>
{{/each}}
</ul>
</li>
{{/if}}
<li class="dropdown notifications-badge-container">
{{{notificationsBadge}}}
</li>
<li class="dropdown menu-container">
<a id="nav-menu-dropdown" class="dropdown-toggle" data-toggle="dropdown" href="#" title="{{translate 'Menu'}}"><span class="fas fa-ellipsis-v"></span></a>
<a
id="nav-menu-dropdown"
class="dropdown-toggle"
data-toggle="dropdown"
href="#"
title="{{translate 'Menu'}}"
><span class="fas fa-ellipsis-v"></span></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="nav-menu-dropdown">
{{#each menuDataList}}
{{#unless divider}}
<li><a href="{{#if link}}{{link}}{{else}}javascript:{{/if}}" class="nav-link{{#if action}} action{{/if}}"{{#if action}} data-action="{{action}}"{{/if}}>{{#if html}}{{{html}}}{{else}}{{label}}{{/if}}</a></li>
<li><a
href="{{#if link}}{{link}}{{else}}javascript:{{/if}}"
class="nav-link{{#if action}} action{{/if}}"{{#if action}}
data-action="{{action}}"{{/if}}
>{{#if html}}{{{html}}}{{else}}{{label}}{{/if}}</a></li>
{{else}}
<li class="divider"></li>
{{/unless}}
@@ -188,7 +208,7 @@
</li>
</ul>
</div>
<a class="minimizer" href="javascript:">
<a class="minimizer hidden" href="javascript:">
<span class="fas fa-chevron-right right"></span>
<span class="fas fa-chevron-left left"></span>
</a>
client/src/views/site/navbar.js
+3 -4
View File
@@ -663,6 +663,8 @@ define('views/site/navbar', ['view'], function (Dep) {
var windowHeight = window.innerHeight;
var windowWidth = window.innerWidth;
this.$minimizer.removeClass('hidden');
if (windowWidth < smallScreenWidth) {
$tabs.css('height', 'auto');
$more.css('max-height', '');
@@ -680,10 +682,6 @@ define('views/site/navbar', ['view'], function (Dep) {
updateSizeForVertical();
this.$el
.find('.notifications-badge-container')
.insertAfter(this.$el.find('.quick-create-container'));
this.adjustBodyMinHeight();
},
@@ -794,6 +792,7 @@ define('views/site/navbar', ['view'], function (Dep) {
this.$body = $('body');
this.$tabs = this.$el.find('ul.tabs');
this.$more = this.$tabs.find('li.more > ul');
this.$minimizer = this.$el.find('a.minimizer');
this.$body.addClass('has-navbar');