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

Merge branch 'master' into PHRAS-2614_This-query-not-fired_4.1

Browse Source
This commit is contained in:
Nicolas Maillat
2019-06-04 10:41:23 +02:00
committed by GitHub
parent 4550257d59 ce6a800852
commit 4021e8d4b4
13 changed files with 109 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -47,7 +47,7 @@
"php": ">=5.5.9", "php": ">=5.5.9",
"ext-intl": "*", "ext-intl": "*",
"alchemy-fr/tcpdf-clone": "~6.0", "alchemy-fr/tcpdf-clone": "~6.0",
"alchemy/embed-bundle": "^2.0.3", "alchemy/embed-bundle": "^2.0.4",
"alchemy/geonames-api-consumer": "~0.1.0", "alchemy/geonames-api-consumer": "~0.1.0",
"alchemy/mediavorus": "^0.4.4", "alchemy/mediavorus": "^0.4.4",
"alchemy/oauth2php": "1.1.0", "alchemy/oauth2php": "1.1.0",

14
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "de1d9335418b121d0ede26765b0a9e7d", "content-hash": "a40bfa0aa6310530dc0c92b141b21305",
"packages": [ "packages": [
{ {
"name": "alchemy-fr/tcpdf-clone", "name": "alchemy-fr/tcpdf-clone",
@@ -131,16 +131,16 @@
}, },
{ {
"name": "alchemy/embed-bundle", "name": "alchemy/embed-bundle",
"version": "2.0.3", "version": "2.0.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/alchemy-fr/embed-bundle.git", "url": "https://github.com/alchemy-fr/embed-bundle.git",
"reference": "e02e25a04911210eaedff0adb9cf7589010c473b" "reference": "b510748686c05c0c1d59b7ad15e2c1098abafc5a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/e02e25a04911210eaedff0adb9cf7589010c473b", "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/b510748686c05c0c1d59b7ad15e2c1098abafc5a",
"reference": "e02e25a04911210eaedff0adb9cf7589010c473b", "reference": "b510748686c05c0c1d59b7ad15e2c1098abafc5a",
"shasum": "" "shasum": ""
}, },
"require-dev": { "require-dev": {
@@ -178,10 +178,10 @@
], ],
"description": "Embed resources bundle", "description": "Embed resources bundle",
"support": { "support": {
"source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.3", "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.4",
"issues": "https://github.com/alchemy-fr/embed-bundle/issues" "issues": "https://github.com/alchemy-fr/embed-bundle/issues"
}, },
"time": "2019-05-23T15:23:14+00:00" "time": "2019-06-03T13:35:50+00:00"
}, },
{ {
"name": "alchemy/geonames-api-consumer", "name": "alchemy/geonames-api-consumer",

BIN
resources/www/common/images/icons/chgcoll_history.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
resources/www/common/images/icons/chgstatus_history.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
resources/www/common/images/icons/delete.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
resources/www/common/images/icons/feedback16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
resources/www/common/images/icons/icon-video-editor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
resources/www/common/images/icons/imgtools_history.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
resources/www/common/images/icons/ppen_history.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
resources/www/common/images/icons/print_history.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
resources/www/common/images/icons/push16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
resources/www/common/images/icons/rss16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

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

@@ -18,115 +18,115 @@
{% endif %} {% endif %}
</span> </span>
</li> </li>
<li class="show-menu" id="toggle-menu-main"> {% if module is defined and module != "lightbox" and app.getAuthenticator().isAuthenticated() %}
<img src="/assets/common/images/icons/menu-burger.png"/> <li class="show-menu" id="toggle-menu-main">
<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() %}
<li class="menu-bar-item">
<a target="_blank" href="{{ path('prod') }}">
<img src="/assets/common/images/icons/menu-prod.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "prod" %}selected{% endif %}">
{{ 'admin::monitor: production' | trans }}
</span>
</a>
</li>
{% 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('prod') }}">
<img src="/assets/common/images/icons/menu-thesaurus.png" class="mobilemenu"/> <img src="/assets/common/images/icons/menu-prod.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "thesaurus" %}selected{% endif %}"> <span class="{% if module is defined and module == "prod" %}selected{% endif %}">
{{ 'admin::monitor: module thesaurus' | trans }} {{ 'admin::monitor: production' | trans }}
</span> </span>
</a> </a>
</li> </li>
{% endif %}
{% if app['browser'].isNewGeneration and app['conf'].get(['registry', 'modules', 'thesaurus']) == true and app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('thesaurus') %}
{# MODULE #}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('admin') %}
<li class="menu-bar-item">
<a target="_blank" href="{{ path('admin') }}">
<img src="/assets/common/images/icons/menu-admin.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "admin" %}selected{% endif %}">
{{ 'admin::monitor: module admin' | trans }}
</span>
</a>
</li>
{% endif %}
{# MODULE #}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('report') %}
<li class="menu-bar-item">
<a target="_blank" href="{{ path('report_dashboard') }}">
<img src="/assets/common/images/icons/menu-report.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "report" %}selected{% endif %}">
{{ 'admin::monitor: module report' | trans }}
</span>
</a>
</li>
{% endif %}
{# MODULE #}
<li class="menu-bar-item">
<a id="validation_link" target="_blank" href="{{ path('lightbox') }}">
<img src="/assets/common/images/icons/menu-lightbox.png" class="mobilemenu"/>
<span>
{{ 'admin::monitor: module validation' | trans }}
</span>
</a>
</li>
{# MODULE #}
{% if module is defined and module == "prod" %}
{% 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') %} <a target="_blank" href="{{ path('thesaurus') }}">
<img src="/assets/common/images/icons/menu-thesaurus.png" class="mobilemenu"/>
{% if not app['browser'].supportFileAPI() %} <span class="{% if module is defined and module == "thesaurus" %}selected{% endif %}">
{% set link = path('upload_flash_form') %} {{ 'admin::monitor: module thesaurus' | trans }}
{% endif %} </span>
<a href="{{ link }}" class="uploader-open-action"
title="{{ 'Upload' | trans }}">
<img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/>
<span>
{{ 'admin::monitor: module upload' | trans }}
</span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% endif %}
{# MODULE #}
{% if module == "prod" %} {# MODULE #}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('admin') %}
<li class="menu-bar-item">
<a target="_blank" href="{{ path('admin') }}">
<img src="/assets/common/images/icons/menu-admin.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "admin" %}selected{% endif %}">
{{ 'admin::monitor: module admin' | trans }}
</span>
</a>
</li>
{% endif %}
{# MODULE #}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('report') %}
<li class="menu-bar-item">
<a target="_blank" href="{{ path('report_dashboard') }}">
<img src="/assets/common/images/icons/menu-report.png" class="mobilemenu"/>
<span class="{% if module is defined and module == "report" %}selected{% endif %}">
{{ 'admin::monitor: module report' | trans }}
</span>
</a>
</li>
{% endif %}
{# MODULE #}
<li class="menu-bar-item"> <li class="menu-bar-item">
<a href="#" class="state-navigation" data-state="publication"> <a id="validation_link" target="_blank" href="{{ path('lightbox') }}">
<img src="/assets/common/images/icons/menu-publication.png" class="mobilemenu"/> <img src="/assets/common/images/icons/menu-lightbox.png" class="mobilemenu"/>
<span> <span>
{{ 'Publications' | trans }} {{ 'admin::monitor: module validation' | trans }}
</span> </span>
</a> </a>
</li> </li>
{% endif %}
{% if module is defined and module == "prod" and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::ORDER_MASTER')) %} {# MODULE #}
<li class="menu-bar-item"> {% if module is defined and module == "prod" %}
<a href="#" class="order-open-action" title="{{ 'Orders manager' | trans }}"> {% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_module('upload') %}
<span> <li class="menu-bar-item">
{{ 'Commandes' | trans }} {% set link = path('upload_html5_form') %}
</span>
</a>
</li>
{% endif %}
{% endif %} {% if not app['browser'].supportFileAPI() %}
</ol> {% set link = path('upload_flash_form') %}
</div> {% endif %}
</li>
<a href="{{ link }}" class="uploader-open-action"
title="{{ 'Upload' | trans }}">
<img src="/assets/common/images/icons/menu-upload.png" class="mobilemenu"/>
<span>
{{ 'admin::monitor: module upload' | trans }}
</span>
</a>
</li>
{% endif %}
{% endif %}
{# MODULE #}
{% if module == "prod" %}
<li class="menu-bar-item">
<a href="#" class="state-navigation" data-state="publication">
<img src="/assets/common/images/icons/menu-publication.png" class="mobilemenu"/>
<span>
{{ 'Publications' | trans }}
</span>
</a>
</li>
{% endif %}
{% if module is defined and module == "prod" and app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::ORDER_MASTER')) %}
<li class="menu-bar-item">
<a href="#" class="order-open-action" title="{{ 'Orders manager' | trans }}">
<span>
{{ 'Commandes' | trans }}
</span>
</a>
</li>
{% endif %}
</ol>
</div>
</li>
{% endif %}
<li class="show-menu" id="toggle-menu-link"> <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">
@@ -142,36 +142,27 @@
<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">
{% if app.getAuthenticator().isAuthenticated() %}
<li class="menu-bar-item"> <li class="menu-bar-item">
{% 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 }}</span>
{{ 'Guest' | trans }}
</span>
{% else %} {% else %}
<a target="_blank" href="{{ path('account') }}" <a target="_blank" href="{{ path('account') }}"
title="{{ 'login:: Mon compte' | trans }}"> 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() }}</span>
{{ app.getAuthenticatedUser().getDisplayName() }}
</span>
</a> </a>
{% endif %} {% endif %}
{% endif %} </li>
</li> <li class="menu-bar-item">
<li class="menu-bar-item">
{% 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 }}</span>
{{ 'phraseanet:: deconnection' | trans }}
</span>
</a> </a>
{% endif %} </li>
</li> {% endif %}
<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"/>