public/images/itunes.gif @@ -21,6 +21,7 @@ class AudiographyController < ApplicationController audiography.user.fake? ? @show_rss = false : @show_rss = true @basic_url = "http://" + Linking.site() + audiography.get_url @follow_link = audiography.get_xml_url() + @itunes_link = audiography.get_itunes_url() @user_can_edit = false @url_title = params[:identifier] app/controllers/audiography_controller.rb @@ -25,6 +25,7 @@ class TrackController < ApplicationController @items = Tracking::tracks_to_items(@tracks) @show_rss = true @follow_link = Linking::latest_tracks_xml() + @itunes_link = Linking::latest_tracks_itunes() @title = "Latest" respond_to do |format| app/controllers/track_controller.rb @@ -30,6 +30,10 @@ class Audiography < ActiveRecord::Base Linking::audiography_xml(self) end + def get_itunes_url() + Linking::audiography_itunes(self) + end + def tracks() Track.find(:all, :conditions => "audiography_id = #{self.id}", :order => "sort_order ASC, created_at DESC") end app/models/audiography.rb @@ -9,7 +9,8 @@ <% else %> <%= render(:partial => 'track/playlist_setup', :locals => { :show => "audiography", :identifier => @url_title }) %> <%= render(:partial => 'track/list_title', :locals => { :title => @title, - :follow_link => @follow_link }) %> + :follow_link => @follow_link, + :itunes_link => @itunes_link }) %> <!-- edit audiography --> <% if @user_can_edit %> app/views/audiography/index.html.erb @@ -1,43 +1,46 @@ +<div class="track_controls" style="display:none;" + id="<%=controls_dom_id%>" + onmouseover="Element.show('<%=controls_dom_id%>')" + onmouseout="Element.hide('<%=controls_dom_id%>')"> - -<% if link_to_audiography %> - <div class="track_audiography_holder"> - <a href='/<%=track.audiography.url_title%>'><span class="track_audiography_link"><%=track.audiography.url_title%></span></a> - </div> -<% else %> - <div class="track_controls" - id="<%=controls_dom_id%>" - onmouseover="Element.show('<%=controls_dom_id%>')" - onmouseout="Element.hide('<%=controls_dom_id%>')" - style="display:none;"> - <% if user_can_edit %> - <span onmouseover="Element.show('drag_handle_in<%=track.id%>'); - Element.hide('drag_handle_out<%=track.id%>');" - onmouseout="Element.hide('drag_handle_in<%=track.id%>'); - Element.show('drag_handle_out<%=track.id%>');"> - <img src="/images/drag_handle_grey.gif" class="drag_handle handle" id='drag_handle_out<%=track.id%>' title='Reorder song' alt='Reorder song'> - <img src="/images/drag_handle.gif" class="drag_handle handle" id='drag_handle_in<%=track.id%>' style="display:none;" title='Reorder song' alt='Reorder song'> - </span> - - <span onmouseover="Element.show('edit_handle_in<%=track.id%>'); - Element.hide('edit_handle_out<%=track.id%>');" - onmouseout="Element.hide('edit_handle_in<%=track.id%>'); - Element.show('edit_handle_out<%=track.id%>');"> - <a href='/track/edit/<%=track.id%>'> - <img src='/images/edit_handle_grey.gif' class='edit_handle handle' id='edit_handle_out<%=track.id%>' title='Edit song' alt='Edit song'> - <img src='/images/edit_handle.gif' class='edit_handle handle' id='edit_handle_in<%=track.id%>' style="display:none;" title='Edit song' alt='Edit song'> - </a> - </span> - <% end-%> - - <span onmouseover="Element.show('permalink_handle_in<%=track.id%>'); - Element.hide('permalink_handle_out<%=track.id%>');" - onmouseout="Element.hide('permalink_handle_in<%=track.id%>'); - Element.show('permalink_handle_out<%=track.id%>');"> - <a href="<%=track.full_permalink()%>"> - <img src='/images/permalink_handle_grey.gif' class='edit_handle handle' id='permalink_handle_out<%=track.id%>' title='Go to song' alt='Go to song'> - <img src='/images/permalink_handle.gif' class='edit_handle handle' id='permalink_handle_in<%=track.id%>' style="display:none;" title='Go to song' alt='Go to song'> - </a> - </span> - </div> -<% end-%> \ No newline at end of file + <!-- link to audiography --> + <% if link_to_audiography %> + <div class="track_audiography_holder"> + <a href='/<%=track.audiography.url_title%>'><%=track.audiography.url_title%></a> + </div> + <% end-%> + + <% if user_can_edit %> + + <!-- reorder --> + <span onmouseover="Element.show('drag_handle_in<%=track.id%>'); + Element.hide('drag_handle_out<%=track.id%>');" + onmouseout="Element.hide('drag_handle_in<%=track.id%>'); + Element.show('drag_handle_out<%=track.id%>');"> + <img src="/images/drag_handle_grey.gif" class="drag_handle handle" id='drag_handle_out<%=track.id%>' title='Reorder song' alt='Reorder song'> + <img src="/images/drag_handle.gif" class="drag_handle handle" id='drag_handle_in<%=track.id%>' style="display:none;" title='Reorder song' alt='Reorder song'> + </span> + + <!-- edit --> + <span onmouseover="Element.show('edit_handle_in<%=track.id%>'); + Element.hide('edit_handle_out<%=track.id%>');" + onmouseout="Element.hide('edit_handle_in<%=track.id%>'); + Element.show('edit_handle_out<%=track.id%>');"> + <a href='/track/edit/<%=track.id%>'> + <img src='/images/edit_handle_grey.gif' class='edit_handle handle' id='edit_handle_out<%=track.id%>' title='Edit song' alt='Edit song'> + <img src='/images/edit_handle.gif' class='edit_handle handle' id='edit_handle_in<%=track.id%>' style="display:none;" title='Edit song' alt='Edit song'> + </a> + </span> + <% end-%> + + <!-- permalink --> + <span onmouseover="Element.show('permalink_handle_in<%=track.id%>'); + Element.hide('permalink_handle_out<%=track.id%>');" + onmouseout="Element.hide('permalink_handle_in<%=track.id%>'); + Element.show('permalink_handle_out<%=track.id%>');"> + <a href="<%=track.full_permalink()%>"> + <img src='/images/permalink_handle_grey.gif' class='edit_handle handle' id='permalink_handle_out<%=track.id%>' title='Go to song' alt='Go to song'> + <img src='/images/permalink_handle.gif' class='edit_handle handle' id='permalink_handle_in<%=track.id%>' style="display:none;" title='Go to song' alt='Go to song'> + </a> + </span> +</div> \ No newline at end of file app/views/track/_controls_and_links.html.erb @@ -2,8 +2,11 @@ <div class="page_title"> <% if @show_rss %> <div class="follow"> + <a href="<%=itunes_link%>" class="follow_link"> + <img src="/images/itunes.gif" title="Play all tracks in iTunes" width=20 border=0> + </a> <a href="<%=follow_link%>" class="follow_link"> - <img src="/images/rss.gif" width=19 border=0> + <img src="/images/rss.gif" title="Follow via RSS" width=19 border=0> </a> </div> <% end-%> app/views/track/_list_title.rhtml @@ -21,7 +21,7 @@ <!-- clock --> <div class="track_play_stop" style="float:right;"><span id="track_clock<%=@i%>" class="track_clock"></span></div> - <!-- title, editing, comment --> + <!-- title, comment --> <div class="main_track_content" onclick="<%=onclick_val%>"> <span class="track_artist_and_title"><strong><%= track.artist %></strong> <%= track.title %></span> <% if track.comment && track.comment != "" %> app/views/track/_show.html.erb @@ -1,6 +1,6 @@ <div class="page_content_holder"> <%= render(:partial => 'track/playlist_setup', :locals => {:show => "latest", :identifier => nil }) %> - <%= render(:partial => 'track/list_title', :locals => { :title => @title, :follow_link => @follow_link }) %> + <%= render(:partial => 'track/list_title', :locals => { :title => @title, :follow_link => @follow_link, :itunes_link => @itunes_link }) %> <!-- show items --> <% if @items.length > 0 %> app/views/track/latest.html.erb @@ -4,7 +4,7 @@ module Linking if production? return Util.ne(audiography.url_title) ? "http://" + audiography.url_title + "." + self.site() : nil else - return Util.ne(audiography.url_title) ? "/" + audiography.url_title : nil + return Util.ne(audiography.url_title) ? "http://" + self.site + "/" + audiography.url_title : nil end end @@ -12,10 +12,18 @@ module Linking self.audiography(in_audiography) + "?format=xml" end + def self.audiography_itunes(in_audiography) + (self.audiography(in_audiography) + "?format=xml").gsub(/http/, "itpc") + end + def self.latest_tracks_xml "/track/latest?format=xml" end + def self.latest_tracks_itunes + "itpc://" + self.site + "/track/latest?format=xml" + end + def self.cookie_domain if production? return ".playmary.com" @@ -28,7 +36,7 @@ module Linking if production? return "playmary.com" else - return "/" + return "localhost:3000" end end lib/linking.rb @@ -87,13 +87,14 @@ textarea { border: 1px solid #224; width:296; font-size: 12px; font-family:'Luci .track_play_stop { vertical-align:text-top; text-align:right; width:42; } .track_edit { font-size:10px; } .track_delete { font-size: 12px; } -.track_audiography_holder { color:#aaa; margin:0 0 -18.1 -235; font-size:12; text-align:right; width:224; } +.track_audiography_holder { margin:0 0 -20 -235; font-size:13; padding:1 0 0 0; height:19px; text-align:right; width:280px; } +.track_audiography_holder a { color:#777; } +.track_audiography_holder a:hover { color:#000; } .track_controls { margin:0 0 -20 -77; padding:0 10 1 0; text-align:right; height:19px; width:70; } .handle { padding:2px; } .drag_handle { cursor:move; } .edit_handle { cursor:pointer; border:0px;} .permalink_handle { cursor:pointer; display:inline; } -.track_audiography_link { color:#777; } .permalink { font-size:9.6; } LI.track_list_item { list-style:none; } public/stylesheets/main.css e4ee0b1878abf130ee87581c2a975ec5ca943943 Mary Cook maryrosecook@mary-cooks-macbook-pro.local http://github.com/maryrosecook/playmary/commit/470d419c42b59145e130b56bf356d76bbaf55608 470d419c42b59145e130b56bf356d76bbaf55608 2009-10-16T08:48:47-07:00 2009-10-16T08:48:47-07:00 made audiography link invisible and added permalink on latest tracks page 6377e0343ad8edfe9dcdd49fb170f3db3749cecb Mary Cook maryrosecook@mary-cooks-macbook-pro.local