0
@@ -31,6 +31,7 @@ class AssetsController < ApplicationController
0
     respond_to do |format|
0
       format.html do
0
         @page_title = "#{@asset.name} by #{@user.name}"
0
+        @description = @page_title + " - #{@asset[:description]}"
0
         @assets = [@asset]
0
         @listens = @asset.listens.find(:all)
0
         @comments = @asset.comments.public.find_all_by_spam(false)

0
@@ -20,9 +20,9 @@ class User
0
   def dummy_pic(size)
0
     case size
0
       when :album then 'no-pic-200.png'
0
-      when :large then 'no-pic-125.png'
0
+      when :large then 'no-pic-83.png'
0
       when :small then 'no-pic-50.png'
0
-      when :tiny then 'icons/user.png'
0
+      when :tiny then 'no-pic-25.png'
0
       when nil then 'no-pic-200.jpg' 
0
     end
0
   end

0
@@ -43,7 +43,7 @@
0
           </div>
0
             <div class="track_links">
0
            <% if authorized_for(asset) %>
0
-                <%= link_to "Edit", edit_user_track_path(asset.user, asset), :class => 'edit_with_text', :title => 'edit this track' %>
0
+                <%= link_to "Edit", edit_user_track_path(asset.user, asset), :class => 'edit_in_box', :title => 'edit this track' %>
0
              <% end %>
0
            <%= link_to "View more", user_track_path(asset.user, asset.permalink), :class => 'view_more', :title => "#{h(asset.name)} by #{h(asset.user.name)}" unless @single_track %>
0
 

0
@@ -1,7 +1,10 @@
0
+<div class="track_options">
0
+<%= link_to " ", destroy_user_track_path(@user, @asset), :method => :delete, 
0
+:confirm => 'Are you sure? This will delete the song permanently, including all play history and comments.',
0
+:class => 'delete_green'%>
0
+</div>
0
 <div class="edit_track box" style="position:relative;">
0
   <h2 class="box">Editing "<%=h @asset.name %>"</h2>
0
-    
0
-  <%= link_to "delete track", destroy_user_track_path(@user, @asset), :id => 'delete_track_button', :class => 'confirm_before_delete delete button'%>
0
 
0
   <% form_for(:asset, :url => user_track_path(current_user, @asset), :html => { :method => :put }) do |f| %>
0
 

0
@@ -14,7 +14,8 @@
0
     <%= render :partial => 'assets/asset', :collection => @assets %>
0
   </div>
0
   <div class="footer_box">
0
-    <%= link_to 'view all recent music', radio_path(:per_page => 40,:source => 'latest'), :title => 'latest uploaded mp3s' %>
0
+    <%= link_to ' ', radio_path(:per_page => 40,:source => 'latest'), 
0
+        :class=> 'view_all_recent_music', :title => 'latest music on alonetone' %>
0
   </div>
0
   
0
   <h2 id="latest_comments" class="box">Latest Comments</h2>
0
@@ -22,7 +23,8 @@
0
     <%= render :partial => 'shared/comment', :collection => @comments%>
0
   </div>
0
   <div class="footer_box">
0
-   <%= link_to 'view all latest comments', all_comments_path, :title => 'view latest comments' %>
0
+   <%= link_to ' ', all_comments_path, 
0
+     :class => 'view_all_comments', :title => 'view latest comments' %>
0
    </div>
0
 <% end %>
0
 
0
@@ -38,7 +40,8 @@
0
     <%= render :partial => 'assets/asset', :collection => @popular %>
0
   </div>
0
   <div class="footer_box">
0
-   <%= link_to 'view all kicking ass', top_path(40), :title => 'alonetone radio: currently kicking ass' %>
0
+   <%= link_to ' ', radio_path(:per_page => 40,:source => 'popular'), :class => "view_all_kicking_ass", 
0
+      :title => 'alonetone radio: currently kicking ass' %>
0
   </div>
0
   
0
    <h2 id="recently_favorited" class="box">Recently favorited</h2>
