Hide uploading text when using progress bar

superfluous visual information, since the progress bar implies the uploading action
horde · Aug 21, 2014 · d38dbbc · d38dbbc
1 parent 241ac91
commit d38dbbc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/imp/js/compose-dimp.js b/imp/js/compose-dimp.js
@@ -1467,7 +1467,8 @@ var IMP_Compose_Attachlist = Class.create({
             .insert(
                 new Element('SPAN')
                     .addClassName('attach_upload_text')
-                    .insert((Object.isElement(f) ? $F(f) : f.name).escapeHTML() + ' (' + DimpCore.text.uploading + ')')
+                    .insert((Object.isElement(f) ? $F(f) : f.name).escapeHTML())
+                    .insert(new Element('SPAN').insert('(' + DimpCore.text.uploading + ')'))
             );
 
         $('attach_list').show().insert(li);
@@ -1559,7 +1560,9 @@ var IMP_Compose_Attachlist = Class.create({
                                         backgroundPosition: parseInt(100 - (e2.loaded / e2.total * 100), 10) + "% 0"
                                     });
                                     if (!p.visible()) {
-                                        li.down('.attach_upload_text').addClassName('attach_upload_text_progress');
+                                        li.down('.attach_upload_text')
+                                            .addClassName('attach_upload_text_progress')
+                                            .down('SPAN').remove();
                                         p.show();
                                     }
                                 }

diff --git a/imp/themes/default/dynamic/screen.css b/imp/themes/default/dynamic/screen.css
@@ -726,6 +726,9 @@ div.msgfullread span.messagePrintShow {
     -o-text-overflow: ellipsis;
     white-space: nowrap;
 }
+#attach_list span.attach_upload_text span {
+    padding-left: 5px;
+}
 #attach_list span.attach_upload_text_progress {
     max-width: 290px;
     margin-right: 10px;