From: <mako@atdot.cc>
Date: Wed, 5 Sep 2007 14:57:17 +0000 (-0400)
Subject: merged in link to blog
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/920ef241649e7f6101fc9e72c5581f9d3a2f7270?hp=96f76b16213a465772c8d8b50d08d6b4796b730b

merged in link to blog
---

diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 4138694..b651273 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -7,7 +7,8 @@ class AboutController < ApplicationController
     redirect_to :action => 'overview'
   end
 
-  def features
+  def blog
+    redirect_to "http://blog.selectricity.org"
   end
 
   private
diff --git a/app/views/about/_sidebar.rhtml b/app/views/about/_sidebar.rhtml
index a624e0d..d61ff6c 100644
--- a/app/views/about/_sidebar.rhtml
+++ b/app/views/about/_sidebar.rhtml
@@ -1,6 +1,7 @@
 <h2>Information and Documentation</h2>
 
 <% steps = [ ['overview', 'Overview'],
+             ['blog', 'News/Blog' ],
              ['features', 'Major Features' ],
 #             ['why', 'Why Selectricity?' ],
              ['team', 'The Team'],
diff --git a/app/views/layouts/_footer.rhtml b/app/views/layouts/_footer.rhtml
index a30193c..f481c85 100644
--- a/app/views/layouts/_footer.rhtml
+++ b/app/views/layouts/_footer.rhtml
@@ -1,4 +1,5 @@
   <div id="footer">
-	<a href="http://code.selectricity.org/">Copyleft 2006, 2007</a> &nbsp;&nbsp; || &nbsp;&nbsp; 
-	<a href="http://www.media.mit.edu">MIT Media Lab</a>
+	<a href="http://blog.selectricity.org/">Copyleft 2006, 2007</a> 
+	<a href="http://www.media.mit.edu">MIT Media Lab</a>, <%= link_to("Selectricity Team", :controller => 'about', :action => 'team') %>&nbsp;&nbsp;::&nbsp;&nbsp; 
+    <a href="http://blog.selectricity.org/">Selectricity News Blog</a>
   </div>