hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-2608 #time 2h

Browse Source
This commit is contained in:
Harrys Ravalomanana
2019-05-31 10:21:00 +04:00
parent d757cf439a
commit 0e4e5782aa
2 changed files with 168 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/www/_shared/styles/_main-menu.scss
View File

@@ -38,13 +38,13 @@ $mainMenuBottomBorder: none !default;
display: inline-block !important; display: inline-block !important;
} }
.show-menu { .show-menu {
display: none;
i { i {
font-size: 26px; font-size: 26px;
vertical-align: middle; vertical-align: middle;
color: $mainMenuLinkActiveColor; color: $mainMenuLinkActiveColor;
} }
img { img {
display: none;
margin-top: 5px; margin-top: 5px;
} }
} }
@@ -152,8 +152,10 @@ $mainMenuBottomBorder: none !default;
} }
#mainMenu { #mainMenu {
.show-menu { .show-menu {
display: inline-block;
cursor: pointer; cursor: pointer;
img {
display: inline-block;
}
} }
.mobilemenu { .mobilemenu {
display: block; display: block;

27
templates/web/common/menubar.html.twig
View File

@@ -90,7 +90,8 @@
{% set link = path('upload_flash_form') %} {% set link = path('upload_flash_form') %}
{% endif %} {% endif %}
<a href="{{ link }}" class="uploader-open-action" title="{{ 'Upload' | trans }}"> <a href="{{ link }}" class="uploader-open-action"
title="{{ 'Upload' | trans }}">
<img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/> <img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/>
<span> <span>
{{ 'admin::monitor: module upload' | trans }} {{ 'admin::monitor: module upload' | trans }}
@@ -126,7 +127,7 @@
</ol> </ol>
</div> </div>
</li> </li>
<li class="show-menu" id="toggle-menu-link" style="display: none"> <li class="show-menu" id="toggle-menu-link">
<img src="/assets/common/images/icons/menu-web-site.png"/> <img src="/assets/common/images/icons/menu-web-site.png"/>
<div id="nav_customlink_container" class="mobile-link"> <div id="nav_customlink_container" class="mobile-link">
<div class="arrow-up"></div> <div class="arrow-up"></div>
@@ -150,7 +151,8 @@
{{ 'Guest' | trans }} {{ 'Guest' | trans }}
</span> </span>
{% else %} {% else %}
<a target="_blank" href="{{ path('account') }}" title="{{ 'login:: Mon compte' | trans }}"> <a target="_blank" href="{{ path('account') }}"
title="{{ 'login:: Mon compte' | trans }}">
<img src="/assets/common/images/icons/menu-name-user.png"/> <img src="/assets/common/images/icons/menu-name-user.png"/>
<span> <span>
{{ app.getAuthenticatedUser().getDisplayName() }} {{ app.getAuthenticatedUser().getDisplayName() }}
@@ -299,7 +301,7 @@
</div> </div>
</div> </div>
{% if app.getAuthenticator().isAuthenticated() and module == "prod" %} {% if app.getAuthenticator().isAuthenticated() and module == "prod" %}
<div style="display:none;z-index:30000;" id="notification_box"> <div style="display:none;z-index:30000;" id="notification_box">
{% set notifications = app['events-manager'].get_notifications %} {% set notifications = app['events-manager'].get_notifications %}
{% include 'prod/notifications.html.twig' %} {% include 'prod/notifications.html.twig' %}
@@ -319,9 +321,16 @@
var sortedCustomLinks = _.sortBy(seperatedLinksByLocation[key], 'linkOrder'); var sortedCustomLinks = _.sortBy(seperatedLinksByLocation[key], 'linkOrder');
/*show navigation-bar if there is some result*/ /*show navigation-bar if there is some result*/
console.log(sortedCustomLinks); console.log(sortedCustomLinks);
if (sortedCustomLinks != undefined ) {
$('#toggle-menu-link').show(); $(window).resize(function () {
if (($(window).width() <= 1064) && (sortedCustomLinks != undefined)) {
$('#toggle-menu-link img').show();
} else {
$('#toggle-menu-link img').hide();
} }
});
_.each(sortedCustomLinks, function (linksData) { _.each(sortedCustomLinks, function (linksData) {
if (linksData.linkLanguage == 'all' || linksData.linkLanguage === '{{ app['locale'] }}') { if (linksData.linkLanguage == 'all' || linksData.linkLanguage === '{{ app['locale'] }}') {
var styleAttr = ""; var styleAttr = "";
@@ -359,7 +368,7 @@
} }
} }
$('#toggle-menu-main').on('click', function (event) { $('#toggle-menu-main > img').on('click', function (event) {
$('#nav_menu_container').toggle(); $('#nav_menu_container').toggle();
if ($('#nav_customlink_container').is(":visible")) { if ($('#nav_customlink_container').is(":visible")) {
$('#nav_customlink_container').hide(); $('#nav_customlink_container').hide();
@@ -369,7 +378,7 @@
} }
}); });
$('#toggle-menu-link').on('click', function (event) { $('#toggle-menu-link > img').on('click', function (event) {
$('#nav_customlink_container').toggle(); $('#nav_customlink_container').toggle();
if ($('#nav_menu_container').is(":visible")) { if ($('#nav_menu_container').is(":visible")) {
$('#nav_menu_container').hide(); $('#nav_menu_container').hide();
@@ -379,7 +388,7 @@
} }
}); });
$('#toggle-menu-account').on('click', function (event) { $('#toggle-menu-account > img').on('click', function (event) {
$('#nav_account_container').toggle(); $('#nav_account_container').toggle();
if ($('#nav_menu_container').is(":visible")) { if ($('#nav_menu_container').is(":visible")) {
$('#nav_menu_container').hide(); $('#nav_menu_container').hide();