diff --git a/Gemfile b/Gemfile index fefe5f6..39c0935 100755 --- a/Gemfile +++ b/Gemfile @@ -13,8 +13,8 @@ gem 'webrick', '1.3.1' # Gems used only for assets and not required # in production environments by default. - gem 'sass-rails', '~> 4.0.0' - gem 'coffee-rails', '~> 4.0.0' + gem 'sass-rails', '~> 3.0' + gem 'coffee-rails', '~> 3.0' gem 'bootstrap-sass','~> 2.3.2.1' group :assets do @@ -102,7 +102,7 @@ gem 'rmagick' gem 'bootstrap-addons-rails' gem "jquery-fileupload-rails", "0.4.1" -gem "jquery-ui-rails","~> 4.2.0" +gem "jquery-ui-rails","~> 4.1.0" gem "font-awesome-rails" gem "jquery-datetimepicker-rails" # gem "jquery-sortable-rails" diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index ebf2870..28fd237 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -22,7 +22,7 @@ class HomeController < ApplicationController end def infoscreen authorize! :doadmin, User - @neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).limit(10) + @neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).where(flag_infoscreen: true) render layout: false end def kontakt diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb index 6410924..ce08d18 100755 --- a/app/controllers/neuigkeiten_controller.rb +++ b/app/controllers/neuigkeiten_controller.rb @@ -3,6 +3,7 @@ class NeuigkeitenController < ApplicationController before_filter :load_toolbar_elements, :only=>[:show,:find_link] before_filter :load_toolbar_elements_edit, :only=>[:edit] + acts_as_flagable diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb index 6bab7a0..a89812a 100755 --- a/app/models/neuigkeit.rb +++ b/app/models/neuigkeit.rb @@ -44,6 +44,12 @@ class Neuigkeit < ActiveRecord::Base before_validation :sanitize after_save :update_cache attr_accessor :no_fallbacks + + acts_as_flagable + + FLAG_ICONS={"infoscreen" => "fa fa-flag"} + FLAG_CONFIRM={"infoscreen" => "Neuigkeit am Infoscreen anzeigen"} + def globalize_fallbacks(locale) if self.no_fallbacks [locale] diff --git a/app/views/home/infoscreen.html.erb b/app/views/home/infoscreen.html.erb index 732abb8..6100f27 100644 --- a/app/views/home/infoscreen.html.erb +++ b/app/views/home/infoscreen.html.erb @@ -13,8 +13,8 @@ <% i=1 %> <% @neuigkeiten.each do |n| %> -
<% @toolbar_elements=[];@questions=[] %> -
+
<% @toolbar_elements=[];@questions=[] %> +
<% unless n.picture_robust.big_thumb.to_s.empty? %>


<%= link_to image_tag(n.picture_robust.big_thumb),n.picture_robust.try(:url) %> @@ -54,7 +54,7 @@

-
+
diff --git a/app/views/themes/blue2/neuigkeiten/_menu.html.erb b/app/views/themes/blue2/neuigkeiten/_menu.html.erb index 0b666b5..9b08917 100644 --- a/app/views/themes/blue2/neuigkeiten/_menu.html.erb +++ b/app/views/themes/blue2/neuigkeiten/_menu.html.erb @@ -14,6 +14,8 @@ <%= new_question_for(menu, fa_icon("question")) if can? :new, Survey::Question %> + <%= flag_link(menu, "infoscreen")%> + <%= link_to(fa_icon("globe"), publish_rubrik_neuigkeit_path(menu.rubrik,menu), title: I18n.t('neuigkeit.publish'), class: "btn") if can?(:publish, menu) && !menu.published? %> <%= link_to(fa_stack("globe","ban"), unpublish_rubrik_neuigkeit_path(menu.rubrik,menu), :remote=>true, class: "btn stacked") if can?(:unpublish, menu) && menu.published? diff --git a/config/routes.rb b/config/routes.rb index 456d3c9..aa8d6ae 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -184,7 +184,7 @@ end get 'publish_to_facebook' get 'mail_to_fet' get 'mail_preview' - + get 'flag' end collection do get 'newsletter_preview' diff --git a/db/migrate/20150913090628_add_infoscreen_to_neuigkeit.rb b/db/migrate/20150913090628_add_infoscreen_to_neuigkeit.rb new file mode 100644 index 0000000..de511c4 --- /dev/null +++ b/db/migrate/20150913090628_add_infoscreen_to_neuigkeit.rb @@ -0,0 +1,7 @@ +class AddInfoscreenToNeuigkeit < ActiveRecord::Migration + def change + add_column :neuigkeiten, :flag_infoscreen, :boolean, default: false + add_column :themen, :flag_infoscreen, :boolean, default: false + + end +end