From 65b287d6139af41a859c34793d283be337237d4e Mon Sep 17 00:00:00 2001 From: HausdorffHimself Date: Sun, 1 Sep 2013 21:07:09 +0200 Subject: [PATCH] CHANGE: Themengruppe verwenden pretty_toolbar --- app/controllers/themengruppen_controller.rb | 3 ++ app/views/themengruppen/edit.html.erb | 2 ++ app/views/themengruppen/index.html.erb | 35 ++++++++++++--------- app/views/themengruppen/show.html.erb | 4 ++- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/app/controllers/themengruppen_controller.rb b/app/controllers/themengruppen_controller.rb index a366078..14c70f9 100644 --- a/app/controllers/themengruppen_controller.rb +++ b/app/controllers/themengruppen_controller.rb @@ -3,6 +3,7 @@ class ThemengruppenController < ApplicationController # GET /themengruppen.json def index @themengruppen = Themengruppe.all + @toolbar_elements = [{:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()}] respond_to do |format| format.html # index.html.erb @@ -14,6 +15,8 @@ class ThemengruppenController < ApplicationController # GET /themengruppen/1.json def show @themengruppe = Themengruppe.find(params[:id]) + @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('themengruppe.edit'), :path=>edit_themengruppe_path(@themengruppe)}] + @toolbar_elements << {:hicon=>'icon-remove-circle',:text=>I18n.t('themengruppe.remove'), :path=>themengruppe_path(@themengruppe), :method=>:delete,:confirm=>I18n.t('themengruppe.sure')} respond_to do |format| format.html # show.html.erb diff --git a/app/views/themengruppen/edit.html.erb b/app/views/themengruppen/edit.html.erb index 68f8332..6ae2986 100644 --- a/app/views/themengruppen/edit.html.erb +++ b/app/views/themengruppen/edit.html.erb @@ -2,5 +2,7 @@ <%= render 'form' %> + diff --git a/app/views/themengruppen/index.html.erb b/app/views/themengruppen/index.html.erb index 6c33445..cc80e93 100644 --- a/app/views/themengruppen/index.html.erb +++ b/app/views/themengruppen/index.html.erb @@ -1,20 +1,22 @@
- <% @themengruppen.each_slice(2) do |row| %> -
- <% row.each do |themengruppe| %> -
-
- <%= render themengruppe %> -
-
- <%= link_to 'Edit', edit_themengruppe_path(themengruppe) %> -
-
-
-
- <% end %> + <% @themengruppen.each_slice(2) do |row| %> +
+ <% row.each do |themengruppe| %> +
+
+ <%= render themengruppe %> +
+
+
- <% end %> +
+
+
+ <% end %> +
+ <% end %>

@@ -25,4 +27,7 @@ --> +<%= render :partial=>'layouts/pretty_toolbar' %> + diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb index 8b7258c..c0718c2 100644 --- a/app/views/themengruppen/show.html.erb +++ b/app/views/themengruppen/show.html.erb @@ -25,6 +25,8 @@

- + +<%= render :partial=>'layouts/pretty_toolbar' %>