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 @@
<%= notice %>
+
+
+ <%= @rubrik.name %>
- Name:
- <%= @rubrik.name %>
-
-
- Desc:
<%= @rubrik.desc %>
-
-
- Prio:
- <%= @rubrik.prio %>
-
-
-Moderatoren:
+Moderatoren:
<% @moderatoren.each do |m|%>
-<%= m.email%>
-<% end%>
+<%= m.email%>,
+<% end%>
+
+
+<% @rubrik.neuigkeiten.each_slice(2) do |row| %>
+
+<% row.each do |neuigkeit| %>
+
+<%= render neuigkeit %>
+
+<% end %>
+
+<% end %>
+
+
+
+
<%= 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 %>
+
\ 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!"