comfortable_mexican_sofa 1.12.11 → 2.0.0

data/app/assets/stylesheets/comfy/admin/cms/lib/flatpickr.min.css

@@ -0,0 +1,13 @@
+.flatpickr-calendar{background:transparent;overflow:hidden;max-height:0;opacity:0;visibility:hidden;text-align:center;padding:0;-webkit-animation:none;animation:none;direction:ltr;border:0;font-size:14px;line-height:24px;border-radius:5px;position:absolute;width:307.875px;-webkit-box-sizing:border-box;box-sizing:border-box;-ms-touch-action:manipulation;touch-action:manipulation;background:#fff;-webkit-box-shadow:1px 0 0 #e6e6e6,-1px 0 0 #e6e6e6,0 1px 0 #e6e6e6,0 -1px 0 #e6e6e6,0 3px 13px rgba(0,0,0,0.08);box-shadow:1px 0 0 #e6e6e6,-1px 0 0 #e6e6e6,0 1px 0 #e6e6e6,0 -1px 0 #e6e6e6,0 3px 13px rgba(0,0,0,0.08);}.flatpickr-calendar.open,.flatpickr-calendar.inline{opacity:1;visibility:visible;overflow:visible;max-height:640px}.flatpickr-calendar.open{display:inline-block;z-index:99999}.flatpickr-calendar.animate.open{-webkit-animation:fpFadeInDown 300ms cubic-bezier(.23,1,.32,1);animation:fpFadeInDown 300ms cubic-bezier(.23,1,.32,1)}.flatpickr-calendar.inline{display:block;position:relative;top:2px}.flatpickr-calendar.static{position:absolute;top:calc(100% + 2px);}.flatpickr-calendar.static.open{z-index:999;display:block}.flatpickr-calendar.hasWeeks{width:auto}.flatpickr-calendar .hasWeeks .dayContainer,.flatpickr-calendar .hasTime .dayContainer{border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.flatpickr-calendar .hasWeeks .dayContainer{border-left:0}.flatpickr-calendar.showTimeInput.hasTime .flatpickr-time{height:40px;border-top:1px solid #e6e6e6}.flatpickr-calendar.noCalendar.hasTime .flatpickr-time{height:auto}.flatpickr-calendar:before,.flatpickr-calendar:after{position:absolute;display:block;pointer-events:none;border:solid transparent;content:'';height:0;width:0;left:22px}.flatpickr-calendar.rightMost:before,.flatpickr-calendar.rightMost:after{left:auto;right:22px}.flatpickr-calendar:before{border-width:5px;margin:0 -5px}.flatpickr-calendar:after{border-width:4px;margin:0 -4px}.flatpickr-calendar.arrowTop:before,.flatpickr-calendar.arrowTop:after{bottom:100%}.flatpickr-calendar.arrowTop:before{border-bottom-color:#e6e6e6}.flatpickr-calendar.arrowTop:after{border-bottom-color:#fff}.flatpickr-calendar.arrowBottom:before,.flatpickr-calendar.arrowBottom:after{top:100%}.flatpickr-calendar.arrowBottom:before{border-top-color:#e6e6e6}.flatpickr-calendar.arrowBottom:after{border-top-color:#fff}.flatpickr-calendar:focus{outline:0}.flatpickr-wrapper{position:relative;display:inline-block}.flatpickr-month{background:transparent;color:rgba(0,0,0,0.9);fill:rgba(0,0,0,0.9);height:28px;line-height:1;text-align:center;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:hidden}.flatpickr-prev-month,.flatpickr-next-month{text-decoration:none;cursor:pointer;position:absolute;top:0;line-height:16px;height:28px;padding:10px calc(3.57% - 1.5px);z-index:3;}.flatpickr-prev-month i,.flatpickr-next-month i{position:relative}.flatpickr-prev-month.flatpickr-prev-month,.flatpickr-next-month.flatpickr-prev-month{/*
+        /*rtl:begin:ignore*/left:0;/*
+        /*rtl:end:ignore*/}/*
+        /*rtl:begin:ignore*/
+/*
+        /*rtl:end:ignore*/
+.flatpickr-prev-month.flatpickr-next-month,.flatpickr-next-month.flatpickr-next-month{/*
+        /*rtl:begin:ignore*/right:0;/*
+        /*rtl:end:ignore*/}/*
+        /*rtl:begin:ignore*/
+/*
+        /*rtl:end:ignore*/
+.flatpickr-prev-month:hover,.flatpickr-next-month:hover{color:#959ea9;}.flatpickr-prev-month:hover svg,.flatpickr-next-month:hover svg{fill:#f64747}.flatpickr-prev-month svg,.flatpickr-next-month svg{width:14px;}.flatpickr-prev-month svg path,.flatpickr-next-month svg path{-webkit-transition:fill .1s;transition:fill .1s;fill:inherit}.numInputWrapper{position:relative;height:auto;}.numInputWrapper input,.numInputWrapper span{display:inline-block}.numInputWrapper input{width:100%}.numInputWrapper span{position:absolute;right:0;width:14px;padding:0 4px 0 2px;height:50%;line-height:50%;opacity:0;cursor:pointer;border:1px solid rgba(57,57,57,0.05);-webkit-box-sizing:border-box;box-sizing:border-box;}.numInputWrapper span:hover{background:rgba(0,0,0,0.1)}.numInputWrapper span:active{background:rgba(0,0,0,0.2)}.numInputWrapper span:after{display:block;content:"";position:absolute;top:33%}.numInputWrapper span.arrowUp{top:0;border-bottom:0;}.numInputWrapper span.arrowUp:after{border-left:4px solid transparent;border-right:4px solid transparent;border-bottom:4px solid rgba(57,57,57,0.6)}.numInputWrapper span.arrowDown{top:50%;}.numInputWrapper span.arrowDown:after{border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid rgba(57,57,57,0.6)}.numInputWrapper span svg{width:inherit;height:auto;}.numInputWrapper span svg path{fill:rgba(0,0,0,0.5)}.numInputWrapper:hover{background:rgba(0,0,0,0.05);}.numInputWrapper:hover span{opacity:1}.flatpickr-current-month{font-size:135%;line-height:inherit;font-weight:300;color:inherit;position:absolute;width:75%;left:12.5%;padding:6.16px 0 0 0;line-height:1;height:28px;display:inline-block;text-align:center;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);}.flatpickr-current-month.slideLeft{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);-webkit-animation:fpFadeOut 400ms ease,fpSlideLeft 400ms cubic-bezier(.23,1,.32,1);animation:fpFadeOut 400ms ease,fpSlideLeft 400ms cubic-bezier(.23,1,.32,1)}.flatpickr-current-month.slideLeftNew{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);-webkit-animation:fpFadeIn 400ms ease,fpSlideLeftNew 400ms cubic-bezier(.23,1,.32,1);animation:fpFadeIn 400ms ease,fpSlideLeftNew 400ms cubic-bezier(.23,1,.32,1)}.flatpickr-current-month.slideRight{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);-webkit-animation:fpFadeOut 400ms ease,fpSlideRight 400ms cubic-bezier(.23,1,.32,1);animation:fpFadeOut 400ms ease,fpSlideRight 400ms cubic-bezier(.23,1,.32,1)}.flatpickr-current-month.slideRightNew{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);-webkit-animation:fpFadeIn 400ms ease,fpSlideRightNew 400ms cubic-bezier(.23,1,.32,1);animation:fpFadeIn 400ms ease,fpSlideRightNew 400ms cubic-bezier(.23,1,.32,1)}.flatpickr-current-month span.cur-month{font-family:inherit;font-weight:700;color:inherit;display:inline-block;margin-left:.5ch;padding:0;}.flatpickr-current-month span.cur-month:hover{background:rgba(0,0,0,0.05)}.flatpickr-current-month .numInputWrapper{width:6ch;width:7ch\0;display:inline-block;}.flatpickr-current-month .numInputWrapper span.arrowUp:after{border-bottom-color:rgba(0,0,0,0.9)}.flatpickr-current-month .numInputWrapper span.arrowDown:after{border-top-color:rgba(0,0,0,0.9)}.flatpickr-current-month input.cur-year{background:transparent;-webkit-box-sizing:border-box;box-sizing:border-box;color:inherit;cursor:default;padding:0 0 0 .5ch;margin:0;display:inline-block;font-size:inherit;font-family:inherit;font-weight:300;line-height:inherit;height:initial;border:0;border-radius:0;vertical-align:initial;}.flatpickr-current-month input.cur-year:focus{outline:0}.flatpickr-current-month input.cur-year[disabled],.flatpickr-current-month input.cur-year[disabled]:hover{font-size:100%;color:rgba(0,0,0,0.5);background:transparent;pointer-events:none}.flatpickr-weekdays{background:transparent;text-align:center;overflow:hidden;width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:28px}span.flatpickr-weekday{cursor:default;font-size:90%;background:transparent;color:rgba(0,0,0,0.54);line-height:1;margin:0;text-align:center;display:block;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;font-weight:bolder}.dayContainer,.flatpickr-weeks{padding:1px 0 0 0}.flatpickr-days{position:relative;overflow:hidden;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;width:307.875px;}.flatpickr-days:focus{outline:0}.dayContainer{padding:0;outline:0;text-align:left;width:307.875px;min-width:307.875px;max-width:307.875px;-webkit-box-sizing:border-box;box-sizing:border-box;display:inline-block;display:-ms-flexbox;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-wrap:wrap;-ms-flex-pack:justify;-webkit-justify-content:space-around;justify-content:space-around;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);opacity:1}.flatpickr-calendar.animate .dayContainer.slideLeft{-webkit-animation:fpFadeOut 400ms cubic-bezier(.23,1,.32,1),fpSlideLeft 400ms cubic-bezier(.23,1,.32,1);animation:fpFadeOut 400ms cubic-bezier(.23,1,.32,1),fpSlideLeft 400ms cubic-bezier(.23,1,.32,1)}.flatpickr-calendar.animate .dayContainer.slideLeft,.flatpickr-calendar.animate .dayContainer.slideLeftNew{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.flatpickr-calendar.animate .dayContainer.slideLeftNew{-webkit-animation:fpFadeIn 400ms cubic-bezier(.23,1,.32,1),fpSlideLeft 400ms cubic-bezier(.23,1,.32,1);animation:fpFadeIn 400ms cubic-bezier(.23,1,.32,1),fpSlideLeft 400ms cubic-bezier(.23,1,.32,1)}.flatpickr-calendar.animate .dayContainer.slideRight{-webkit-animation:fpFadeOut 400ms cubic-bezier(.23,1,.32,1),fpSlideRight 400ms cubic-bezier(.23,1,.32,1);animation:fpFadeOut 400ms cubic-bezier(.23,1,.32,1),fpSlideRight 400ms cubic-bezier(.23,1,.32,1);-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.flatpickr-calendar.animate .dayContainer.slideRightNew{-webkit-animation:fpFadeIn 400ms cubic-bezier(.23,1,.32,1),fpSlideRightNew 400ms cubic-bezier(.23,1,.32,1);animation:fpFadeIn 400ms cubic-bezier(.23,1,.32,1),fpSlideRightNew 400ms cubic-bezier(.23,1,.32,1)}.flatpickr-day{background:none;border:1px solid transparent;border-radius:150px;-webkit-box-sizing:border-box;box-sizing:border-box;color:#393939;cursor:pointer;font-weight:400;width:14.2857143%;-webkit-flex-basis:14.2857143%;-ms-flex-preferred-size:14.2857143%;flex-basis:14.2857143%;max-width:39px;height:39px;line-height:39px;margin:0;display:inline-block;position:relative;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;text-align:center;}.flatpickr-day.inRange,.flatpickr-day.prevMonthDay.inRange,.flatpickr-day.nextMonthDay.inRange,.flatpickr-day.today.inRange,.flatpickr-day.prevMonthDay.today.inRange,.flatpickr-day.nextMonthDay.today.inRange,.flatpickr-day:hover,.flatpickr-day.prevMonthDay:hover,.flatpickr-day.nextMonthDay:hover,.flatpickr-day:focus,.flatpickr-day.prevMonthDay:focus,.flatpickr-day.nextMonthDay:focus{cursor:pointer;outline:0;background:#e6e6e6;border-color:#e6e6e6}.flatpickr-day.today{border-color:#959ea9;}.flatpickr-day.today:hover,.flatpickr-day.today:focus{border-color:#959ea9;background:#959ea9;color:#fff}.flatpickr-day.selected,.flatpickr-day.startRange,.flatpickr-day.endRange,.flatpickr-day.selected.inRange,.flatpickr-day.startRange.inRange,.flatpickr-day.endRange.inRange,.flatpickr-day.selected:focus,.flatpickr-day.startRange:focus,.flatpickr-day.endRange:focus,.flatpickr-day.selected:hover,.flatpickr-day.startRange:hover,.flatpickr-day.endRange:hover,.flatpickr-day.selected.prevMonthDay,.flatpickr-day.startRange.prevMonthDay,.flatpickr-day.endRange.prevMonthDay,.flatpickr-day.selected.nextMonthDay,.flatpickr-day.startRange.nextMonthDay,.flatpickr-day.endRange.nextMonthDay{background:#569ff7;-webkit-box-shadow:none;box-shadow:none;color:#fff;border-color:#569ff7}.flatpickr-day.selected.startRange,.flatpickr-day.startRange.startRange,.flatpickr-day.endRange.startRange{border-radius:50px 0 0 50px}.flatpickr-day.selected.endRange,.flatpickr-day.startRange.endRange,.flatpickr-day.endRange.endRange{border-radius:0 50px 50px 0}.flatpickr-day.selected.startRange + .endRange,.flatpickr-day.startRange.startRange + .endRange,.flatpickr-day.endRange.startRange + .endRange{-webkit-box-shadow:-10px 0 0 #569ff7;box-shadow:-10px 0 0 #569ff7}.flatpickr-day.selected.startRange.endRange,.flatpickr-day.startRange.startRange.endRange,.flatpickr-day.endRange.startRange.endRange{border-radius:50px}.flatpickr-day.inRange{border-radius:0;-webkit-box-shadow:-5px 0 0 #e6e6e6,5px 0 0 #e6e6e6;box-shadow:-5px 0 0 #e6e6e6,5px 0 0 #e6e6e6}.flatpickr-day.disabled,.flatpickr-day.disabled:hover{pointer-events:none}.flatpickr-day.disabled,.flatpickr-day.disabled:hover,.flatpickr-day.prevMonthDay,.flatpickr-day.nextMonthDay,.flatpickr-day.notAllowed,.flatpickr-day.notAllowed.prevMonthDay,.flatpickr-day.notAllowed.nextMonthDay{color:rgba(57,57,57,0.3);background:transparent;border-color:transparent;cursor:default}.flatpickr-day.week.selected{border-radius:0;-webkit-box-shadow:-5px 0 0 #569ff7,5px 0 0 #569ff7;box-shadow:-5px 0 0 #569ff7,5px 0 0 #569ff7}.rangeMode .flatpickr-day{margin-top:1px}.flatpickr-weekwrapper{display:inline-block;float:left;}.flatpickr-weekwrapper .flatpickr-weeks{padding:0 12px;-webkit-box-shadow:1px 0 0 #e6e6e6;box-shadow:1px 0 0 #e6e6e6}.flatpickr-weekwrapper .flatpickr-weekday{float:none;width:100%;line-height:28px}.flatpickr-weekwrapper span.flatpickr-day{display:block;width:100%;max-width:none}.flatpickr-innerContainer{display:block;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden;}.flatpickr-rContainer{display:inline-block;padding:0;-webkit-box-sizing:border-box;box-sizing:border-box}.flatpickr-time{text-align:center;outline:0;display:block;height:0;line-height:40px;max-height:40px;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;}.flatpickr-time:after{content:"";display:table;clear:both}.flatpickr-time .numInputWrapper{-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;width:40%;height:40px;float:left;}.flatpickr-time .numInputWrapper span.arrowUp:after{border-bottom-color:#393939}.flatpickr-time .numInputWrapper span.arrowDown:after{border-top-color:#393939}.flatpickr-time.hasSeconds .numInputWrapper{width:26%}.flatpickr-time.time24hr .numInputWrapper{width:49%}.flatpickr-time input{background:transparent;-webkit-box-shadow:none;box-shadow:none;border:0;border-radius:0;text-align:center;margin:0;padding:0;height:inherit;line-height:inherit;cursor:pointer;color:#393939;font-size:14px;position:relative;-webkit-box-sizing:border-box;box-sizing:border-box;}.flatpickr-time input.flatpickr-hour{font-weight:bold}.flatpickr-time input.flatpickr-minute,.flatpickr-time input.flatpickr-second{font-weight:400}.flatpickr-time input:focus{outline:0;border:0}.flatpickr-time .flatpickr-time-separator,.flatpickr-time .flatpickr-am-pm{height:inherit;display:inline-block;float:left;line-height:inherit;color:#393939;font-weight:bold;width:2%;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.flatpickr-time .flatpickr-am-pm{outline:0;width:18%;cursor:pointer;text-align:center;font-weight:400;}.flatpickr-time .flatpickr-am-pm:hover,.flatpickr-time .flatpickr-am-pm:focus{background:#f0f0f0}.flatpickr-input[readonly]{cursor:pointer}@-webkit-keyframes fpFadeInDown{from{opacity:0;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}to{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}@keyframes fpFadeInDown{from{opacity:0;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0)}to{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}@-webkit-keyframes fpSlideLeft{from{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}to{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}@keyframes fpSlideLeft{from{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}to{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}@-webkit-keyframes fpSlideLeftNew{from{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}to{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}@keyframes fpSlideLeftNew{from{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}to{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}@-webkit-keyframes fpSlideRight{from{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}to{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}@keyframes fpSlideRight{from{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}to{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}@-webkit-keyframes fpSlideRightNew{from{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}to{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}@keyframes fpSlideRightNew{from{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}to{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}@-webkit-keyframes fpFadeOut{from{opacity:1}to{opacity:0}}@keyframes fpFadeOut{from{opacity:1}to{opacity:0}}@-webkit-keyframes fpFadeIn{from{opacity:0}to{opacity:1}}@keyframes fpFadeIn{from{opacity:0}to{opacity:1}}

data/app/assets/stylesheets/comfy/admin/cms/redactor_overrides.sass

@@ -16,7 +16,7 @@
           display: inline
       #redactor-image-manager-box
         img
-          border: 1px solid #ddd
           margin: 0 5px 5px 0
+          opacity: 0.75
         img:hover
-          border-color: #fff
+          opacity: 1

data/app/controllers/comfy/admin/base_controller.rb

@@ -0,0 +1,20 @@
+class Comfy::Admin::BaseController < ComfortableMexicanSofa.config.base_controller.to_s.constantize
+
+  include Comfy::Paginate
+
+  # Authentication module must have `authenticate` method
+  include ComfortableMexicanSofa.config.admin_auth.to_s.constantize
+
+  # Authorization module must have `authorize` method
+  include ComfortableMexicanSofa.config.admin_authorization.to_s.constantize
+
+  helper Comfy::Admin::CmsHelper
+  helper Comfy::CmsHelper
+
+  protect_from_forgery
+
+  before_action :authenticate
+
+  layout 'comfy/admin/cms'
+
+end

data/app/controllers/comfy/admin/cms/base_controller.rb

@@ -1,22 +1,9 @@
-class Comfy::Admin::Cms::BaseController < ComfortableMexicanSofa.config.base_controller.to_s.constantize
+class Comfy::Admin::Cms::BaseController < Comfy::Admin::BaseController
 
-  include Comfy::Paginate
-
-  # Authentication module must have `authenticate` method
-  include ComfortableMexicanSofa.config.admin_auth.to_s.constantize
-
-  # Authorization module must have `authorize` method
-  include ComfortableMexicanSofa.config.admin_authorization.to_s.constantize
-
-  protect_from_forgery
-
-  before_action :authenticate,
-                :load_admin_site,
+  before_action :load_admin_site,
                 :set_locale,
-                :load_fixtures,
-                :except => :jump
-
-  layout 'comfy/admin/cms'
+                :load_seeds,
+                except: :jump
 
   if ComfortableMexicanSofa.config.admin_cache_sweeper.present?
     cache_sweeper *ComfortableMexicanSofa.config.admin_cache_sweeper
@@ -33,7 +20,7 @@ protected
 
   def load_admin_site
     id_param = params[:site_id] || session[:site_id]
-    if @site = ::Comfy::Cms::Site.find_by(:id => id_param) || ::Comfy::Cms::Site.first
+    if @site = ::Comfy::Cms::Site.find_by(id: id_param) || ::Comfy::Cms::Site.first
       session[:site_id] = @site.id
     else
       I18n.locale = ComfortableMexicanSofa.config.admin_locale || I18n.default_locale
@@ -47,13 +34,13 @@ protected
     true
   end
 
-  def load_fixtures
-    return unless ComfortableMexicanSofa.config.enable_fixtures
+  def load_seeds
+    return unless ComfortableMexicanSofa.config.enable_seeds
 
     controllers = %w(layouts pages snippets files).collect{|c| 'comfy/admin/cms/' + c}
     if controllers.member?(params[:controller]) && params[:action] == 'index'
-      ComfortableMexicanSofa::Fixture::Importer.new(@site.identifier).import!
-      flash.now[:danger] = I18n.t('comfy.admin.cms.base.fixtures_enabled')
+      ComfortableMexicanSofa::Seeds::Importer.new(@site.identifier).import!
+      flash.now[:warning] = I18n.t('comfy.admin.cms.base.seeds_enabled')
     end
   end
 end

data/app/controllers/comfy/admin/cms/categories_controller.rb

@@ -1,6 +1,6 @@
 class Comfy::Admin::Cms::CategoriesController < Comfy::Admin::Cms::BaseController
 
-  before_action :load_category,  :only => [:edit, :update, :destroy]
+  before_action :load_category, only: [:edit, :update, :destroy]
   before_action :authorize
 
   def edit
@@ -34,5 +34,4 @@ protected
   def category_params
     params.fetch(:category, {}).permit!
   end
-
-end
+end

data/app/controllers/comfy/admin/cms/files_controller.rb

@@ -2,36 +2,41 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
 
   include ActionView::Helpers::NumberHelper
 
-  before_action :build_file,  :only => [:new, :create]
-  before_action :load_file,   :only => [:edit, :update, :destroy]
+  before_action :build_file,  only: [:new, :create]
+  before_action :load_file,   only: [:edit, :update, :destroy]
   before_action :authorize
 
   def index
+    files_scope = @site.files.with_attached_attachment
+
     case params[:source]
+
+    # Integration with Redactor 1.0 Wysiwyg
     when 'redactor'
-      file_scope  = @site.files.limit(100).order('created_at DESC')
+      file_scope  = files_scope.limit(100).order(:position)
       file_hashes = case params[:type]
       when 'image'
-        file_scope.images.collect do |image|
-          { :thumb => image.file.url(:cms_thumb),
-            :image => image.file.url,
-            :title => image.label }
+        file_scope.with_images.collect do |file|
+          { thumb: url_for(file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:redactor])),
+            image: url_for(file.attachment),
+            title: file.label }
         end
       else
         file_scope.collect do |file|
