Merge pull request #152 from jmsche/master

MultipleUpload: Fixed asset link & added remove translation
snowcap · Aug 6, 2015 · 590a9d3 · 590a9d3
2 parents 34552b8 + b696b73
commit 590a9d3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Resources/translations/SnowcapAdminBundle.en.yml b/Resources/translations/SnowcapAdminBundle.en.yml
@@ -193,3 +193,6 @@ error:
 slug_alert:
     title: ATTENTION
     message: If you change the slug, you can break links on other pages!
+
+multiupload_widget:
+    remove: Remove
diff --git a/Resources/translations/SnowcapAdminBundle.fr.yml b/Resources/translations/SnowcapAdminBundle.fr.yml
@@ -192,4 +192,7 @@ error:
 
 slug_alert:
     title: ATTENTION
-    message: Si vous modifiez le slug, vous pouvez casser des liens sur d'autres pages !
+    message: Si vous modifiez le slug, vous pouvez casser des liens sur d'autres pages !
+
+multiupload_widget:
+    remove: Supprimer
diff --git a/Resources/views/Form/form_admin_layout.html.twig b/Resources/views/Form/form_admin_layout.html.twig
@@ -186,9 +186,9 @@
 {% block snowcap_admin_multiupload_url_widget %}
     {% spaceless %}
         <li class="multiupload-file-preview">
-            <button class="btn btn-mini remove">Remove</button>&nbsp;
+            <button class="btn btn-mini remove">{{ 'multiupload_widget.remove'|trans({}, 'SnowcapAdminBundle') }}</button>&nbsp;
 
-            <a href="{{ value }}" target="_blank">
+            <a href="{{ asset(value) }}" target="_blank">
                 {{ value }}
             </a>
 
@@ -200,10 +200,10 @@
 {% block snowcap_admin_multiupload_image_widget %}
     {% spaceless %}
         <li class="multiupload-file-preview">
-            <button class="btn btn-mini remove remove-image">Remove</button>
+            <button class="btn btn-mini remove remove-image">{{ 'multiupload_widget.remove'|trans({}, 'SnowcapAdminBundle') }}</button>
 
-            <a href="{{ form.vars.value }}" target="_blank">
-                <img src="{{ value|imresize(im_resize) }}" alt="{{ value }}" />
+            <a href="{{ asset(value) }}" target="_blank">
+                <img src="{{ asset(value)|imresize(im_resize) }}" alt="{{ value }}" />
             </a>
 
             {{ block('hidden_widget') }}