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;

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

@@ -1,11 +1,11 @@
<div id="mainMenu" class=""> <div id="mainMenu" class="">
{% set configuration = app['conf'].get(['registry', 'custom-links']) %} {% set configuration = app['conf'].get(['registry', 'custom-links']) %}
<div class="PNB menu-bar" style="overflow:hidden;"> <div class="PNB menu-bar" style="overflow:hidden;">
<ol> <ol>
<li> <li>
<span class="title"> <span class="title">
{% if app['conf'].get(['registry', 'general', 'personalize-logo-choice', 'logoChoice']) == 'personalize' and {% if app['conf'].get(['registry', 'general', 'personalize-logo-choice', 'logoChoice']) == 'personalize' and
app['conf'].get(['registry', 'general', 'personalize-logo-choice', 'personalizeFile']) == 'true' %} app['conf'].get(['registry', 'general', 'personalize-logo-choice', 'personalizeFile']) == 'true' %}
{% set extension = app['conf'].get(['registry', 'general', 'personalize-logo-choice', 'fileType']) %} {% set extension = app['conf'].get(['registry', 'general', 'personalize-logo-choice', 'fileType']) %}
{% set personalise_path = '/custom/minilogos/personalize_logo.' ~ extension %} {% set personalise_path = '/custom/minilogos/personalize_logo.' ~ extension %}
@@ -17,192 +17,194 @@
{% endif %} {% endif %}
</span> </span>
</li> </li>
<li class="show-menu" id="toggle-menu-main"> <li class="show-menu" id="toggle-menu-main">
<img src="/assets/common/images/icons/menu-burger.png"/> <img src="/assets/common/images/icons/menu-burger.png"/>
<div id="nav_menu_container" class="desktopmenu"> <div id="nav_menu_container" class="desktopmenu">
<div class="arrow-up"></div> <div class="arrow-up"></div>
<ol class="nav_menu"> <ol class="nav_menu">
{% if module is defined and module != "lightbox" and app.getAuthenticator().isAuthenticated() %} {% if module is defined and module != "lightbox" and app.getAuthenticator().isAuthenticated() %}
<li class="menu-bar-item"> <li class="menu-bar-item">
<a target="_blank" href="{{ path('prod') }}"> <a target="_blank" href="{{ path('prod') }}">
<img src="/assets/common/images/icons/menu-prod.png" class="mobilemenu"/> <img src="/assets/common/images/icons/menu-prod.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "prod" %}selected{% endif %}"> <span class="{% if module is defined and module == "prod" %}selected{% endif %}">
{{ 'admin::monitor: production' | trans }} {{ 'admin::monitor: production' | trans }}
</span> </span>
</a> </a>
</li> </li>
{% if app['browser'].isNewGeneration and app['conf'].get(['registry', 'modules', 'thesaurus']) == true and app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('thesaurus') %} {% if app['browser'].isNewGeneration and app['conf'].get(['registry', 'modules', 'thesaurus']) == true and app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('thesaurus') %}
<li class="menu-bar-item"> <li class="menu-bar-item">
<a target="_blank" href="{{ path('thesaurus') }}"> <a target="_blank" href="{{ path('thesaurus') }}">
<img src="/assets/common/images/icons/menu-thesaurus.png" class="mobilemenu"/> <img src="/assets/common/images/icons/menu-thesaurus.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "thesaurus" %}selected{% endif %}"> <span class="{% if module is defined and module == "thesaurus" %}selected{% endif %}">
{{ 'admin::monitor: module thesaurus' | trans }} {{ 'admin::monitor: module thesaurus' | trans }}
</span> </span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
{# MODULE #} {# MODULE #}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('admin') %} {% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('admin') %}
<li class="menu-bar-item"> <li class="menu-bar-item">
<a target="_blank" href="{{ path('admin') }}"> <a target="_blank" href="{{ path('admin') }}">
<img src="/assets/common/images/icons/menu-admin.png" class="mobilemenu"/> <img src="/assets/common/images/icons/menu-admin.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "admin" %}selected{% endif %}"> <span class="{% if module is defined and module == "admin" %}selected{% endif %}">
{{ 'admin::monitor: module admin' | trans }} {{ 'admin::monitor: module admin' | trans }}
</span> </span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
{# MODULE #} {# MODULE #}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('report') %} {% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('report') %}
<li class="menu-bar-item"> <li class="menu-bar-item">
<a target="_blank" href="{{ path('report_dashboard') }}"> <a target="_blank" href="{{ path('report_dashboard') }}">
<img src="/assets/common/images/icons/menu-report.png" class="mobilemenu"/> <img src="/assets/common/images/icons/menu-report.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "report" %}selected{% endif %}"> <span class="{% if module is defined and module == "report" %}selected{% endif %}">
{{ 'admin::monitor: module report' | trans }} {{ 'admin::monitor: module report' | trans }}
</span> </span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
{# MODULE #} {# MODULE #}
<li class="menu-bar-item"> <li class="menu-bar-item">
<a id="validation_link" target="_blank" href="{{ path('lightbox') }}"> <a id="validation_link" target="_blank" href="{{ path('lightbox') }}">
<img src="/assets/common/images/icons/menu-lightbox.png" class="mobilemenu"/> <img src="/assets/common/images/icons/menu-lightbox.png" class="mobilemenu"/>
<span> <span>
{{ 'admin::monitor: module validation' | trans }} {{ 'admin::monitor: module validation' | trans }}
</span> </span>
</a> </a>
</li> </li>
{# MODULE #} {# MODULE #}
{% if module is defined and module == "prod" %} {% if module is defined and module == "prod" %}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('upload') %} {% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('upload') %}
<li class="menu-bar-item"> <li class="menu-bar-item">
{% set link = path('upload_html5_form') %} {% set link = path('upload_html5_form') %}
{% if not app['browser'].supportFileAPI() %} {% if not app['browser'].supportFileAPI() %}
{% 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"
<img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/> title="{{ 'Upload' | trans }}">
<span> <img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/>
<span>
{{ 'admin::monitor: module upload' | trans }} {{ 'admin::monitor: module upload' | trans }}
</span> </span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% endif %} {% endif %}
{# MODULE #} {# MODULE #}
{% if module == "prod" %} {% if module == "prod" %}
<li class="menu-bar-item"> <li class="menu-bar-item">
<a href="#" class="state-navigation" data-state="publication"> <a href="#" class="state-navigation" data-state="publication">
<img src="/assets/common/images/icons/menu-publication.png" class="mobilemenu"/> <img src="/assets/common/images/icons/menu-publication.png" class="mobilemenu"/>
<span> <span>
{{ 'Publications' | trans }} {{ 'Publications' | trans }}
</span> </span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% if module is defined and module == "prod" and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::ORDER_MASTER')) %} {% if module is defined and module == "prod" and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::ORDER_MASTER')) %}
<li class="menu-bar-item"> <li class="menu-bar-item">
<a href="#" class="order-open-action" title="{{ 'Orders manager' | trans }}"> <a href="#" class="order-open-action" title="{{ 'Orders manager' | trans }}">
<span> <span>
{{ 'Commandes' | trans }} {{ 'Commandes' | trans }}
</span> </span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% endif %} {% endif %}
</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>
<div class="nav-wrapper-box"> <div class="nav-wrapper-box">
<ol class="nav_menu"></ol> <ol class="nav_menu"></ol>
</div> </div>
</div> </div>
</li> </li>
<li class="show-menu" id="toggle-menu-account" style="float: right;margin-right: 16px;"> <li class="show-menu" id="toggle-menu-account" style="float: right;margin-right: 16px;">
<img src="/assets/common/images/icons/menu-user.png"/> <img src="/assets/common/images/icons/menu-user.png"/>
<div class="PNB right mobilemenu" id="nav_account_container"> <div class="PNB right mobilemenu" id="nav_account_container">
<div class="arrow-up"></div> <div class="arrow-up"></div>
<div class="nav-wrapper-box"> <div class="nav-wrapper-box">
<ol class="nav_menu"> <ol class="nav_menu">
<li class="menu-bar-item"> <li class="menu-bar-item">
{% if app.getAuthenticator().isAuthenticated() %} {% if app.getAuthenticator().isAuthenticated() %}
{% if app.getAuthenticatedUser().isGuest %} {% if app.getAuthenticatedUser().isGuest %}
<img src="/assets/common/images/icons/menu-name-user.png"/> <img src="/assets/common/images/icons/menu-name-user.png"/>
<span> <span>
{{ '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') }}"
<img src="/assets/common/images/icons/menu-name-user.png"/> title="{{ 'login:: Mon compte' | trans }}">
<span> <img src="/assets/common/images/icons/menu-name-user.png"/>
<span>
{{ app.getAuthenticatedUser().getDisplayName() }} {{ app.getAuthenticatedUser().getDisplayName() }}
</span> </span>
</a> </a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</li> </li>
<li class="menu-bar-item"> <li class="menu-bar-item">
{% if app.getAuthenticator().isAuthenticated() %} {% if app.getAuthenticator().isAuthenticated() %}
<a href="{{ path('logout', { 'redirect' : '..' ~ app['request'].getPathInfo() }) }}" <a href="{{ path('logout', { 'redirect' : '..' ~ app['request'].getPathInfo() }) }}"
target="_self"> target="_self">
<img src="/assets/common/images/icons/menu-logout.png"/> <img src="/assets/common/images/icons/menu-logout.png"/>
<span> <span>
{{ 'phraseanet:: deconnection' | trans }} {{ 'phraseanet:: deconnection' | trans }}
</span> </span>
</a> </a>
{% endif %} {% endif %}
</li> </li>
<li class="menu-bar-item"> <li class="menu-bar-item">
<a target="_blank" href="https://docs.phraseanet.com/4.0/"> <a target="_blank" href="https://docs.phraseanet.com/4.0/">
<img src="/assets/common/images/icons/menu-help.png"/> <img src="/assets/common/images/icons/menu-help.png"/>
<span> <span>
{{ 'phraseanet:: aide' | trans }} {{ 'phraseanet:: aide' | trans }}
<span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;" <span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;"
id="help-trigger"></span> id="help-trigger"></span>
</span> </span>
</a> </a>
</li> </li>
{% if module is defined and module == "prod" %} {% if module is defined and module == "prod" %}
<li class="menu-bar-item"> <li class="menu-bar-item">
<a href="#"> <a href="#">
<img src="/assets/common/images/icons/menu-help.png"/> <img src="/assets/common/images/icons/menu-help.png"/>
<span style="" class="shortcuts-trigger"> <span style="" class="shortcuts-trigger">
{{ 'phraseanet:: raccourcis clavier' | trans }} {{ 'phraseanet:: raccourcis clavier' | trans }}
</span> </span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
<li class="menu-bar-item"> <li class="menu-bar-item">
<a href="#"> <a href="#">
<img src="/assets/common/images/icons/menu-help.png"/> <img src="/assets/common/images/icons/menu-help.png"/>
<span style="" class="infoDialog" <span style="" class="infoDialog"
infos="<div><span style='font-size:18px;'>PHRASEANET</span> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'> &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</a><p style='margin-top: 10px' ><a href='../../gitlog.txt' target='_blank'>gitlog</a></p></div>">{{ 'phraseanet:: a propos' | trans }}</span> infos="<div><span style='font-size:18px;'>PHRASEANET</span> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'> &copy; Copyright Alchemy 2005-{{ "now"|date("Y") }}</a><p style='margin-top: 10px' ><a href='../../gitlog.txt' target='_blank'>gitlog</a></p></div>">{{ 'phraseanet:: a propos' | trans }}</span>
</a> </a>
</li> </li>
</ol> </ol>
</div> </div>
</div> </div>
</li> </li>
</ol> </ol>
</div> </div>
@@ -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();