-          { :title  => file.label,
-            :name   => file.file_file_name,
-            :link   => file.file.url,
-            :size   => number_to_human_size(file.file_file_size) }
+          { title:  file.label,
+            name:   file.attachment.filename,
+            link:   url_for(file.attachment),
+            size:   number_to_human_size(file.attachment.byte_size) }
         end
       end
-      render :json => file_hashes
+      render json: file_hashes
+
     else
-      files_scope = @site.files.not_page_file
+      files_scope = files_scope
         .includes(:categories)
-        .for_category(params[:category])
-        .order('comfy_cms_files.position')
-      @files = comfy_paginate(files_scope, 50)
+        .for_category(params[:categories])
+        .order("comfy_cms_files.position")
+      @files = comfy_paginate(files_scope, per_page: 50)
     end
   end
 
@@ -42,42 +47,56 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
   def create
     if params[:category]
       ids = @site.categories.of_type('Comfy::Cms::File')
-        .where(:label => params[:category])
+        .where(label: params[:category])
         .each_with_object({}){|c, h| h[c.id] = 1}
-      @file.category_ids = ids
+        @file.category_ids = ids
     end
-    
+
+    # Automatically tagging upload if it's done through redactor
+    if params[:source] == "redactor"
+      category = @site.categories.of_type("Comfy::Cms::File").find_or_create_by(label: "wysiwyg")
+      @file.category_ids ||= {}
+      @file.category_ids[category.id] = 1
+    end
+
     @file.save!
 
     case params[:source]
