hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-25 10:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

PORT PHRAS-1301/PHRAS-1676 to 4.1

Browse Source
This commit is contained in:
Mike Ng
2017-12-13 12:51:08 +04:00
parent aecc97bc3d
commit 2811964f01
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,11 +54,12 @@
<h5>{{ 'upload:: Destination (collection) :' | trans }} :</h5> <h5>{{ 'upload:: Destination (collection) :' | trans }} :</h5>
{# collections list #} {# collections list #}
{% if collections|length > 0 %} {% if collections|length > 0 %}
<select name="base_id" class="span3" style="margin-left: 10px;"> {% set last_used_collection = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'upload_last_used_collection') %}
<select name="base_id" class="span3 upload-options-collection" style="margin-left: 10px;">
{% for sbasId, availableCollections in collections %} {% for sbasId, availableCollections in collections %}
<optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}" class="select-label"> <optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}" class="select-label">
{% for collection in availableCollections['databox_collections'] %} {% for collection in availableCollections['databox_collections'] %}
<option value="{{ collection.get_base_id() }}" class="select-row">{{ collection.get_label(app['locale']) }}</option> <option {% if last_used_collection == collection.get_base_id() %} selected="selected" {% endif %} value="{{ collection.get_base_id() }}" class="select-row">{{ collection.get_label(app['locale']) }}</option>
{% endfor %} {% endfor %}
</optgroup> </optgroup>
{% endfor %} {% endfor %}

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

@@ -55,14 +55,15 @@
<div class='settings-box'> <div class='settings-box'>
<h5>{{ 'upload:: Destination (collection) :' | trans }} :</h5> <h5>{{ 'upload:: Destination (collection) :' | trans }} :</h5>
{# collections list #} {# collections list #}
<select name="base_id" class="span3" style="margin-left: 10px;"> {% set last_used_collection = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'upload_last_used_collection') %}
{% for sbasId, availableCollections in collections %} <select name="base_id" class="span3 upload-options-collection" style="margin-left: 10px;">
<optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}" class="select-label"> {% for sbasId, availableCollections in collections %}
{% for collection in availableCollections['databox_collections'] %} <optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}" class="select-label">
<option value="{{ collection.get_base_id() }}" class="select-row">{{ collection.get_label(app['locale']) }}</option> {% for collection in availableCollections['databox_collections'] %}
<option {% if last_used_collection == collection.get_base_id() %} selected="selected" {% endif %} value="{{ collection.get_base_id() }}" class="select-row">{{ collection.get_label(app['locale']) }}</option>
{% endfor %}
</optgroup>
{% endfor %} {% endfor %}
</optgroup>
{% endfor %}
</select> </select>
{# collections status #} {# collections status #}
{% for availableCollections in collections %} {% for availableCollections in collections %}