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-2719

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-01-24 10:54:53 +04:00
parent 8f24ed7676
commit 2b15159fa2
4 changed files with 14 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.109-d", "phraseanet-production-client": "0.34.110-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",

6
templates/web/common/preview.html.twig
View File

@@ -15,7 +15,11 @@
{% set previewHtml5 = null %} {% set previewHtml5 = null %}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') and record.has_preview == true %} {# first check if type audio and there is no preview , fallback to thumbnail #}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') and record.getType == 'audio' and record.has_preview == false %}
{% set preview_obj = record.get_thumbnail() %}
{% elseif app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') %}
{% set preview_obj = record.get_preview() %} {% set preview_obj = record.get_preview() %}
{% else %} {% else %}
{% set preview_obj = record.get_thumbnail() %} {% set preview_obj = record.get_thumbnail() %}

7
templates/web/prod/actions/edit_default.html.twig
View File

@@ -73,9 +73,9 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="editDiaButtons" style="position:absolute; bottom:14px; right:0px; width:30px; height:12px; display:none"> <div class="editDiaButtons" style="position:absolute; bottom:8px; right:3px; width:30px; display:none">
<span id="idEditDiaButtonsP_{{i}}" style="cursor:pointer"><i class="icon-round-add_box-24px icomoon" style="font-size: 24px">&nbsp;</i></span> <span id="idEditDiaButtonsP_{{i}}" style="cursor:pointer"><i class="fa fa-plus editIcon">&nbsp;</i></span>
<span id="idEditDiaButtonsM_{{i}}" style="cursor:pointer"><i class="icon-baseline-indeterminate_check_box-24px icomoon" style="font-size: 24px">&nbsp;</i></span> <span id="idEditDiaButtonsM_{{i}}" style="cursor:pointer"><i class="fa fa-minus editIcon">&nbsp;</i></span>
</div> </div>
</div> </div>
{% endmacro %} {% endmacro %}
@@ -477,4 +477,5 @@
{% endfor %} {% endfor %}
] ]
}; };
</script> </script>

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.109-d: phraseanet-production-client@0.34.110-d:
version "0.34.109-d" version "0.34.110-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.109-d.tgz#9c48a3a4edabe146351ec36acfa3c9ef2eeddee4" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.110-d.tgz#6ccef1446ba321c15db80898b1d32968cc97cafa"
integrity sha512-AA7b72bWddguCH8jbBtFFsqKTrnfcRAfB8JjJIkUJ/fbZe3FSmDCh0nzPUhc9LbLfzKsmYVIVIZE6zkzlDUyfA== integrity sha512-pAQ4KcbMOaPnY7qr7pOmaAfCE+ULhK0tFQksbmTyTmIBP0vP9IXziWtYhd77pYt3h4yqdohytsaAXHZyO4KIbQ==
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"