small fixes

This commit is contained in:
2015-05-24 13:42:26 +02:00
parent c86b175250
commit eee8248c0f
4 changed files with 13 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
class HomeController < ApplicationController
def index
@beispiele = Beispiel.last([Beispiel.count, 3].min)
@neuigkeiten = Neuigkeit.recent
@neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).limit(10)
if Thema.count>0
t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml")
@rubriken= Rubrik.accessible_by(current_ability, :show)

View File

@@ -13,7 +13,7 @@
#
class Neuigkeit < ActiveRecord::Base
attr_accessible :datum, :text, :title, :rubrik_id, :author_id,:picture, :calentries_attributes
attr_accessible :datum, :text, :title, :rubrik_id, :author_id,:picture, :calentries_attributes, :flag_important
belongs_to :author, :class_name =>'User'
belongs_to :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id"
has_one :calendar, through: :rubrik

View File

@@ -3,7 +3,7 @@
<%= semantic_fields_for "lvas[#{i}]" do |f| %>
<%= f.input :lvanr %>
<%= f.input :sem , :input_html => { "style"=>"width:7em" },:as=>:select, :collection=>["2013S","2013W","2014S","2014W"] %>
<%= f.input :sem , :input_html => { "style"=>"width:7em" },:as=>:select, :collection=>["2012S", "2012W","2013S","2013W","2014S","2014W","2015S","2015W"] %>
<% end %>
<% end %>

View File

@@ -3,8 +3,13 @@
<%= semantic_form_for [@neuigkeit.rubrik,@neuigkeit] do |f| %>
<%= f.inputs do %>
<div class="row-fluid">
<div class="span12">
<div class="span6">
<%= f.input :title, :placeholder=> "Titel" %>
</div>
<div class="span6">
<%= f.input :flag_important, :placeholder=> "Titel" %>
</div>
<div class="span12">
<%= f.input :text, :as=> :tinymce_text %>
</div>
</div>
@@ -12,7 +17,7 @@
<div class="span6">
<% f.input :datum, :as=> :datepicker %>
<%= f.input :rubrik, :as=> :radio, :collection=>Rubrik.all %>
<% f.input :flag_important %>
<%= f.input :flag_important %>
</div>
<div class="span6">
<%= f.input :author, :as=> :select %>