Merge branch 'featured_articles'

2 files changed, 17 insertions, 0 deletions

diff --git a/app/views/content/_featured_articles.html.erb b/app/views/content/_featured_articles.html.erb
new file mode 100644
index 00000000..08f76242
--- /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 00000000..718a516a
--- /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