-    when 'plupload'
-      render :body => render_to_string(:partial => 'file', :object => @file)
-    when 'redactor'
-      render :json => {:filelink => @file.file.url, :filename => @file.label}
+    when "plupload"
+      render body: render_to_string(partial: "file", object: @file)
+    when "redactor"
+      render json: {
+        filelink: url_for(@file.attachment),
+        filename: @file.attachment.filename
+      }
     else
       flash[:success] = I18n.t('comfy.admin.cms.files.created')
-      redirect_to :action => :edit, :id => @file
+      redirect_to action: :edit, id: @file
     end
 
   rescue ActiveRecord::RecordInvalid
     case params[:source]
     when 'plupload'
-      render :body => @file.errors.full_messages.to_sentence, :status => :unprocessable_entity
+      render body: @file.errors.full_messages.to_sentence, status: :unprocessable_entity
     when 'redactor'
-      render body: nil, :status => :unprocessable_entity
+      render body: nil, status: :unprocessable_entity
     else
       flash.now[:danger] = I18n.t('comfy.admin.cms.files.creation_failure')
-      render :action => :new
+      render action: :new
     end
   end
 
+  def edit
+    render
+  end
+
   def update
     if @file.update(file_params)
       flash[:success] = I18n.t('comfy.admin.cms.files.updated')
