app/views/index/index.atom.builder public/feed.atom public/images/opensource.png @@ -1,17 +1,15 @@ class IndexController < ApplicationController - caches_action :feed, :cache_path => {:time => Time.now.hour / 15} - caches_page :index, :topics - after_filter :clear_cache, :only => :feed + caches_action :index, :format => :atom, :cache_path => {:time => Time.now.hour / 15} + caches_action :topics, :format => :atom, :cache_path => {:time => Time.now.hour / 15} + caches_page :index, :format => :html + caches_page :topics, :format => :html + after_filter :clear_cache, :only => :index + after_filter :clear_cache, :only => :topics def index respond_to do |format| format.html - end - end - - def feed - respond_to do |format| format.atom { @stories = Digg.new.stories('stories/popular', :count => 100) } end end app/controllers/index_controller.rb @@ -3,6 +3,7 @@ <div id="tagline"> <p>The Ultimate Digg News Feed (Digg just got even better)</p> <a href="http://feeds.feedburner.com/Diggfeedr"><img src="/images/subscribe.png" id="subscribe" alt="Subscribe Today" /></a> + <br /><br /><a href='/topics'>or get individual topics here</a> </div> <div id="screen"> <p><img src="/images/screen.png" alt="digg.com Screenshot" title="Digg.com" /></p> @@ -21,8 +22,8 @@ <p>These new feeds are <b>100 stories</b> long rather than the regular 40 so you’ll never miss another story.</p> </div> <div class="item"> - <h2>Powered by the Best</h2> - <p>Feeddit is riding on <a href="http://rubyonrails.org">Ruby on Rails</a>, it grabs the latest stories via the <a href="http://apidoc.digg.com/">Digg API</a> and syndicates it via <a href="http://feedburner.com">Feedburner</a>.</p> + <h2>Open Sourceable</h2> + <p>Feeddit is 100% free and open source, anyone can get the code under an MIT License. <a href='/opensource'>Grab it here!</a></p> </div> </div> app/views/index/index.html.erb @@ -1 +1,13 @@ -<p>Open source blerb will go here</p> \ No newline at end of file +<div class='opensource'> + <%= image_tag('opensource.png') %> + + <h2>Open Source for the People</h2> + + <p>Feeddit is so free that we are actually giving away the source code, go on, take it! Do whatever you like with it!</p> + + <p>If you think Feeddit is missing that killer feature then add it and send a pull request, you never know it might get merged back in and put live on the site.</p> + + <p class='download'>Get the latest version from github: <a href='http://github.com/andrew/feeddit/tree/master'>http://github.com/andrew/feeddit/tree/master</a></p> + + +</div> \ No newline at end of file app/views/index/opensource.html.erb @@ -22,7 +22,7 @@ <div id="content"> <div id="header"> <div id="logo"></div> - <div id="title"><h1>Feeddit <span class="note">Formerly DiggFeedr</span></h1></div> + <div id="title"><h1><a href='/'>Feeddit</a> <span class="note">Formerly DiggFeedr</span></h1></div> </div> <div id='middle'> <div id='logopadder'></div> app/views/layouts/application.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.0.991' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') config/environment.rb @@ -1,6 +1,6 @@ ActionController::Routing::Routes.draw do |map| - map.rss '/feed.rss', :controller => 'index', :action => 'feed', :format => 'atom' # legacy routes - map.atom '/feed.atom', :controller => 'index', :action => 'feed', :format => 'atom' # legacy routes + map.rss '/feed.rss', :controller => 'index', :action => 'index', :format => 'atom' # legacy routes + map.atom '/feed.atom', :controller => 'index', :action => 'index', :format => 'atom' # legacy routes map.topic '/topics/:topic.atom', :controller => 'index', :action => 'topics', :format => 'atom' config/routes.rb @@ -1,5 +1,3 @@ -/* Feeddit CSS */ -/* TODO better formatting and compress with asset packager */ body{background:#eee;font:normal normal 0.9em "Lucida Grande", Geneva, Arial, Verdana, sans-serif;} #wrapper{width:895px;margin:50px auto 0 auto;} #header{position:absolute;} @@ -12,7 +10,8 @@ body{background:#eee;font:normal normal 0.9em "Lucida Grande", Geneva, Arial, Ve a img{border:none;} #logo{width:128px; height:128px;background:url('/images/Feeds.png') no-repeat;float:left;margin:0 15px 0 0;} #title{margin:0 0 0 15px;border-bottom:1px solid #eee;float:left;width:550px;} -#title h1{margin:10px 0;color:#222;font-weight:bold;} +#title h1{margin:10px 0;color:#222;font-weight:bold; font-size:3.0em; line-height:0.5em;} +h1 a, h1 a:visited{color:#000; text-decoration:none;} #title .note{font-size:10px;color:#999;font-weight:normal;} #screen{width:438px;height:390px;overflow:hidden;position:absolute;margin:0 0 0 410px;top:-70px;} #tagline{background:url('/images/tagline.png') no-repeat;width:415px;height:86px;position:absolute;top:85px;text-align:center;} @@ -21,7 +20,7 @@ a img{border:none;} #blurb{clear:both; position:absolute; top:345px; width:835px;} .item{width:20%;float:left;margin:0 20px 0 10px;} .item h2, .item p{color:#333;} -.item b, .item a, .item a:visited{color:#4578B1; font-weight:bold;} +.item b, a, a:visited{color:#4578B1; font-weight:bold;} h2{font-size:1.1em;margin:2px 0;padding:0;} p{margin:3px 0;} #legal{clear:both;color:#aaa;font-size:0.7em;padding:30px 10px 0 10px; position:absolute; width:835px; top:620px; } @@ -32,18 +31,8 @@ p{margin:3px 0;} #middle{position:absolute; top:160px; width:800px; margin:0 0 0 10px; font-size:0.8em;} #topics-list{ margin:20px 0 0 0; padding:0; } #topics-list li{ list-style:none; } -#topics-list a{ - background:#F6F6F6; - display:block; - text-decoration:none; - color:#555; - background:; - border:1px solid #ddd; - width:138px; - float:left; - text-align:center; - margin:3px 5px; - padding:4px 5px; - height:25px; - } -#topics-list a:hover{font-weight:bold; background:#FBFBC3;} \ No newline at end of file +#topics-list a{background:#F6F6F6;display:block; text-decoration:none; color:#555; border:1px solid #ddd; width:138px; float:left; text-align:center;margin:3px 5px;padding:4px 5px;height:25px;} +#topics-list a:hover{font-weight:bold; background:#FBFBC3;} +.opensource{width:500px; margin:0 auto;} +.opensource h2, p{margin:0 0 10px 0;} +.opensource .download{background:#eee; border:1px solid #ddd; padding:5px;} \ No newline at end of file public/stylesheets/style.css app/views/index/feed.atom.builder 2343f964ca8967f72f98e9df00b7283f4442f2cb Andrew Nesbitt andrewnez@gmail.com http://github.com/andrew/feeddit/commit/109d1e94985fa335bc9ba4ced4855b0ef01ec4da 109d1e94985fa335bc9ba4ced4855b0ef01ec4da 2008-05-25T13:43:16-07:00 2008-05-25T13:43:16-07:00 improved and refactored views 0ab1fe30f567c9075e085586f4337b37d05917d2 Andrew Nesbitt andrewnez@gmail.com