diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml index fc6b6477e..a9b6bc29c 100644 --- a/app/views/photos/_new_photo.haml +++ b/app/views/photos/_new_photo.haml @@ -15,7 +15,8 @@ onProgress: function(id, fileName, loaded, total){ - + var progress = Math.round(loaded / total * 100 ); + $('#fileInfo').text(fileName + ' ' + progress + '%'); }, onSubmit: function(id, fileName){ @@ -26,6 +27,7 @@ }, onComplete: function(id, fileName, responseJSON){ + $('#fileInfo').text(fileName + ' completed').fadeOut(2000); $("#publisher_spinner").fadeOut(100); $('#file-upload').removeClass("loading"); var id = responseJSON.data.photo.id; diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index e506af86c..265991084 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -39,6 +39,7 @@ .options_and_submit .right + #fileInfo = image_tag 'ajax-loader.gif', :class => 'hidden', :id => "publisher_spinner" - if aspect == :all = status.submit t('.share'), :title => t('.share_with_all'), :disable_with => t('.posting') diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 9c19fdd33..936d2b346 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -847,6 +847,8 @@ label :style italic :display inline + #fileInfo + :display inline #image_picker :margin :top 5px @@ -1536,6 +1538,7 @@ ul.aspects :left 600px :top 0 + #profile_photo_upload :margin :top 5px