porting PHRAS-1616 to 4.1

This commit is contained in:
Mike Ng
2018-01-03 17:08:02 +04:00
parent 0d7c2bd52d
commit 82d9ef86a4
2 changed files with 38 additions and 26 deletions

View File

@@ -36,18 +36,18 @@
({% trans with {'%maxFileSizeReadable%' : maxFileSizeReadable} %}maximum : %maxFileSizeReadable%{% endtrans %})
</span>
</td>
<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 }}"/>
</td>
<td class="uploader-infmaxFileSizeo">
<p>
{{ 'You are using the HTML5 uploader.' | trans }}
{% if not app['browser'].supportFileAPI() %}
{{ 'Your browser does not support all HTML5 features properly.' | trans }}
{% endif %}
</p>
<a id="UPLOAD_FLASH_LINK" href="{{ path('upload_flash_form') }}" class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a>
</td>
{#<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 }}"/>#}
{#</td>#}
{#<td class="uploader-infmaxFileSizeo">#}
{#<p>#}
{#{{ 'You are using the HTML5 uploader.' | trans }}#}
{#{% if not app['browser'].supportFileAPI() %}#}
{#{{ 'Your browser does not support all HTML5 features properly.' | trans }}#}
{#{% endif %}#}
{#</p>#}
<a style="display: none" id="UPLOAD_FLASH_LINK" href="{{ path('upload_flash_form') }}" class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a>
{#</td>#}
</tr>
</table>
@@ -131,6 +131,12 @@
</div>
</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 %}
{{ 'You can not upload files' | trans }}
{% endif %}