From fc19206edd136d9354fb9d7ace5551faa0e35c8a Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 8 Mar 2015 22:11:56 +0100 Subject: [PATCH] gremium tags --- app/views/gremien/show.html.erb | 16 ++++++++-------- app/views/memberships/_membership.html.erb | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/gremien/show.html.erb b/app/views/gremien/show.html.erb index 10ea53e..bf87c06 100644 --- a/app/views/gremien/show.html.erb +++ b/app/views/gremien/show.html.erb @@ -1,16 +1,16 @@ <%= render 'fetprofiles/tabs' %> -
+

<%= notice %>

<%= link_to I18n.t('common.edit'), edit_gremium_path(@gremium) if can? :edit, @gremium%>
-

+

<%= @gremium.name %>

<% Gremium::TYPEN[@gremium.typ.to_i].to_s %> -

+

<%= @gremium.desc.html_safe %>

<% unless @gremium.thema.nil? %> @@ -25,23 +25,23 @@ <% @memberships.each_slice(4) do |r| %>
<% r.each do |m| %> + <% cache("member_"+ m.id.to_s+"_portrait"+[m.updated_at m.fetprofile.updated_at].max.utc.to_s) do %> <%= link_to m.fetprofile do %> -
+
<%= image_tag m.fetprofile.try(:picture).try(:portrait) %> +

<% if m.fetprofile.nil?%> PROFIL fehlt <% else %> - <%= m.fetprofile.name %>
+ <%= m.fetprofile.name %>
<%= render(m) %> <% end %>

- - -
<% end %> <% end %> + <% end %>
<% end %>
diff --git a/app/views/memberships/_membership.html.erb b/app/views/memberships/_membership.html.erb index 7d63c00..287b442 100644 --- a/app/views/memberships/_membership.html.erb +++ b/app/views/memberships/_membership.html.erb @@ -2,7 +2,7 @@ <%= membership.stop.nil? ? I18n.t("gremium.seit")+" " : I18n.t("gremium.von")+" " %> <%=membership.start.to_s %> <%= " "+I18n.t("gremium.bis")+" "+membership.stop.to_s unless membership.stop.nil? %> -<%= Membership::TYPEN_g[membership.fetprofile.geschlecht.to_i][membership.typ.to_i] %> +<%= Membership::TYPEN_g[membership.fetprofile.geschlecht.to_i][membership.typ.to_i] %> <%= membership.gremium.fall2 %>