From 6408d04ea88f2a24e40150dd1787a273c11a1e34 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Sun, 11 Aug 2013 00:38:01 +0200
Subject: [PATCH] =?UTF-8?q?Modul-show=20=C3=BCberarbeitet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/modulgruppen/_kurz.html.erb |  1 +
 app/views/moduls/_modul.html.erb      | 43 +++++++++++++--------------
 2 files changed, 21 insertions(+), 23 deletions(-)
 create mode 100644 app/views/modulgruppen/_kurz.html.erb

diff --git a/app/views/modulgruppen/_kurz.html.erb b/app/views/modulgruppen/_kurz.html.erb
new file mode 100644
index 0000000..610f838
--- /dev/null
+++ b/app/views/modulgruppen/_kurz.html.erb
@@ -0,0 +1 @@
+<b><%=link_to modulgruppe.name, modulgruppe %></b> <%= ' ( ' + modulgruppe.studium.name + ')' unless modulgruppe.studium.nil? %>
diff --git a/app/views/moduls/_modul.html.erb b/app/views/moduls/_modul.html.erb
index eca542f..78ff8dc 100755
--- a/app/views/moduls/_modul.html.erb
+++ b/app/views/moduls/_modul.html.erb
@@ -1,26 +1,23 @@
-<div style="border: solid 1px; padding:2px"><p>
-  <b><%= 
-if modul.name.nil? 
-name=""
-else
-name=modul.name
-end
-link_to "Modul "+name , modul_path(modul) %> </b>
-</p>
+
+<h1><%=@modul.name %></h1>
+
+
+<h2>Beschreibung </h2>
 <p>
-  <%= raw(modul.desc) %>
+  <%= raw(@modul.desc) %>
 </p>
-LVAs: 
-
-<ul>
-
-<% modul.lvas.each do |lv| %>
-<li>
-<%= link_to  lv.name.to_s, lva_path(lv.id)  %>
-</li>
-<% end %>
-
-</ul>
-
-<% # @toolbar_elements << {:icon=>:pencil,:text=>I18n.t("common.edit"),:path=> edit_modul_path(modul)} %>
+<h2>Lvas</h2>
+<% @modul.lvas.each_slice(3) do |row| %>
+<div class="row-fluid">
+<% row.each do |lv| %>
+<div class="span4">
+<%= render 'lvas/lva_semester', :lva=>lv%>
 </div>
+<% end %>
+</div>
+
+<% end %>
+<h2>Modulgruppen</h2>
+<% @modul.modulgruppen.each do |mg| %>
+<%= render 'modulgruppen/kurz', :modulgruppe=>mg %><br>
+<% end %>