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

PHRAS-3047

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-05-05 14:23:28 +04:00
parent 218d5c8b68
commit 88402ccddb
4 changed files with 9 additions and 9 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.192-d", "phraseanet-production-client": "0.34.193-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/actions/Tools/index.html.twig
View File

@@ -194,7 +194,7 @@
{# exiftool section #} {# exiftool section #}
{% if metadatas %} {% if metadatas %}
<div id="exiftool" class="tabBox"> <div id="exiftool" class="tabBox">
<div class="metadatas-top-block" style="padding: 0 15px"> <div class="metadatas-top-block">
<select id="select-meta-subdef" name="metaSubdef" class="input-medium check-filters"> <select id="select-meta-subdef" name="metaSubdef" class="input-medium check-filters">
<option value="" disabled >{{"prod::tool:select subdef" | trans}}</option> <option value="" disabled >{{"prod::tool:select subdef" | trans}}</option>
{% for subdef in listsubdef %} {% for subdef in listsubdef %}

6
templates/web/prod/actions/Tools/metadata.html.twig
View File

@@ -1,11 +1,11 @@
{% set thumbnail = record.get_thumbnail() %} {% set thumbnail = record.get_thumbnail() %}
<img class="metadatas-image" style='float:left; margin-right:15px' <p><img class="metadatas-image" style='margin-right:15px'
src="{{thumbnail.get_url()}}" src="{{thumbnail.get_url()}}"
width="{{thumbnail.get_width()}}" width="{{thumbnail.get_width()}}"
height="{{thumbnail.get_height()}}" /> height="{{thumbnail.get_height()}}" />
</p>
<h3 class="metadatas-title" ><span>{{"prod::tool:metadata:metadatas" | trans}} : </span></h3> <h3 class="metadatas-title" ><span>{{"prod::tool:metadata:metadatas" | trans}} : {{ subdef_name }}</span></h3>
<div> <div>
<table> <table>

8
yarn.lock
View File

@@ -7578,10 +7578,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.192-d: phraseanet-production-client@0.34.193-d:
version "0.34.192-d" version "0.34.193-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.192-d.tgz#6a10cfc03f241cf2447a16fd6a424c8a6ec8133d" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.193-d.tgz#d89eb70fce270811dcf756f87b6a02ecf110aad9"
integrity sha512-KpIwCuxKBnmJcwulfcKJvykNtM8rVcgPlXtBcvxdFotPqthBXRk8wUgk9GqI/jzlMlu2N1UwiCYwun0wzxOXeQ== integrity sha512-ehi7IM7Y1rAhYojsYm76klhqYdzVLS/MBxaNrdzwPqXm7CWqxkTdEpYicH3Q2b3VxXVzECFvuMQNetXDrGjMXQ==
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"