Added new news tab

supramap · Nov 19, 2010 · 770a7b0 · 770a7b0
1 parent 4c2f0d2
commit 770a7b0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 165,457 deletions.
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -6,10 +6,14 @@ def help
   def contact
   end
 
+  def news
+
+  end
+
   def oil_spill
-    @oil = Oil.find(:all)
-    @file = 'hello'
-    @fish = Fish.find(:all)
+    #@oil = Oil.find(:all)
+    #@file = 'hello'
+    #@fish = Fish.find(:all)
   end
 
    # def oil_spill( fish,oil)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -46,6 +46,7 @@
       <li><a href="/home/oil_spill">Oil Spill</a></li>
       <li><a href="/home/help">Help</a></li>
       <li><a href="/home/contact">Contact Us</a></li>
+      <li><a href="/home/news">News</a></li>
     </ul>
     </div>
     <div id="content-wrapper">

diff --git a/log/development.log b/log/development.log