Merge remote-tracking branch 'thomasb/master'

app/controllers/lvas_controller.rb

@@ -16,6 +16,14 @@ class LvasController < ApplicationController
    
     @toolbar_elements<<{:hicon=>'icon-plus-sign', :icon=>:plus, :text => "Neues Beispiel", :path=> new_beispiel_path(:lva_id =>@lva.id)}
      @toolbar_elements<<{:hicon=>'icon-pencil', :icon=>:pencil,:text =>I18n.t('common.edit'),:path => edit_lva_path(@lva)}
+    @topbar_elements =[{:hicon=>'icon-list', :text=>I18n.t("lva.list"), :path=>lvas_path}]
+    for m in @lva.modul
+      @topbar_elements << {:newline=>true}
+      @topbar_elements << {:text=> '<b>' + m.name + '</b>', :path=>modul_path(m)}
+      for mg in m.modulgruppen
+        @topbar_elements << {:text => mg.studium.name + ' (' + mg.name + ')', :path=>studium_path(mg.studium)}
+        end
+      end
   end
 
   # GET /lvas/new

app/controllers/moduls_controller.rb

@@ -30,18 +30,18 @@ class ModulsController < ApplicationController
 
     
     @topbar_elements = [{:hicon=>'icon-list', :text=>I18n.t("modul.list"),:path=>moduls_path}]
-          
+      @tb=[]
-      @topbar_elements <<{:newline=>true}
     for i in @modul.modulgruppen
+
       if  !i.studium.nil?
-      name =i.studium.name
+        name =i.studium.name
-      id = i.studium.id
+        id = i.studium.id
-        else
+      else
-         s.name = 'Kein Studium vorhanden'
+        s.name = 'Kein Studium vorhanden'
         s.id = nil
-        end
-      @topbar_elements <<{:text=> i.name + ' ('+i.studium.name + ')', :path=>studium_modulgruppen_path(i)}
       end
+      @tb <<{:text=> i.name + ' ('+i.studium.name + ')', :path=>modulgruppe_path(i)} 
+    end
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @modul }

app/views/layouts/_topbar.html.erb

@@ -5,7 +5,7 @@
       <br>
     <% else %>
       <li>
-	<%= link_to_unless_current '<i class="'.html_safe + tb[:hicon].to_s.html_safe + '"></i>'.html_safe+ tb[:text], tb[:path] %><span class="divider">/</span></li>
+	<%= link_to_unless_current '<i class="'.html_safe + tb[:hicon].to_s.html_safe + '"></i>'.html_safe+ tb[:text].html_safe, tb[:path] %><span class="divider">/</span></li>
     <% end %>
   <% end %>
 </ul>

app/views/lvas/_lva_semester.html.erb

@@ -1,7 +1,7 @@
 
 <p class="lva_semester">
-  <b><%= link_to lva.name, lva_path(lva)%></b>
+  <b><%= link_to lva.name, lva_path(lva)%></b><br>
-  (|<% lva.modul.each do |m| %> <%= link_to m.name, modul_path(m) unless m.modulgruppen.map{|x| x.studium}.index(@studium).nil? && !@studium.nil? %> |<% end %>)
+  Module: /<% lva.modul.each do |m| %> <%= link_to m.name + ' / ', modul_path(m) unless m.modulgruppen.map{|x| x.studium}.index(@studium).nil? && !@studium.nil? %><% end %>
   <br>
   <%="LVa-Nr " + lva.lvanr.to_s %>
   <%= lva.ects %> ECTS / <%= lva.stunden %> Std <% " / " + lva.beispiele.count.to_s + " Beispiele"%> <br>

app/views/lvas/show.html.erb

@@ -1,4 +1,4 @@
-<%= render 'layouts/link_all'%>
+<%= render 'layouts/topbar'%>
 <p id="notice"><%= notice %></p>
 <p>
 

app/views/moduls/show.html.erb

@@ -1,5 +1,5 @@
 <%= render 'layouts/topbar'%>
-
+<%= render 'layouts/topbar', :topbar=>@tb%>
 <p id="notice"><%= notice %></p>
 <%= render @modul %>