fixed fetprofile overflow

This commit is contained in:
Andreas Stephanides
2013-09-24 10:39:24 +02:00
parent 896540429f
commit fdaf47c26e
2 changed files with 17 additions and 2 deletions

View File

@@ -26,6 +26,6 @@ class Fetprofile < ActiveRecord::Base
accepts_nested_attributes_for :memberships accepts_nested_attributes_for :memberships
scope :active, -> { where(:active=>true).order(:vorname) } scope :active, -> { where(:active=>true).order(:vorname) }
def fetmail def fetmail
(fetmailalias.nil? || fetmail.empty?) ? short.to_s + "@fet.at" : fetmailalias.to_s + "@fet.at" (fetmailalias.nil? || fetmailalias.empty?) ? short.to_s + "@fet.at" : fetmailalias.to_s + "@fet.at"
end end
end end

View File

@@ -1,32 +1,47 @@
<%= render 'fetprofiles/tabs' %> <%= render 'fetprofiles/tabs' %>
<h1> <h1>
<%= I18n.t 'fetprofiles.all' if params[:filter] == "all" %> <%= I18n.t 'fetprofiles.all' if params[:filter] == "all" %>
<%= I18n.t 'fetprofiles.active' if params[:filter].nil? || params[:filter]== "active" <%= I18n.t 'fetprofiles.active' if params[:filter].nil? || params[:filter]== "active"
%> %>
</h1> </h1>
<ul class="unstyled fetprofile_list"> <ul class="unstyled fetprofile_list">
<% @fetprofiles.each do |fetprofile| %> <% @fetprofiles.each do |fetprofile| %>
<li> <li>
<%= link_to fetprofile do %> <%= link_to fetprofile do %>
<div class="media"> <div class="media">
<span class="pull-left"> <span class="pull-left">
<%= image_tag fetprofile.picture.portrait.url %> <%= image_tag fetprofile.picture.portrait.url %>
</span> </span>
<div class="media-body"> <div class="media-body">
<h2><%= fetprofile.name %></h2> <h2><%= fetprofile.name %></h2>
<p><%= fetprofile.fetmail %></p> <p><%= fetprofile.fetmail %></p>
<% if false %>
<p><%= fetprofile.desc %></p> <p><%= fetprofile.desc %></p>
<% end %>
</div> </div>
</div> </div>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>
</ul> </ul>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<%= link_to I18n.t('fetprofiles.new'), new_fetprofile_path %> <%= link_to I18n.t('fetprofiles.new'), new_fetprofile_path %>
</div> </div>
</div> </div>
</div> </div>