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 10:25:10 +04:00
parent 6b8455a73d
commit fff7aa833f
3 changed files with 8 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.190-d", "phraseanet-production-client": "0.34.191-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",

5
templates/web/prod/actions/Tools/index.html.twig
View File

@@ -20,7 +20,7 @@
<div id='prod-tool-box' class="PNB10"> <div id='prod-tool-box' class="PNB10">
{# jquery Tabs #} {# jquery Tabs #}
<div id="tool-tabs" class="tabs"> <div id="tool-tabs" class="tabs tool-modal-wrapper">
{# jquery menu #} {# jquery menu #}
<div> <div>
<ul> <ul>
@@ -314,7 +314,8 @@
$(document).ready(function(){ $(document).ready(function(){
/**load default Subdef info **/ /**load default Subdef info **/
loadMetadataTab( '{{ path('prod_subdefs_metadata', {'databox_id': record.get_sbas_id(), 'record_id': record.get_record_id, 'subdef_name': 'document' }) }}'); loadMetadataTab( '{{ path('prod_subdefs_metadata', {'databox_id': record.get_sbas_id(), 'record_id': record.get_record_id, 'subdef_name': 'document' }) }}');
$('#exiftool').height($('#prod-tool-box').height() - 50 ); $('.tool-modal-wrapper .tabBox').height($('#prod-tool-box').height() - 61 );
$('#exiftool').height($('#prod-tool-box').height() - 55 );
/**load selected Subdef info **/ /**load selected Subdef info **/
$('#select-meta-subdef').on('change', function (e) { $('#select-meta-subdef').on('change', function (e) {
var selectedSubdef = $(this).children('option:selected'); var selectedSubdef = $(this).children('option:selected');

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.190-d: phraseanet-production-client@0.34.191-d:
version "0.34.190-d" version "0.34.191-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.190-d.tgz#9102adb8404d5844343de60e967faf6994cece50" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.191-d.tgz#44de4d2eb8c0d4de2896291a8d5eec9876a50d9c"
integrity sha512-rBig74Rh4XJKIBzdzHVG5hhS2JatMh1qPU+Cv2OGH5NWR3wc+nWqGkZf4ufrTWOeHFNypI50C8c0MEubJF9VnA== integrity sha512-SJwu6Mdteme+RihfJsRrd8hY84LVM40ITJjF12IXRxVcFnxRGEZ9N7xnKdyuGtUtGy9c/g63Ps3PmRhnLvpLbg==
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"