0
@@ -46,7 +49,8 @@
0
     <%= render :partial => 'shared/favorite', :collection => @favorites %>
0
   </div>  
0
   <div class="footer_box">
0
-    <%= link_to 'view all recent favorites', radio_path(:per_page => 40, :source => 'favorites'), :title => 'alonetone radio: recently favorited' %>
0
+    <%= link_to ' ', radio_path(:per_page => 40, :source => 'favorites'), 
0
+      :class => 'view_all_favorites', :title => 'alonetone radio: recently favorited' %>
0
   </div>
0
 <% end %>
0
 

0
@@ -1,6 +1,14 @@
0
 <% render(:layout => 'users/user') do %>
0
   
0
   <% content_for :left do %>
0
+    <% if authorized_for(@asset) %>
0
+        <div class="track_options">
0
+            <%= link_to " ", edit_user_track_path(@asset.user, @asset), :class => 'edit_green', :title => 'edit this track' %>
0
+            <%= link_to " ", destroy_user_track_path(@asset.user, @asset), :method => 'delete', :class => 'delete_green ',
0
+            :confirm => 'Are you sure? This will delete the song permanently, including all play history and comments.',
0
+            :title => 'delete this track permanently '%>
0
+        </div>
0
+    <% end %>
0
   <div id="single_track" class="box">
0
 
0
       <%= render :partial => 'assets/assets'%>
0
@@ -12,11 +20,6 @@
0
       <div id="track_details" class="static_content">
0
           <h1>About "<%=h @asset.title %>"</h1>
0
           <p><%= @asset.description %></p>
0
-          <% if authorized_for(@asset) %>
0
-                <div class="track_links">
0
-                    <%= link_to "Edit", edit_user_track_path(@asset.user, @asset), :class => 'edit_with_text', :title => 'edit this track' %>
0
-                </div>
0
-          <% end %>
0
       </div>
0
      <% end %>
0
      

0
@@ -13,7 +13,8 @@
0
         </div>
0
     </div>
0
     <div class="footer_box onepx">
0
-    <%= link_to "view feature", feature_path(feature.permalink),:title => "featured alonetone artist: #{feature.featured_user.name}" %>
0
+    <%= link_to "", feature_path(feature.permalink),:class => 'view_feature', 
0
+        :title => "featured musician: #{feature.featured_user.name}" %>
0
     </div>
0
 
0
 <% end %>
0
\ No newline at end of file

0
@@ -1,5 +1,4 @@
0
 <h1>Featured Artist - <%=h @user.name %></h1>
0
-<h2><%= link_to "view all featured artists", features_path %></h2>
0
 <% content_for :left do %>
0
   <% div_for @feature do %>
0
       <div class="box">
0
@@ -27,12 +26,14 @@
0
     other interested authors contribute text. Step up!
0
     </div>
0
   </div>
0
+  <div class="footer_box">
0
+    <%= link_to ' ', features_path, :class => 'view_all_features' %>
0
+   </div>
0
 <% end %>
0
 
0
 <% content_for :right do %>
0
    <div class="box feature_stats">
0
        <h2 class="box">Vital Stats</h2>
0
-        <%= link_to "visit #{h @user.name}'s alonetone page", user_home_path(@user), :class => 'view_more'%>
0
         <div class="static_content clearfix">
0
            <div class="pic">
0
            <%= user_image_link(@feature.featured_user, :album) %>
0
@@ -45,10 +46,17 @@
0
                <%= itunes_link_for(@user) if present? @user.itunes %><br/>
0
                <%= "This feature viewed #{@feature.views_count} times" if authorized? %>
0
            </div>
0
+           <%= link_to " ", user_home_path(@user), :class => 'view_more'%>
0
        </div>
0
    </div>
0
+   <div class="footer_box">
0
+    <%= link_to ' ', features_path, :class => 'view_all_features' %>
0
+   </div>
0
    
0
    <%= render :partial => 'featured_tracks'%>
