linked to blog from the footer and about page

diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 41386942a2eaa4570650ad2ee8f9456abdb358a7..b651273e7536e63544b68c2f7be4c324012839fe 100644 (file)
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -7,7 +7,8 @@ class AboutController < ApplicationController
     redirect_to :action => 'overview'
   end
 
     redirect_to :action => 'overview'
   end
 

-  def features
+  def blog
+    redirect_to "http://blog.selectricity.org"

   end
 
   private
   end
 
   private

diff --git a/app/views/about/_sidebar.rhtml b/app/views/about/_sidebar.rhtml
index a624e0da512ea2d229e7663a6bb23e3d24b188f9..d61ff6cc20974628e299b62939bc68b6453975de 100644 (file)
--- a/app/views/about/_sidebar.rhtml
+++ b/app/views/about/_sidebar.rhtml
@@ -1,6 +1,7 @@
 <h2>Information and Documentation</h2>
 
 <% steps = [ ['overview', 'Overview'],
 <h2>Information and Documentation</h2>
 
 <% steps = [ ['overview', 'Overview'],

+             ['blog', 'News/Blog' ],

              ['features', 'Major Features' ],
 #             ['why', 'Why Selectricity?' ],
              ['team', 'The Team'],
              ['features', 'Major Features' ],
 #             ['why', 'Why Selectricity?' ],
              ['team', 'The Team'],

diff --git a/app/views/layouts/_footer.rhtml b/app/views/layouts/_footer.rhtml
index a30193cefd72ce35b5187df48bb20f6fb98eafd2..f481c852a6b5f830f8dd7560cd8441e45717ae1f 100644 (file)
--- a/app/views/layouts/_footer.rhtml
+++ b/app/views/layouts/_footer.rhtml
@@ -1,4 +1,5 @@
   <div id="footer">
   <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>
   </div>