diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb index 6964774..8c5e3cb 100755 --- a/app/controllers/studien_controller.rb +++ b/app/controllers/studien_controller.rb @@ -16,8 +16,10 @@ class StudienController < ApplicationController @sem = 'true' end if @sem == 'true' + @link = "Modulansicht" @change = 'false' else + @link = "Semesteransicht" @change = 'true' end diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb index 4c97a77..494b00b 100644 --- a/app/views/studien/show.html.erb +++ b/app/views/studien/show.html.erb @@ -2,28 +2,24 @@

<%= notice %>

- <%= link_to ''.html_safe+ I18n.t("studien.allestudien"), studien_path,:raw=>true %>|<%= link_to "Ansicht wechseln", studium_path(@studium, :sem => @change)%> + <%= link_to ''.html_safe+ I18n.t("studien.allestudien"), studien_path,:raw=>true %>|<%= link_to "Zu "+@link+ " wechseln", studium_path(@studium, :sem => @change)%> + + <% if @sem=='false'%> + <%= render :partial => "studien/studien", @collection => @studium, :as=>:studium%> + <% else %> + <%= render :partial =>"studien/semesteransicht", @collection => @studium, :as=>:studium%> + <% end %> +
-<%= @sem %> -<% if @sem=='false'%> -<% @change = 'true' %> -<%= render :partial => "studien/studien", @collection => @studium, :as=>:studium%> -<% else %> -<%= render :partial =>"studien/semesteransicht", @collection => @studium, :as=>:studium%> -<% @change = 'false' %> -<% end %> -
+
+ + <%= link_to ''.html_safe+I18n.t("studien.newmodulgroup"), new_studium_modulgruppe_path(@studium),:class=>"btn" %> | + <%= link_to ''.html_safe+I18n.t("common.edit"), edit_studium_path(@studium) ,:class=>"btn"%> + <%= link_to 'Destroy', @studium, method: :delete, data: { confirm: 'Are you sure?' } %> + +
-
- - <%= link_to ''.html_safe+I18n.t("studien.newmodulgroup"), new_studium_modulgruppe_path(@studium),:class=>"btn" %> | - <%= link_to ''.html_safe+I18n.t("common.edit"), edit_studium_path(@studium) ,:class=>"btn"%> - <%= link_to 'Destroy', @studium, method: :delete, data: { confirm: 'Are you sure?' } %> -
- - -
-<%= toolbar_html(@toolbar_elements) %> + <%= toolbar_html(@toolbar_elements) %>