0
+   <div class="footer_box">
0
+    <%= link_to ' ', user_tracks_path(@user.login), :class => 'view_more_tracks' %>
0
+   </div>
0
    <%= render :partial => 'users/mostly_listens_to' %>
0
    <%= render :partial => 'shared/comment', :collection => @comments %>
0
 <% end %>
0
\ No newline at end of file

0
@@ -22,7 +22,9 @@
0
   
0
   </head>
0
   <body>
0
-  
0
+      <div id="top_bar">
0
+        <%= render :partial => 'shared/top_bar', :current_user => current_user %>
0
+      </div>
0
       <div id="header">
0
         <a href="/" title="go home to alonetone" id="logo"></a>
0
         <%= render :partial=> 'shared/nav' %>
0
@@ -30,10 +32,6 @@
0
     
0
   <div id="wrapper">
0
     <div id="content" class="content">    
0
-      <div id="top_bar">
0
-        <%= render :partial => 'shared/search'%>
0
-        <%= render :partial => 'shared/user_bar', :current_user => current_user %>
0
-      </div>
0
       <%= check_for_and_display_welcome_back %>
0
       <%= check_for_and_display_flashes %>
0
       <div id="main">

0
@@ -1,57 +1,54 @@
0
 - render(:layout => 'halp') do
0
   .faq.box  
0
     %h2.box.static
0
-      Help! What is this "alonetone" thing?
0
+      What the heck is "alonetone"?
0
     .static_content
0
-      Alonetone provides free and unlimited mp3 hosting and distribution for musicians. 
0
+      A place where Do-It-Yourself and everyday musicians upload their music to freely share with each other and the world.
0
       %br 
0
       %br
0
-      If you make music and you own the rights to it,
0
+      If you make music (and you own the rights to it),
0
       this site is something you should know about. Go 
0
       =link_to 'sign up!', signup_path
0
   .faq.box
0
     %h2.box.static
0
-      Is this a website for musicians?
0
+      So, it is a website for musicians?
0
     .static_content
0
-      Yes, it is a website to connect listeners and musicians. We work our butt off to give musicians the tools they need to distribute their music.
0
+      It is a website to connect listeners and musicians. We work our butt off to give musicians the tools they need to distribute their music.
0
       %br
0
       %br
0
+      There are plenty of fans and friends of musicians who also hang around or sign up for accounts. 
0
+      %br
0
       If you love music but don't make it, great. There are tons of musical gems on this site, and a lot of talent. Hang out with us, listen a while. Talk with us. Favorite the tracks you love.
0
   .faq.box  
0
     %h2.box.static
0
-      Can I upload my mp3s here?
0
+      Can I join and upload mp3s here?
0
     .static_content
0
-      If you made the music, then of course! 
0
+      If you made the music and own the rights to it, we would be honored.
0
       =link_to 'Go sign up.', signup_path
0
       %br
0
       %br If you didn't make the music, and just want to share it, then no...go elsewhere! 
0
     
0
   .faq.box  
0
     %h2.box.static
0
-      I mean, I really don't get it: Why alonetone?
0
+      I don't get it: Why alonetone?
0
     .static_content
0
-      Commercial services for musicians exist. We want to give you something different.
0
-      We are not interested in making a buck off of you. We are interested in getting musicians on their feet
0
-      on the web and allowing folks to solidly deliver their music, known or unknown.
0
+      You are right, there are plenty of websites for musicians to upload their music.  Why alonetone?
0
+      %br
0
       %br
0
+      Well, most of the 'free' services you'll run into elsewhere are running ads, funded
0
+      by investors, or actually owned by media conglomerates. In general, they are hoping making money off of your "content"...erm...music. 
0
+      Most music communities are overly obsessed with genres and popularity, and we're just not turned on by that. Time for something new, don't you think?
0
       %br
0
-      Even the other 'free' services you'll run into elsewhere are running ads or funded
0
-      by investors hoping to make it big and meanwhile making money off of your "content"...erm music
0
       %br
