From 642ca81cc8e15d8e1eb15ee053072a68cc7986b6 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <st-andreas@gmx.at>
Date: Tue, 12 Feb 2013 11:18:52 +0100
Subject: [PATCH] kleine Korrektur im Ribrik Controller

---
 app/controllers/rubriken_controller.rb |  2 +-
 app/views/rubriken/show.html.erb       | 44 +++++++++++++++-----------
 config/locales/de.yml                  |  3 +-
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/app/controllers/rubriken_controller.rb b/app/controllers/rubriken_controller.rb
index 5c4d7ba..1af6a78 100644
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -44,7 +44,7 @@ class RubrikenController < ApplicationController
       
       response_notice= I18n.t("rubrik/moderatoradded")
     else
-      response_notice= I18n.t("rubrik/moderatoraddnorights"
+      response_notice= I18n.t("rubrik/moderatoraddnorights")
     end
     respond_to do |format|
       format.html { redirect_to @rubrik,:notice => response_notice }
diff --git a/app/views/rubriken/show.html.erb b/app/views/rubriken/show.html.erb
index c783d2d..a86dbad 100644
--- a/app/views/rubriken/show.html.erb
+++ b/app/views/rubriken/show.html.erb
@@ -1,31 +1,39 @@
 <p id="notice"><%= notice %></p>
+<div class="row-fluid">
+<span class="span12">
+  <h1><%= @rubrik.name %></h1>
 
 <p>
-  <b>Name:</b>
-  <%= @rubrik.name %>
-</p>
 
-<p>
-  <b>Desc:</b>
   <%= @rubrik.desc %>
 </p>
-
-<p>
-  <b>Prio:</b>
-  <%= @rubrik.prio %>
-</p>
-
-<b>Moderatoren:</b>
+<b>Moderatoren:</b><i>
 <% @moderatoren.each do |m|%>
-<%= m.email%>
-<% end%>
+<%= m.email%>,
+<% end%></i>
+</span>
+</div>
 
+<% @rubrik.neuigkeiten.each_slice(2) do |row| %>
+<div class="row-fluid">
+<% row.each do |neuigkeit| %>
+<div class="span6 min-width:13em;">
+<%= render neuigkeit %>
+</div>
+<% end %>
+</div>
+<% end %>
+
+
+<div class="row-fluid">
+<span class="span12">
 <%= semantic_form_for @rubrik, :url=> url_for(:action => 'addmoderator',:id=>@rubrik.id) do |f| %>
 <%= f.inputs do %>
-<%= f.input :moderator, :as => :select, :collection => Hash[User.all.map{|b| [b.email,b.id]}] ,:label=>"Hinzufügen"%>
-		<% end %>
-		<%= f.action :submit %>
-	<% end %>
+<%= f.input :moderator, :as => :select, :collection => Hash[User.all.map{|b| [b.email,b.id]}] ,:label=>"Hinzufuegen"%>
+<% end %>
+<%= f.action :submit %>
+<% end %>
 
 <%= link_to 'Edit', edit_rubrik_path(@rubrik) %> |
 <%= link_to 'Back', rubriken_path %>
+</span></div>
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0577690..834670b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2,7 +2,7 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 de:
   hello: "Hallo Welt"
-
+  
   studien:
     list: "Studien der Fakultät Elektrotechnik"
     new: "Neues Studium"
@@ -18,6 +18,7 @@ de:
     studien: "Studien"
     news: "News"
     info: "Information"
+
   rubrik:
     moderatoradded: "Neuen Moderator hinzugefügt!"
     moderatoraddnorights: "Keine Berechtigung neue Moderatoren hinzuzufügen!"