Permalink
Browse files

Rails 2.3.2 - BLIZZZZAM.

  • Loading branch information...
1 parent e8ff073 commit cb94214789d6cf83407560258b52e144aaa01de1 @sudara sudara committed Mar 22, 2009
Showing with 552 additions and 5,045 deletions.
  1. 0 app/controllers/{application.rb → application_controller.rb}
  2. +4 −0 app/controllers/pages_controller.rb
  3. +1 −0 app/controllers/posts_controller.rb
  4. +1 −0 app/controllers/topics_controller.rb
  5. +3 −0 app/controllers/updates_controller.rb
  6. +4 −3 app/models/asset.rb
  7. +1 −1 app/models/listen.rb
  8. +1 −1 app/views/assets/_asset_tabs.html.erb
  9. +5 −5 app/views/forums/_forums.html.erb
  10. +1 −6 app/views/forums/index.html.erb
  11. +0 −3 app/views/forums/show.html.erb
  12. +1 −1 app/views/layouts/application.html.erb
  13. +23 −0 app/views/layouts/forums.html.erb
  14. +17 −0 app/views/layouts/pages.html.haml
  15. +15 −18 app/views/pages/change_my_url.html.haml
  16. +16 −18 app/views/pages/delete_a_song.haml
  17. +13 −16 app/views/pages/delete_my_account.html.haml
  18. +26 −28 app/views/pages/download_a_song.haml
  19. +14 −16 app/views/pages/edit_a_song.haml
  20. +53 −55 app/views/pages/get_listened_to.html.haml
  21. +1 −2 app/views/pages/howto.html.haml
  22. +166 −168 app/views/pages/index.html.haml
  23. +68 −70 app/views/pages/itunes.html.haml
  24. +82 −83 app/views/pages/stats.html.haml
  25. +0 −2 app/views/posts/index.html.erb
  26. +0 −2 app/views/topics/edit.html.erb
  27. +0 −3 app/views/topics/new.html.erb
  28. +22 −25 app/views/topics/show.html.erb
  29. 0 app/views/updates/{_latest.html.erb → _sidebar.html.erb}
  30. +4 −8 app/views/updates/index.html.erb
  31. +1 −3 app/views/updates/show.html.erb
  32. +1 −0 config/boot.rb
  33. +2 −1 config/environment.rb
  34. +2 −0 public/stylesheets/sass/alonetone.sass
  35. +3 −0 script/dbconsole
  36. +0 −83 vendor/gems/BlueCloth-1.0.0/bin/bluecloth
  37. +0 −150 vendor/gems/BlueCloth-1.0.0/install.rb
  38. +0 −1,144 vendor/gems/BlueCloth-1.0.0/lib/bluecloth.rb
  39. +0 −117 vendor/gems/BlueCloth-1.0.0/test.rb
  40. +0 −71 vendor/gems/BlueCloth-1.0.0/tests/00_Class.tests.rb
  41. +0 −1,527 vendor/gems/BlueCloth-1.0.0/tests/05_Markdown.tests.rb
  42. +0 −57 vendor/gems/BlueCloth-1.0.0/tests/10_Bug.tests.rb
  43. +0 −132 vendor/gems/BlueCloth-1.0.0/tests/15_Contrib.tests.rb
  44. +0 −274 vendor/gems/BlueCloth-1.0.0/tests/bctestcase.rb
  45. +0 −34 vendor/gems/BlueCloth-1.0.0/tests/data/antsugar.txt
  46. +0 −17 vendor/gems/BlueCloth-1.0.0/tests/data/ml-announce.txt
  47. +0 −67 vendor/gems/BlueCloth-1.0.0/tests/data/re-overflow.txt
  48. +0 −281 vendor/gems/BlueCloth-1.0.0/tests/data/re-overflow2.txt
  49. +0 −553 vendor/gems/BlueCloth-1.0.0/utils.rb
  50. +1 −0 vendor/plugins/haml/init.rb
