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-2875 add Collection on caption tooltip

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-01-22 16:04:36 +04:00
parent 482583f891
commit e06c4d8eca
4 changed files with 12 additions and 7 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.105-d", "phraseanet-production-client": "0.34.106-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",

7
templates/web/prod/Tooltip/Caption.html.twig
View File

@@ -1,6 +1,11 @@
{% extends 'prod/Tooltip/Tooltip.html.twig' %} {% extends 'prod/Tooltip/Tooltip.html.twig' %}
{% set title %}{{ 'Caption' | trans }}{% endset %} {% set title %}{{ 'Caption' | trans }} &nbsp;<span class="collection-block" style="float: right"> {% set collectionLogo = collection_logo(record.baseId) %}
{% if collectionLogo is empty %}
{{ record.collectionName }}
{% else %}
{{ collectionLogo|raw }}
{% endif %}</span> {% endset %}
{% set width = 400 %} {% set width = 400 %}
{% set maxwidth = 700 %} {% set maxwidth = 700 %}

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

@@ -112,7 +112,7 @@
{% endfor %} {% endfor %}
</div> </div>
<div id="all_baskets-block" class="all_baskets-block"> <div id="all_baskets-block" class="all_baskets-block">
{% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::BASKETS')) %} {% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::BASKETS')) | sort | reverse %}
<div tooltipsrc="{{ path('prod_tooltip_basket', { 'basket' : basket.getId() }) }}" <div tooltipsrc="{{ path('prod_tooltip_basket', { 'basket' : basket.getId() }) }}"
id="SSTT_{{basket.getId()}}" id="SSTT_{{basket.getId()}}"
class="basketTips ui-accordion-header ui-state-default class="basketTips ui-accordion-header ui-state-default

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.105-d: phraseanet-production-client@0.34.106-d:
version "0.34.105-d" version "0.34.106-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.105-d.tgz#f34a02238e1fec724a836943cb8324df62a6a6db" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.106-d.tgz#020379df0fc6023eebd5e188c7047b2e83892070"
integrity sha512-5Qv2zmLwWiXrYt99V6kS5RRDwXkAjFahkuSA4Z6mTO74ClJYKDnpUIWG6jKcYtwVyBuKQPxa1XPLSrdXkbZg6Q== integrity sha512-Z8XPVe++0oQ6LYubGMHovOhJg1qbSPoCyAD0HMazmtg+TzklfNcvPmUKWxKev2mP9qMLwYr5h4ts7XueyangAQ==
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"