hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-2875

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-01-21 12:39:25 +04:00
parent 04c3830c2a
commit f0063ff257
5 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.103-d", "phraseanet-production-client": "0.34.104-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

2
templates/web/prod/WorkZone/Basket.html.twig
View File

@@ -89,7 +89,7 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div style="margin:0 7px;overflow:hidden;position:relative"> <div class="basket-content">
{% set basket_length = basket.getElements()|length %} {% set basket_length = basket.getElements()|length %}
<div class="alert_datas_changed ui-corner-all">{{ 'Certaines donnees du panier ont change' | trans }} <a class="basket_refresher" href="#">{{ 'rafraichir' | trans }}</a></div> <div class="alert_datas_changed ui-corner-all">{{ 'Certaines donnees du panier ont change' | trans }} <a class="basket_refresher" href="#">{{ 'rafraichir' | trans }}</a></div>
{% if basket_length == 0 %} {% if basket_length == 0 %}

4
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -312,9 +312,10 @@
{% endif %} {% endif %}
{% import 'common/thumbnail.html.twig' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div class="chim-content">
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') == '1' %} {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') == '1' %}
<div class="title"> <div class="title">
{{ record.get_title() | truncate(20, true, "...") }} {{ record.get_title()|truncate(20, "...") }}
</div> </div>
{% endif %} {% endif %}
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') == '1' %} {% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') == '1' %}
@@ -360,6 +361,7 @@
</div> </div>
</div> </div>
</div>
{% endmacro %} {% endmacro %}
{% macro display_basket(app, basket) %} {% macro display_basket(app, basket) %}

4
templates/web/prod/WorkZone/Story.html.twig
View File

@@ -81,7 +81,7 @@
</div> </div>
</div> </div>
<div style="margin:0 7px;overflow:hidden;position: relative"> <div class="basket-content">
{% set story_length = Story.get_children().get_elements()|length %} {% set story_length = Story.get_children().get_elements()|length %}
<div class="alert_datas_changed ui-corner-all"> <div class="alert_datas_changed ui-corner-all">
{{ 'Certaines donnees du reportage ont change' | trans }} {{ 'Certaines donnees du reportage ont change' | trans }}
@@ -97,7 +97,7 @@
{% import 'prod/WorkZone/Macros.html.twig' as Macros %} {% import 'prod/WorkZone/Macros.html.twig' as Macros %}
{% for record in Story.get_children().get_elements() %} {% for record in Story.get_children().get_elements() %}
<span class="wrapCHIM_{{ record.get_serialize_key() }}"> <span class="chim-wrapper wrapCHIM_{{ record.get_serialize_key() }}">
{{ Macros.element('groupings', Story, record, record, record.getNumber()) }} {{ Macros.element('groupings', Story, record, record, record.getNumber()) }}
</span> </span>
{% endfor %} {% endfor %}

8
yarn.lock
View File

@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.103-d: phraseanet-production-client@0.34.104-d:
version "0.34.103-d" version "0.34.104-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.103-d.tgz#7f043af8c504d66d94450c25029d63338da58037" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.104-d.tgz#97eb1014f7fcda330a0e5746ec4a85f60eb67a0c"
integrity sha512-8/205hCZaFCZsFfTCjG1BBCemInnPEu3npQHCNaCAz+TA2ojzajNxbgeGY3Fw6PjUYv+qoPpBQgNaOiBwybkKg== integrity sha512-2ius5Yjhku04N/nVJDOc0MN3qPM6oIBRlQQgrAT8nsS5GCKDypAmpdF4e8IuneV0uD28XDf6KH59HRBOy+Mg+Q==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"