-      redirect_to :action => :edit, :id => @file
+      redirect_to action: :edit, id: @file
     else
       flash.now[:danger] = I18n.t('comfy.admin.cms.files.update_failure')
-      render :action => :edit
+      render action: :edit
     end
   end
 
@@ -87,7 +106,7 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
       format.js
       format.html do
         flash[:success] = I18n.t('comfy.admin.cms.files.deleted')
-        redirect_to :action => :index
+        redirect_to action: :index
       end
     end
   end
@@ -111,7 +130,7 @@ protected
     @file = @site.files.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     flash[:danger] = I18n.t('comfy.admin.cms.files.not_found')
-    redirect_to :action => :index
+    redirect_to action: :index
   end
 
   def file_params

data/app/controllers/comfy/admin/cms/layouts_controller.rb

@@ -1,12 +1,12 @@
 class Comfy::Admin::Cms::LayoutsController < Comfy::Admin::Cms::BaseController
 
-  before_action :build_layout,  :only => [:new, :create]
-  before_action :load_layout,   :only => [:edit, :update, :destroy]
+  before_action :build_layout,  only: [:new, :create]
+  before_action :load_layout,   only: [:edit, :update, :destroy]
   before_action :authorize
 
   def index
-    return redirect_to :action => :new if @site.layouts.count == 0
-    @layouts = @site.layouts.roots
+    return redirect_to action: :new if @site.layouts.count == 0
+    @layouts = @site.layouts.roots.order(:position)
   end
 
   def new
