forked from bofh/fetsite
add picture to neuigkeit
This commit is contained in:
@@ -14,13 +14,14 @@
|
||||
|
||||
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 :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id"
|
||||
validates :rubrik, :presence=>true
|
||||
validates :author, :presence=>true
|
||||
translates :title,:text, :versioning=>true, :fallbacks_for_empty_translations => true
|
||||
has_one :calentry, :as => :object
|
||||
mount_uploader :picture, PictureUploader
|
||||
scope :published, -> {where("datum >= ? AND datum IS NOT NULL", Time.now.to_date)}
|
||||
scope :recent, -> { published.where("updated_at >= ? ",Time.now - 7.days)}
|
||||
def datum_nilsave
|
||||
|
||||
@@ -3,9 +3,10 @@
|
||||
<%= f.inputs do %>
|
||||
<%= f.input :title, :placeholder=>"Titel" %>
|
||||
<%= f.input :text, :as=>:tinymce_text %>
|
||||
<%= f.input :datum %>
|
||||
<% f.input :datum %>
|
||||
<%= f.input :rubrik, :as=>:radio, :collection=>Rubrik.all %>
|
||||
<%= f.input :author, :as=>:radio %>
|
||||
<%= f.input :picture, :as=>:file %>
|
||||
<% end %>
|
||||
|
||||
<%= f.actions do %>
|
||||
|
||||
@@ -1,6 +1,23 @@
|
||||
|
||||
<h2><%= link_to neuigkeit.title,neuigkeit_path(neuigkeit) %></h2>
|
||||
<%= if !neuigkeit.author.nil?
|
||||
neuigkeit.author.email
|
||||
end %>
|
||||
<p><%= raw(neuigkeit.text) %></p>
|
||||
<div class="container-fluid"
|
||||
<div class="row-fluid">
|
||||
<div class="span9">
|
||||
<%= neuigkeit.rubrik.name %>
|
||||
</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>
|
||||
|
||||
Reference in New Issue
Block a user