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

Fix #1323 & #1322 Can not upload wmark stamp & logo for a collection

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-07-31 15:35:40 +02:00
parent f28df88d74
commit 7e3ca30674
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
templates/web/admin/collection/collection.html.twig
View File

@@ -154,7 +154,11 @@
{% elseif app['authentication'].getUser().ACL.has_right_on_base(bas_id, 'manage') %} {% elseif app['authentication'].getUser().ACL.has_right_on_base(bas_id, 'manage') %}
<span>{% trans 'admin::base:collection: aucun fichier (minilogo, watermark ...)' %}</span> <span>{% trans 'admin::base:collection: aucun fichier (minilogo, watermark ...)' %}</span>
<form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_logo', { 'bas_id' : bas_id }) }}" style="margin:0;"> <form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_logo', { 'bas_id' : bas_id }) }}" style="margin:0;">
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<span>{% trans %}Select files{% endtrans %}...</span>
<input name="newLogo" type="file" accept="image/*" /> <input name="newLogo" type="file" accept="image/*" />
</span>
</form> </form>
{% endif %} {% endif %}
</div> </div>
@@ -175,7 +179,11 @@
{% elseif app['authentication'].getUser().ACL.has_right_on_base(bas_id, 'manage') %} {% elseif app['authentication'].getUser().ACL.has_right_on_base(bas_id, 'manage') %}
<span>{% trans 'admin::base:collection: aucun fichier (minilogo, watermark ...)' %}</span> <span>{% trans 'admin::base:collection: aucun fichier (minilogo, watermark ...)' %}</span>
<form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_watermark', { 'bas_id' : bas_id }) }}" style="margin:0;"> <form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_watermark', { 'bas_id' : bas_id }) }}" style="margin:0;">
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<span>{% trans %}Select files{% endtrans %}...</span>
<input name="newWm" type="file" accept="image/*" /> <input name="newWm" type="file" accept="image/*" />
</span>
</form> </form>
{% endif %} {% endif %}
</div> </div>
@@ -196,7 +204,11 @@
{% elseif app['authentication'].getUser().ACL.has_right_on_base(bas_id, 'manage') %} {% elseif app['authentication'].getUser().ACL.has_right_on_base(bas_id, 'manage') %}
<span>{% trans 'admin::base:collection: aucun fichier (minilogo, watermark ...)' %}</span> <span>{% trans 'admin::base:collection: aucun fichier (minilogo, watermark ...)' %}</span>
<form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_stamp', { 'bas_id' : bas_id }) }}" style="margin:0;"> <form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_stamp', { 'bas_id' : bas_id }) }}" style="margin:0;">
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<span>{% trans %}Select files{% endtrans %}...</span>
<input name="newStamp" type="file" accept="image/*" /> <input name="newStamp" type="file" accept="image/*" />
</span>
</form> </form>
{% endif %} {% endif %}
</div> </div>
@@ -217,7 +229,11 @@
{% elseif app['authentication'].getUser().ACL.has_right_on_base(bas_id, 'manage') %} {% elseif app['authentication'].getUser().ACL.has_right_on_base(bas_id, 'manage') %}
<span>{% trans 'admin::base:collection: aucun fichier (minilogo, watermark ...)' %}</span> <span>{% trans 'admin::base:collection: aucun fichier (minilogo, watermark ...)' %}</span>
<form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_banner', { 'bas_id' : bas_id }) }}" style="margin:0;"> <form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_banner', { 'bas_id' : bas_id }) }}" style="margin:0;">
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<span>{% trans %}Select files{% endtrans %}...</span>
<input name="newBanner" type="file" accept="image/*" /> <input name="newBanner" type="file" accept="image/*" />
</span>
</form> </form>
{% endif %} {% endif %}
</div> </div>
@@ -295,7 +311,7 @@
if(datas.success) { if(datas.success) {
alert(datas.msg); alert(datas.msg);
if(submitLink.hasClass('reload')) { if(submitLink.hasClass('reload')) {
reloadTree('base:{{ databox.get_sbas_id() }}', true); reloadTree('base:{{ collection.get_sbas_id() }}', true);
} else if(submitLink.hasClass('reload-tree')) { } else if(submitLink.hasClass('reload-tree')) {
reloadTree('bases:bases', true); reloadTree('bases:bases', true);
} }
@@ -313,12 +329,14 @@
$(this).fileupload({ $(this).fileupload({
dataType: 'html', dataType: 'html',
add: function(e, data) { add: function(e, data) {
if (typeof data.files[0].type !== "undefined") {
if( ! /(\.|\/)(png|jpeg|jpg|pjpg|gif)$/i.test(data.files[0].type)) { if( ! /(\.|\/)(png|jpeg|jpg|pjpg|gif)$/i.test(data.files[0].type)) {
{% set supported_file_types = ['jpg', 'jpeg', 'pjpg', 'gif', 'png']|join(' | ') %} {% set supported_file_types = ['jpg', 'jpeg', 'pjpg', 'gif', 'png']|join(' | ') %}
alert("{% trans %} Invalid file type, only ({{ supported_file_types }}) file formats are supported {% endtrans %}"); alert("{% trans %} Invalid file type, only ({{ supported_file_types }}) file formats are supported {% endtrans %}");
return false; return false;
} }
}
data.submit(); data.submit();
}, },