public/images/help/github.png public/images/help/twitter.png @@ -74,8 +74,8 @@ class AssetsController < ApplicationController @assets = Asset.latest(@limit) @favorites = Track.favorites.find(:all, :limit => 5) @popular = Asset.find(:all, :limit => @limit, :order => 'hotness DESC') - @comments = Comment.public.find(:all, :limit => 5, :order => 'created_at DESC') unless admin? - @comments = Comment.include_private.find(:all, :limit => 5, :order => 'created_at DESC') if admin? + @comments = Comment.public.find(:all, :limit => 5, :order => 'created_at DESC', :include => :commentable) unless admin? + @comments = Comment.include_private.find(:all, :limit => 5, :order => 'created_at DESC', :include => :commentable) if admin? @playlists = Playlist.public.latest(12) @tab = 'home' @welcome = true unless logged_in? app/controllers/assets_controller.rb @@ -2,10 +2,11 @@ url = formatted_user_track_url(asset.user, asset, :mp3, :referer => 'itunes') xml.title asset.name xml.link user_track_url(asset.user, asset) - xml.description "#{asset.name} by #{asset.user.name}" xml.guid url xml.pubDate rss_date asset.created_at xml.enclosure :url=> url,:type=>'audio/mpeg', :size => asset.size + xml.itunes :summary, asset.description + xml.description, asset.description xml.itunes :duration, asset.length xml.itunes :author, asset.user.name xml.itunes :keywords, "#{asset.name} #{asset.user.name} alonetone" app/views/shared/_asset.rss.builder @@ -1,39 +1,41 @@ +<% unless @single_track %> + <%= render :partial => 'assets/asset', :locals => { :asset => comment.commentable}%> +<% end %> + <% div_for comment, :class => (cycle('even', 'odd')) do %> <div class="comment_user"> - <% if comment.commenter %> - <%= user_image_link(comment.commenter, :small)%> - <% else %> - <%= image_tag User.dummy_pic(:small)%> - <% end %> + <% if comment.commenter %> + <%= user_image_link(comment.commenter, :small)%> + <% else %> + <%= image_tag User.dummy_pic(:small)%> + <% end %> <% if comment.private %> <div class="private_comment"> </div> <% end %> - - <% if !@single_track %> - <div class="comment_about">about <%= link_for_comment(comment) %></div> - <% end %> - <span class="comment_user_text"> - <%= comment.commenter ? (link_to (h comment.commenter.name), user_home_path(comment.commenter)) : 'Guest' %> - said <%= time_ago_in_words(comment.created_at) %> ago - </span> - <% if authorized_for_comment(comment) %> - <% if comment.spam == false %> - <%= link_to ' ', comment_path(comment, :spam => true), :class => 'button spam', :confirm => 'Are you sure you want to mark this as SPAM? This will make it harder for the user who posted this comment to post again', :method => :delete%> - <% else %> - <%= link_to ' ', unspam_comment_path(comment), :class => 'unspam button', :confirm => 'This will make the comment public. Are you sure?' %> - <% end %> - <%= link_to ' ', comment_path(comment), :class=> 'delete_comment button', :confirm => 'Are you sure you want to delete this comment?', :method => :delete %> - <% end %> - </div> + <% if authorized_for_comment(comment) %> + <% if comment.spam == false %> + <%= link_to ' ', comment_path(comment, :spam => true), :class => 'button spam', :confirm => 'Are you sure you want to mark this as SPAM? This will make it harder for the user who posted this comment to post again', :method => :delete%> + <% else %> + <%= link_to ' ', unspam_comment_path(comment), :class => 'unspam button', :confirm => 'This will make the comment public. Are you sure?' %> + <% end %> + <%= link_to ' ', comment_path(comment), :class=> 'delete_comment button', :confirm => 'Are you sure you want to delete this comment?', :method => :delete %> + <% end %> + </div> + + <div class="comment_user_text"> + <%= comment.commenter ? (link_to (h comment.commenter.name), user_home_path(comment.commenter)) : 'Guest' %> + said <%= time_ago_in_words(comment.created_at) %> ago + </div> + <div class="comment_body"> <%= comment.body %> </div> + <div class="clear"> - </div> <% end if comment && (!comment.private? || authorized_for_comment(comment))%> \ No newline at end of file app/views/shared/_comment.html.erb @@ -8,4 +8,8 @@ <%= link_to image_tag('help/facebook.png'), 'http://apps.facebook.com/alonetone' %><br/> <%= link_to 'alonetone on facebook', 'http://apps.facebook.com/alonetone' %> </div> + <div class="chunk"> + <%= link_to image_tag('help/twitter.png'), 'http://twitter.com/alonetone' %><br/> + <%= link_to 'follow alonetone on twitter', 'http://twitter.com/alonetone'%><br/> + </div> </div> app/views/shared/_visit_us.html.erb @@ -19,7 +19,7 @@ xml.rss "xmlns:itunes"=> "http://www.itunes.com/dtds/podcast-1.0.dtd", "version" xml.itunes :author, @user.name xml.itunes :subtitle, "#{@user.name} on alonetone.com" xml.itunes :summary, @user.bio || "Latest music from #{@user.name} on alonetone.com" - xml.itunes :keywords, 'independant free alonetone musician artist latest upcoming' + xml.itunes :keywords, "independant free alonetone musician artist latest upcoming do-it-yourself DIY #{@user.name} #{@user.login}" xml.itunes :image, :href=>@user.avatar(:album) xml.itunes :owner do app/views/users/show.rss.builder @@ -1,4 +1,4 @@ -RAILS_GEM_VERSION = '2.1.1' unless defined? RAILS_GEM_VERSION +#RAILS_GEM_VERSION = '2.1.1' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') config/environment.rb @@ -188,14 +188,7 @@ .comment, .user_report, .update, .listen :position relative - :color = !text_color - .comment_user, .update_title_bar - :background url(../images/backgrounds/comment_even.png) repeat-x top left - :background-color = !box_background - &.even - .comment_user - :background-image url(../images/backgrounds/comment.png) - :background-color = !box_background_even + :color = !white div.private_comment :background url(../images/icons/private.png) no-repeat top left :position absolute @@ -205,42 +198,32 @@ :width 25px :height 25px .comment_user, .update_title_bar - :position relative - :height 50px - :margin-bottom 1px a.alonetoner, img + :margin-top 1px :float left :margin-right 10px - .comment_user_text, .about_details - :line-height 10px - :font-size 11px - a - :font-size 11px - .comment_about, .title - :line-height 18px - :padding-top 8px - a + .comment_user_text + :color = !white + :margin-left 73px + :padding-top 10px + :font-size 12px + :text-shadow #000 1px 1px 1px + a,a:visited :font-weight bold - .edit - :position absolute - :top 15px - :right 10px - a - :font-size 12px - :text-decoration underline - .edit - :right 25px + :color = !white + :text-decoration underline + :font-size 12px + :text-shadow #000 1px 1px 1px .comment_body, .body - :background-color = !box_background - :padding 10px 20px 30px 20px + :padding 5px 20px 30px 0px :margin-bottom 3px + :margin-left 73px a - :color = !text_color - .comment_about - a - :font-weight bold + :color = !white + :text-shadow #000 1px 1px 1px p - :color = !text_color + :color = !white + :text-shadow #000 1px 1px 1px :margin 16px 0px 0px 0px :line-height 18px h1,h2,h3 @@ -249,9 +232,7 @@ :color = !text_color :font-size 16px :font-weight bold - &.even - .comment_body, .body - :background-color = !box_background_even + .comment_form .comment_as @@ -493,7 +474,7 @@ a.add_to_favorites, a.favorited .chunk :padding-top 20px :float left - :width 300px + :width 270px :text-align center a img public/stylesheets/sass/alonetone.sass @@ -4,4 +4,5 @@ rescue LoadError require 'haml' # From gem end +# Load Haml and Sass Haml.init_rails(binding) vendor/plugins/haml/init.rb 49f77bfe6ffe4bfa56a8d59304a12975109ff870 Sudara sudara@alonetone.com http://github.com/tiendung/alonetone/commit/d02ebe110d8fb8236d20581a1e23fdd93300ea06 d02ebe110d8fb8236d20581a1e23fdd93300ea06 2008-11-09T10:31:27-08:00 2008-11-09T10:31:27-08:00 partial commit of some new comment UI changes 8b66c6bcbc282a88b67736ffaa4e95beff9da6a5 Sudara sudara@alonetone.com