@@ -127,7 +127,7 @@ class PlaylistsController < ApplicationController
respond_to do |format|
if @playlist.update_attributes(params[:playlist])
flash[:notice] = 'Playlist was successfully updated.'
- format.html { redirect_to(@playlist) }
+ format.html { redirect_to(@user,@playlist) }
format.xml { head :ok }
else
format.html { render :action => "edit" }
app/controllers/playlists_controller.rb
@@ -126,7 +126,10 @@ class UsersController < ApplicationController
if @user.save
flash[:ok] = "Sweet, updated"
end
- redirect_to :action => 'edit'
+ redirect_to :back
+ end
+ format.js do
+ @user.save ? (return head(:ok)) : (return head(:bad_request))
end
end
end
app/controllers/users_controller.rb
@@ -37,31 +37,7 @@ module ApplicationHelper
CGI.rfc1123_date(date)
end
- def website_for(user)
- link_to "#{user.name}'s website", ('http://'+h(user.website))
- end
-
- def myspace_for(user)
- link_to "#{user.name} on Myspace.com",('http://'+h(user.myspace))
- end
-
- def itunes_link_for(user)
- link_to "Open #{user.name}'s music in iTunes", 'http://'+h(user.itunes)
- end
-
- def avatar(user, size=nil)
- case size
- when 100 then image_tag(user.has_pic? ? user.pic.public_filename(:large) : 'no-pic-thumb100.jpg')
- when 50 then image_tag(user.has_pic? ? user.pic.thumb.public_filename(:small) : 'no-pic-thumb50.jpg')
- when nil then image_tag(user.has_pic? ? user.pic.public_filename(:tiny) : 'no-pic.jpg' )
- end
- end
-
- def user_location(user)
- if (user.present?(:city) || user.present?(:country))
- "from #{[user.city, user.country].compact.join(', ')}"
- end
- end
+
def track_name_for(asset, length=40)
truncate(h(asset.name),length)
@@ -100,5 +76,18 @@ module ApplicationHelper
admin? || @user === current_user
end
+ def notice_for(notice, h1_text, &block)
+ concat content_tag(:div, ((content_tag :h1, h1_text, :class => 'notice') +
+ hide_notice_link(notice) +
+ capture(&block)), :class => 'notice'),
+ block.binding unless notice_hidden?(notice)
+ end
+
+ def hide_notice_link(notice)
+ link_to ['Ok, hide this notice', 'Yup! all good, thanks'].rand,
+ user_path(current_user, :user =>{:settings => {:hide_notice => {notice => true}}}, :method => :put),
+ :class => 'hide_notice' if logged_in?
+ end
+ protected
end
app/helpers/application_helper.rb
@@ -1,9 +1,39 @@
module UsersHelper
+ def website_for(user)
+ link_to "#{user.name}'s website", ('http://'+h(user.website))
+ end
+
+ def myspace_for(user)
+ link_to "#{user.name} on Myspace.com",('http://'+h(user.myspace))
+ end
+
+ def itunes_link_for(user)
+ link_to "Open #{user.name}'s music in iTunes", 'http://'+h(user.itunes)
+ end
+
+ def avatar(user, size=nil)
+ case size
+ when 100 then image_tag(user.has_pic? ? user.pic.public_filename(:large) : 'no-pic-thumb100.jpg')
+ when 50 then image_tag(user.has_pic? ? user.pic.thumb.public_filename(:small) : 'no-pic-thumb50.jpg')
+ when nil then image_tag(user.has_pic? ? user.pic.public_filename(:tiny) : 'no-pic.jpg' )
+ end
+ end
+
+ def user_location(user)
+ if (user.present?(:city) || user.present?(:country))
+ "from #{[user.city, user.country].compact.join(', ')}"
+ end
+ end
+
def user_image_link(user, size = :large)
link_to(image_tag(user.avatar(size),:alt => "#{user.name} on alonetone"), user_home_path(user), :alt => "#{user.name} on alonetone")
end
+ def notice_hidden?(notice)
+ logged_in? && current_user.settings.present?('hide_notice') && current_user.settings['hide_notice'].present?(notice)
+ end
+
def setting(symbol_or_string)
if logged_in? && current_user.settings
return current_user.settings[symbol_or_string.to_sym]
app/helpers/users_helper.rb
@@ -1,8 +1,8 @@
-<h2>Need some help?</h2>
-<ul>
- <li>Drag tracks from 'available tracks' into the playlist to add them </li>
- <li>Click on the description or title to edit</li>
- <li>Click on the photo to upload new cover art for your playlist</li>
- <li>Within the playlist drag tracks by the <%= image_tag 'playlists/button-move.png'%> to reorder them</li>
- <li>To remove tracks from the playlist click <%= image_tag 'playlists/button-delete.png' %></li>
-</ul>
\ No newline at end of file
+<% notice_for('edit_playlist',"Editing '#{h @playlist.title}'") do %>
+ <ol>
+ <li>Find the track you want to add</li>
+ <li>Drag track to your playlist on the left</li>
+ <li>Repeat!</li>
+ <li>Order tracks in your playlist by dragging them up and down</li>
+ </ol>
+<% end %>
\ No newline at end of file
app/views/playlists/_inline_help.html.erb
@@ -1,26 +1,34 @@
-<h1>Editing '<%= @playlist.title %>'</h1>
-
- <%= error_messages_for :playlist %>
- <%= render :partial => 'inline_help'%>
+<%= error_messages_for :playlist %>
+<%= render :partial => 'inline_help'%>
<% content_for :left do %>
<div id="edit_playlist">
<% render :layout => 'playlist_layout' do %>
- <%= render :partial => 'track', :collection => @playlist.tracks %>
- <div id="drop_here">
- Drop Track here
- </div>
- <% end %>
-
-
- <div id="pic_upload" style="display:none;">
+ <%= link_to 'edit title & description','#edit_playlist_info',:class=>'slide_open_href edit' %>
+ <div id="pic_upload" class="static_content" style="display:none;">
Upload a square photo, 400px by 400px for best results.<br/>
<% form_for :pic, :url => attach_pic_user_playlist_path(@user, @playlist), :html => {:multipart => true, :method => :post} do |f| %>
<%= f.file_field :uploaded_data %>
<%= submit_tag "Upload new Pic" %>
<% end %>
+ </div>
+ <div id="edit_playlist_info" class="static_content"style="display:none;">
+ <% form_for [@user, @playlist] do |f| %>
+ Title<br/>
+ <%= f.text_field :title %><br/>
+ Description<br/>
+ <%= f.text_area :description, :rows => 4, :cols => 40, :class => 'double_trouble' %><br/>
+ <div class="submit_wrapper">
+ <%= f.submit "update" %>
+ </div>
+ <% end %>
+ </div>
+ <%= render :partial => 'track', :collection => @playlist.tracks %>
+ <div id="drop_here">
+ Drop Track here
</div>
+ <% end %>
</div>
<% end %>
app/views/playlists/edit.html.erb
@@ -35,8 +35,11 @@ class Object
#
def present?(*methods_variables_or_attributes)
methods_variables_or_attributes.detect do |monkey|
- if monkey.is_a? Symbol
- result = try(monkey.to_sym)
+ if (monkey.is_a? Symbol)
+ result = try(monkey)
+ result && !result.empty?
+ elsif self.is_a? Hash # hashes with string keys
+ result = self[monkey]
result && !result.empty?
else # allow plain jane variables to be tested
monkey && !monkey.empty?
lib/goodies.rb
@@ -5,6 +5,47 @@ soundManager.onload = function() {
soundIsReady = true;
}
+// we want regular access to the auth token
+Alonetone = {
+ authParams : $.param({'authenticity_token':window.authenticityToken})
+}
+
+// rails friendly "delete" (does not degrade!)
+Remote.DeleteLink = $.klass(Remote.Base,{
+ onclick: function(){
+ var options = $.extend({
+ url: this.element.attr('href'),
+ type: 'POST',
+ data: $.param({'authenticity_token':window.authenticityToken,'_method':'delete'})
+ },this.options);
+ return this._makeRequest(options);
+ }
+});
+
+// rails friendly 'put'
+Remote.PutLink = $.klass(Remote.Base,{
+ onclick: function(){
+ var options = $.extend({
+ url: this.element.attr('href'),
+ type: 'POST',
+ data: $.param({'authenticity_token':window.authenticityToken,'_method':'put'})
+ },this.options);
+ return this._makeRequest(options);
+ }
+});
+
+DismissableNotice = $.klass(Remote.PutLink,{
+ initialize: function($super){
+ this.notice = this.element.parents('div.notice');
+ $super(); // make sure to call init on parent
+ },
+
+ success:function(e){
+ this.notice.fadeOut('slow');
+ }
+});
+
+
// for debug purposes
$.fn.log = function() {
if (this.size()==0) return "<em>wrapped set is empty</em>"
@@ -68,10 +109,6 @@ $(function() {
});
-
-
-
-
SortablePlaylist = $.klass({
initialize : function(){
this.tracks = $('.tracks', this.element);
@@ -192,8 +229,8 @@ ResizeableFooter = $.klass({
});
SlideOpenNext = $.klass({
- initialize:function(){
- this.next = this.element.next();
+ initialize:function(to_open){
+ this.next = (to_open == undefined ? this.element.next() : (to_open = 'href' ? $(this.element.attr('href')) : $(to_open)));
},
onclick:function(){
this.next.slideToggle();
@@ -202,14 +239,6 @@ SlideOpenNext = $.klass({
});
-/* rails friendly "delete" (does not degrade!)
-DeleteLink = $.klass({
- onclick: function() {
- var options = $.extend({ url: this.element.attr('href'), type: 'POST', data: }, this.options);
- return this._makeRequest(options);
- }
-});
-*/
// text area that grows 2x in size upon need
AdjustableTextarea = $.klass({
@@ -513,7 +542,15 @@ jQuery(function($) {
// ability to tab through various track sources
$('#playlist_sources ul#playlist_source_options').attach(Tabbies);
+ // the various groups of tracks you can add to a playlist
$('#playlist_sources').attach(PlaylistSource);
+
+ $('#edit_playlist .playlist .cover a').attach(SlideOpenNext, '#pic_upload');
+
+ $('a.slide_open_href').attach(SlideOpenNext,'href');
+
+ $('a.hide_notice').attach(DismissableNotice);
+
});
public/javascripts/application.js
@@ -300,4 +300,4 @@ div.small_spinner
:background url(../images/small_spinner.gif) no-repeat center center
:height 20px
:margin-top 5px
- :width 20px
\ No newline at end of file
+ :width 20px
public/stylesheets/sass/alonetone.sass
@@ -40,6 +40,9 @@ img a, img a:visited
:color = !text_color
img
:max-width 550px
+ ol li
+ :list-style-type decimal
+ :list-style-position inside
.content .user_report .body, .content .update .body, .notice, .static_content, .content .comment_body
a, a:visited
:text-decoration underline
@@ -107,9 +110,11 @@ div.flash
:padding 20px 30px
:margin-bottom 20px
+// links that float right
a.arrows, a.view_more, a.view_all,a.edit
:background url(../images/buttons/arrow.png) no-repeat right center
:padding-right 12px
+
.content
a.view_all, a.edit
:color = !text_color
@@ -117,7 +122,16 @@ a.arrows, a.view_more, a.view_all,a.edit
:float right
:margin-top -31px
:margin-right 25px
-
+div.notice a.hide_notice
+ :float right
+ :margin-top -31px
+ :margin-right 0px
+ :font-size 12px
+ :font-weight bold
+ :color = !orange
+
+
+
// for example the sort url and add url on edit playlists
a.hidden
:display none
public/stylesheets/sass/typography.sass
b855d749613478190f277f427ff834c9da63fc61
Sudara
sudara@alonetone.com
http://github.com/sudara/alonetone/commit/4e24b9695a77bc04aafa862c62c084c72e120dcc
4e24b9695a77bc04aafa862c62c084c72e120dcc
2008-04-22T13:52:33-07:00
2008-04-22T13:52:33-07:00
flesh out playlist editing, add notices
0cbaa992a1be6a2c3fba5ad9dd23dbdb12e7d046
Sudara
sudara@alonetone.com