@@ -2,6 +2,10 @@
class PagesController < ApplicationController
skip_filter filter_chain, :only => :help_an_app_support_brutha_out
+ layout "pages"
+
+
+
class Hell < StandardError; end
def twentyfour
@@ -1,6 +1,7 @@
class PostsController < ApplicationController
before_filter :find_parents
before_filter :find_post, :only => [:edit, :update, :destroy]
+ layout "forums"
# /posts
# /users/1/posts
@@ -1,6 +1,7 @@
class TopicsController < ApplicationController
before_filter :find_forum
before_filter :find_topic, :only => [:show, :edit, :update, :destroy]
+ layout "forums"
def index
respond_to do |format|
@@ -1,5 +1,8 @@
class UpdatesController < ApplicationController
before_filter :login_required, :except => [:index, :show]
+ layout 'pages'
+
+
# GET /updates
# GET /updates.xml
def index
View
@@ -60,7 +60,8 @@ class Asset < ActiveRecord::Base
has_one :first_playlist,
:source => :playlist,
:through => :tracks,
- :conditions => {'playlists.is_favorite' => false, 'tracks.is_favorite' => false},
+ :conditions => {'playlists.is_favorite' => false, 'tracks.is_favorite' => false,
+ 'playlists.user_id' => '#{user_id}' },
:order => 'tracks.created_at ASC',
:include => :pic
@@ -118,8 +119,8 @@ def clean_permalink
def self.formatted_time(time)
if time
min_and_sec = time.divmod(60)
- minutes = min_and_sec[0].to_s
- seconds = min_and_sec[1].to_s
+ minutes = min_and_sec[0].to_i.to_s
+ seconds = min_and_sec[1].to_i.to_s
seconds = "0"+seconds if seconds.length == 1
minutes + ':' + seconds
else
View
@@ -43,7 +43,7 @@ def self.source_chart
various = count_within_a_month - data.collect(&:last).sum
- data << ['various other sources', various]
+ data['various other sources'] = various
Gchart.pie(
:size => '500x125',
@@ -28,7 +28,7 @@
<% end %>
</div>
- <% if playlist = asset.first_playlist %>
+ <% if (playlist = asset.first_playlist) %>
<div class="min_height_50">
<div class="mini_cover">
<%= link_to(image_tag('jewel-case-50.png'), user_playlist_path(asset.user,playlist), :class => 'jewel_case_50') %>
@@ -1,19 +1,19 @@
<div id="static_header">
<div class="title">
- <h1 class="static"><%= yield :h1 %></h1>
+ <h1 class="static"><% yield :h1 %></h1>
</div>
<div id="links">
<div id="breadcrumbs">
- <%= yield :breadcrumbs %>
+ <% yield :breadcrumbs %>
</div>
<div id="extras">
- <%= yield :extras %>
+ <% yield :extras %>
</div>
</div>
- <%= yield :pagination %>
+ <% yield :pagination %>
</div>
<div id="forums_layout">
<%= yield %>
- </div>
+ </div>
@@ -1,15 +1,11 @@
-<% render :layout => 'forums' do %>
<% content_for :h1 do %>alonetone Forums <% end %>
<% content_for :extras do %>
<%= topic_count %>, <%= post_count %>
- <% end %>
-
-
- <% content_for :extras do %>
<%= feed_icon_tag "Recent Posts", formatted_posts_path(:format => 'atom') %>
<% end %>
+
<% if admin? %>
<div class="button_wrapper" style="margin-top:-30px;">
<%= link_to " ", new_forum_path, :id => 'create_new_forum', :class => 'button' %>
@@ -68,4 +64,3 @@
<div class="footer_box">
<%= link_to('', posts_path, :class=>'view_all_recent_posts', :title => 'view all recent posts') if Post.first %>
</div>
-<% end %>
@@ -1,4 +1,3 @@
-<% render :layout => 'forums' do %>
<% content_for :h1 do %>
<%= @forum.name %>
<% end %>
@@ -63,5 +62,3 @@
<div class="footer_box">
<%= link_to ' ', new_forum_topic_path(@forum), :id => "create_new_topic", :class => 'margin1px', :title => 'Start a new forum topic' %></p>
</div>
-
-<% end %>
@@ -36,7 +36,7 @@
<%= check_for_and_display_welcome_back %>
<%= check_for_and_display_flashes %>
<div id="main">
- <%= yield %>
+ <%= yield(:pages) or yield(:forums) or yield %>
</div>
<div id="static">
<%= yield :static %>
@@ -0,0 +1,23 @@
+<% content_for :forums do %>
+<div id="static_header">
+
+ <div class="title">
+ <h1 class="static"><%= yield :h1 %></h1>
+ </div>
+
+ <div id="links">
+ <div id="breadcrumbs">
+ <%= yield :breadcrumbs %>
+ </div>
+ <div id="extras">
+ <%= yield :extras %>
+ </div>
+ </div>
+ <%= yield :pagination %>
+</div>
+ <div id="forums_layout">
+ <%= yield %>
+ </div>
+<% end %>
+<%= render :file => 'layouts/application' %>
+
@@ -0,0 +1,17 @@
+- content_for :pages do
+ #static_header
+ .title
+ %h1.static
+ All about alonetone
+ #links
+ %ul.links
+ = user_nav_item "What is alonetone?", {:controller => 'pages', :action => 'index' }, :title => 'about alonetone'
+ = user_nav_item "How do I?...", {:controller => 'pages', :action => 'howto' }, :title => 'get help with alonetone'
+ = user_nav_item "Stats", {:controller => 'pages', :action => 'stats'}, :added_class => 'contact', :title => 'alonetone statistics'
+ = user_nav_item "Forums", forums_path, :added_class => 'contact', :title => 'forums'
+ = user_nav_item "Latest News", updates_path, :added_class => 'contact', :title => 'latest news (blog)'
+ = yield :pagination
+ - content_for :static do
+ = yield
+ = render :partial => 'sidebar'
+= render :file => 'layouts/application'
@@ -1,18 +1,15 @@
-- render :layout => 'halp' do
- .faq.box
- %h2.box.static
- How do I change my alonetone url, login or email address?
- .static_content
- %br
- Don't like that your 'home page' is at http://alonetone.com/buttmunch1234
- %br
- Are you changing your email address and want to keep alonetone in the loop?
- %br
- %br
- %strong
- The fastest way to change any of these things is to email sudara@alonetone.com
- %br
- %br
- We don't yet automate these changes, but they are no big deal, Sudara will get you straightened out within a day or so.
-
-= render :partial => 'sidebar'
+.faq.box
+%h2.box.static
+ How do I change my alonetone url, login or email address?
+.static_content
+ %br
+ Don't like that your 'home page' is at http://alonetone.com/buttmunch1234
+ %br
+ Are you changing your email address and want to keep alonetone in the loop?
+ %br
+ %br
+ %strong
+ The fastest way to change any of these things is to email sudara@alonetone.com
+ %br
+ %br
+ We don't yet automate these changes, but they are no big deal, Sudara will get you straightened out within a day or so.
@@ -1,18 +1,16 @@
-- render :layout => 'halp' do
- .faq.box
- %h2.box.static
- How do I delete a song I uploaded?
- .static_content
- 1. Make sure you are logged in
- %br
- 2. Find your song anywhere on alonetone
- %br
- 3. Click "edit"
- %br
- %br
- = image_tag "http://img.skitch.com/20080911-898funyggcupn2qp249jpxt5gy.png"
- %br
- 5. Click "delete track"
- %br
- = image_tag "http://img.skitch.com/20080610-tdxr4hcexs639rw3r3nuy6qxjw.png"
-= render :partial => 'sidebar'
+.faq.box
+ %h2.box.static
+ How do I delete a song I uploaded?
+ .static_content
+ 1. Make sure you are logged in
+ %br
+ 2. Find your song anywhere on alonetone
+ %br
+ 3. Click "edit"
+ %br
+ %br
+ = image_tag "http://img.skitch.com/20080911-898funyggcupn2qp249jpxt5gy.png"
+ %br
+ 5. Click "delete track"
+ %br
+ = image_tag "http://img.skitch.com/20080610-tdxr4hcexs639rw3r3nuy6qxjw.png"
@@ -1,16 +1,13 @@
-- render :layout => 'halp' do
- .faq.box
- %h2.box.static
- How do I download a song from alonetone?
- .static_content
- You can't, you are forever locked in to our evil and terrible system.
- %br
- %br
- Just Kidding. The fastest way to delete your entire alonetone account is to email sudara@alonetone.com
- %br
- %br
- Hey, and if you signed up with 2 accounts for some reason, be a chap and let Sudara know via email or via
- =link_to 'the forums', forums_path
- so that he can remove unnecessary accounts. Thanks!
-
-= render :partial => 'sidebar'
+.faq.box
+ %h2.box.static
+ How do I download a song from alonetone?
+ .static_content
+ You can't, you are forever locked in to our evil and terrible system.
+ %br
+ %br
+ Just Kidding. The fastest way to delete your entire alonetone account is to email sudara@alonetone.com
+ %br
+ %br
+ Hey, and if you signed up with 2 accounts for some reason, be a chap and let Sudara know via email or via
+ =link_to 'the forums', forums_path
+ so that he can remove unnecessary accounts. Thanks!
@@ -1,28 +1,26 @@
-- render :layout => 'halp' do
- .faq.box
- %h2.box.static
- How do I download a song from alonetone?
- .static_content
- All songs on alonetone are downloadable.
- %br
- %br
- The best way to download a song is to <strong>right-click</strong> the down arrow to the right of the song you want to download
- %br
- %br
- = image_tag "http://img.skitch.com/20080610-fb2x4q43dspqppiekbcxsbiy9b.png"
- %br
- %br
- Right-click the down arrow and a menu will pop up. Choose "Save Link As..." or "Save Target As..." or "Download Linked File As" (depending if you have a mac or PC):
- %br
- %br
- = image_tag "http://img.skitch.com/20080610-qpeish6ba6aqmkdqfi1355tcs6.png"
- %br
- %br
- = image_tag "http://img.skitch.com/20080610-249cruh7in7s2kq23eeatkrn6.png"
- %br
- %br
- = image_tag "http://img.skitch.com/20080610-811urm74rp33gaass6j8dsyusi.png"
- %br
- %br
- = image_tag "http://img.skitch.com/20080610-thya3t31h2tg8jg4ardahk34nd.png"
-= render :partial => 'sidebar'
+.faq.box
+ %h2.box.static
+ How do I download a song from alonetone?
+ .static_content
+ All songs on alonetone are downloadable.
+ %br
+ %br
+ The best way to download a song is to <strong>right-click</strong> the down arrow to the right of the song you want to download
+ %br
+ %br
+ = image_tag "http://img.skitch.com/20080610-fb2x4q43dspqppiekbcxsbiy9b.png"
+ %br
+ %br
+ Right-click the down arrow and a menu will pop up. Choose "Save Link As..." or "Save Target As..." or "Download Linked File As" (depending if you have a mac or PC):
+ %br
+ %br
+ = image_tag "http://img.skitch.com/20080610-qpeish6ba6aqmkdqfi1355tcs6.png"
+ %br
+ %br
+ = image_tag "http://img.skitch.com/20080610-249cruh7in7s2kq23eeatkrn6.png"
+ %br
+ %br
+ = image_tag "http://img.skitch.com/20080610-811urm74rp33gaass6j8dsyusi.png"
+ %br
+ %br
+ = image_tag "http://img.skitch.com/20080610-thya3t31h2tg8jg4ardahk34nd.png"
@@ -1,16 +1,14 @@
-- render :layout => 'halp' do
- .faq.box
- %h2.box.static
- How do I edit a song and/or change a song's title?
- .static_content
- 1. Make sure you are logged in
- %br
- 2. Find your song anywhere on alonetone
- %br
- 3. Click "edit"
- %br
- %br
- = image_tag "http://img.skitch.com/20080911-898funyggcupn2qp249jpxt5gy.png"
- %br
- 5. Enter a new title for the song and/or enter a description to help other's find your music.
-= render :partial => 'sidebar'
+.faq.box
+ %h2.box.static
+ How do I edit a song and/or change a song's title?
+ .static_content
+ 1. Make sure you are logged in
+ %br
+ 2. Find your song anywhere on alonetone
+ %br
+ 3. Click "edit"
+ %br
+ %br
+ = image_tag "http://img.skitch.com/20080911-898funyggcupn2qp249jpxt5gy.png"
+ %br
+ 5. Enter a new title for the song and/or enter a description to help other's find your music.
Oops, something went wrong.

0 comments on commit cb94214

Please sign in to comment.