From 2b5a6edb3b9e03ab6f570898e62c6e64e02809d9 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Fri, 2 Aug 2013 19:08:35 +0200
Subject: [PATCH] Bugfixes

---
 app/controllers/modulgruppen_controller.rb | 1 -
 app/views/lvas/show.html.erb               | 2 +-
 app/views/studien/_navigation.html.erb     | 6 +++---
 app/views/studien/show.html.erb            | 6 ++++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/controllers/modulgruppen_controller.rb b/app/controllers/modulgruppen_controller.rb
index be6f8e0..c69f8fe 100755
--- a/app/controllers/modulgruppen_controller.rb
+++ b/app/controllers/modulgruppen_controller.rb
@@ -56,7 +56,6 @@ class ModulgruppenController < ApplicationController
     else
       @studium=Studium.find_by_id(params[:modulgruppe][:studium_id]) 
     end
- @modulgruppe.studium_id = params[:studium_id]
     respond_to do |format|
          
       if @modulgruppe.save
diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb
index e88bce4..9dd333c 100755
--- a/app/views/lvas/show.html.erb
+++ b/app/views/lvas/show.html.erb
@@ -1,7 +1,7 @@
 <% @lva.modul.each do |modul| %>
 <% modul.modulgruppen.each do |g| %>
 <ul class="breadcrumb">
-<li><%= link_to g.studium.name , studium_path(g.studium)%>
+<li><%= link_to g.studium.name , studium_semesteransicht_path(g.studium)%>
 <span class="divider">/</span></li>
 <li><%= link_to g.name , modulgruppe_path(g)%><span class="divider">/</span></li>
 <li><%= link_to modul.name , modul_path(modul)%></li>
diff --git a/app/views/studien/_navigation.html.erb b/app/views/studien/_navigation.html.erb
index cee7ed0..b2c8012 100755
--- a/app/views/studien/_navigation.html.erb
+++ b/app/views/studien/_navigation.html.erb
@@ -2,15 +2,15 @@
 <ul class="breadcrumb">
   <li>  <%= link_to '<i class="icon-list"></i>'.html_safe+ I18n.t("studien.allestudien"), studien_path,:raw=>true %>
     <span class="divider">/</span></li>
-  <li> <%= link_to  @text, @path%>
+  <li> <%= link_to @text, @path%>
     <span class="divider">/</span></li>
   <br>
   <% Studium.all.each do |s| %>
     <li>
       <% if @sem=='true' %>
-	<%= link_to s.name, studium_semesteransicht_path(s) %>
+	<%= link_to_unless_current s.name, studium_semesteransicht_path(s) %>
       <% else %>
-	<%= link_to s.name, studium_path(s) %>
+	<%= link_to_unless_current s.name, studium_path(s) %>
       <% end %>
       <span class="divider">/</span></li>
 </li>
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index 64f3c32..e557109 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -4,6 +4,7 @@
     <p id="notice"><%= notice %></p>
     <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
   </div>
+  <div>
   <%= raw(@studium.desc) %>
   <% @studienphasen.each do |sp| %>
     <% sp[:modulgruppen].each do |row| %>
@@ -16,6 +17,7 @@
       </div>
     <% end %>
   <% end %>
-  <%= render 'layouts/pretty_toolbar' %><br>
-  <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
+   <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
+   </div>
+  <%= render 'layouts/pretty_toolbar' %>
 </div>