bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:fetsite/fetsite

Browse Source 
Conflicts:
	app/controllers/application_controller.rb
This commit is contained in:
Andreas Stephanides
2015-03-09 17:40:52 +01:00
parent d5e0d20884 63e3d68053
commit 3cc9de7d29
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/application_controller.rb
View File

@@ -40,15 +40,18 @@
def get_theme def get_theme
if params[:theme]== "default" || params[:theme]=="2003" || params[:theme].nil?
params[:theme]="blue1" # if params[:theme]== "default" || params[:theme]=="2003" || params[:theme].nil?
end
if ThemesForRails.available_theme_names.include?(params[:theme]) # params[:theme]="blue1"
params[:theme] # end
# if ThemesForRails.available_theme_names.include?(params[:theme])
# params[:theme]
else #else
"blue1" "blue1"
end #end
end end
def default_url_options def default_url_options
{locale: I18n.locale, theme: (theme_name=="blue1") ? nil : theme_name , ansicht: nil} {locale: I18n.locale, theme: (theme_name=="blue1") ? nil : theme_name , ansicht: nil}

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

@@ -25,7 +25,7 @@
<% @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 %> <% cache(("member_" + m.id.to_s + "_portrait" + ([m.updated_at, m.try(:fetprofile).try(: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" itemprop="hasmember" itemscope itemtype="http://schema.org/Person"> <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) %>

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] %> <meta itemprop="name" content="<%= membership.gremium.name"/><span > <%= 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>