0
+      alonetone was started to provide a non-commercial alternative. Something useful, something different, something that the musicians can feel like they own.
0
       %br
0
-      Beyond that, we want to do it right. Clean, and only the essentials.
0
+      %br
0
+      Beyond that, we want to do it right. Clean, only the essentials. Not too dorked-out. Easy to get around.
0
 
0
   .faq.box  
0
     %h2.box.static
0
-      Ok, no companies, great. So, who makes alonetone?
0
+      Wow, no company! So who makes alonetone?
0
     .static_content
0
-      The musicians and listeners themselves are responsible for steering the ship. 
0
-      After the initial launch most features were inspired, recommended by, and build to please alonetoners
0
-      who spoke up and helped by providing their valuable feedback in email conversations with Sudara or
0
-      via 
0
-      =link_to 'the alonetone forums', forums_path
0
-      %br
0
-      %br
0
       alonetone is conceived and built by 
0
       =link_to 'Sudara', user_home_path(User.find :first)
0
       %br
0
@@ -68,7 +65,15 @@
0
       %br
0
       The forums are moderated by 
0
       =link_to 'Another Cultural Landslide', user_home_path('anotherculturallandslide')
0
-
0
+      %br
0
+      %br
0
+      The musicians and listeners themselves are responsible for steering the ship. 
0
+      After the initial launch most features were inspired, recommended by, and build to please alonetoners
0
+      who spoke up and helped by providing their valuable feedback in email conversations with Sudara or
0
+      via 
0
+      =link_to 'the alonetone forums', forums_path
0
+      %br
0
+      %br
0
   
0
   .faq.box  
0
     %h2.box.static
0
@@ -79,20 +84,23 @@
0
     %h2.box.static
0
       Can I sell my music here?
0
     .static_content
0
-      Nope. There are many places that you can sell your music at, if you want to take a crack at it.
0
+      Nope. 
0
       %br
0
-      %br I personally believe (and always have) that selling mp3s really won't bring the average musician much luck.
0
-      %br If you have a marketing machine behind you or already have 1000s of fans, this is another story. 
0
+      %br
0
+      We believe in giving our music away. There are many places where you can try and sell your tunes, if you want to take a crack at it.
0
+      %br
0
+      %br Selling mp3s really won't bring the average musician anything useful - you'll waste tons of effort, get your hopes up, and....Well, if you have a marketing machine behind you or already have 1000s of fans, 
0
+      this is another story. Go for it. Otherwise, focus on making great tunes and connecting to people.
0
   .faq.box    
0
     %h2.box.static
0
       But I want to make money with my music.
0
     .static_content
0
-      I believe that you can and should be able to. But not by selling mp3s, sorry. 
0
+      We certainly understand that. 
0
       %br
0
       %br
0
-      The music world is changing fast.
0
       Selling mp3s is a short-term and short-lived last ditch effort on behalf of the changing industry.
0
-      Radiohead and NIN are currently getting away with it (though they are also moving to a more free model)...but you? At this point, your best bet is to play live, or get your music into as many hands as you can. 
0
+      Radiohead and NIN get away with it (though they are also moving to a more free model)...but you? 
0
+      At this point, your best bet is to play live, or get your music into as many hands as you can. 
0
       =link_to 'We can help with the latter.', signup_path
0
       %br
0
       %br
0
@@ -118,7 +126,7 @@
0
     %h2.box.static
0
       Isn't this costing you money? Are you bad at business?
0
     .static_content
0
-      There are some costs, primarily the storage costs. If the site grows much larger, they will be significant, but not unmanageable.
0
+      There are some costs, primarily the storage costs, which are currently under $100 a month. If the site grows much larger, they will be significant, but not unmanageable.
0
       %br
0
       %br
0
       I pay these out of pocket for a few reasons: I want to promote independent music and display the wonderful amazing fact that the music distribution model has changed. One average person can singlehandedly float hundreds of musicians, thousands of mp3s and hundreds of thousands of downloads. Incredible - it points to pretty crazy and amazing future world of music. 
