Merge branch 'featured_articles'

5 files changed, 50 insertions, 10 deletions

diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb
index d9ec5db..5a288ed 100644
--- a/app/helpers/content_helper.rb
+++ b/app/helpers/content_helper.rb
@@ -20,6 +20,11 @@ module ContentHelper
     render :partial => 'content/tags'
   end
   
+  def featured_articles
+    @featured_articles = FeaturedArticle.all
+    render :partial => 'content/featured_articles'
+  end
+  
   def headline_image
     image = @page.assets.images.first
     if image
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index e86be0e..054e7ee 100644
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -1,6 +1,28 @@
 class MenuItem < ActiveRecord::Base
   
-  translates :title
+  default_scope :conditions => {:type => "MenuItem"}
   
-  acts_as_list
+  translates    :title
+  
+  acts_as_list  :scope => :type
+  
+  before_save   :determine_type_id
+  
+  
+  private
+  
+    def determine_type_id
+      case self.class.name
+        
+      when "MenuItem"
+        self.type_id = 1
+      when "FeaturedArticle"
+        self.type_id = 2
+      end
+    end
 end
+
+
+class FeaturedArticle < MenuItem
+  default_scope :conditions => {:type => "FeaturedArticle"}
+end
\ No newline at end of file
diff --git a/app/views/content/_featured_articles.html.erb b/app/views/content/_featured_articles.html.erb
new file mode 100644
index 0000000..08f7624
--- /dev/null
+++ b/app/views/content/_featured_articles.html.erb
@@ -0,0 +1,9 @@
+<div id="frontpage_calendar">
+  <h2>Featured</h2>
+  <ul>
+    <% @featured_articles.each do |item| %>
+    <li><%= link_to_path item.title, item.path %></li>
+    <% end %>
+  </ul>
+</div>
+
diff --git a/app/views/content/_search.html.erb b/app/views/content/_search.html.erb
new file mode 100644
index 0000000..718a516
--- /dev/null
+++ b/app/views/content/_search.html.erb
@@ -0,0 +1,8 @@
+<table>
+<% form_tag search_path, :method => 'get' do %>
+  <tr>
+    <td><%= text_field_tag :search_term, params[:search_term] %></td>
+    <td style="padding-top: 2px"><%= image_submit_tag("search_button.png") %></td>
+  </tr>
+<% end %>
+</table>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 0b32673..7a5222d 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -15,18 +15,13 @@
         <%= image_tag "header.png" %>
       </div>
       <div id="search">
-        <table>
-        <% form_tag search_path, :method => 'get' do %>
-          <tr>
-            <td><%= text_field_tag :search_term %></td>
-            <td style="padding-top: 2px"><%= image_submit_tag("search_button.png") %></td>
-          </tr>
-        <% end %>
-        </table>
+        <%= render :partial => "content/search" %>
       </div>
       <div id="left_column">
         <%= main_menu %>
         
+        <%= language_selector %>
+        
         <%= calendar %>
       </div>
       <div id="center_column">
@@ -34,6 +29,7 @@
       </div>
       <div id="right_column">
         <%= tags %>
+        <%= featured_articles %>
       </div>
     </div>