From d928330189856e70caf74e769056231bffce3dc1 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Fri, 23 Aug 2013 18:28:38 +0200
Subject: [PATCH] neuigeiten startseite

---
 app/controllers/neuigkeiten_controller.rb | 9 ++++++++-
 app/controllers/rubriken_controller.rb    | 2 +-
 app/views/rubriken/index.html.erb         | 7 +++----
 config/routes.rb                          | 3 ++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb
index 32bcaca..70ad200 100755
--- a/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
@@ -11,6 +11,8 @@ class NeuigkeitenController < ApplicationController
     if can? :edit, @neuigkeit
 	@toolbar_elements << {:text=>I18n.t('common.edit'),:path=>edit_neuigkeit_path(@neuigkeit),:icon=>:pencil}
 	@toolbar_elements << {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => neuigkeit_path(@neuigkeit), :method=> :delete,:confirm=>"Sure?" }
+    @toolbar_elements << {:hicon=>'icon-plus', :text=> "publish",:path => neuigkeit_publish_path(@neuigkeit),:confirm=>"Sure?" }
+
     end
   end
 
@@ -20,7 +22,12 @@ class NeuigkeitenController < ApplicationController
     @neuigkeit.rubrik=@rubrik unless @rubrik.nil?
  end
 
-
+  def publish 
+    @neuigkeit = Neuigkeit.find(params[:id])
+    @neuigkeit.publish
+    @neuigkeit.save
+    redirect_to @neuigkeit
+  end 
   def edit
     @neuigkeit = Neuigkeit.find(params[:id])
   end
diff --git a/app/controllers/rubriken_controller.rb b/app/controllers/rubriken_controller.rb
index bbff5b5..b34ef46 100755
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -3,7 +3,7 @@ class RubrikenController < ApplicationController
    load_and_authorize_resource
   def index
     @rubriken = Rubrik.all
- 
+    @neuigkeiten = Neuigkeit.recent
   end
 
  
diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb
index 46de7f6..2b8ee82 100755
--- a/app/views/rubriken/index.html.erb
+++ b/app/views/rubriken/index.html.erb
@@ -1,13 +1,12 @@
 <%= render 'tabs' %>
 <h1><%= I18n.t("rubrik.title")%></h1>
-<% @rubriken.each do |rubrik| %>
 
-<% rubrik.neuigkeiten.recent.each do |n| %>
+<ul class="unstyled"
+<% @neuigkeiten.each do |n| %>
 
 <li><%= render n %> </li>
 <% end %>
-<%= link_to 'Weitere Artikel zu '+rubrik.name.to_s , rubrik %>   
-<% end %>
+</ul>
 
 
 
diff --git a/config/routes.rb b/config/routes.rb
index cef5142..ee3e374 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -51,7 +51,8 @@
      resources :neuigkeiten
 		 resources :fragen
      get 'rubriken/verwalten', :controller=>:rubriken, :action=>:alle_verwalten, :as=>'alle_verwalten_rubrik'
-
+     
+	 get 'neuigkeiten/:id/publish', :controller=>:neuigkeiten, :action=>:publish, :as=>'neuigkeit_publish'
      resources :rubriken do
        resources :neuigkeiten, :only=>[:new, :show]
      end