@@ -20,30 +20,30 @@ class Comfy::Admin::Cms::LayoutsController < Comfy::Admin::Cms::BaseController
   def create
     @layout.save!
     flash[:success] = I18n.t('comfy.admin.cms.layouts.created')
-    redirect_to :action => :edit, :id => @layout
+    redirect_to action: :edit, id: @layout
   rescue ActiveRecord::RecordInvalid
     flash.now[:danger] = I18n.t('comfy.admin.cms.layouts.creation_failure')
-    render :action => :new
+    render action: :new
   end
 
   def update
     @layout.update_attributes!(layout_params)
     flash[:success] = I18n.t('comfy.admin.cms.layouts.updated')
-    redirect_to :action => :edit, :id => @layout
+    redirect_to action: :edit, id: @layout
   rescue ActiveRecord::RecordInvalid
     flash.now[:danger] = I18n.t('comfy.admin.cms.layouts.update_failure')
-    render :action => :edit
+    render action: :edit
   end
 
   def destroy
     @layout.destroy
     flash[:success] = I18n.t('comfy.admin.cms.layouts.deleted')
-    redirect_to :action => :index
+    redirect_to action: :index
   end
 
   def reorder
     (params[:comfy_cms_layout] || []).each_with_index do |id, index|
-      ::Comfy::Cms::Layout.where(:id => id).update_all(:position => index)
+      ::Comfy::Cms::Layout.where(id: id).update_all(position: index)
     end
     head :ok
   end
