From 14ff1e014307897f18941fe0858b815dc456d4f7 Mon Sep 17 00:00:00 2001 From: maxwell Date: Thu, 17 Mar 2011 13:07:01 -0700 Subject: [PATCH] ms dg improved styling, fixed delete --- app/controllers/photos_controller.rb | 20 +++++---- app/views/photos/_new_photo.haml | 51 ++++++++++------------- app/views/shared/_publisher.html.haml | 2 - public/images/ajax-loader2.gif | Bin 3720 -> 8787 bytes public/stylesheets/sass/application.sass | 28 ++++--------- 5 files changed, 41 insertions(+), 60 deletions(-) diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index baf48d0a7..17ec16634 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -5,8 +5,7 @@ class PhotosController < ApplicationController before_filter :authenticate_user! - respond_to :html - respond_to :json, :only => :show + respond_to :html, :json def index @post_type = :photos @@ -124,18 +123,21 @@ class PhotosController < ApplicationController if photo photo.destroy - flash[:notice] = I18n.t 'photos.destroy.notice' - - if photo.status_message_id - respond_with photo, :location => photo.status_message - else - respond_with photo, :location => person_photos_path(current_user.person) + respond_to do |format| + format.json{ render :nothing => true, :status => 204 } + format.html do + flash[:notice] = I18n.t 'photos.destroy.notice' + if photo.status_message_id + respond_with photo, :location => photo.status_message + else + respond_with photo, :location => person_photos_path(current_user.person) + end + end end else respond_with photo, :location => person_photos_path(current_user.person) end - end def show diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml index 37be87eab..dde30ed35 100644 --- a/app/views/photos/_new_photo.haml +++ b/app/views/photos/_new_photo.haml @@ -17,8 +17,6 @@ sizeLimit: 4194304, onProgress: function(id, fileName, loaded, total){ - var progress = Math.round(loaded / total * 100 ); - $('#fileInfo').text(fileName + ' ' + progress + '%'); }, messages: { @@ -30,38 +28,39 @@ onSubmit: function(id, fileName){ $('#file-upload').addClass("loading"); $('#publisher').find("input[type='submit']").attr('disabled','disabled'); - $("div.mention_helper").fadeTo(100, 0, function() { - $("#publisher .options_and_submit, #fileInfo").fadeIn(50); - }); $("#publisher textarea").addClass("with_attachments"); - $("#publisher_spinner").fadeIn(100); $('#photodropzone').append( "
  • " + "" + "
    • " ); - }, onComplete: function(id, fileName, responseJSON) { $('#fileInfo').text(fileName + ' completed'); - var id = responseJSON.data.photo.id; - var url = responseJSON.data.photo.thumb_small; + var id = responseJSON.data.photo.id, + url = responseJSON.data.photo.url, + currentPlaceholder = $('li.loading').first(); $("#publisher textarea").addClass("with_attachments"); - $('#new_status_message').append(""); - $('li.loading').first().replaceWith( - "
  • " + - "" + - "
    X
    " + - "
    " + - "
    • " - ); - $('#publisher').find("input[type='submit']").removeAttr('disabled'); - $("#publisher textarea").css('paddingBottom', $("#photodropzone").height() + 10); - $('.x').live('click', function(){ + + // replace image placeholders + var img = currentPlaceholder.find('img'); + img.attr('src', url); + img.attr('data-id', id); + currentPlaceholder.removeClass('loading'); + currentPlaceholder.append("
    X
    " + + "
    "); + //// + + var publisher = $('#publisher'), + textarea = publisher.find('textarea'); + + publisher.find("input[type='submit']").removeAttr('disabled'); + + $('.x').bind('click', function(){ var photo = $(this).closest('.publisher_photo'); photo.addClass("dim"); $.ajax({url: "photos/" + photo.children('img').attr('data-id'), @@ -69,24 +68,18 @@ success: function() { photo.fadeOut(400, function(){ photo.remove(); - $("#publisher textarea").css('paddingBottom', $("#photodropzone").height() + 10); + textarea.css('paddingBottom', $("#photodropzone").height() + 10); if ( $('.publisher_photo').length == 0){ - $("#publisher textarea").removeClass("with_attachments"); - $("#publisher textarea").css('paddingBottom', ''); + textarea.removeClass("with_attachments"); + textarea.css('paddingBottom', ''); } }); } }); }); - }, onAllComplete: function(completed_files){ - $('#fileInfo').delay(1800).fadeOut(200, function() { - $("div.mention_helper").fadeTo(100, 100); - }); - $("#publisher_spinner").fadeOut(100); - $('#file-upload').removeClass("loading"); } }); diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml index 2e073bae9..9056d8c3e 100644 --- a/app/views/shared/_publisher.html.haml +++ b/app/views/shared/_publisher.html.haml @@ -45,8 +45,6 @@ .right - #fileInfo - = image_tag 'ajax-loader.gif', :class => 'hidden', :id => "publisher_spinner" = status.submit t('.share'), :disable_with => t('.posting'), :class => 'button' .public_toggle diff --git a/public/images/ajax-loader2.gif b/public/images/ajax-loader2.gif index 8fdcfaf56d783cc7e6c7f144de96a79031d3f167..2aebe21eaaf66b16b785c1900981b4ae3cf52ab6 100644 GIT binary patch literal 8787 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 literal 3720 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 Sg0~_|TyOeCum4@YjK2X~9tukU diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 35b70a3ac..55d98c9e5 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -872,16 +872,6 @@ label :position relative :top 0 - ul - :padding 0 - >li - :display inline - :margin-right 2px - img - :-webkit-border-radius 5px - :-moz-border-radius 5px - :border-radius 5px - input[type='text'], textarea :width 435px @@ -1014,17 +1004,19 @@ label :bottom 0 :width 435px :left 5px + :padding 0 + li + :display inline-block :margin-right 4px img - :height 50px :width 50px .circle :display none :z-index 1 :position absolute :right -7px - :top -47px + :top -5px :background :color #333 @@ -1035,19 +1027,15 @@ label :border 1px solid #fff - :-webkit-border-radius 10px - :-moz-border-radius 10px - :border-radius 10px - - :-webkit-box-shadow 0 1px 3px #000 - :-moz-box-shadow 0 1px 3px #000 - :box-shadow 0 1px 3px #000 + :-webkit-border-radius 20px + :-moz-border-radius 20px + :border-radius 20px .x :display none :z-index 2 :position absolute - :top -45px + :top -3px :right -1px :font :size small