diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb index 6a4ca7b..976bd4b 100755 --- a/app/controllers/studien_controller.rb +++ b/app/controllers/studien_controller.rb @@ -5,7 +5,7 @@ class StudienController < ApplicationController def index @studien = Studium.all @toolbar_elements<<{:icon =>:plus, :text=> I18n.t('studien.new') ,:path=>new_studium_path } - @toolbar_elements<<{:text=> I18n.t('modulgruppe.show.link') ,:path=>modulgruppen_path } + # @toolbar_elements<<{:text=> I18n.t('modulgruppe.show.link') ,:path=>modulgruppen_path } @toolbar_elements<<{:text=> I18n.t('modul.show.link') ,:path=>moduls_path } @toolbar_elements<<{:text=> 'Alle LVas auflisten', :path=>lvas_path} end diff --git a/app/views/lvas/_lva_semester.html.erb b/app/views/lvas/_lva_semester.html.erb index 96544d5..48ea699 100755 --- a/app/views/lvas/_lva_semester.html.erb +++ b/app/views/lvas/_lva_semester.html.erb @@ -1,6 +1,7 @@ -
- <%= link_to lva.name + " / " + lva.lvanr.to_s, lva_path(lva) %> -<%= lva.ects %> ECTS/ <%= lva.stunden %> Std <%= " / " + lva.beispiele.count.to_s + " Beispiele"%> -
+

+ <%= link_to lva.name, lva_path(lva)%>
<%="LVa-Nr " + lva.lvanr.to_s %> +<%= lva.ects %> ECTS / <%= lva.stunden %> Std <%= " / " + lva.beispiele.count.to_s + " Beispiele"%>
+<%= link_to "Edit", edit_lva_path(lva) %> | <%= link_to "Beispiel hinzufügen", new_beispiel_path(:lva_id=>lva.id) %> +

<% #toolbar_html(@toolbar_elements) %> diff --git a/app/views/lvas/index.html.erb b/app/views/lvas/index.html.erb index c09b08a..2eec9ee 100755 --- a/app/views/lvas/index.html.erb +++ b/app/views/lvas/index.html.erb @@ -1,31 +1,7 @@

Listing lvas

- - - - - - - - - - - - - -<% @lvas.each do |lva| %> - - - - - - - - - - -<% end %> -
NameDescEctsLvanrStunden
<%= lva.name %><%= lva.desc %><%= lva.ects %><%= lva.lvanr %><%= lva.stunden %><%= link_to 'Show', lva %><%= link_to 'Edit', edit_lva_path(lva) %><%= link_to 'Destroy', lva, method: :delete, data: { confirm: 'Are you sure?' } %>
- -
- + <%= link_to 'New Lva', new_lva_path %>