@@ -54,18 +54,17 @@ protected
     @layout = @site.layouts.new(layout_params)
     @layout.parent      ||= ::Comfy::Cms::Layout.find_by_id(params[:parent_id])
     @layout.app_layout  ||= @layout.parent.try(:app_layout)
-    @layout.content     ||= '{{ cms:page:content:rich_text }}'
+    @layout.content     ||= "{{ cms:wysiwyg content }}"
   end
 
   def load_layout
     @layout = @site.layouts.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     flash[:danger] = I18n.t('comfy.admin.cms.layouts.not_found')
-    redirect_to :action => :index
+    redirect_to action: :index
   end
 
   def layout_params
     params.fetch(:layout, {}).permit!
   end
-
 end

data/app/controllers/comfy/admin/cms/pages_controller.rb

@@ -1,21 +1,22 @@
 class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
-  before_action :check_for_layouts, :only => [:new, :edit]
-  before_action :build_cms_page,    :only => [:new, :create]
-  before_action :load_cms_page,     :only => [:edit, :update, :destroy]
+
+  before_action :check_for_layouts, only: [:new, :edit]
+  before_action :build_page,        only: [:new, :create]
+  before_action :load_page,         only: [:edit, :update, :destroy]
   before_action :authorize
-  before_action :preview_cms_page,  :only => [:create, :update]
+  before_action :preview_page,      only: [:create, :update]
 
   def index
