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 branch master into PHRAS-2430

Browse Source
This commit is contained in:
Harrys Ravalomanana
2019-04-05 15:11:09 +04:00
parent c5e95b7e44 4bb3e28bf5
commit 2390244e9e
25 changed files with 2077 additions and 1732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
templates/web/prod/upload/upload.html.twig
View File

@@ -31,7 +31,10 @@
<span>{{ 'Select files...' | trans }}</span>
<input type="file" name="files[]" multiple>
</span>
<br />
<br />
<p class="or_upload">{{ "Or" | trans }}</p>
<div class="url_upload"><input type="url" value="" id="add-url"><button class="add-url add_url_upload">{{ 'Add this url' | trans }}</button></div>
<br/>
<span class="comment">
({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %}maximum : %maxFileSizeReadable%{% endtrans %})
</span>