diff --git a/app/assets/javascripts/mobile.js b/app/assets/javascripts/mobile.js index 64ff4d9f4..cdeebc3a5 100644 --- a/app/assets/javascripts/mobile.js +++ b/app/assets/javascripts/mobile.js @@ -294,8 +294,8 @@ function createUploader(){ messages: { typeError: Diaspora.I18n.t("photo_uploader.invalid_ext"), - sizeError: Diaspora.I18n.t("photos.new_photo.size_error"), - emptyError: Diaspora.I18n.t("photos.new_photo.empty") + sizeError: Diaspora.I18n.t("photo_uploader.new_photo.size_error"), + emptyError: Diaspora.I18n.t("photo_uploader.new_photo.empty") }, onSubmit: function(id, fileName){ @@ -303,13 +303,13 @@ function createUploader(){ $('#publisher_textarea_wrapper').addClass("with_attachments"); $('#photodropzone').append( "
  • " + - "\"Ajax-loader2\"" + + "Ajax-loader2" + "
  • " ); }, onComplete: function(id, fileName, responseJSON) { - $('#fileInfo-publisher').text(fileName + ' completed'); + $('#fileInfo-publisher').text(Diaspora.I18n.t("photo_uploader.completed", file=fileName)); var id = responseJSON.data.photo.id, url = responseJSON.data.photo.unprocessed_image.url, currentPlaceholder = $('li.loading').first(); diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss index 6f4783505..d70579900 100644 --- a/app/assets/stylesheets/mobile.css.scss +++ b/app/assets/stylesheets/mobile.css.scss @@ -546,6 +546,9 @@ footer { border: { bottom: 1px solid #999; } + .counter { + font-size: 14px; + } } textarea { @@ -1040,7 +1043,7 @@ input#q.search { } #file-upload-publisher { - bottom: 10px !important; + bottom: 0px !important; display: inline-block; padding: 3px 12px; position: absolute !important; diff --git a/app/views/shared/_publisher.mobile.haml b/app/views/shared/_publisher.mobile.haml index 9a8ec63b8..5c1bdfddd 100644 --- a/app/views/shared/_publisher.mobile.haml +++ b/app/views/shared/_publisher.mobile.haml @@ -46,6 +46,6 @@ #file-upload-publisher{:title => t('.upload_photos'), :class => 'btn'} = image_tag 'icons/camera.png', :style => "height: 14px; width: 19px;", :alt => t('.upload_photos').titleize #publisher_mobile - = submit_tag t('.share'), :class => 'btn primary', :id => "submit_new_message", :style => "position: absolute; right: 20px; bottom: 10px" + = submit_tag t('.share'), :class => 'btn primary', :id => "submit_new_message", :style => "position: absolute; right: 20px; bottom: 0px" #publisher_photo_upload