hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 01:43:13 +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",
"npm": "^6.0.0",
"npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.103-d",
"phraseanet-production-client": "0.34.104-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

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

@@ -89,7 +89,7 @@
{% endif %}
</div>
</div>
<div style="margin:0 7px;overflow:hidden;position:relative">
<div class="basket-content">
{% 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>
{% if basket_length == 0 %}

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

@@ -312,54 +312,56 @@
{% endif %}
{% import 'common/thumbnail.html.twig' as thumbnail %}
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') == '1' %}
<div class="title">
{{ record.get_title() | truncate(20, true, "...") }}
</div>
{% endif %}
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') == '1' %}
<div class="status" style="position:relative;height:20px;overflow-y:visible;z-index:15;">
{% for flag in record_flags(record) %}
<img src="{{ flag.path }}" title="{{ attribute(flag.labels, app.locale) }}" />
{% endfor %}
</div>
{% endif %}
<div class="CHIM diapo CHIM_{{record.get_serialize_key()}} open-preview-action"
data-kind="{% if wz_scope == 'groupings' %}REG{% else %}BASK{% endif %}"
data-position="{{ ord }}"
data-id="{% if wz_scope == 'groupings' %}{{container.get_sbas_id()}}_{{container.get_record_id()}}{% else %}{{container.getId()}}{% endif %}"
style="height:{{box_height}}px;"
id="CHIM_{% if wz_scope == 'groupings' %}{{record.get_serialize_key()}}{% else %}{{ contained.getId() }}{% endif %}">
<input type="hidden" name="id" value="{{ record.get_serialize_key() }}"/>
<div class="chim-content">
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_title_display') == '1' %}
<div class="title">
{{ record.get_title()|truncate(20, "...") }}
</div>
{% endif %}
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_status_display') == '1' %}
<div class="status" style="position:relative;height:20px;overflow-y:visible;z-index:15;">
{% for flag in record_flags(record) %}
<img src="{{ flag.path }}" title="{{ attribute(flag.labels, app.locale) }}" />
{% endfor %}
</div>
{% endif %}
<div class="CHIM diapo CHIM_{{record.get_serialize_key()}} open-preview-action"
data-kind="{% if wz_scope == 'groupings' %}REG{% else %}BASK{% endif %}"
data-position="{{ ord }}"
data-id="{% if wz_scope == 'groupings' %}{{container.get_sbas_id()}}_{{container.get_record_id()}}{% else %}{{container.getId()}}{% endif %}"
style="height:{{box_height}}px;"
id="CHIM_{% if wz_scope == 'groupings' %}{{record.get_serialize_key()}}{% else %}{{ contained.getId() }}{% endif %}">
<input type="hidden" name="id" value="{{ record.get_serialize_key() }}"/>
<div style="position:absolute;background-color:#959595;color:black;font-weight:bold;padding:3px;z-index:90;">
{{record.getNumber()}}
</div>
{{thumbnail.format(record.get_thumbnail,140,140, '', true, false)}}
<div class="bottom">
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') == '1' %}
<span class="icon-stack captionRolloverTips captionTips"
tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.getNumber() }) }}">
<i class="icomoon icon-round-list-24px white" ></i>
</span>
{% endif %}
<a
{% if wz_scope == 'groupings' %}
id="WZEL{{ container.get_sbas_id() }}_{{ container.get_record_id() }}_{{ record.get_sbas_id() }}_{{ record.get_record_id() }}"
href="{{ path('prod_stories_story_remove_element', { 'sbas_id' : container.get_sbas_id(), 'record_id' : container.get_record_id(), 'child_sbas_id' : record.get_sbas_id(), 'child_record_id' : record.get_record_id() }) }}"
{% elseif wz_scope == 'basket' %}
id="WZEL_{{ container.getId() }}_{{ record.get_sbas_id() }}_{{ record.get_record_id() }}"
href="{{ path('prod_baskets_basket_element_remove', { 'basket' : container.getId(), 'basket_element_id' : contained.getId()}) }}"
{% elseif wz_scope == 'basket' %}
href="#"
{% endif %}
class="WorkZoneElementRemover {{ wz_scope }}" title="{{ 'delete' | trans }}" >
<i class="icomoon icon-circle fa-stack-2x" aria-hidden="true"></i>
<i class="icomoon icon-round-close-24px fa-stack-1x " aria-hidden="true"></i>
</a>
<div style="position:absolute;background-color:#959595;color:black;font-weight:bold;padding:3px;z-index:90;">
{{record.getNumber()}}
</div>
{{thumbnail.format(record.get_thumbnail,140,140, '', true, false)}}
<div class="bottom">
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') == '1' %}
<span class="icon-stack captionRolloverTips captionTips"
tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.getNumber() }) }}">
<i class="icomoon icon-round-list-24px white" ></i>
</span>
{% endif %}
<a
{% if wz_scope == 'groupings' %}
id="WZEL{{ container.get_sbas_id() }}_{{ container.get_record_id() }}_{{ record.get_sbas_id() }}_{{ record.get_record_id() }}"
href="{{ path('prod_stories_story_remove_element', { 'sbas_id' : container.get_sbas_id(), 'record_id' : container.get_record_id(), 'child_sbas_id' : record.get_sbas_id(), 'child_record_id' : record.get_record_id() }) }}"
{% elseif wz_scope == 'basket' %}
id="WZEL_{{ container.getId() }}_{{ record.get_sbas_id() }}_{{ record.get_record_id() }}"
href="{{ path('prod_baskets_basket_element_remove', { 'basket' : container.getId(), 'basket_element_id' : contained.getId()}) }}"
{% elseif wz_scope == 'basket' %}
href="#"
{% endif %}
class="WorkZoneElementRemover {{ wz_scope }}" title="{{ 'delete' | trans }}" >
<i class="icomoon icon-circle fa-stack-2x" aria-hidden="true"></i>
<i class="icomoon icon-round-close-24px fa-stack-1x " aria-hidden="true"></i>
</a>
</div>
</div>
</div>
</div>
</div>
{% endmacro %}
{% macro display_basket(app, basket) %}

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

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

8
yarn.lock
View File

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