0
@@ -129,10 +137,13 @@
0
     %h2.box.static
0
       What if the site explodes in popularity?
0
     .static_content
0
-      In the event that the I can no longer afford to singlehandedly keep alonetone up, the popularity of the site and the sheer volume of users needed to produce the cost would likely ensure that it would be kept afloat by other like-minded do good-ers.
0
+      That would be a good problem to have, now wouldn't it!
0
+      %br
0
       %br
0
+      Seriously, though: In the event that the I can no longer afford to singlehandedly keep alonetone up, the popularity of the site and the sheer volume of users needed to produce the cost would likely ensure that it would be kept afloat by other like-minded do good-ers.
0
       %br
0
-      I have no current intention to pollute the site with advertising.
0
+      %br
0
+      I have no current intention to pollute the site with advertising, even to break even.
0
   .faq.box    
0
     %h2.box.static
0
       How is the site built?
0
@@ -146,18 +157,14 @@
0
     .static_content
0
       alonetone is about 2800 lines of rails code and about the same amount of javascript and css.
0
       %br
0
-      %br We use 
0
-      =link_to 'Attachment_fu', 'http://svn.techno-weenie.net/projects/plugins/attachment_fu/'
0
-      =link_to 'Amazon S3 for mp3 hosting', 'http://aws.amazon.com'
0
-      SASS, will_paginate, rspec, jquery, low pro. Sound is done with Sound Manager 2.
0
   .faq.box
0
     %h2.box.static
0
       Is the code open source?
0
     .static_content
0
-      You bet. It is available via git at the
0
-      =link_to 'alonetone git repository', 'http://github.com/sudara/alonetone/wikis'
0
-      and you can 
0
-      =link_to 'browse the latest release here', 'http://github.com/sudara/alonetone/tree/master'
0
+      You bet your sweet programming butt it is. It is available via git at the
0
+      =link_to 'alonetone git repository', 'http://github.com/sudara/alonetone'
0
+      %br
0
+      %br
0
       We are looking for development help, so go ahead and email me if you are interested.
0
       
0
 = render(:partial => 'sidebar')

0
@@ -1,13 +1,13 @@
0
 
0
 <% render(:layout => 'users/user') do %>
0
       <% if authorized? %>
0
-	    <div class="additional_options">
0
+	    <div class="additional_options_solo">
0
         <div class="button_wrapper">
0
-		    <%= link_to "create new playlist", new_user_playlist_path(@user), :id => 'add_playlist_button', :class => 'add button' %>
0
+		    <%= link_to " ", new_user_playlist_path(@user), :id => 'create_new_playlist', :class => 'button' %>
0
         </div>
0
             <% if @user.playlists.public.size > 2 %>
0
             <div class="button_wrapper">
0
-    		    <%= link_to "change playlist order", sort_user_playlists_path(@user), :id => 'sort_playlist_button', :class => 'sort button'  %>
0
+    		    <%= link_to " ", sort_user_playlists_path(@user), :id => 'change_playlist_order', :class => 'button'  %>
0
             </div>
0
         <% end %>
0
     </div>

0
@@ -1,31 +1,32 @@
0
 <% div_for comment, :class => (cycle('even', 'odd')) do %>
0
   
0
   <div class="comment_user">
0
-    	<% if comment.commenter %>
0
-          <%= user_image_link(comment.commenter, :small)%>
0
-    		<% else %>
0
-    			<%= image_tag User.dummy_pic(:small)%>
0
-    	<% end %>
0
-    	<% if comment.private %>
0
-    	    <div class="private_comment">
0
-    	    </div>
0
-    	<% end %>
0
+	<% if comment.commenter %>
0
+        <%= user_image_link(comment.commenter, :small)%>
0
+	<% else %>
0
+	    <%= image_tag User.dummy_pic(:small)%>
0
+	<% end %>
0
+    <% if comment.private %>
0
+        <div class="private_comment">
0
+        </div>
0
+    <% end %>
0
    
