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

add picture to neuigkeit

Browse Source
This commit is contained in:
Andreas Stephanides
2013-08-23 14:30:01 +02:00
parent 41433c20f9
commit 0ca18d1f84
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/neuigkeit.rb
View File

@@ -14,13 +14,14 @@
class Neuigkeit < ActiveRecord::Base class Neuigkeit < ActiveRecord::Base
attr_accessible :datum, :text, :title, :rubrik_id, :author_id attr_accessible :datum, :text, :title, :rubrik_id, :author_id,:picture
belongs_to :author, :class_name =>'User' belongs_to :author, :class_name =>'User'
belongs_to :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id" belongs_to :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id"
validates :rubrik, :presence=>true validates :rubrik, :presence=>true
validates :author, :presence=>true validates :author, :presence=>true
translates :title,:text, :versioning=>true, :fallbacks_for_empty_translations => true translates :title,:text, :versioning=>true, :fallbacks_for_empty_translations => true
has_one :calentry, :as => :object has_one :calentry, :as => :object
mount_uploader :picture, PictureUploader
scope :published, -> {where("datum >= ? AND datum IS NOT NULL", Time.now.to_date)} scope :published, -> {where("datum >= ? AND datum IS NOT NULL", Time.now.to_date)}
scope :recent, -> { published.where("updated_at >= ? ",Time.now - 7.days)} scope :recent, -> { published.where("updated_at >= ? ",Time.now - 7.days)}
def datum_nilsave def datum_nilsave

3
app/views/neuigkeiten/_form.html.erb
View File

@@ -3,9 +3,10 @@
<%= f.inputs do %> <%= f.inputs do %>
<%= f.input :title, :placeholder=>"Titel" %> <%= f.input :title, :placeholder=>"Titel" %>
<%= f.input :text, :as=>:tinymce_text %> <%= f.input :text, :as=>:tinymce_text %>
<%= f.input :datum %> <% f.input :datum %>
<%= f.input :rubrik, :as=>:radio, :collection=>Rubrik.all %> <%= f.input :rubrik, :as=>:radio, :collection=>Rubrik.all %>
<%= f.input :author, :as=>:radio %> <%= f.input :author, :as=>:radio %>
<%= f.input :picture, :as=>:file %>
<% end %> <% end %>
<%= f.actions do %> <%= f.actions do %>

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

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