merged changes back from the production version

[selectricity] / app / views / layouts / _footer.rhtml

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">
-       <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>