@@ -157,6 +157,11 @@ class User < ActiveRecord::Base self.class.name end + def touch + updated_at_will_change! + save + end + protected def followee_ids app/models/user.rb @@ -1,4 +1,3 @@ - <div class="more tabs" id="tabs_for_track_<%= object_id %>" style="display:none;"> <ul> <li><%= link_to 'comment', "#comment_track_#{asset.unique_id}" %> </li> @@ -79,4 +78,4 @@ </div> - </div> \ No newline at end of file + </div> app/views/assets/_asset_tabs.html.erb @@ -2,13 +2,11 @@ <div id="comment_<%= object.unique_id %>" class="comment_asset"> <div class="comment_form"> <% form_for :comment, :url => user_track_comments_path(object.user, object), :id=>"comment_form_#{object.unique_id}" do |f| %> + <div class="comment_as"> - <% if logged_in? %> - <%= image_tag current_user.avatar(:tiny) %>Say something, <%=h current_user.name %>: - <% else %> - <%= image_tag 'icons/user.png' %> Say something as a guest or <%= link_to 'login', login_path, :title => 'login to alonetone' %>: - <% end %> +  </div> + <%= f.text_area :body, :rows => 4, :cols => 40, :class=> 'double_trouble', :id=>"comment_body_#{object.unique_id}" %> <%= f.check_box :private, :class => 'private' %> <span class="public">Make Private</span><span class="private" style="display:none;"><%= image_tag 'icons/private.png' %> Only <%=h object.user.name%> will see this</span> app/views/assets/_comment.html.erb @@ -19,7 +19,7 @@ <%= javascript_include_tag 'jquery-1.3.2.min','soundmanager','jquery-ui-1.7.1.custom.min','jquery-carousel','jquery-lowpro','jquery-hotkeys','facebox','twitter','application', 'highlight','tablesorter', :cache => 'allonetone' %>  - <%= render :partial => 'shared/javascript_auth_token' %> + <%= render :partial => 'shared/javascript_payload' %> </head> <body> app/views/layouts/application.html.erb @@ -1,11 +1,15 @@ <% render(:layout => 'users/user') do %> <% content_for :left do %> - <div id="single_playlist"> - <%= render :partial => @playlist %> - </div> + + <% cache("#{@playlist.cache_key}") do %> + + <div id="single_playlist"> + <%= render :partial => @playlist %> + </div> + <% end %> + <% end %> - + <% content_for :right do %> - <%= render :partial => 'share', :object => @playlist %> <% end %> <% end %> \ No newline at end of file app/views/playlists/show.html.erb @@ -1,3 +1,5 @@ -<% div_for(small_user, :class => 'small_user') do %> - <%= user_image_link(small_user, :small)%> +<% cache("#{small_user.cache_key}-pic-small") do %> + <% div_for(small_user, :class => 'small_user') do %> + <%= user_image_link(small_user, :small)%> + <% end %> <% end %> \ No newline at end of file app/views/shared/_small_user.html.erb @@ -1,3 +1,4 @@ + <div id="user_header"> <%= link_to(image_tag(@user.avatar(:large), :class => 'small_avatar', :alt => "#{h(@user.name)}"), profile_path(@user), :class => 'image', :id=>'alonetoner', :title => "#{h(@user.name)}'s profile - all about #{h(@user.name)}") %> @@ -5,6 +6,9 @@ <div class="user_title"> <h1 class="user"><%=h @user.name %></h1><span class="user_location"><%= user_location(@user) %></span> <%= follow_toggle(@user) %> + + <% cache("#{user.cache_key}+#{authorized?}+#{admin?}") do %> + <% if authorized? %> <%= link_to 'edit your profile', edit_user_path(@user), :class => "edit_profile #{ admin? ? 'admin' : ''}" %> <%= link_to image_tag('icons/alonetone_plus_small.png'), user_plus_path(@user), :class=> 'alonetone_plus_link' if authorized? && @user.plus_enabled? %> @@ -26,4 +30,5 @@ </ul> </div> </div> +<% end %> <%= yield %> \ No newline at end of file app/views/users/_user.html.erb @@ -16,7 +16,8 @@ <% if @user.has_public_playlists? %> <h2 id="user_latest_playlists">Latest Playlists by <%=@user.name%></h2> - <%= render :partial => 'shared/carousel' %> + <%= render :partial => 'shared/carousel' %> + <div class="clear"> </div> <% end %> @@ -37,7 +38,10 @@ <% content_for :right do %> <%= render :partial => 'popular' if present?(@popular_tracks) && (setting('most_popular', @user) == 'true')%> + + <% cache("#{@user.id}+#{@comments.size}") do %> <%= render :partial => 'shared/comments' if @comments.size > 0 %> + <% end %> <% end %> </div> app/views/users/show.html.erb @@ -3,11 +3,9 @@ ActionController::Routing::Routes.draw do |map| map.admin 'secretz', :controller => 'secretz' - # manual, ghetto, overriding links map.rpm_challenge 'rpmchallenge', :controller => 'pages', :action => 'rpm_challenge' map.twentyfour '24houralbum', :controller => 'pages', :action => 'twentyfour' - map.feedback 'feedback', :controller => 'user_reports' map.resources :features, :sessions, :user_reports map.blog_home 'blog', :controller => 'updates', :action => 'index' config/routes.rb @@ -47,7 +47,27 @@ DismissableNotice = $.klass(Remote.PutLink,{ FavoriteToggle = $.klass(Remote.Link,{ + + // set the correct state to begin with + // based on whether it's included in userFavorites array + + initialize:function(options){ + if(window.userFavorites.length > 0){ + item = jQuery.grep(window.userFavorites, function(element, index){ + return element == options.asset_id; + }); + if(item.length > 0){ // user has it as a fav + this.element.addClass('favorited'); + } + } + $super(); + }, + beforeSend:function(e){ + // modify the link to use the correct user's username + + + if(this.element.hasClass('favorited')) this.element.removeClass('favorited'); else public/javascripts/application.js app/views/shared/_javascript_auth_token.html.erb 151d821739813ba0871f5889a69afe0011f2ee85 Sudara sudara@alonetone.com http://github.com/sudara/alonetone/commit/147826f379d3a204a2570c7158d4fea5feac0329 147826f379d3a204a2570c7158d4fea5feac0329

2009-10-20T13:56:22-07:00

2009-10-14T04:14:12-07:00

Some experimental caching fun 66a3e459959795dab6794c1825cffe6b252ce221 Sudara sudara@alonetone.com