-    return redirect_to :action => :new if site_has_no_pages?
+    return redirect_to action: :new if site_has_no_pages?
 
     return index_for_redactor if params[:source] == 'redactor'
 
     @pages_by_parent = pages_grouped_by_parent
 
-    if params[:category].present?
-      @pages = @site.pages.includes(:categories).for_category(params[:category]).order('label')
+    @pages = if params[:categories].present?
+      @site.pages.includes(:categories).for_category(params[:categories]).order(:label)
     else
-      @pages = [@site.pages.root].compact
+      [@site.pages.root].compact
     end
   end
 
@@ -30,30 +31,30 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
   def create
     @page.save!
     flash[:success] = I18n.t('comfy.admin.cms.pages.created')
-    redirect_to :action => :edit, :id => @page
+    redirect_to action: :edit, id: @page
   rescue ActiveRecord::RecordInvalid
     flash.now[:danger] = I18n.t('comfy.admin.cms.pages.creation_failure')
-    render :action => :new
+    render action: :new
   end
 
   def update
     @page.save!
     flash[:success] = I18n.t('comfy.admin.cms.pages.updated')
-    redirect_to :action => :edit, :id => @page
+    redirect_to action: :edit, id: @page
   rescue ActiveRecord::RecordInvalid
     flash.now[:danger] = I18n.t('comfy.admin.cms.pages.update_failure')
