3 files changed, 21 insertions, 8 deletions

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..c6029e0
--- /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 %></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>