0
-	  <% if !@single_track %>
0
-	  <div class="comment_about">about <%= link_for_comment(comment) %></div>
0
-	 <% end %>
0
-	     <span class="comment_user_text">
0
+    <% if !@single_track %>
0
+        <div class="comment_about">about <%= link_for_comment(comment) %></div>
0
+    <% end %>
0
+    
0
+	<span class="comment_user_text">
0
       <%= comment.commenter ? (link_to (h comment.commenter.name), user_home_path(comment.commenter)) : 'Guest' %>
0
       said <%= time_ago_in_words(comment.created_at) %> ago
0
     </span>
0
    
0
   <% if authorized_for_comment(comment) %>
0
       <% if comment.spam == false %>
0
-	        <%= link_to 'SPAM', comment_path(comment, :spam => true), :class => 'remove button', :style => 'margin-right: 40px;', :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%>
0
+	        <%= 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%>
0
       <% else %>
0
-	        <%= link_to 'un-SPAM', unspam_comment_path(comment), :class => 'unspam button', :style => 'margin-right: 40px;', :confirm => 'This will make the comment public. Are you sure?' %>
0
+	        <%= link_to ' ', unspam_comment_path(comment), :class => 'unspam button',  :confirm => 'This will make the comment public. Are you sure?' %>
0
         <% end %>
0
-		<%= link_to 'Delete', comment_path(comment), :class=> 'delete button', :confirm => 'Are you sure you want to delete this comment?', :method => :delete %>
0
+		<%= link_to ' ', comment_path(comment), :class=> 'delete_comment button', :confirm => 'Are you sure you want to delete this comment?', :method => :delete %>
0
   <% end %>
0
   </div>
0
   <div class="comment_body">

0
@@ -3,5 +3,6 @@
0
   <%= render :partial => 'shared/comment', :collection => comments %>
0
 </div>
0
 <div class="footer_box">
0
-  <%= link_to 'view all comments', user_comments_path(@user.login), :title => "view all comments about #{h @user.name}'s music" %>
0
+  <%= link_to ' ', user_comments_path(@user.login), 
0
+     :class => 'view_all_comments', :title => "all comments about #{h @user.name}'s music" %>
0
 </div>

0
@@ -1,6 +1,7 @@
0
 <div id="search">  
0
+  <%= link_to '','#',:id => 'search_button' %>
0
+
0
   <% form_tag search_url, :id =>'search_form' do %>
0
     <%= text_field_tag 'query', (@query || session[:last_query] || 'artist, song title or keyword') %>
0
   <% end %>
0
-  <%= link_to '','#',:id => 'search_button' %>
0
 </div>
0
\ No newline at end of file

0
@@ -5,5 +5,5 @@
0
   <% end %>
0
 </div>
0
 <div class="footer_box">
0
-  <%= link_to "view all favorited tracks", listens_path(@user.login) if @user.favorites.tracks.size > 5 %>
0
+  <%= link_to " ", listens_path(@user.login), :class => "view_all_favorites" if @user.favorites.tracks.size > 5 %>
0
 </div>
0
\ No newline at end of file

0
@@ -3,5 +3,6 @@
0
   <%= render :partial => 'assets/asset', :collection => @assets %>
0
 </div>
0
 <div class="footer_box">
0
-	<%= link_to "view all #{@user.assets_count} tracks", user_tracks_path(@user), :title => "uploaded mp3s by #{h(@user.name)}" if @user.assets_count > 5 %>
0
+	<%= link_to " ", user_tracks_path(@user), 
0
+	    :class => 'view_more_tracks', :title => "uploaded mp3s by #{h(@user.name)}" if @user.assets_count > 5 %>
0
 </div>
0
\ No newline at end of file

0
@@ -3,5 +3,5 @@
0
   <%= render :partial => 'users/listen', :collection => @listens %>
0
 </div>
0
 <div class="footer_box">