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 pull request #3284 from alchemy-fr/PHRAS-2861_Prod_Basket_menu_preference

Browse Source 
PHRAS-2861  #comment merge Prod Basket : add show caption button  and tooltip
This commit is contained in:
Nicolas Maillat
2020-01-16 00:35:22 +01:00
committed by GitHub
parent 19d473bef6 778cf368bd
commit 0474aeca4d
3 changed files with 12 additions and 8 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.98-d", "phraseanet-production-client": "0.34.99-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",

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

@@ -329,6 +329,12 @@
</div> </div>
{{thumbnail.format(record.get_thumbnail,82,82, '', true, false)}} {{thumbnail.format(record.get_thumbnail,82,82, '', true, false)}}
<div class="bottom"> <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" style="background: #777;border-radius: 2px;padding: 0px 1px;line-height: 1;margin: 0 4px 4px 4px;"></i>
</span>
{% endif %}
<a <a
{% if wz_scope == 'groupings' %} {% if wz_scope == 'groupings' %}
id="WZEL{{ container.get_sbas_id() }}_{{ container.get_record_id() }}_{{ record.get_sbas_id() }}_{{ record.get_record_id() }}" id="WZEL{{ container.get_sbas_id() }}_{{ container.get_record_id() }}_{{ record.get_sbas_id() }}_{{ record.get_record_id() }}"
@@ -342,9 +348,7 @@
class="WorkZoneElementRemover {{ wz_scope }}" title="{{ 'delete' | trans }}" > class="WorkZoneElementRemover {{ wz_scope }}" title="{{ 'delete' | trans }}" >
<i class="fa fa-times" aria-hidden="true"></i> <i class="fa fa-times" aria-hidden="true"></i>
</a> </a>
{% if app['settings'].getUserSetting(app.getAuthenticatedUser(), 'basket_caption_display') == '1' %}
<div class="captionRolloverTips" tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : record.get_sbas_id(), 'record_id' : record.get_record_id(), 'context' : 'basket', 'number' : record.getNumber() }) }}"></div>
{% endif %}
</div> </div>
</div> </div>
{% endmacro %} {% endmacro %}

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.98-d: phraseanet-production-client@0.34.99-d:
version "0.34.98-d" version "0.34.99-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.98-d.tgz#4a8da93f09e8cc3e352f3bbe70fe19033a14da77" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.99-d.tgz#fc06941163f698dc77ebca8a4c16663aa3ac458a"
integrity sha512-2pR0Kb3toMUc2Lz9v80Z55XopikZAYKJ1nFIIABJjGVw4DRE0peSkHip2S08a4tx1CvgH9cW6tdFLQBS4RCdLQ== integrity sha512-016LZam+eNQqAYyduiGinT79YkGeUDWZ9uk7r01BHmgsYjWc+UoCvUvExhCCHcoyMm+qd29VfHhQAWoyCCkG6g==
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"