Merge branch 'public_search'

4 files changed, 38 insertions, 0 deletions

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
new file mode 100644
index 0000000..97ecdfd
--- /dev/null
+++ b/app/controllers/search_controller.rb
@@ -0,0 +1,11 @@
+class SearchController < ApplicationController
+  def index
+    @page = Page.new
+    search_term = params[:search_term]
+    if search_term and not search_term.empty?
+      nodes = Node.search(params[:search_term])
+      @results = nodes.map {|node| node.head}
+    end
+  end
+
+end
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
new file mode 100644
index 0000000..b3ce20a
--- /dev/null
+++ b/app/helpers/search_helper.rb
@@ -0,0 +1,2 @@
+module SearchHelper
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 69db939..0b32673 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,6 +14,16 @@
       <div id="header">
         <%= 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>
+      </div>
       <div id="left_column">
         <%= main_menu %>
         
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
new file mode 100644
index 0000000..28764bf
--- /dev/null
+++ b/app/views/search/index.html.erb
@@ -0,0 +1,15 @@
+<h2>Suche</h2>
+
+
+
+<% if params[:search_term] %>
+  <h3>Suchergebnisse für Suchbegriff: <%= params[:search_term] %></h3>
+<% end %>
+
+<%= 
+  render(
+    :partial => 'custom/partials/article',
+    :collection => @results,
+    :as => :page
+  )
+%>
\ No newline at end of file