nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix css and js error with upload photo mobile

Browse source
This commit is contained in:
movilla 2013-02-28 01:01:00 +01:00
parent 76b1e9b0dc
commit 9b2d3c66bf
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/mobile.js
View file

@ -294,8 +294,8 @@ function createUploader(){
messages: { messages: {
typeError: Diaspora.I18n.t("photo_uploader.invalid_ext"), typeError: Diaspora.I18n.t("photo_uploader.invalid_ext"),
sizeError: Diaspora.I18n.t("photos.new_photo.size_error"), sizeError: Diaspora.I18n.t("photo_uploader.new_photo.size_error"),
emptyError: Diaspora.I18n.t("photos.new_photo.empty") emptyError: Diaspora.I18n.t("photo_uploader.new_photo.empty")
}, },
onSubmit: function(id, fileName){ onSubmit: function(id, fileName){
@ -303,13 +303,13 @@ function createUploader(){
$('#publisher_textarea_wrapper').addClass("with_attachments"); $('#publisher_textarea_wrapper').addClass("with_attachments");
$('#photodropzone').append( $('#photodropzone').append(
"<li class='publisher_photo loading' style='position:relative;'>" + "<li class='publisher_photo loading' style='position:relative;'>" +
"<img alt=\"Ajax-loader2\" src=\"/assets/ajax-loader2.gif\" />" + "<img alt='Ajax-loader2' src='/assets/ajax-loader2.gif' />" +
"</li>" "</li>"
); );
}, },
onComplete: function(id, fileName, responseJSON) { 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, var id = responseJSON.data.photo.id,
url = responseJSON.data.photo.unprocessed_image.url, url = responseJSON.data.photo.unprocessed_image.url,
currentPlaceholder = $('li.loading').first(); currentPlaceholder = $('li.loading').first();

5
app/assets/stylesheets/mobile.css.scss
View file

@ -546,6 +546,9 @@ footer {
border: { border: {
bottom: 1px solid #999; bottom: 1px solid #999;
} }
.counter {
font-size: 14px;
}
} }
textarea { textarea {
@ -1040,7 +1043,7 @@ input#q.search {
} }
#file-upload-publisher { #file-upload-publisher {
bottom: 10px !important; bottom: 0px !important;
display: inline-block; display: inline-block;
padding: 3px 12px; padding: 3px 12px;
position: absolute !important; position: absolute !important;

2
app/views/shared/_publisher.mobile.haml
View file

@ -46,6 +46,6 @@
#file-upload-publisher{:title => t('.upload_photos'), :class => 'btn'} #file-upload-publisher{:title => t('.upload_photos'), :class => 'btn'}
= image_tag 'icons/camera.png', :style => "height: 14px; width: 19px;", :alt => t('.upload_photos').titleize = image_tag 'icons/camera.png', :style => "height: 14px; width: 19px;", :alt => t('.upload_photos').titleize
#publisher_mobile #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 #publisher_photo_upload