From 13e1c6356107fcdb6b8d3cf5973002d54b1dd442 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Fri, 2 Aug 2013 10:40:22 +0200 Subject: [PATCH] Toolbar einbindungen --- app/views/studien/edit.html.erb | 4 ++-- app/views/studien/index.html.erb | 9 +++++---- app/views/studien/semesteransicht.html.erb | 2 ++ app/views/studien/show.html.erb | 12 +----------- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/app/views/studien/edit.html.erb b/app/views/studien/edit.html.erb index 766d5b2..a2f6ed9 100755 --- a/app/views/studien/edit.html.erb +++ b/app/views/studien/edit.html.erb @@ -1,6 +1,6 @@ -

Editing studium

+

<%= I18n.t("studien.edit")%>

<%= render 'form' %> <%= link_to 'Show', @studium %> | -<%= link_to 'Back', studien_path %> \ No newline at end of file +<%= link_to 'Back', studien_path %> diff --git a/app/views/studien/index.html.erb b/app/views/studien/index.html.erb index 1cd2dcb..c4c242b 100755 --- a/app/views/studien/index.html.erb +++ b/app/views/studien/index.html.erb @@ -2,13 +2,14 @@ <% @studien.sort_by{|z| z[:zahl]}.each do |studium| %> - + <% end %>
<% link_to I18n.t("studien.new"), new_studium_path %> <% link_to I18n.t("modulgruppe.show"), modulgruppen_path %> -<%= toolbar_html(@toolbar_elements) %> +<%= render :partial=>'layouts/pretty_toolbar'%> +<% #toolbar_html(@toolbar_elements) %> diff --git a/app/views/studien/semesteransicht.html.erb b/app/views/studien/semesteransicht.html.erb index de3a868..a46b9fe 100644 --- a/app/views/studien/semesteransicht.html.erb +++ b/app/views/studien/semesteransicht.html.erb @@ -13,3 +13,5 @@ <% end %> + +<%= render :partial=>'layouts/pretty_toolbar' %> diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb index 9919f43..96ff5e8 100644 --- a/app/views/studien/show.html.erb +++ b/app/views/studien/show.html.erb @@ -16,14 +16,4 @@ <% end %> <% end %> - -
- - <%= link_to ''.html_safe+I18n.t("studien.newmodulgroup"), new_studium_modulgruppe_path(:studium_id=>@studium.id),:class=>"btn" %> | - <%= link_to ''.html_safe+I18n.t("common.edit"), edit_studium_path(@studium) ,:class=>"btn"%> - -
- - - - <%= toolbar_html(@toolbar_elements) %> +<%= render :partial=>'layouts/pretty_toolbar' %>