From ff4a14a35065f0840db31ed0490f98568bace314 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Wed, 21 Aug 2013 13:08:36 +0200 Subject: [PATCH] show changes --- app/views/lecturers/_lec_lva.html.erb | 1 + app/views/lvas/show.html.erb | 13 +++++++------ app/views/studien/index.html.erb | 9 ++++++--- app/views/studien/verwalten.html.erb | 4 ++-- 4 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 app/views/lecturers/_lec_lva.html.erb diff --git a/app/views/lecturers/_lec_lva.html.erb b/app/views/lecturers/_lec_lva.html.erb new file mode 100644 index 0000000..0cc48224 --- /dev/null +++ b/app/views/lecturers/_lec_lva.html.erb @@ -0,0 +1 @@ +

<%= lec_lva.name %>

diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb index a294a2e..99bc1ff 100755 --- a/app/views/lvas/show.html.erb +++ b/app/views/lvas/show.html.erb @@ -18,12 +18,6 @@

Beispiele

-

Beschreibung

- <%= @lva.desc %> - -<%= link_to "Beispiel neu" , new_beispiel_path(:lva_id=>@lva.id) %> -

-

Beispiele

+
+

<%= I18n.t "lecturers.lecturers" %>

+ <% @lva.lecturers.each do |lec| %> + <%= render :partial=>'lecturers/lec_lva', :object=>lec %> + + <% end %> +
diff --git a/app/views/studien/index.html.erb b/app/views/studien/index.html.erb index 0d58a99..23459f3 100755 --- a/app/views/studien/index.html.erb +++ b/app/views/studien/index.html.erb @@ -4,12 +4,15 @@

<%= I18n.t("studien.list") %>

- <% @studien.sort_by{|z| z[:zahl]}.each do |studium| %> -
+ <% @studien.each_slice(2) do |row| %> +
+ <% row.each do |studium|%> +
<%= render studium%>
<% end %> - +
+ <%end%>
diff --git a/app/views/studien/verwalten.html.erb b/app/views/studien/verwalten.html.erb index 4a22854..dd56b33 100644 --- a/app/views/studien/verwalten.html.erb +++ b/app/views/studien/verwalten.html.erb @@ -5,7 +5,7 @@

<%= I18n.t("studien.verwaltung.title") %>

<%= I18n.t("studien.verwaltung.explanation").html_safe %> -

Studien

+

<%= I18n.t "studien.studien"%>

<% @studien.each_slice([(Studium.count/2.0).ceil, 1].max) do |col| %> @@ -166,7 +166,7 @@
    - <% @messages.flatten.each do |m| %> + <% @messages.flatten.compact.each do |m| %> <% if !m.strip.empty? %>
  • <%= m.html_safe %>
  • <% end %>