diff --git a/Gemfile b/Gemfile index d3ae6cd..d052fd5 100644 --- a/Gemfile +++ b/Gemfile @@ -29,26 +29,15 @@ end gem "jruby-openssl", :platform => :jruby -# Refinery/rails should pull in the proper versions of these -group :assets do - gem "sass-rails" - gem "coffee-rails" - gem "uglifier" -end - -group :development do - gem 'quiet_assets' -end - group :development, :test do gem 'rspec-its' end group :test do - gem "launchy" + gem 'launchy' end # Load local gems according to Refinery developer preference. if File.exist? local_gemfile = File.expand_path("../.gemfile", __FILE__) eval File.read(local_gemfile) -end \ No newline at end of file +end diff --git a/Rakefile b/Rakefile index 022bde3..5221e2b 100644 --- a/Rakefile +++ b/Rakefile @@ -6,15 +6,15 @@ rescue LoadError end ENGINE_PATH = File.dirname(__FILE__) -APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__) +APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__) if File.exists?(APP_RAKEFILE) load 'rails/tasks/engine.rake' end -require "refinerycms-testing" +require 'refinerycms-testing' Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH) load File.expand_path('../tasks/rspec.rake', __FILE__) -task :default => :spec \ No newline at end of file +task default: :spec diff --git a/app/controllers/refinery/calendar/admin/events_controller.rb b/app/controllers/refinery/calendar/admin/events_controller.rb index 0604fcd..c2bb029 100644 --- a/app/controllers/refinery/calendar/admin/events_controller.rb +++ b/app/controllers/refinery/calendar/admin/events_controller.rb @@ -7,7 +7,7 @@ class EventsController < ::Refinery::AdminController crudify :'refinery/calendar/event', sortable: false, - order: "starts_at DESC" + order: 'starts_at DESC' protected diff --git a/app/controllers/refinery/calendar/events_controller.rb b/app/controllers/refinery/calendar/events_controller.rb index 9d84278..1355b1f 100644 --- a/app/controllers/refinery/calendar/events_controller.rb +++ b/app/controllers/refinery/calendar/events_controller.rb @@ -1,32 +1,33 @@ +require 'responders' + module Refinery module Calendar class EventsController < ::ApplicationController before_action :find_page, except: :archive + respond_to :html + def index - @events = Event.upcoming.order('refinery_calendar_events.starts_at DESC') + @events = Event.upcoming.order(starts_at: :desc) - # you can use meta fields from your model instead (e.g. browser_title) - # by swapping @page for @event in the line below: - present(@page) + present @page end def show @event = Event.friendly.find(params[:id]) - # you can use meta fields from your model instead (e.g. browser_title) - # by swapping @page for @event in the line below: - present(@page) + present @page end def archive - @events = Event.archive.order('refinery_calendar_events.starts_at DESC') - render :template => 'refinery/calendar/events/index' + @events = Event.archive.order(starts_at: :desc) + render template: 'refinery/calendar/events/index' end protected + def find_page - @page = ::Refinery::Page.where(:link_url => "/calendar/events").first + @page = ::Refinery::Page.where(link_url: '/calendar/events').first end end diff --git a/app/models/refinery/calendar/event.rb b/app/models/refinery/calendar/event.rb index 1b4d606..2177780 100644 --- a/app/models/refinery/calendar/event.rb +++ b/app/models/refinery/calendar/event.rb @@ -1,6 +1,6 @@ module Refinery module Calendar - class Event < Refinery::Core::BaseModel + class Event < ActiveRecord::Base extend FriendlyId friendly_id :title, :use => :slugged @@ -13,35 +13,26 @@ class Event < Refinery::Core::BaseModel alias_attribute :to, :ends_at delegate :name, :address, - :to => :venue, - :prefix => true, - :allow_nil => true + to: :venue, + prefix: true, + allow_nil: true - scope :starting_on_day, lambda {|day| where(starts_at: day.beginning_of_day..day.tomorrow.beginning_of_day) } - scope :ending_on_day, lambda {|day| where(ends_at: day.beginning_of_day..day.tomorrow.beginning_of_day) } + scope :starting_on_day, ->(day) { where(starts_at: day.beginning_of_day..day.tomorrow.beginning_of_day) } + scope :ending_on_day, ->(day) { where(ends_at: day.beginning_of_day..day.tomorrow.beginning_of_day) } - scope :on_day, lambda {|day| + scope :on_day, ->(day) { where( arel_table[:starts_at].in(day.beginning_of_day..day.tomorrow.beginning_of_day). or(arel_table[:ends_at].in(day.beginning_of_day..day.tomorrow.beginning_of_day)). - or( arel_table[:starts_at].lt(day.beginning_of_day).and(arel_table[:ends_at].gt(day.tomorrow.beginning_of_day)) ) + or(arel_table[:starts_at].lt(day.beginning_of_day).and(arel_table[:ends_at].gt(day.tomorrow.beginning_of_day)) ) ) } - class << self - def upcoming - where('refinery_calendar_events.starts_at >= ?', Time.now) - end + scope :upcoming, -> { where arel_table[:starts_at].gteq Time.now } - def featured - where(:featured => true) - end + scope :featured, -> { where featured: true } - def archive - where('refinery_calendar_events.starts_at < ?', Time.now) - end - - end + scope :archive, -> { where arel_table[:starts_at].lt Time.now } end end end diff --git a/app/models/refinery/calendar/venue.rb b/app/models/refinery/calendar/venue.rb index bdaa1c6..f5a81b9 100644 --- a/app/models/refinery/calendar/venue.rb +++ b/app/models/refinery/calendar/venue.rb @@ -1,8 +1,12 @@ module Refinery module Calendar - class Venue < Refinery::Core::BaseModel + class Venue < ActiveRecord::Base has_many :events - validates :name, :presence => true, :uniqueness => true + + validates :name, + presence: true, + uniqueness: true + end end end diff --git a/app/views/refinery/calendar/admin/events/_actions.html.erb b/app/views/refinery/calendar/admin/events/_actions.html.erb index 729cbf1..76208a9 100644 --- a/app/views/refinery/calendar/admin/events/_actions.html.erb +++ b/app/views/refinery/calendar/admin/events/_actions.html.erb @@ -4,23 +4,26 @@ <%= render '/refinery/admin/search', :url => refinery.calendar_admin_events_path %> <% end %> +
  • <%= link_to t('.create_new'), refinery.new_calendar_admin_event_path, :class => "add_icon" %>
    • + <%= render 'refinery/calendar/admin/shared/links' %> -<% if !searching? && ::Refinery::Calendar::Admin::EventsController.sortable? && ::Refinery::Calendar::Event.any? %> -
  • - <%= link_to t('.reorder', :what => "Events"), - refinery.calendar_admin_events_path, - :id => "reorder_action", - :class => "reorder_icon" %> - <%= link_to t('.reorder_done', :what => "Events"), - refinery.calendar_admin_events_path, - :id => "reorder_action_done", - :style => "display: none;", - :class => "reorder_icon" %> -
    • -<% end %> + <% if !searching? && ::Refinery::Calendar::Admin::EventsController.sortable? && ::Refinery::Calendar::Event.any? %> +
  • + <%= link_to t('.reorder', :what => "Events"), + refinery.calendar_admin_events_path, + :id => "reorder_action", + :class => "reorder_icon" %> + + <%= link_to t('.reorder_done', :what => "Events"), + refinery.calendar_admin_events_path, + :id => "reorder_action_done", + :style => "display: none;", + :class => "reorder_icon" %> +
    • + <% end %> diff --git a/app/views/refinery/calendar/admin/events/_event.html.erb b/app/views/refinery/calendar/admin/events/_event.html.erb index 962decc..4b2f22d 100644 --- a/app/views/refinery/calendar/admin/events/_event.html.erb +++ b/app/views/refinery/calendar/admin/events/_event.html.erb @@ -1,20 +1,15 @@
  • - + <%= event.title %> - - - <%= link_to refinery_icon_tag("application_go.png"), refinery.calendar_event_path(event), - :title => t('.view_live_html'), - :target => "_blank" %> + + <%= action_icon :preview, refinery.calendar_event_path(event), t('.view_live_html') %> + + <%= action_icon :edit, refinery.edit_calendar_admin_event_path(event), t('.edit') %> - <%= link_to refinery_icon_tag("application_edit.png"), refinery.edit_calendar_admin_event_path(event), - :title => t('.edit') %> - <%= link_to refinery_icon_tag("delete.png"), refinery.calendar_admin_event_path(event), - :class => "cancel confirm-delete", - :title => t('.delete'), - :confirm => t('message', :scope => 'refinery.admin.delete', :title => event.title), - :method => :delete %> + <%= action_icon :delete, refinery.calendar_admin_event_path(event), t('.delete'), + :class => 'cancel confirm-delete', + :confirm => t('refinery.admin.delete.message', :title => event.title) %>
    • diff --git a/app/views/refinery/calendar/admin/events/_form.html.erb b/app/views/refinery/calendar/admin/events/_form.html.erb index 11d8966..aee7d3b 100644 --- a/app/views/refinery/calendar/admin/events/_form.html.erb +++ b/app/views/refinery/calendar/admin/events/_form.html.erb @@ -1,10 +1,7 @@ <%= form_for [refinery, :calendar_admin, @event] do |f| -%> - <%= render '/refinery/admin/error_messages', - :object => @event, - :include_object_name => true %> + <%= render '/refinery/admin/error_messages', :object => @event, :include_object_name => true %> - -
    +
    <%= f.label :title -%> <%= f.text_field :title, :class => 'larger widest' -%>
    @@ -16,32 +13,32 @@

    -
    +
    <%= f.label :from -%> <%= f.date_field :from, :class => 'datetime_range' -%>
    -
    +
    <%= f.label :to -%> <%= f.date_field :to, :class => 'datetime_range' -%>
    -
    +
    <%= f.label :registration_link -%> - <%= f.text_field :registration_link, :class => 'larger' -%> + <%= f.text_field :registration_link, :class => 'larger widest' -%>
    -
    - <%= f.label :venue_id, 'Venue' %> +
    + <%= f.label :venue_id %> <%= f.collection_select :venue_id, @venues, :id, :name, { :include_blank => 'None' }, :class => 'chzn-select', :'data-placeholder' => 'Search Venues', :style => 'width: 300px;' %>
    -
    +
    <%= f.label :excerpt -%> - <%= f.text_area :excerpt, :size => '65x5' -%> + <%= f.text_area :excerpt, :size => '65x5' -%>
    -
    +
      <% [:description].each_with_index do |part, part_index| %> @@ -63,8 +60,8 @@ <%= render '/refinery/admin/form_actions', :f => f, :continue_editing => false, - :delete_title => t('delete', :scope => 'refinery.events.admin.events.event'), - :delete_confirmation => t('message', :scope => 'refinery.admin.delete', :title => @event.title) %> + :delete_title => t('refinery.calendar.admin.events.event.delete'), + :delete_confirmation => t('refinery.admin.delete.message', :title => @event.title) %> <% end -%> <% content_for :stylesheets do %> <%= stylesheet_link_tag 'chosen' %> diff --git a/app/views/refinery/calendar/admin/events/_records.html.erb b/app/views/refinery/calendar/admin/events/_records.html.erb index f6806b4..4272c28 100644 --- a/app/views/refinery/calendar/admin/events/_records.html.erb +++ b/app/views/refinery/calendar/admin/events/_records.html.erb @@ -1,7 +1,8 @@ <% if searching? %> -

      <%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %>

      +

      <%= t('refinery.admin.search.results_for', :query => params[:search]) %>

      <% end %> -
      + +
      <% if @events.any? %> <%= render 'events' %> <% else %> @@ -11,7 +12,7 @@ <%= t('.no_items_yet') %> <% else %> - <%= t('no_results', :scope => 'refinery.admin.search') %> + <%= t('refinery.admin.search.no_results') %> <% end %>

      <% end %> diff --git a/app/views/refinery/calendar/admin/events/_sortable_list.html.erb b/app/views/refinery/calendar/admin/events/_sortable_list.html.erb index 102bd24..406b986 100644 --- a/app/views/refinery/calendar/admin/events/_sortable_list.html.erb +++ b/app/views/refinery/calendar/admin/events/_sortable_list.html.erb @@ -1,5 +1,5 @@ -
        +
          <%= render :partial => 'event', :collection => @events %>
        -<%= render '/refinery/admin/sortable_list', - :continue_reordering => (local_assigns.keys.include?(:continue_reordering)) ? continue_reordering : true %> + +<%= render '/refinery/admin/sortable_list', :continue_reordering => (local_assigns.keys.include?(:continue_reordering)) ? continue_reordering : true %> diff --git a/app/views/refinery/calendar/admin/events/index.html.erb b/app/views/refinery/calendar/admin/events/index.html.erb index 3efbb86..7158527 100644 --- a/app/views/refinery/calendar/admin/events/index.html.erb +++ b/app/views/refinery/calendar/admin/events/index.html.erb @@ -1,8 +1,10 @@ -
        -

        <%= t('title', :scope => 'refinery.plugins.refinery_calendar') %> : <%= t('title', :scope => 'refinery.plugins.events') %>

        +
        +

        <%= t('refinery.plugins.refinery_calendar.title') %>: <%= t('refinery.plugins.events.title') %>

        <%= render 'records' %>
        -