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 #3406 from alchemy-fr/PHRAS-2989-Prod-detailed-view-basket

Browse Source 
PHRAS-2989 #comment merge  Prod - Detailed view - link in basket, store etc ... requires a double click
This commit is contained in:
Nicolas Maillat
2020-03-23 10:31:02 +01:00
committed by GitHub
parent f6591cc30c 3d64d47614
commit 556409392c
3 changed files with 12 additions and 16 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.150-d", "phraseanet-production-client": "0.34.153-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/preview/appears_in.html.twig
View File

@@ -23,19 +23,19 @@
data-position="0" data-position="0"
data-id="{{basket.getId()}}" data-id="{{basket.getId()}}"
data-reload="true" data-reload="true"
class="otherBaskToolTip open-preview-action" title="{{basket.getDescription()}}"> class="otherBaskToolTip to-open-preview-action" title="{{basket.getDescription()}}">
{#<img style="vertical-align:middle" src="/assets/common/images/icons/basket.png" width="16">#} {#<img style="vertical-align:middle" src="/assets/common/images/icons/basket.png" width="16">#}
{% if basket.getValidation() %} {% if basket.getValidation() %}
<img src='/assets/common/images/icons/basket_validation.png' title='' width="16" class="btn-image"/> <img src='/assets/common/images/icons/basket_validation.png' title='' width="24" class="btn-image"/>
{% elseif basket.getPusher() %} {% elseif basket.getPusher() %}
{% if not basket.isRead() %} {% if not basket.isRead() %}
<img src='/assets/common/images/icons/basket_push_unread.png' title='' width="16" class="btn-image"/> <img src='/assets/common/images/icons/basket_push_unread.png' title='' width="24" class="btn-image"/>
{% else %} {% else %}
<img src='/assets/common/images/icons/basket_push.png' title='' width="16" class="btn-image"/> <img src='/assets/common/images/icons/basket_push.png' title='' width="24" class="btn-image"/>
{% endif %} {% endif %}
{% else %} {% else %}
<img src='/assets/common/images/icons/basket.png' title='' width="16" class="btn-image"/> <img src='/assets/common/images/icons/basket.png' title='' width="24" class="btn-image"/>
{% endif %} {% endif %}
<span class="title">{{basket.getName()}}</span> <span class="title">{{basket.getName()}}</span>

16
yarn.lock
View File

@@ -5305,14 +5305,10 @@ jquery-simplecolorpicker@^0.3.1:
resolved "https://registry.yarnpkg.com/jquery-simplecolorpicker/-/jquery-simplecolorpicker-0.3.1.tgz#4f6befd380ab05470f585d5482e5180556e460eb" resolved "https://registry.yarnpkg.com/jquery-simplecolorpicker/-/jquery-simplecolorpicker-0.3.1.tgz#4f6befd380ab05470f585d5482e5180556e460eb"
integrity sha1-T2vv04CrBUcPWF1UguUYBVbkYOs= integrity sha1-T2vv04CrBUcPWF1UguUYBVbkYOs=
"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e": "jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git", "jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e":
version "1.4.2"
resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e"
"jquery-treeview@https://github.com/alchemy-fr/jquery-treeview.git":
version "1.4.2" version "1.4.2"
uid "1e9e5a49d2875b878801e904cd08c2d25e85af1e" uid "1e9e5a49d2875b878801e904cd08c2d25e85af1e"
resolved "https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e" resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e"
jquery-ui-datepicker-with-i18n@^1.10.4: jquery-ui-datepicker-with-i18n@^1.10.4:
version "1.10.4" version "1.10.4"
@@ -7581,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.150-d: phraseanet-production-client@0.34.153-d:
version "0.34.150-d" version "0.34.153-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.150-d.tgz#625ea96c045719b405fe9b707b632b1290aca285" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.153-d.tgz#3014c7345cad2f3f106975805e5b8db5e8db3d56"
integrity sha512-JrtPq6dCTCBxX6kGViXZj4Sc26PMFIaifT3PVD1WHLUCNd/U3nnHzpzKUgVC0ibqOj4aVwA8JW/oMilGEe3cmg== integrity sha512-IX5oVB4MmI/PE9iDkeuuXdjfoJd4q4SdFxHuGLswyT0PWxZhIzLT7D2zNc77ULpcnX9KnvCs6wIEIn4UbKC0pQ==
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"