app/views/assets/_add_to_facebook.html.erb app/views/assets/_big_share.html.erb app/views/assets/share.html.erb app/views/users/create.html.erb public/images/buttons/facebook_share_icon.gif vendor/plugins/haml/init.rb @@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base before_filter :ie6 before_filter :login_by_token, :display_news before_filter :set_page_title - before_filter :currently_online, :prep_bugaboo + before_filter :prep_bugaboo before_filter :update_last_seen_at, :only => [:index] before_filter :set_latest_update_title app/controllers/application.rb @@ -24,8 +24,6 @@ class AssetsController < ApplicationController end end - # GET /assets/1 - # GET /assets/1.xml def show respond_to do |format| format.html do @@ -34,6 +32,7 @@ class AssetsController < ApplicationController @listens = @asset.listens.find(:all) @comments = @asset.comments.find_all_by_spam(false) @listeners = @asset.listeners.first(5) + @single = true end format.mp3 do register_listen app/controllers/assets_controller.rb @@ -4,10 +4,15 @@ class PagesController < ApplicationController class Fuck < StandardError; end + def index + @page_title = "About alonetone, the kickass home for musicians" + end + def home end def about + @page_title = "About alonetone, the kickass home for musicians" end def actually_going_somewhere_with_facebooker_and_rails @@ -27,7 +32,7 @@ class PagesController < ApplicationController end def itunes - + @page_title = "How to get your music on iTunes (as a music podcast) with alonetone" end def sitemap app/controllers/pages_controller.rb @@ -4,7 +4,7 @@ class UpdatesController < ApplicationController # GET /updates.xml def index @updates = Update.find(:all, :order => 'created_at DESC') - + @page_title = "Latest News about alonetone, the kick ass musician's home" respond_to do |format| format.html # index.html.erb format.xml { render :xml => @updates } app/controllers/updates_controller.rb @@ -6,7 +6,7 @@ class UserReportsController < ApplicationController # GET /user_reports.xml def index @user_reports = UserReport.find_all_by_spam(false, :include => :user, :order => 'user_reports.created_at DESC') - + @page_title = "Feedback about alonetone" respond_to do |format| format.html # index.html.erb format.xml { render :xml => @user_reports } app/controllers/user_reports_controller.rb @@ -1,13 +1,11 @@ class UsersController < ApplicationController - skip_before_filter :update_last_seen_at, :only => [:create, :new, :activate, :sudo] before_filter :find_user, :except => [:new, :create, :sudo] before_filter :login_required, :except => [:index, :show, :new, :create, :activate, :bio] skip_before_filter :login_by_token, :only => :sudo - rescue_from NoMethodError, :with => :display_user_home_or_index def index @@ -41,7 +39,7 @@ class UsersController < ApplicationController @assets = @user.assets.find(:all, :limit => 5) @playlists = @user.playlists.find(:all,:conditions => [ "tracks_count > 0"]) @listens = @user.listens.find(:all, :limit =>5) - @track_plays = @user.track_plays.find(:all, :limit =>10) + @track_plays = @user.track_plays.from_user.find(:all, :limit =>10) @comments = @user.comments.find_all_by_spam(false, :limit => 10) end format.xml { @assets = @user.assets.find(:all, :order => 'created_at DESC')} @@ -55,7 +53,8 @@ class UsersController < ApplicationController def new @user = User.new - @page_title = "Sign up with alonetone to upload your mp3s or discover new music" + @page_title = "Sign up to upload your mp3s on alonetone" + flash.now[:error] = "Join alonetone to upload and create playlists (it is quick: about 45 seconds)" if params[:new] end @@ -77,11 +76,11 @@ class UsersController < ApplicationController flash[:error] = "The signup message cannot be sent to '#{CGI.escapeHTML @user.email}' at this moment. Please, try again later." redirect_to :action => "new" end - flash[:ok] = "An email was sent to '#{CGI.escapeHTML @user.email}'. <br/>You just have to click the link in the email, and the hard work is over! <br/> Note: check your junk/spam inbox if you don't see a new email right away." - redirect_to login_path + flash[:ok] = "We just sent you an email to '#{CGI.escapeHTML @user.email}'.<br/><br/>You just have to click the link in the email, and the hard work is over! <br/> Note: check your junk/spam inbox if you don't see a new email right away." end end rescue ActiveRecord::RecordInvalid + flash[:error] = "Whups, there was a small issue" render :action => 'new' end app/controllers/users_controller.rb @@ -47,8 +47,9 @@ module ApplicationHelper link_to ' ', formatted_user_track_path(asset.user.login, asset.permalink, :mp3), :id=>"play-#{asset.id}", :class => 'play_link', :referer => referer end - def user_nav_item(text, link, added_class='link') - content_tag(:li, link_to_unless_current(text, link),:class=> ("#{added_class} #{"current" if current_page?(link)}")) + def user_nav_item(text, link, options=nil) + added_class = options.delete(:added_class) if options.is_a? Hash + content_tag(:li, link_to_unless_current(text, link, options),:class=> ("#{added_class} #{"current" if current_page?(link)}")) end def link_source(source) app/helpers/application_helper.rb @@ -17,7 +17,7 @@ # end class Asset < ActiveRecord::Base - + # used for extra mime types that dont follow the convention @@extra_content_types = { :audio => ['application/ogg'], :movie => ['application/x-shockwave-flash'], :pdf => ['application/pdf'] }.freeze @@allowed_extensions = %w(.mp3) @@ -34,6 +34,8 @@ class Asset < ActiveRecord::Base cattr_reader *%w(movie audio image other).collect! { |t| "#{t}_condition".to_sym } has_many :tracks, :dependent => :destroy + has_many :playlists, :through => :tracks + belongs_to :user, :counter_cache => true has_many :listens, :dependent => :destroy app/models/asset.rb @@ -1,4 +1,7 @@ class Comment < ActiveRecord::Base + + named_scope :valid, :conditions => [:spam => false] + belongs_to :commentable, :polymorphic => true # optional user who made the comment app/models/comment.rb @@ -1,21 +1,11 @@ -# == Schema Information -# Schema version: 16 -# -# Table name: listens -# -# id :integer(11) not null, primary key -# asset_id :integer(11) -# user_id :integer(11) -# created_at :datetime -# updated_at :datetime -# - class Listen < ActiveRecord::Base @@launch_date = 'Tue Jan 01 00:00:00 +0100 2008'.to_time # A "Listen" occurs when a user listens to another users track belongs_to :asset, :counter_cache => true + + named_scope :from_user, {:conditions => ['listener_id != ""']} belongs_to :listener, :class_name => 'User', :foreign_key => 'listener_id' belongs_to :track_owner, :class_name => 'User', :counter_cache => true app/models/listen.rb @@ -1,34 +1,13 @@ -# == Schema Information -# Schema version: 16 -# -# Table name: users -# -# id :integer(11) not null, primary key -# login :string(40) -# email :string(100) -# salt :string(40) -# activation_code :string(40) -# activated_at :datetime -# created_at :datetime -# updated_at :datetime -# deleted_at :datetime -# token :string(255) -# token_expires_at :datetime -# admin :boolean(1) -# last_seen_at :datetime -# crypted_password :string(40) -# assets_count :integer(11) -# display_name :string(255) -# identity_url :string(255) -# pic_id :integer(11) -# - require 'digest/sha1' class User < ActiveRecord::Base # has a bunch of prefs serialize :settings + named_scope :musicians, {:conditions => ['assets_count > ?',0], :order => 'assets_count DESC', :include => :pic} + named_scope :activated, {:conditions => {:activation_code => nil}, :order => 'created_at DESC', :include => :pic} + named_scope :recently_seen, {:order => 'last_seen_at DESC', :include => :pic} + # Can create music has_many :assets, :dependent => :destroy, :order => 'created_at DESC' has_many :playlists, :dependent => :destroy, :order => 'playlists.created_at DESC' @@ -139,7 +118,7 @@ class User < ActiveRecord::Base end def listens_average - (self.listens_count.to_f / ((((Time.now - self.assets.first.created_at) / 60 / 60 / 24 )).ceil)).ceil + (self.listens_count.to_f / ((((Time.now - self.assets.find(:all, :limit => 1, :order => 'created_at').first.created_at) / 60 / 60 / 24 )).ceil)).ceil end def dummy_pic(size) @@ -159,9 +138,9 @@ class User < ActiveRecord::Base def self.paginate_by_params(params) case params[:sort] when 'recently_joined' - self.paginate_all_by_activation_code(nil, :per_page => 15, :include => :pic, :order => "users.created_at DESC", :page => params[:page]) + self.activated.paginate(:all, :per_page => 15, :page => params[:page]) when 'monster_uploaders' - self.paginate(:all, :conditions => 'users.assets_count > 0', :per_page => 15, :include => :pic, :order => "users.assets_count DESC", :page => params[:page]) + self.musicians.paginate(:all,:per_page => 15, :page => params[:page]) when 'dedicated_listeners' @entries = WillPaginate::Collection.create((params[:page] || 1), 15) do |pager| # returns an array, like so: [User, number_of_listens] @@ -187,7 +166,7 @@ class User < ActiveRecord::Base end end else # last_seen - self.paginate(:all, :include =>:pic, :conditions => ['users.created_at < ?',1.day.ago],:order => 'last_seen_at DESC', :page => params[:page], :per_page => 15) + self.recently_seen.paginate(:all, :page => params[:page], :per_page => 15) end end app/models/user.rb @@ -1,4 +1,7 @@ class UserReport < ActiveRecord::Base + + named_scope :valid, :conditions => [:spam => false] + validates_presence_of :description, :category belongs_to :user serialize :params app/models/user_report.rb @@ -3,4 +3,5 @@ <%= link_to h(asset.user.name), user_home_path(asset.user), :class => 'artist' %> <% end %> <% end %> -<%= render :partial => 'assets/asset_tabs', :locals => {:asset => asset} %> + +<%= render :partial => 'assets/asset_tabs', :locals => {:asset => asset} unless @single %> app/views/assets/_asset.html.erb @@ -22,9 +22,9 @@ <% end %> </div> - <div class="panel"> + <div class="panel no_border"> <div class="track_links"> - <%= link_to "view more", user_track_path(asset.user, asset.permalink), :class => 'view_more' %> + <%= link_to "view more", user_track_path(asset.user, asset.permalink), :class => 'view_more' unless @single %> <% if authorized_for(asset) %> <%= link_to "edit", edit_user_track_path(asset.user, asset), :class => 'edit' %> <% end %> app/views/assets/_asset_tabs.html.erb @@ -1,6 +1,6 @@ <% object = object.asset if object.respond_to?(:asset) -%> -<div id="comment_<%= object.unique_id%>" class="comment_asset footer_content"> +<div id="comment_<%= object.unique_id %>" class="comment_asset"> <div class="comment_form"> <% form_for :comment, :url => user_track_comments_path(object.user, object) do |f| %> <%= f.text_area :body, :rows => 4, :cols => 40, :class=> 'double_trouble' %> app/views/assets/_comment.html.erb @@ -1,42 +1,13 @@ <% id = object.id.to_s %> <% object = object.asset if object.respond_to?(:asset) -%> -<div id="share_<%=id%>" class="share_asset footer_content"> - - -<%= link_to "Home page", user_track_url(object.user, object.permalink) %> for this song:<br/> -<%= text_field_tag "home_#{id}", user_track_url(object.user, object.permalink), :size => 40,:class => 'tabbed_input' %> <br/> -Mp3 download link:<br/> -<%= text_field_tag "link_#{id}", formatted_user_track_url(object.user, object.permalink, :mp3), :size => 40, :class => 'tabbed_input' %> <br/> - - -Put the music on your website:<br/> -Get the <%= link_to 'HTML code', '#' %> or the <%= link_to 'embedded_flash_player', '#'%> - -<div id="html_code_<%=id%>" style="display:none;"> - <div class="scriptaculous"> - <h3>HTML code</h3> - <%= text_area_tag 'code', "<a href='#{formatted_user_track_url(object.user, object, :mp3)}'>Download #{object.name}</a>", :rows => 2, :cols => 50 %> - </div> +<div id="share_<%=id%>" class="panel no_border"> + <%= link_to "Home page", user_track_url(object.user, object.permalink) %> for this song:<br/> + <%= text_field_tag "home_#{id}", user_track_url(object.user, object.permalink), :size => 40,:class => 'tabbed_input' %> <br/> </div> - -<div id="flash_code_<%=id%>" style="display:none;"> - <div class="scriptaculous"> - <h3>Embedd a Flash Player</h3> - <%= text_area_tag 'flash_player', "<embed src=\"#{FLASH_PLAYER}\" width=\"250\" height=\"20\" allowfullscreen=\"true\" allowscriptaccess=\"always\" flashvars=\"&file=#{formatted_user_track_url(object.user, object.permalink, :mp3)}&height=20&width=250&frontcolor=0x3C3C3C&backcolor=0xf3f3f3&lightcolor=0xFF944B&screencolor=0xFF944B&showdigits=false\" />", :rows => 3, :cols =>50 %> - <p class="tip">(customize how it looks by visiting <%= link_to 'the setup wizard', 'http://www.jeroenwijering.com/?page=wizard&example=2'%>) - </p> - </div> +<div class="panel no_border"> + <%= render :partial => 'assets/add_to_facebook', :object => object %> </div> - +<div class="panel no_border"> + <%= link_to "more sharing options", user_track_path(object.user,object.permalink), :class => 'view_more' %> </div> \ No newline at end of file app/views/assets/_share.html.erb @@ -1,8 +1,9 @@ -<div id="recent_listeners"> +<% if present?(@listeners)%> +<h2 class="box">Recent Listeners</h2> +<div id="recent_listeners" class="box static_content"> -<h2>Recent Listeners</h2> - -<%= render :partial => 'shared/small_user', :collection => @listeners %> + <%= render :partial => 'shared/small_user', :collection => @listeners %> -<div class="clear"></div> -</div> \ No newline at end of file + <div class="clear"></div> +</div> +<% end %> \ No newline at end of file app/views/assets/_users.html.erb @@ -2,27 +2,39 @@ <% content_for :left do %> <div id="single_track" class="box"> - <h2><%= @asset.name %></h2> - <%= render :partial => 'assets/assets'%> - </div> - - <div id="track details"> - <% if @asset.description && !@asset.description.empty? %> - <h2 class="big">About this track</h2> - <p><%= @asset.description %></p> - <% end %> - <% if @asset.youtube_embed && !@asset.youtube_embed.empty? %> - <object width="425" height="355"><param name="movie" value="http://www.youtube.com/v/<%=@asset.youtube_embed%>&rel=0&color1=0xd6d6d6&color2=0xf0f0f0&border=0"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/<%=@asset.youtube_embed%>&rel=0&color1=0xd6d6d6&color2=0xf0f0f0&border=0" type="application/x-shockwave-flash" wmode="transparent" width="425" height="355"></embed></object> + <%= render :partial => 'assets/assets'%> + + <% if @asset.description && !@asset.description.empty? %> + <div id="track_details" class="static_content"> + <h1>About "<%=h @asset.title %>"</h1> + <p><%= @asset.description %></p> + </div> + <% end %> + + <% if @asset.youtube_embed && !@asset.youtube_embed.empty? %> + <div class='static_content'> + <object width="425" height="355"><param name="movie" value="http://www.youtube.com/v/<%=@asset.youtube_embed%>&rel=0&color1=0xd6d6d6&color2=0xf0f0f0&border=0"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/<%=@asset.youtube_embed%>&rel=0&color1=0xd6d6d6&color2=0xf0f0f0&border=0" type="application/x-shockwave-flash" wmode="transparent" width="425" height="355"></embed></object> + </div> <% end %> + + <div class="static_content"> + Add your thoughts:<br/> + <%= render :partial => 'comment', :object => @asset %> + </div> </div> + + <%= render :partial => 'big_share'%> + <%= render :partial => 'stats'%> + + - <%= render :partial => 'stats'%> <% end %> <% content_for :right do %> <%= render :partial => 'users'%> <div class="clear"> </div> <%= render :partial => 'shared/comments' if @comments && @comments.size > 0%> + <% end %> app/views/assets/show.html.erb @@ -6,7 +6,7 @@ <% if @facebook_account %> <div style="margin-left:20px;width:200px"> - <% facebook_form_for(:asset, asset, :url => (add_to_profile_facebook_path(@facebook_account, :addable_type => 'asset', :addable_id => asset.id))) do |f| %> + <% facebook_form_for(:asset, asset, :url => (add_to_profile_facebook_path(:addable_type => 'asset', :addable_id => asset.id))) do |f| %> <%= f.buttons "Add track to your profile" %> <% end %> </div> app/views/facebook_accounts/_asset.fbml.erb @@ -11,7 +11,7 @@ <td style="width:40px;"><h4 style="margin-bottom:20px">Search:</h4></td> <td style="padding:20px"> - <% facebook_form_for(:asset, nil, :url => (add_to_profile_facebook_path(@facebook_account, :addable_type => 'asset')), :width => 50, :style => "height:40px", :label_width => 0 ) do |f| %> + <% facebook_form_for(:asset, :url => (add_to_profile_facebook_path(:addable_type => 'asset')), :width => 50, :style => "height:40px", :label_width => 0 ) do |f| %> <fb:typeahead-input name="addable_id" style="display:inline;width:200px;"> <% @search_assets.each do |asset| %> <fb:typeahead-option value="<%= asset.id %>"><%= asset.name %></fb:typeahead-option> app/views/facebook_accounts/_search.fbml.erb @@ -6,9 +6,9 @@ #links %ul.links = user_nav_item "What is alonetone?", {:controller => 'pages', :action => 'index' } - = user_nav_item "Stats", {:controller => 'pages', :action => 'stats'}, 'contact' - = user_nav_item "Latest News",{:controller => 'updates', :action => 'index' }, 'contact' - = user_nav_item "User reports", {:controller => 'user_reports', :action => 'index'}, 'contact' + = user_nav_item "Stats", {:controller => 'pages', :action => 'stats'}, :added_class => 'contact' + = user_nav_item "Latest News",{:controller => 'updates', :action => 'index' }, :added_class => 'contact' + = user_nav_item "User reports", {:controller => 'user_reports', :action => 'index'}, :added_class => 'contact' - content_for :static do = yield app/views/pages/_halp.html.haml @@ -1,7 +1,7 @@ <% form_tag sessions_path do -%> <p> <label for="login"><%= 'Login' %></label><br /> - <%= text_field_tag :login, params[:login], :onkeypress => 'LoginForm.checkLogin(this)' %> + <%= text_field_tag :login, params[:login] %> </p> <div id="password_fields"> app/views/sessions/_login.rhtml @@ -16,10 +16,10 @@ <% else %> <li id='upload'> - <%= link_to ' ', signup_path, :title => "upload new mp3 on alonetone", :class => "tab#{' active' if @tab == 'upload' }" %> + <%= link_to ' ', signup_path(:new => true), :title => "upload new mp3 on alonetone", :class => "tab#{' active' if @tab == 'upload' }" %> </li> <li id='your_stuff'> - <%= link_to ' ', signup_path, :title => "your stuff on alonetone", :class => "tab#{' active' if @tab == 'your_stuff' }" %> + <%= link_to ' ', signup_path(:new => true), :title => "your stuff on alonetone", :class => "tab#{' active' if @tab == 'your_stuff' }" %> </li> <% end %> app/views/shared/_nav.rhtml @@ -1,6 +1,6 @@ <p> <label for="user_login">Login </label> (Letters and numbers only)<br /> - <%= form.text_field :login, :onkeypress => 'LoginForm.checkLogin(this)' %> + <%= form.text_field :login %> </p> <p> app/views/users/_form.rhtml @@ -2,7 +2,7 @@ <h2 class="box">Latest listens to your music</h2> <%= link_to 'view all', listens_path(@user.login), :class => 'view_all' if @track_plays.size > 0 %> <div class="static_content"> - <strong><%= @user.listens.today %></strong> new plays & downloads today <br/> + <strong><%= @user.track_plays.today %></strong> new plays & downloads today <br/> <%= @user.listens_count %> total plays and downloads (<strong><%= @user.listens_average %></strong> per/day) </div> <%= render :partial => 'users/track_play', :collection => @track_plays %> app/views/users/_track_plays.html.erb @@ -11,15 +11,15 @@ <% end %> <div id="user_links"> <ul class="user_links"> - <%= user_nav_item "Latest", user_home_path(@user) %> - <%= user_nav_item "Albums & Playlists", user_playlists_path(@user) if @user.has_public_playlists? %> - <%= user_nav_item "Tracks", user_tracks_path(@user) if @user.assets_count > 0 %> - <%= user_nav_item "Profile", profile_path(@user) if @user.bio %> + <%= user_nav_item "Latest", user_home_path(@user), :title => "#{h @user.name}'s latest stuff on alonetone" %> + <%= user_nav_item "Albums & Playlists", user_playlists_path(@user), :title => "#{h @user.name}'s albums and playlists on alonetone" if @user.has_public_playlists? %> + <%= user_nav_item "Tracks", user_tracks_path(@user), :title => "#{h @user.name}'s uploaded mp3s on alonetone" if @user.assets_count > 0 %> + <%= user_nav_item "Profile", profile_path(@user), :title => "#{h @user.name}'s profile on alonetone" if @user.bio %> - <%= user_nav_item "Email", "mailto://#{@user.email}","contact" if admin? %> - <%= user_nav_item "Myspace", "http://myspace.com/#{@user.myspace}","contact" if @user.present?(:myspace)%> - <%= user_nav_item "iTunes", "http://#{@user.itunes}","contact" if @user.present?(:itunes) %> - <%= user_nav_item "Sudo", sudo_user_path(@user),"contact" if (admin? || @sudo)%> + <%= user_nav_item "Email", "mailto://#{@user.email}",:added_class => "contact" if admin? %> + <%= user_nav_item "Myspace", "http://myspace.com/#{@user.myspace}",:added_class => "contact" if @user.present?(:myspace)%> + <%= user_nav_item "iTunes", "http://#{@user.itunes}",:added_class => "contact" if @user.present?(:itunes) %> + <%= user_nav_item "Sudo", sudo_user_path(@user),:added_class => "contact" if (admin? || @sudo)%> </ul> </div> </div> app/views/users/_user.html.erb @@ -1,24 +1,26 @@ <%= error_messages_for :user %> <% content_for :left do %> - <h1>Join alonetone</h1> - <div id="signup"> + <h2 class="box">Join alonetone</h2> + <%= link_to "or login here", login_path, :class=> 'view_more'%> + <div id="signup" class="static_content box"> <% form_for :user, :url => users_path do |f| -%> <%= render :partial => "form", :object => f %> - <div class="join_wrapper"><%= submit_tag 'Join alonetone' %></div> + <div class="submit_wrapper"><%= submit_tag 'Join alonetone' %></div> <% end -%> - - <div id="signup-questions"> - <%= pretty_text "More questions?",:h3 %><br/> - get the answers you need by <%= link_to 'clicking here', about_path %> - </div> + </div> + <h2 class="playlist_title box">Want to know more?</h2> + <div id="signup-questions" class="static_content box"> + alonetone is a non-commercial venture, giving musicians a free home for their music and the tools they need to promote it<br/><br/> + Read our FAQ by <%= link_to 'clicking here', about_path %> </div> <% end %> <% content_for :right do %> - <div id="what-you-get"> - <h1>Why alonetone?</h1> + <h2 class="box">Why alonetone?</h2> + <div id="what-you-get" class="box static_content"> + <%= image_tag 'promo/unlimited-uploads.jpg'%> <h2 class='hug'>Upload your music (mp3 format)</h2> app/views/users/new.html.erb @@ -23,7 +23,6 @@ require 'goodies' PASSWORD_SALT = 'so_salty_its_unbearable' # DEPENDENCIES - begin require 'mp3info' require 'zip/zip' @@ -33,4 +32,7 @@ rescue end WillPaginate::ViewHelpers.pagination_options[:inner_window] = 2 -WillPaginate::ViewHelpers.pagination_options[:outer_window] = 0 \ No newline at end of file +WillPaginate::ViewHelpers.pagination_options[:outer_window] = 0 + +# Take advantage of rails 2.1 +ActiveRecord::Base.partial_updates = true \ No newline at end of file config/initializers/setup.rb @@ -6,7 +6,10 @@ ActionController::Routing::Routes.draw do |map| # RESTFUL WORKAROUND FOR FACEBOOK map.facebook_home '', :controller => 'facebook_accounts', :conditions => {:canvas => true} - map.resources 'facebook', :controller => 'facebook_accounts', :member => {:add_to_profile => :post, :remove_from_profile => :get}, :conditions =>{:canvas => true} + map.resources 'facebook', :controller => 'facebook_accounts', + :member => {:remove_from_profile => :get}, + :collection => {:add_to_profile => :any}, # hack, because we're not actually using resources + :conditions =>{:canvas => true} #map.facebook_resources :facebook_accounts, 'facebook_accounts', :controller => 'facebook_accounts', :condition => {:canvas => true} map.sitemap 'sitemap.xml', :controller => 'pages', :action => 'sitemap', :format => 'xml' @@ -46,7 +49,7 @@ ActionController::Routing::Routes.draw do |map| map.comments ':login/comments', :controller => 'comments' map.resources :users, :controller => :users, :member => {:attach_pic => :post, :sudo => :any} do |user| - user.resources :tracks, :controller => :assets, :collection => {:latest => :get, :search => :post}, :path_prefix => ':login', :member_path => ':login/tracks/:id' do |track| + user.resources :tracks, :controller => :assets, :member => {:share => :get}, :collection => {:latest => :get, :search => :post}, :path_prefix => ':login', :member_path => ':login/tracks/:id' do |track| track.resources :comments end config/routes.rb @@ -375,7 +375,7 @@ Track = $.klass({ this.originalDocumentTitle = document.title; // for prepending when playing tracks // dont allow tab details to be opened on editing playlists - this.allowDetailsOpen = (this.element.hasClass('unopenable')) ? false : true; + this.allowDetailsOpen = (this.element.hasClass('unopenable') || (this.element.parent().parent('#single_track').size() > 0)) ? false : true; }, @@ -593,6 +593,9 @@ jQuery(function($) { // uploader $('#uploader').attach(Uploader); + + // comments on the single track page + $('#single_track .comment_form form').attach(CommentForm); }); public/javascripts/application.js @@ -258,10 +258,6 @@ div.pagination :height 32px -#recent_listeners - :margin-bottom 30px - :height 120px - // static headers are like the user header, but without pics #static_header .title, #links @@ -290,7 +286,15 @@ :font-size 18px :font-weight bold - + +// sign up +#what-you-get + :background-color #f3f3f3 + h2 + :color = !text_color + :font-size 14px + :margin-bottom 30px + :text-shadow none // static content .static_content @@ -306,7 +310,8 @@ #recent_listeners div :float left - :margin-left 27px + :margin-right 24px + :height 60px div.small_spinner :margin-top 5px public/stylesheets/sass/alonetone.sass @@ -90,3 +90,21 @@ span.counter :opacity 0.99 :color = !white + +#single_track + h1 + :color = !text_color + :font-size 14px + :font-weight bold + :text-shadow none + :margin-bottom 10px + #track_details + :position relative + :display block + :background url(../images/backgrounds/album.png) repeat-x top left + :background-color = !playlist_box_silver + :padding 15px 15px 15px 20px + :margin-top 1px + textarea + :margin-top 10px + :width 380px public/stylesheets/sass/tracks.sass @@ -141,4 +141,17 @@ a.hidden :display none div.fieldWithErrors input - :border = !orange 2px solid \ No newline at end of file + :border = !orange 2px solid + +input.facebook + :background url(../images/buttons/facebook_share_icon.gif) no-repeat 2px center + :background-color #3B5998 + :height 22px + :border-color #D8DFEA rgb(14, 31, 91) rgb(14, 31, 91) rgb(216, 223, 234) + :border-style solid + :border-width 1px + :color #FFFFFF + :font-family "lucida grande",tahoma,verdana,arial,sans-serif + :font-size 11px + :margin 0pt 2px + :padding 2px 20px \ No newline at end of file public/stylesheets/sass/typography.sass @@ -115,44 +115,58 @@ module Technoweenie # :nodoc: def image?(content_type) content_types.include?(content_type) end - - # Callback after an image has been resized. - # - # class Foo < ActiveRecord::Base - # acts_as_attachment - # after_resize do |record, img| - # record.aspect_ratio = img.columns.to_f / img.rows.to_f - # end - # end - def after_resize(&block) - write_inheritable_array(:after_resize, [block]) - end - - # Callback after an attachment has been saved either to the file system or the DB. - # Only called if the file has been changed, not necessarily if the record is updated. - # - # class Foo < ActiveRecord::Base - # acts_as_attachment - # after_attachment_saved do |record| - # ... - # end - # end - def after_attachment_saved(&block) - write_inheritable_array(:after_attachment_saved, [block]) + + def self.extended(base) + base.class_inheritable_accessor :attachment_options + base.before_destroy :destroy_thumbnails + base.before_validation :set_size_from_temp_path + base.after_save :after_process_attachment + base.after_destroy :destroy_file + base.after_validation :process_attachment + if defined?(::ActiveSupport::Callbacks) + base.define_callbacks :after_resize, :after_attachment_saved, :before_thumbnail_saved + end end - - # Callback before a thumbnail is saved. Use this to pass any necessary extra attributes that may be required. - # - # class Foo < ActiveRecord::Base - # acts_as_attachment - # before_thumbnail_saved do |record, thumbnail| - # ... - # end - # end - def before_thumbnail_saved(&block) - write_inheritable_array(:before_thumbnail_saved, [block]) + + unless defined?(::ActiveSupport::Callbacks) + # Callback after an image has been resized. + # + # class Foo < ActiveRecord::Base + # acts_as_attachment + # after_resize do |record, img| + # record.aspect_ratio = img.columns.to_f / img.rows.to_f + # end + # end + def after_resize(&block) + write_inheritable_array(:after_resize, [block]) + end + + # Callback after an attachment has been saved either to the file system or the DB. + # Only called if the file has been changed, not necessarily if the record is updated. + # + # class Foo < ActiveRecord::Base + # acts_as_attachment + # after_attachment_saved do |record| + # ... + # end + # end + def after_attachment_saved(&block) + write_inheritable_array(:after_attachment_saved, [block]) + end + + # Callback before a thumbnail is saved. Use this to pass any necessary extra attributes that may be required. + # + # class Foo < ActiveRecord::Base + # acts_as_attachment + # before_thumbnail_saved do |thumbnail| + # record = thumbnail.parent + # ... + # end + # end + def before_thumbnail_saved(&block) + write_inheritable_array(:before_thumbnail_saved, [block]) + end end - # Get the thumbnail class, which is the current attachment class by default. # Configure this with the :thumbnail_class option. def thumbnail_class @@ -179,6 +193,10 @@ module Technoweenie # :nodoc: end module InstanceMethods + def self.included(base) + base.define_callbacks *[:after_resize, :after_attachment_saved, :before_thumbnail_saved] if base.respond_to?(:define_callbacks) + end + # Checks whether the attachment's content type is an image content type def image? self.class.image?(content_type) @@ -323,6 +341,41 @@ module Technoweenie # :nodoc: end protected + + # Yanked from ActiveRecord::Callbacks, modified so I can pass args to the callbacks besides self. + # Only accept blocks, however + if ActiveSupport.const_defined?(:Callbacks) + # Rails 2.1 and beyond! + def callback_with_args(method, arg = self) + notify(method) + + result = run_callbacks(method, { :object => arg }) { |result, object| result == false } + + if result != false && respond_to_without_attributes?(method) + result = send(method) + end + + result + end + + def run_callbacks(kind, options = {}, &block) + options.reverse_merge!( :object => self ) + self.class.send("#{kind}_callback_chain").run(options[:object], options, &block) + end + else + # Rails 2.0 + def callback_with_args(method, arg = self) + notify(method) + + result = nil + callbacks_for(method).each do |callback| + result = callback.call(self, arg) + return false if result == false + end + result + end + end + # Generates a unique filename for a Tempfile. def random_tempfile_filename "#{rand Time.now.to_i}#{filename || 'attachment'}" @@ -387,19 +440,6 @@ module Technoweenie # :nodoc: end end - # Yanked from ActiveRecord::Callbacks, modified so I can pass args to the callbacks besides self. - # Only accept blocks, however - def callback_with_args(method, arg = self) - notify(method) - - result = nil - callbacks_for(method).each do |callback| - result = callback.call(self, arg) - return false if result == false - end - - return result - end # Removes the thumbnails for the attachment, if it has any def destroy_thumbnails vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu.rb @@ -16,7 +16,7 @@ module Technoweenie # :nodoc: rescue # Log the failure to load the image. This should match ::Magick::ImageMagickError # but that would cause acts_as_attachment to require rmagick. - logger.debug("Exception working with image: #{$!}") + logger.warn("Exception working with image: #{$!}") binary_data = nil end block.call binary_data if block && binary_data @@ -45,7 +45,8 @@ module Technoweenie # :nodoc: else img.change_geometry(size.to_s) { |cols, rows, image| image.resize!(cols, rows) } end - self.temp_path = write_to_temp_file(img.to_blob) + img.strip! + self.temp_path = write_to_temp_file(img.to_blob{self.quality = 90}) end end end vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/rmagick_processor.rb 4426d950e202e33e3d5de7da3764d2cf71c53645 Sudara sudara@alonetone.com http://github.com/sudara/alonetone/commit/bfc34288b2efd27df188c1a83d6e896b8e649248 bfc34288b2efd27df188c1a83d6e896b8e649248

2008-04-28T13:01:09-07:00

Major reworking of sharing functionality and tweaks across the css 279c2b7fad50edcc243f126d31ee97ee61a18d67 Sudara sudara@alonetone.com