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

fix neuigkeit

Browse Source
This commit is contained in:
Andreas Stephanides
2013-08-23 16:07:13 +02:00
parent ee7f06cb23
commit 2548ddb9ab
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/memberships_controller.rb
View File

@@ -19,7 +19,7 @@ class MembershipsController < ApplicationController
# POST /memberships.json # POST /memberships.json
def create def create
@membership = Membership.new(params[:membership]) @membership = Membership.new(params[:membership])
@membership.fetprofile= Fetprofle.find(params[:fetprofile_id])
respond_to do |format| respond_to do |format|
if @membership.save if @membership.save
format.html { redirect_to @membership.fetprofile, notice: 'Membership was successfully created.' } format.html { redirect_to @membership.fetprofile, notice: 'Membership was successfully created.' }

4
app/models/neuigkeit.rb
View File

@@ -36,4 +36,8 @@ class Neuigkeit < ActiveRecord::Base
def reverse_publish def reverse_publish
self.datum = nil self.datum = nil
end end
def text_first_words
md = /<p>(?<text>[\w\s,\.!\?]*)/.match self.text
md[:text].split(" ")[1..100].join(" ")+ " ..."
end
end end

3
app/uploaders/picture_uploader.rb
View File

@@ -35,7 +35,10 @@ class PictureUploader < CarrierWave::Uploader::Base
version :thumb do version :thumb do
process :resize_to_fill => [64, 64] process :resize_to_fill => [64, 64]
end end
version :big_thumb do
process :resize_to_fill => [200,200]
end
version :portrait do version :portrait do
process :resize_to_fill => [128,192] process :resize_to_fill => [128,192]
end end

12
app/views/neuigkeiten/_neuigkeit.html.erb
View File

@@ -1,23 +1,25 @@
<div class="container-fluid" <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span9"> <div class="span9">
<%= neuigkeit.rubrik.name %> <%= neuigkeit.rubrik.name %>
</div> </div>
<div class="span3"><p> <div class="span3"><p>
<%= neuigkeit.author.email.to_s unless neuigkeit.try(:author).try(:email).to_s %> am <%= neuigkeit.author.email.to_s unless neuigkeit.try(:author).try(:email).to_s %>
<%= I18n.l neuigkeit.try(:datum).try(:to_date) unless neuigkeit.try(:datum).try(:to_date).nil? %></p> <%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %></p>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="media"> <div class="media">
<div class="pull-right" href="#"> <div class="pull-left" href="#">
<p><br><%= image_tag neuigkeit.picture.thumb.url %></p> <p><br><%= image_tag neuigkeit.picture.thumb.url %></p>
</div> </div>
<div class="media-body"> <div class="media-body">
<h1><%= link_to neuigkeit.title,neuigkeit_path(neuigkeit) %></h1> <h1><%= link_to neuigkeit.title,neuigkeit_path(neuigkeit) %></h1>
<%= raw(neuigkeit.text) %> <%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>

9
app/views/neuigkeiten/show.html.erb
View File

@@ -10,15 +10,16 @@
<%= @neuigkeit.rubrik.name %> <%= @neuigkeit.rubrik.name %>
</div> </div>
<div class="span3"><p> <div class="span3"><p>
<%= @neuigkeit.try(:author).email.to_s %> am <p>
<%= I18n.l @neuigkeit.datum.to_date %></p> <%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %>
<%= "am " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil? %></p>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<div class="media"> <div class="media">
<div class="pull-right" href="#"> <div class="pull-left" href="#">
<p><br><%= "FOTO" %></p> <p><br><%= image_tag @neuigkeit.picture.big_thumb.url %></p>
</div> </div>
<div class="media-body"> <div class="media-body">
<h1><%= link_to @neuigkeit.title,neuigkeit_path(@neuigkeit) %></h1> <h1><%= link_to @neuigkeit.title,neuigkeit_path(@neuigkeit) %></h1>