From e70cc8405f25d5e745572c28ac132eac97b3866b Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Tue, 9 Jun 2015 15:03:01 +0200
Subject: [PATCH] AutoCommit Die Jun  9 15:03:01 CEST 2015

---
 app/models/rubrik.rb                           | 3 +++
 app/views/neuigkeiten/_neuigkeit_edit.html.erb | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/models/rubrik.rb b/app/models/rubrik.rb
index 027156d..50f2135 100755
--- a/app/models/rubrik.rb
+++ b/app/models/rubrik.rb
@@ -20,6 +20,9 @@ class Rubrik < ActiveRecord::Base
   has_one :calendar
   validates :calendar , :presence=>true
   before_validation :sanitize
+  def icon_name
+    (ActionController::Base.helpers.content_tag("i","", class: self.icon)) + self.name
+  end
   def moderator
     u=User.with_role(:newsmoderator).first
     if !u.nil? 
diff --git a/app/views/neuigkeiten/_neuigkeit_edit.html.erb b/app/views/neuigkeiten/_neuigkeit_edit.html.erb
index 6a80568..657b934 100644
--- a/app/views/neuigkeiten/_neuigkeit_edit.html.erb
+++ b/app/views/neuigkeiten/_neuigkeit_edit.html.erb
@@ -9,7 +9,9 @@
   
   <div class="media">
 	  <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 class="pull-right">
 			<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_simple %>
 <script>
-$(function(){$('#toolBar').stick_in_parent();})</script>
+$(function(){$('#toolBar').stick_in_parent();})
+$('.selectpicker').selectpicker();
+</script>