From b654f20fc382bac7975d8eb94bfe5452571fa390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr>
Date: Wed, 28 Jan 2015 17:11:48 +0100
Subject: [PATCH] =?UTF-8?q?L=C3=A9ger=20changements=20de=20styles=20et=20d?=
 =?UTF-8?q?e=20templates.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/js/widget/file_upload.js         |  2 ++
 Resources/less/file_upload.less            | 23 ++++++++++++++++++----
 Resources/views/Form/file_upload.html.twig | 13 ++++++------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/Resources/js/widget/file_upload.js b/Resources/js/widget/file_upload.js
index 41dfb0ac..a3a12f98 100644
--- a/Resources/js/widget/file_upload.js
+++ b/Resources/js/widget/file_upload.js
@@ -58,6 +58,8 @@
                 $this.find('.icon')
                     .removeClass('fa-circle-o-notch fa-spin fa-file-o')
                     .addClass('fa-exclamation-triangle');
+                $this.find('.description').remove();
+                $this.find('.id').remove();
             },
             updateDisplay = function() {
                 var hasEntry = false;
diff --git a/Resources/less/file_upload.less b/Resources/less/file_upload.less
index f6c64318..d78dd3ee 100644
--- a/Resources/less/file_upload.less
+++ b/Resources/less/file_upload.less
@@ -4,18 +4,17 @@ All rights reserved.
 */
 
 @import "variables.less";
-@import "bootstrap/less/mixins.less";
 
 .fileinput-entry {
-    .cancel, .delete {
-        margin-left: 0.5em;
+    & > * {
+        margin: 0 0.2em;
     }
     .description {
         display: inline;
         width: auto;
         height: auto;
         padding: @padding-xs-vertical @padding-xs-horizontal;
-        margin: 0;
+        //margin: 0;
     }
     .progress {
         height: (@line-height-computed / 2);
@@ -24,9 +23,25 @@ All rights reserved.
     .progress-text {
         float: right;
     }
+    .error {
+        display: none;
+    }
+    .size {
+        &:before { content: '('; }
+        &:after  { content: ')'; }
+    }
     &.alert {
         padding: @padding-xs-vertical @padding-xs-horizontal;
         margin-bottom: 0;
+        .name:after {
+            content: " :";
+        }
+        .error {
+            display: inline;
+        }
+        .size, .description {
+            display: none;
+        }
     }
 }
 
diff --git a/Resources/views/Form/file_upload.html.twig b/Resources/views/Form/file_upload.html.twig
index 884b6693..1a6fd1e8 100644
--- a/Resources/views/Form/file_upload.html.twig
+++ b/Resources/views/Form/file_upload.html.twig
@@ -2,8 +2,9 @@
 {% block file_upload_progress_prototype %}
     <div class="template-upload fileinput-entry">
         <div class="progress-text" style="display: none"></div>
-        <i class="fa fa-circle-o-notch fa-spin icon"></i>&nbsp;<span class="name"></span>&nbsp;(<span class="size"></span>)
-        <span class="error" style="display: none"></span>
+        <i class="fa fa-circle-o-notch fa-spin icon"></i>&nbsp;<span class="name"></span>
+        <span class="size"></span>
+        <span class="error"></span>
         <a href="#" class="danger cancel" title="{% trans %}button.cancel{% endtrans %}">
             {{- irstea_icon('remove') -}}
         </a>
@@ -19,12 +20,10 @@
         <input class="id" type="hidden" name="{{ full_name }}{% if multiple %}[{{index|default('__index__')}}]{% endif %}[id]" value="{{ file.id|default }}"/>
         <i class="fa fa-file{% if file.icon|default(false) %}-{{ file.icon }}{% endif %}-o icon"></i>&nbsp;<span class="name">
             <a{% if file %} href="{{ path('file_upload_get_content', {id: file.id, token: csrf_token}) }}"{% endif %}>{{ file.name|default }}</a>
-    </span>
-        (<span class="size">
-            {{- file.size|default -}}
-        </span>)
+        </span>
+        <span class="size">{{ file.size|default }}</span>
         <input class="form-control description" type="text" placeholder="{% trans %}form.file_upload.description.placeholder{% endtrans %}" name="{{ full_name }}{% if multiple %}[{{index|default('__index__')}}]{% endif %}[description]" value="{{ file.description|default }}"/>
-        <span class="error danger" style="display: none">ERROR</span>
+        <span class="error"></span>
         <a href="#" class="danger delete {%- if disabled or read_only %} disabled{% endif -%}" title="{% trans %}button.delete{% endtrans %}">
             {{- irstea_icon('remove') -}}
         </a>
-- 
GitLab