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

AutoCommit Sam Aug 22 18:17:03 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-22 18:17:03 +02:00
parent af39f21595
commit 934e004416
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/neuigkeit.rb
View File

@@ -13,7 +13,7 @@
# #
class Neuigkeit < ActiveRecord::Base class Neuigkeit < ActiveRecord::Base
attr_accessible :datum, :text, :title, :rubrik_id, :author_id,:picture, :calentries_attributes, :flag_important attr_accessible :datum, :text, :title, :rubrik_id, :author_id,:picture,:picture_cache, :calentries_attributes, :flag_important
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"
has_one :calendar, through: :rubrik has_one :calendar, through: :rubrik

4
app/views/neuigkeiten/_neuigkeit_edit.html.erb
View File

@@ -30,7 +30,7 @@
<% end %> <% end %>
<div class="media"> <div class="media">
<% unless @neuigkeit.picture_robust.big_thumb.to_s.empty? %> <% unless @neuigkeit.picture_robust.big_thumb.to_s.empty? %>
<div class="pull-left" href="#"> <div class="pull-left" href="#" style="width:200px">
<p><br><%= link_to image_tag(@neuigkeit.picture_robust.big_thumb.url),@neuigkeit.picture_robust.try(:url) %> <p><br><%= link_to image_tag(@neuigkeit.picture_robust.big_thumb.url),@neuigkeit.picture_robust.try(:url) %>
<%= f.input :picture, as: :uploader %> <%= f.input :picture, as: :uploader %>
<%= f.hidden_field :picture_cache %> <%= f.hidden_field :picture_cache %>
@@ -38,7 +38,7 @@
</p> </p>
</div> </div>
<% end %> <% end %>
<div class="media-body"> <div class="media-body" style="border: dashed black thin">
<h1 itemprop="name" class="editable_simple" data-target="#neuigkeit_title"> <h1 itemprop="name" class="editable_simple" data-target="#neuigkeit_title">
<%= raw(@neuigkeit.title) %> <%= raw(@neuigkeit.title) %>
</h1> </h1>

2
app/views/themes/blue2/neuigkeiten/_menu.html.erb
View File

@@ -16,7 +16,7 @@
<span class=" pull-right"> <span class=" pull-right">
<%= link_to(fa_icon("globe"), publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), title: I18n.t('neuigkeit.publish'), class: "btn") if can?(:publish, @neuigkeit) && !@neuigkeit.published? <%= link_to(fa_icon("globe"), publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), title: I18n.t('neuigkeit.publish'), class: "btn") if can?(:publish, @neuigkeit) && !@neuigkeit.published?
%> %>
<%= link_to (fa_stack("globe","ban"), unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :remote=>true, class: "btn stacked") if can?(:unpublish, @neuigkeit) && @neuigkeit.published? <%= link_to(fa_stack("globe","ban"), unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :remote=>true, class: "btn stacked") if can?(:unpublish, @neuigkeit) && @neuigkeit.published?
%> %>
<% if @neuigkeit.published? %> <% if @neuigkeit.published? %>
<div class="dropdown" style=" display:inline""> <div class="dropdown" style=" display:inline"">

2
app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb
View File

@@ -4,7 +4,7 @@
<%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %> <%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
<div> <div>
<% cache("menu_neuigkeit"+ can?(:edit,@neuigkeit).to_s +can?(:find_link, @neuigkeit).to_s + can?(:new, Survey::Question).to_s + can?(:publish, @neuigkeit).to_s + can?(:unpublish, @neuigkeit).to_s + @neuigkeit.published?.to_s ) do %> <% cache("menu_neuigkeit"+ can?(:edit,@neuigkeit).to_s + can?(:find_link, @neuigkeit).to_s + can?(:new, Survey::Question).to_s + can?(:publish, @neuigkeit).to_s + can?(:unpublish, @neuigkeit).to_s + @neuigkeit.published?.to_s ) do %>
<%= render partial: "menu" %> <%= render partial: "menu" %>
<% end %> <% end %>
</div> </div>