andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

gremium tags

Browse Source
This commit is contained in:
Andreas Stephanides
2015-03-08 22:11:56 +01:00
parent 8bf5583e00
commit fc19206edd
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/gremien/show.html.erb
View File

@@ -1,16 +1,16 @@
<%= render 'fetprofiles/tabs' %> <%= render 'fetprofiles/tabs' %>
<div class="content-wrap content-column"> <div class="content-wrap content-column" itemscope itemtype="http://schema.org/Organization">
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<div class="content-wrap content-column"> <div class="content-wrap content-column">
<%= link_to I18n.t('common.edit'), edit_gremium_path(@gremium) if can? :edit, @gremium%> <%= link_to I18n.t('common.edit'), edit_gremium_path(@gremium) if can? :edit, @gremium%>
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<h1> <h1 itemprop="name">
<%= @gremium.name %> <%= @gremium.name %>
</h1> </h1>
<% Gremium::TYPEN[@gremium.typ.to_i].to_s %> <% Gremium::TYPEN[@gremium.typ.to_i].to_s %>
<p> <p itemprop="description">
<%= @gremium.desc.html_safe %> <%= @gremium.desc.html_safe %>
</p> </p>
<% unless @gremium.thema.nil? %> <% unless @gremium.thema.nil? %>
@@ -25,23 +25,23 @@
<% @memberships.each_slice(4) do |r| %> <% @memberships.each_slice(4) do |r| %>
<div class="row-fluid"> <div class="row-fluid">
<% r.each do |m| %> <% 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 %> <%= link_to m.fetprofile do %>
<div class="span3" style="vertical-align:middle; text-align:center"> <div class="span3" style="vertical-align:middle; text-align:center" itemprop="hasmember" itemscope itemtype="http://schema.org/Person">
<%= image_tag m.fetprofile.try(:picture).try(:portrait) %> <%= image_tag m.fetprofile.try(:picture).try(:portrait) %>
<meta itemprop="sameAs" content="<%= fetprofile_path(m.fetprofile) %>"/>
<p> <p>
<% if m.fetprofile.nil?%> <% if m.fetprofile.nil?%>
PROFIL fehlt PROFIL fehlt
<% else %> <% else %>
<%= m.fetprofile.name %> <br> <span itemprop="name"><%= m.fetprofile.name %> </span><br>
<%= render(m) %> <%= render(m) %>
<% end %> <% end %>
</p> </p>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
<% end %>
</div> </div>
<% end %> <% end %>
<div class="row-fluid"> <div class="row-fluid">

2
app/views/memberships/_membership.html.erb
View File

@@ -2,7 +2,7 @@
<%= membership.stop.nil? ? I18n.t("gremium.seit")+" " : I18n.t("gremium.von")+" " %> <%= membership.stop.nil? ? I18n.t("gremium.seit")+" " : I18n.t("gremium.von")+" " %>
<%=membership.start.to_s %> <%=membership.start.to_s %>
<%= " "+I18n.t("gremium.bis")+" "+membership.stop.to_s unless membership.stop.nil? %> <%= " "+I18n.t("gremium.bis")+" "+membership.stop.to_s unless membership.stop.nil? %>
<%= Membership::TYPEN_g[membership.fetprofile.geschlecht.to_i][membership.typ.to_i] %> <span itemprop="name"> <%= Membership::TYPEN_g[membership.fetprofile.geschlecht.to_i][membership.typ.to_i] %> <meta itemprop="name" content="<%= membership.gremium.name"/><span >
<%= membership.gremium.fall2 %></span> <%= membership.gremium.fall2 %></span>
<meta itemprop="sameAs" content="<%= gremium_path(membership.gremium, :theme=>nil)%>"/> <meta itemprop="sameAs" content="<%= gremium_path(membership.gremium, :theme=>nil)%>"/>
</span> </span>