Merge branch 'public_search'

10 files changed, 80 insertions, 1 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
diff --git a/config/routes.rb b/config/routes.rb
index c3b2e84..1706dad 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -18,6 +18,7 @@ ActionController::Routing::Routes.draw do |map|
   map.logout    '/logout',  :controller => 'sessions', :action => 'destroy'
   map.login     '/login',   :controller => 'sessions', :action => 'new'
   map.admin_search 'admin/search', :controller => 'admin', :action => 'search'
+  map.search    'search',   :controller => "search", :action => 'index' 
   map.resources :users
   map.resources :menu_items, :member => {:sort => :post}
   map.resource  :session
diff --git a/public/images/search_button.png b/public/images/search_button.png
new file mode 100644
index 0000000..9a59f04
--- /dev/null
+++ b/public/images/search_button.png
diff --git a/public/images/search_field.png b/public/images/search_field.png
new file mode 100644
index 0000000..1ee523d
--- /dev/null
+++ b/public/images/search_field.png
diff --git a/public/stylesheets/ccc.css b/public/stylesheets/ccc.css
index beb16f0..6a9458f 100644
--- a/public/stylesheets/ccc.css
+++ b/public/stylesheets/ccc.css
@@ -107,7 +107,7 @@ div#left_column {
 div#center_column {
   position: absolute;
   background-color: #ffffff;
-  left: 185px;
+  left: 200px;
   width: 460px;
   padding-left: 15px;
   padding-right: 15px; 
@@ -139,4 +139,32 @@ div.article_partial h2 a {
 
 div.article_partial p.excerpt {
   color: #404040;
+}
+
+div#search {
+  position: absolute;
+  top: 145px;
+  left: 676px;
+  height: 1000px;
+  vertical-align: top;
+}
+
+div#search input[type=button] {
+  display: block;
+  height: 20px;
+}
+
+div#search input[type=text] {
+  display: block;
+  padding: 0px;
+  margin: 0px;
+  height: 20px;
+  width: 132px;
+  line-height: 20px;
+  border: none;
+  background-image: url(/images/search_field.png);
+  background-repeat:no-repeat;
+  padding-right: 5px;
+  margin-right: 5px;
+  background-position: top top;
 }
\ No newline at end of file
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
new file mode 100644
index 0000000..49bb14f
--- /dev/null
+++ b/test/functional/search_controller_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class SearchControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end
diff --git a/test/unit/helpers/search_helper_test.rb b/test/unit/helpers/search_helper_test.rb
new file mode 100644
index 0000000..3034163
--- /dev/null
+++ b/test/unit/helpers/search_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class SearchHelperTest < ActionView::TestCase
+end