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 #2420 from mike-esokia/PHRAS-1741_PORT_PHRAS-1616

Browse Source 
PHRAS-1741 porting PHRAS-1616 to 4.1
This commit is contained in:
Nicolas Maillat
2018-01-08 12:28:18 +01:00
committed by GitHub
parent b67df5ee30 82d9ef86a4
commit 62c7443333
2 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
templates/web/prod/upload/upload-flash.html.twig
View File

@@ -33,20 +33,20 @@
({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %}maximum : %maxFileSizeReadable%{% endtrans %}) ({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %}maximum : %maxFileSizeReadable%{% endtrans %})
</span> </span>
</td> </td>
<td class='uploader-icon'> {#<td class='uploader-icon'>#}
<img src='/assets/common/images/icons/logo-flash.png' width="32px" heigh="32px" title="{{ 'You are using the Flash uploader.' | trans }}"/> {#<img src='/assets/common/images/icons/logo-flash.png' width="32px" heigh="32px" title="{{ 'You are using the Flash uploader.' | trans }}"/>#}
</td> {#</td>#}
<td class='uploader-info'> {#<td class='uploader-info'>#}
<p> {#<p>#}
{{ 'You are using the Flash uploader.' | trans }} {#{{ 'You are using the Flash uploader.' | trans }}#}
{% if not app['browser'].supportFileAPI() %} {#{% if not app['browser'].supportFileAPI() %}#}
{{ 'This version does not allow you to access all the features offered by the HTML5 uploader' | trans }} {#{{ 'This version does not allow you to access all the features offered by the HTML5 uploader' | trans }}#}
{% endif %} {#{% endif %}#}
</p> {#</p>#}
{% if app['browser'].supportFileAPI() %} {#{% if app['browser'].supportFileAPI() %}#}
<a id="UPLOAD_HTML5_LINK" href="{{ path('upload_html5_form') }}" class="dialog full-dialog">{{ 'Use the HTML5 uploader' | trans }}</a> <a style="display: none" id="UPLOAD_HTML5_LINK" href="{{ path('upload_html5_form') }}" class="dialog full-dialog">{{ 'Use the HTML5 uploader' | trans }}</a>
{% endif %} {#{% endif %}#}
</td> {#</td>#}
</tr> </tr>
</table> </table>
{# settings box #} {# settings box #}
@@ -122,6 +122,12 @@
</div> </div>
</form> </form>
<div>
<select name="upload_type" id="upload_type" class="input-large" style="width: 200px; float:right">
<option value="html">{{ 'Use the HTML5 uploader' | trans }}</option>
<option value="flash" selected>{{ 'Use the Flash uploader' | trans }}</option>
</select>
</div>
</div> </div>
</div> </div>
</div> </div>

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

@@ -36,18 +36,18 @@
({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %}maximum : %maxFileSizeReadable%{% endtrans %}) ({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %}maximum : %maxFileSizeReadable%{% endtrans %})
</span> </span>
</td> </td>
<td class='uploader-icon'> {#<td class='uploader-icon'>#}
<img src='/assets/common/images/icons/html5-logo.png' width="32px" heigh="32px" title="{{ 'You are using the HTML5 uploader.' | trans }}"/> {#<img src='/assets/common/images/icons/html5-logo.png' width="32px" heigh="32px" title="{{ 'You are using the HTML5 uploader.' | trans }}"/>#}
</td> {#</td>#}
<td class="uploader-infmaxFileSizeo"> {#<td class="uploader-infmaxFileSizeo">#}
<p> {#<p>#}
{{ 'You are using the HTML5 uploader.' | trans }} {#{{ 'You are using the HTML5 uploader.' | trans }}#}
{% if not app['browser'].supportFileAPI() %} {#{% if not app['browser'].supportFileAPI() %}#}
{{ 'Your browser does not support all HTML5 features properly.' | trans }} {#{{ 'Your browser does not support all HTML5 features properly.' | trans }}#}
{% endif %} {#{% endif %}#}
</p> {#</p>#}
<a id="UPLOAD_FLASH_LINK" href="{{ path('upload_flash_form') }}" class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a> <a style="display: none" id="UPLOAD_FLASH_LINK" href="{{ path('upload_flash_form') }}" class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a>
</td> {#</td>#}
</tr> </tr>
</table> </table>
@@ -132,6 +132,12 @@
</div> </div>
</form> </form>
<div>
<select name="upload_type" id="upload_type" class="input-large" style="width: 200px; float:right">
<option value="html" selected>{{ 'Use the HTML5 uploader' | trans }}</option>
<option value="flash">{{ 'Use the Flash uploader' | trans }}</option>
</select>
</div>
{% else %} {% else %}
{{ 'You can not upload files' | trans }} {{ 'You can not upload files' | trans }}
{% endif %} {% endif %}