diff --git a/app/controllers/fetprofiles_controller.rb b/app/controllers/fetprofiles_controller.rb index f1c9772..17cdd4c 100644 --- a/app/controllers/fetprofiles_controller.rb +++ b/app/controllers/fetprofiles_controller.rb @@ -20,6 +20,8 @@ class FetprofilesController < ApplicationController # GET /fetprofiles/1.json def show @fetprofile = Fetprofile.find(params[:id]) + @gremientabs = Gremium.tabs + if params["verwalten"] @toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('fetprofile.newmembership'),:path => new_fetprofile_membership_path(@fetprofile) , :confirm=>"Sure?" } if can? :new, Membership @toolbar_elements << {:hicon=>'icon-pencil', :text=> I18n.t('common.edit'),:path => edit_fetprofile_path(@fetprofile),:confirm=>"Sure?" } if can? :edit, @fetprofile diff --git a/app/views/fetprofiles/show.html.erb b/app/views/fetprofiles/show.html.erb index 5a44b10..760381c 100644 --- a/app/views/fetprofiles/show.html.erb +++ b/app/views/fetprofiles/show.html.erb @@ -1,10 +1,11 @@ +<%= render 'fetprofiles/tabs' %>

<%= notice %>

-
-
-
+
+
+ <%= image_tag @fetprofile.picture.portrait.url %> -
-
+ +

<%= @fetprofile.name %>

<%= @fetprofile.fetmailalias %> @@ -12,14 +13,7 @@

<%= @fetprofile.desc %>

-

-

-
-
- -
-
    <% @fetprofile.memberships.each do |m| %>
  • @@ -29,6 +23,8 @@
  • <% end %>
- <%= render 'layouts/pretty_toolbar' %> +
-
+
+
+ <%= render 'layouts/pretty_toolbar' %>