-    render :action => :edit
+    render action: :edit
   end
 
   def destroy
     @page.destroy
     flash[:success] = I18n.t('comfy.admin.cms.pages.deleted')
-    redirect_to :action => :index
+    redirect_to action: :index
   end
 
-  def form_blocks
-    @page = @site.pages.find_by_id(params[:id]) || @site.pages.new
-    @page.layout = @site.layouts.find_by_id(params[:layout_id])
+  def form_fragments
+    @page = @site.pages.find_by(id: params[:id]) || @site.pages.new
+    @page.layout = @site.layouts.find_by(id: params[:layout_id])
   end
 
   def toggle_branch
@@ -68,7 +69,7 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
 
   def reorder
     (params[:comfy_cms_page] || []).each_with_index do |id, index|
-      ::Comfy::Cms::Page.where(:id => id).update_all(:position => index)
+      ::Comfy::Cms::Page.where(id: id).update_all(position: index)
     end
     head :ok
   end
@@ -79,7 +80,7 @@ protected
     tree_walker = ->(page, list, offset) do
       return unless page.present?
       label = "#{'. . ' * offset}#{page.label}"
-      list << {:name => label, :url => page.url(:relative)}
+      list << {name: label, url: page.url(relative: true)}
       page.children.each do |child_page|
         tree_walker.(child_page, list, offset + 1)
       end
@@ -87,11 +88,11 @@ protected
     end
 
     page_select_options = [{
-      :name => I18n.t('comfy.admin.cms.pages.form.choose_link'),
-      :url  => false
+      name: I18n.t('comfy.admin.cms.pages.form.choose_link'),
+      url: false
     }] + tree_walker.(@site.pages.root, [ ], 0)
 
-    render :json => page_select_options
+    render json: page_select_options
   end
 
   def site_has_no_pages?
@@ -99,7 +100,7 @@ protected
   end
 
   def pages_grouped_by_parent
-    @site.pages.includes(:categories).group_by(&:parent_id)
+    @site.pages.order(:position).includes(:categories).group_by(&:parent_id)
   end
 
   def check_for_layouts
@@ -109,22 +110,21 @@ protected
     end
   end
 
-  def build_cms_page
+  def build_page
     @page = @site.pages.new(page_params)
     @page.parent ||= (@site.pages.find_by_id(params[:parent_id]) || @site.pages.root)
     @page.layout ||= (@page.parent && @page.parent.layout || @site.layouts.first)
   end
 
-  def load_cms_page
+  def load_page
     @page = @site.pages.find(params[:id])
     @page.attributes = page_params
-    @page.layout ||= (@page.parent && @page.parent.layout || @site.layouts.first)
   rescue ActiveRecord::RecordNotFound
     flash[:danger] = I18n.t('comfy.admin.cms.pages.not_found')
-    redirect_to :action => :index
+    redirect_to action: :index
   end
 
-  def preview_cms_page
+  def preview_page
     if params[:preview]
       layout = @page.layout.app_layout.blank?? false : @page.layout.app_layout
       @cms_site   = @page.site
@@ -138,7 +138,7 @@ protected
       # Chrome chokes on content with iframes. Issue #434
       response.headers['X-XSS-Protection'] = '0'
 
-      render :inline => @page.render, :layout => layout, :content_type => 'text/html'
+      render inline: @page.render, layout: layout, content_type: 'text/html'
     end
   end