Merge remote branch 'mnutt/photo_upload_status'

app/views/photos/_new_photo.haml

@@ -30,14 +30,14 @@
        onSubmit: function(id, fileName){
         $('#file-upload').addClass("loading");
         $('#publisher').find("input[type='submit']").attr('disabled','disabled');
-        $("#publisher .options_and_submit").fadeIn(50);
+        $("div.mention_helper").fadeTo(100, 0, function() {
+          $("#publisher .options_and_submit, #fileInfo").fadeIn(50);
+        });
         $("#publisher_spinner").fadeIn(100);
        },
 
-       onComplete: function(id, fileName, responseJSON){
-        $('#fileInfo').text(fileName + ' completed').fadeOut(2000);
-        $("#publisher_spinner").fadeOut(100);
-        $('#file-upload').removeClass("loading");
+       onComplete: function(id, fileName, responseJSON) {
+        $('#fileInfo').text(fileName + ' completed');
         var id = responseJSON.data.photo.id;
         var url = responseJSON.data.photo.thumb_small;
 
@@ -70,6 +70,15 @@
                           }
                   });
         });
+
+       },
+
+       onAllComplete: function(completed_files){
+        $('#fileInfo').delay(1800).fadeOut(200, function() {
+          $("div.mention_helper").fadeTo(100, 100);
+        });
+        $("#publisher_spinner").fadeOut(100);
+        $('#file-upload').removeClass("loading");
        }
 
    });

app/views/shared/_publisher.html.haml

@@ -37,7 +37,7 @@
         = hidden_field_tag 'aspect_ids[]', aspect_id.to_s
 
       .options_and_submit
-        %div
+        %div.mention_helper
           %i= t('.mention_helper_text')
 
         .right

config/assets.yml

@@ -19,9 +19,9 @@ javascripts:
     - public/javascripts/vendor/jquery.infinitescroll.min.js
     - public/javascripts/vendor/facebox.js
     - public/javascripts/vendor/timeago.js
-    - public/javascripts/vendor/fileuploader.js
     - public/javascripts/vendor/Mustache.js
     - public/javascripts/jquery.autocomplete-custom.js
+    - public/javascripts/fileuploader-custom.js
     - public/javascripts/keycodes.js
     - public/javascripts/diaspora.js
     - public/javascripts/widgets/i18n.js

public/stylesheets/sass/application.sass

@@ -881,6 +881,8 @@ label
 
     #fileInfo
       :display inline
+      :position relative
+      :top -2px
 
   .content_creation
     :margin