app/models/stalking.rb
db/migrate/20080907131513_add_stalkings.rb
public/images/backgrounds/welcome_notice.png
@@ -1,3 +0,0 @@
-[submodule "vendor/rails"]
- path = vendor/rails
- url = git://github.com/rails/rails
.gitmodules
@@ -33,7 +33,7 @@ class Asset
end
def listens_per_week
- listens.count(:all, :conditions => ['listens.listener_id != ?', self.user_id]).to_f / days_old * 7
+ listens.count(:all, :conditions => ['listens.listener_id != ?', self.user_id]).to_f * 7 / days_old
rescue
0
end
app/models/asset/statistics.rb
@@ -34,6 +34,11 @@ class User < ActiveRecord::Base
# top tracks
has_many :top_tracks, :class_name => 'Asset', :limit => 10, :order => 'listens_count DESC'
+
+ # stalking
+ has_many :stalkers, :class_name => 'Stalking'
+ has_many :stalkees, :class_name => 'Stalking'
+ has_many :new_tracks_from_stalkees, :through => :stalkees, :class_name => 'Asset'
# The following attributes can be changed via mass assignment
attr_accessible :login, :email, :password, :password_confirmation, :website, :myspace,
app/models/user.rb
@@ -1,4 +1,4 @@
-- render :layout => 'halp' do
+- render(:layout => 'halp') do
.faq.box
%h2.box.static
Help! What is this "alonetone" thing?
@@ -159,4 +159,5 @@
and you can
=link_to 'browse the latest release here', 'http://github.com/sudara/alonetone/tree/master'
We are looking for development help, so go ahead and email me if you are interested.
-= render :partial => 'sidebar'
+
+= render(:partial => 'sidebar')
app/views/pages/index.html.haml
@@ -1,6 +1,6 @@
<div id="search">
- <%= link_to '','#',:id => 'search_button' %>
- <% form_tag search_url, :style => 'display:none;' do %>
- <%= text_field_tag 'query', (@query || session[:last_query] || '') %>
+ <% form_tag search_url, :id =>'search_form' do %>
+ <%= text_field_tag 'query', (@query || session[:last_query] || 'artist, song title or keyword') %>
<% end %>
+ <%= link_to '','#',:id => 'search_button' %>
</div>
\ No newline at end of file
app/views/shared/_search.html.erb
@@ -1,6 +1,5 @@
-<div class="notice">
- <h1 class="notice">alonetone, a damn fine home for musicians</h1>
- alonetone gives music makers free mp3 uploads, unlimited distribution, sharing tools & warm fuzzies <br/><br/>
- <%= image_tag 'help/how_to_play.jpg' %><br/><br/>
- <%=link_to 'Sign up', signup_path, :title => 'sign up to upload your music' %> to join the community of artists and listeners. <%=link_to 'Have questions?', about_path, :title => 'help' %>
+<div id="welcome" class="notice">
+ alonetone gives musicians a home for their music<br/>
+ unlimited distribution, sharing tools & warm fuzzies <br/><br/><br/>
+ <%=link_to 'Sign up', signup_path, :title => 'sign up to upload your music' %> to start uploading your tracks or <%=link_to 'read our FAQ', about_path, :title => 'help' %>
</div>
app/views/shared/_self_confidence.html.erb
@@ -5,7 +5,7 @@
# ENV['RAILS_ENV'] ||= 'production'
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
config/environment.rb
@@ -798,17 +798,22 @@ jQuery(function($) {
// double the text area size when typing a lot
$('textarea.double_trouble').attach(AdjustableTextarea,16);
- // slide open the search
+ // search submit
$('#search_button').click(function(){
- $(this).addClass('active');
- $(this).next().width('0px');
- $(this).next().animate({
- width: '200px'
- });
- $(this).next().focus();
+ $('#search_form').submit();
return false;
});
+ // clear default text from search box
+ $('#query').focus(function(){
+ $(this).addClass('focused');
+ if($(this).val() == 'artist, song title or keyword')
+ $(this).val('');
+ });
+ $('#query').blur(function(){
+ $(this).removeClass('focused');
+ });
+
// setup the footer
$('#footer').attach(ResizeableFooter);
public/javascripts/application.js
@@ -75,27 +75,31 @@
a
:background url(../images/buttons/search.png) no-repeat 0px 0
:display block
- :float left
+ :position absolute
+ :left 215px
:width 84px
:height 27px
- &:hover, &.active
+ &:hover
:background-position -84px 0
form
:position absolute
:top 0px
- :left 86px
- :height 28px
+ :left 0px
+ :height 22px
:width 200px
- input
+ #query
:margin 0
- :margin-left 15px
- :height 22px
+ :margin-left 0px
+ :margin-top 1px
+ :height 17px
:font-size 14px
- :color = !white
+ :color = !silver
:padding 2px 3px
:width 200px
:background-color #5b5d4a
:border 1px solid #4b4e3f
+ &.focused
+ :color = #fff
// browse all users
#user_index, #user_search_results
public/stylesheets/sass/alonetone.sass
@@ -213,4 +213,11 @@ div.notice, div.errorExplanation
:padding 20px 30px
:margin-bottom 20px
:border-bottom 1px solid #7e807e
- :border-top 1px solid #6f6f6f
\ No newline at end of file
+ :border-top 1px solid #6f6f6f
+
+div#welcome
+ :background #c7c8c7 url(../images/backgrounds/welcome_notice.png) no-repeat top left
+ :height 73px
+ :width 830px
+ :padding-top 100px
+ :padding-left 26px
\ No newline at end of file
public/stylesheets/sass/layout.sass
vendor/rails
617b491cd28a1222f0597815a8a307a1b914eaa3
Sudara
sudara@alonetone.com
http://github.com/tiendung/alonetone/commit/7d58672dcca84a752a31212ae492868b3f91e89c
7d58672dcca84a752a31212ae492868b3f91e89c
2008-09-07T08:36:30-07:00
2008-09-07T08:36:30-07:00
remove rails edge, pimp out welcome message, make search more prominent
174d48ce05400bd968571f494644909e78393415
Sudara
sudara@alonetone.com