diff --git a/app/controllers/lvas_controller.rb b/app/controllers/lvas_controller.rb
index d2ee71f..7b737dd 100755
--- a/app/controllers/lvas_controller.rb
+++ b/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=> '' + m.name + '', :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
diff --git a/app/controllers/moduls_controller.rb b/app/controllers/moduls_controller.rb
index d4503ed..a21712c 100755
--- a/app/controllers/moduls_controller.rb
+++ b/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}]
-
- @topbar_elements <<{:newline=>true}
+ @tb=[]
for i in @modul.modulgruppen
+
if !i.studium.nil?
- name =i.studium.name
- id = i.studium.id
- else
- s.name = 'Kein Studium vorhanden'
+ name =i.studium.name
+ id = i.studium.id
+ else
+ 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 }
diff --git a/app/views/layouts/_topbar.html.erb b/app/views/layouts/_topbar.html.erb
index f22b2dc..2a4c0de 100755
--- a/app/views/layouts/_topbar.html.erb
+++ b/app/views/layouts/_topbar.html.erb
@@ -5,7 +5,7 @@
<% else %>
- <%= link_to lva.name, lva_path(lva)%>
- (|<% 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 %>)
+ <%= link_to lva.name, lva_path(lva)%>
+ 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 %>
<%="LVa-Nr " + lva.lvanr.to_s %>
<%= lva.ects %> ECTS / <%= lva.stunden %> Std <% " / " + lva.beispiele.count.to_s + " Beispiele"%>
diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb
index df3bb49..78efd78 100755
--- a/app/views/lvas/show.html.erb
+++ b/app/views/lvas/show.html.erb
@@ -1,4 +1,4 @@
-<%= render 'layouts/link_all'%>
+<%= render 'layouts/topbar'%>
<%= notice %>
diff --git a/app/views/moduls/show.html.erb b/app/views/moduls/show.html.erb index 74c1367..2bf73e9 100755 --- a/app/views/moduls/show.html.erb +++ b/app/views/moduls/show.html.erb @@ -1,5 +1,5 @@ <%= render 'layouts/topbar'%> - +<%= render 'layouts/topbar', :topbar=>@tb%>
<%= notice %>
<%= render @modul %>