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

AutoCommit Die Jun 9 15:03:01 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-06-09 15:03:01 +02:00
parent d146cf09a7
commit e70cc8405f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/rubrik.rb
View File

@@ -20,6 +20,9 @@ class Rubrik < ActiveRecord::Base
has_one :calendar has_one :calendar
validates :calendar , :presence=>true validates :calendar , :presence=>true
before_validation :sanitize before_validation :sanitize
def icon_name
(ActionController::Base.helpers.content_tag("i","", class: self.icon)) + self.name
end
def moderator def moderator
u=User.with_role(:newsmoderator).first u=User.with_role(:newsmoderator).first
if !u.nil? if !u.nil?

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

@@ -9,7 +9,9 @@
<div class="media"> <div class="media">
<span itemprop="articleSection"> <span itemprop="articleSection">
<%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %>&nbsp;<%= @neuigkeit.rubrik.name %> <%= f.input :rubrik, :as=> :select, :collection=>Rubrik.all,:class=> :selectpicker, :label=>false , :member_label=> :name %>
<% ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %>&nbsp;<% @neuigkeit.rubrik.name %>
</span> </span>
<span class="pull-right"> <span class="pull-right">
<span itemprop="author"><%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %> <span itemprop="author"><%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %>
@@ -64,4 +66,6 @@
<%= tinymce :inline_div %> <%= tinymce :inline_div %>
<%= tinymce :inline_simple %> <%= tinymce :inline_simple %>
<script> <script>
$(function(){$('#toolBar').stick_in_parent();})</script> $(function(){$('#toolBar').stick_in_parent();})
$('.selectpicker').selectpicker();
</script>