app/views/digg/index.atom.builder @@ -1,33 +1,27 @@ class DiggController < ApplicationController - - def popular - respond_to do |format| - format.atom { @stories = Digg.new.stories('stories/popular', :count => 100) } - end - end - - def topics + + def index respond_to do |format| format.html { @topics = Digg.new.topics } + format.atom { @stories = Digg.new.stories("stories/#{upcoming_or_popular}", :count => 100) } end end def topic respond_to do |format| - format.atom { @stories = Digg.new.stories("stories/topic/#{params[:topic]}/popular", :count => 100) } + format.atom { @stories = Digg.new.stories("stories/topic/#{params[:topic]}/#{upcoming_or_popular}", :count => 100) } end end + + private - def upcoming - respond_to do |format| - format.atom { @stories = Digg.new.stories('stories/upcoming', :count => 100) } - end + helper_method :upcoming? + def upcoming? + params[:upcoming] end - def upcoming_topic - respond_to do |format| - format.atom { @stories = Digg.new.stories("stories/topic/#{params[:topic]}/upcoming", :count => 100) } - end + def upcoming_or_popular + upcoming? ? 'upcoming' : 'popular' end end \ No newline at end of file app/controllers/digg_controller.rb @@ -1,19 +1,22 @@ -<%= link_to "popular", digg_popular_path %> +<div class='switch'> + <%= link_to "Upcoming", digg_upcoming_path, :class => "upcoming #{'active' if upcoming?}" %> + <%= link_to "Popular", digg_path, :class => "popular #{'active' unless upcoming?}" %> +</div> -<%= link_to "upcoming", digg_upcoming_path %> - -<h2>Popular by topic</h2> +<p><%= link_to "All #{upcoming? ? 'Upcoming' : 'Popular'} Feed", (upcoming? ? digg_upcoming_feed_path : digg_popular_path ) %> +</p> +<h2><%= upcoming? ? 'Upcoming' : 'Popular' %> stories by topic</h2> <ul id='topics-list'> <% for topic in @topics %> - <li><%= link_to topic.name, digg_topic_path(:topic => topic.short_name) %></li> + <li> + <% if upcoming? %> + <%= link_to "<span>#{topic.name}</span>", digg_upcoming_topic_path(:topic => topic.short_name) %> + <% else %> + <%= link_to topic.name, digg_topic_path(:topic => topic.short_name) %> + <% end %> + </li> <% end %> </ul> -<h2>Upcoming by topic</h2> - -<ul id='topics-list'> -<% for topic in @topics %> - <li><%= link_to topic.name, digg_upcoming_topic(:topic => topic.short_name) %></li> -<% end %> -</ul> \ No newline at end of file +<!-- :diggbar => params[:diggbar] --> \ No newline at end of file app/views/digg/index.html.erb @@ -1,5 +1,5 @@ -atom_feed(:schema_date => 2008, :root_url => root_url, :url => digg_topic_url(:topic => params[:topic])) do |feed| - feed.title "Feeddit Topic: '#{params[:topic].titleize}'" +atom_feed(:schema_date => 2008, :root_url => root_url, :url => (upcoming? ? digg_upcoming_topic_url(:topic => params[:topic]) : digg_topic_url(:topic => params[:topic]))) do |feed| + feed.title "#{'Upcoming in ' if upcoming?}Feeddit Topic: '#{params[:topic].titleize}'" feed.updated Time.at(@stories.timestamp.to_i) for story in @stories app/views/digg/topic.atom.builder @@ -6,7 +6,7 @@ <%= link_to image_tag('subscribe.png', :id => 'subscribe'), "http://feeds.feedburner.com/Diggfeedr" %> - <br /><%= link_to "or get individual topics here", digg_topics_path %> + <br /><%= link_to "or get individual topics here", digg_path %> </div> <div id="blurb"> <div class="item"> app/views/index/index.html.erb @@ -1,19 +1,19 @@ ActionController::Routing::Routes.draw do |map| map.with_options :controller => 'digg' do |route| - route.digg '/digg/', :action => 'index' - route.digg_popular '/digg/popular.atom', :action => 'popular', :format => 'atom' - route.digg_topic '/digg/topics/:topic.atom', :action => 'topic', :format => 'atom' - route.digg_topics '/digg/topics', :action => 'topics' - route.digg_upcoming '/digg/upcoming', :action => 'popular', :format => 'atom' - route.digg_upcoming_topic '/digg/upcoming/topics/:topic.atom', :action => 'topic', :format => 'atom' + route.digg '/digg', :action => 'index' + route.digg_upcoming '/digg/upcoming', :action => 'index', :upcoming => true + route.digg_popular '/digg/popular.atom', :action => 'index', :format => 'atom' + route.digg_upcoming_feed '/digg/upcoming.atom', :action => 'index', :format => 'atom', :upcoming => true + route.digg_topic '/digg/topics/:topic.atom', :action => 'topic', :format => 'atom' + route.digg_upcoming_topic '/digg/topics/upcoming/:topic.atom', :action => 'topic', :format => 'atom', :upcoming => true end # legacy routes - map.rss '/feed.rss', :controller => 'digg', :action => 'popular', :format => 'atom' - map.atom '/feed.atom', :controller => 'digg', :action => 'popular', :format => 'atom' - map.topics '/topics', :controller => 'digg', :action => 'topics' - map.topic '/topics/:topic.atom', :controller => 'digg', :action => 'topic', :format => 'atom' + map.rss '/feed.rss', :controller => 'digg', :action => 'index', :format => 'atom' + map.atom '/feed.atom', :controller => 'digg', :action => 'index', :format => 'atom' + map.topics '/topics', :controller => 'digg', :action => 'index' + map.topic '/topics/:topic.atom', :controller => 'digg', :action => 'topic', :format => 'atom' map.with_options :controller => 'index' do |index| index.root config/routes.rb @@ -117,6 +117,7 @@ h1 a #topics-list :margin 20px 0 0 0 :padding 0 + :clear both li :list-style none @@ -176,3 +177,43 @@ h1 a #middle :clear both :font-size 0.8em + +.switch + :height 40px + :margin 0 0 20px + :float right + a + :font-size 1.5em + :display block + :width 110px + :height 20px + :float right + :text-align center + :text-decoration none + :color #888 + :text-shadow 1px 1px 1px #fff + :padding 10px 0 + :-webkit-box-shadow 1px 1px 1px #aaa + :background #eee + + &:hover + :color #555 + + &.active + :background #4578B1 + :text-shadow none + :color #CFE1FF + + &:hover + :color #BBCCEA + + &.popular + :width 99px + + :-webkit-border-bottom-left-radius 10px + :-webkit-border-top-left-radius 10px + + &.upcoming + :width 110px + :-webkit-border-bottom-right-radius 10px + :-webkit-border-top-right-radius 10px \ No newline at end of file public/stylesheets/sass/application.sass app/views/digg/popular.atom.builder app/views/digg/topics.html.erb app/views/digg/upcoming.atom.builder app/views/digg/upcoming_topic.atom.builder d6b267a19167a2eb06fb7d210f588bb20f77c309 Andrew Nesbitt andrewnez@gmail.com http://github.com/andrew/feeddit/commit/f99b18dc75ff5da11333244bcec629742a982fd0 f99b18dc75ff5da11333244bcec629742a982fd0 2009-04-11T05:41:05-07:00 2009-04-11T05:41:05-07:00 Simplified and improved digg namespace feeds and views f05d05ce29498fe35a8135f91d28aff1fbf6d2d7 Andrew Nesbitt andrewnez@gmail.com