pwb 1.0.0 → 1.1.1

data/spec/features/pwb/admin_spec_tmp.rb

@@ -0,0 +1,54 @@
+require 'rails_helper'
+
+module Pwb
+  RSpec.describe "Admin panel", type: :feature, js: true do
+    # pending "need to figure out why test below fails on travis"
+
+    before(:all) do
+      @admin_user = User.create!(email: "user@example.org", password: "very-secret", admin: true)
+      @prop_for_long_term_rent = FactoryGirl.create(
+        :pwb_prop,
+        :long_term_rent,
+        price_rental_monthly_current_cents: 100_000,
+        reference: "ref_pfltr"
+      )
+    end
+
+    scenario 'sign in works' do
+      sign_in_as @admin_user.email, @admin_user.password
+      # Capybara.raise_server_errors = false
+      # # above needed to prevent this error:
+      # # No route matches [GET] "/assets/icons/ellipsis.png"
+
+      # visit('/admin')
+      # # puts current_url
+      # # require 'pry'; binding.pry
+      # # save_and_open_page
+      # fill_in('Email', with: @admin_user.email)
+      # fill_in('Password', with: @admin_user.password)
+      # click_button('Sign in')
+
+      # expect(page).to have_css(".main-menu", count: 1)
+      # expect(last('.card').find('h2')).to have_content('Website')
+      byebug
+      
+      expect(page).to have_link(nil, href: '/en/admin/properties/new')
+      # below fails in travis CI - perhaps because translations aren't loading??
+      # expect(page).to have_link('Add a property')
+    end
+
+    # scenario 'settings works' do
+    #   sign_in_as @admin_user.email, @admin_user.password
+    #   Capybara.raise_server_errors = false
+
+    #   click_link(nil, href: '/en/admin/website/settings')
+    #   # visit('/en/admin/website/settings/general')
+
+    #   byebug
+    # end
+
+    after(:all) do
+      @prop_for_long_term_rent.destroy
+    end
+  end
+end

data/spec/fixtures/to_import/pwb-properties.csv

@@ -1,6 +1,6 @@
 id,title_en,title_es,description_en,description_es,price_sale_current_cents,price_rental_monthly_current_cents,count_bedrooms,count_bathrooms,count_toilets,count_garages,street_address,street_number,postal_code,city,country,longitude,latitude
 
 57,Example flat for sale.,Ejemplo de un piso para vender.,Description of the amazing flat for sale.,Descripción de una flat estupenda para vender.,5000000,0,1,1.0,1,0,Calle Sup,23,29590,Málaga,Spain,-4.52615000000003,36.73234
-58,Example flat to rent.,Ejemplo de un piso para alquilar.,Description of the amazing flat to rent.,Descripción de una flat estupenda para alquilar.,0,50000,1,1.0,1,0,Calle Sup,23,29590,Málaga,Spain,-4.52615000000003,36.73234
+58,Example flat to rent.,Ejemplo de un piso para arrendar.,Description of the amazing flat to rent.,Descripción de una flat estupenda para arrendar.,0,50000,1,1.0,1,0,Calle Sup,23,29590,Málaga,Spain,-4.52615000000003,36.73234
 55,Example villa for sale.,Ejemplo de villa para vender.,Description of the amazing villa for sale.,Descripción de una villa estupenda para vender.,30000000,0,2,2.0,1,1,Calle Sup,23,29590,Málaga,Spain,-4.52615000000003,36.73234
-56,Example mansion for rent.,Una villa estupenda para aliquilar.,Description of the amazing mansion for rent.,Descripción de una villa estupenda para aliquilar.,0,100000,2,2.0,1,1,Calle Sup,23,29590,Málaga,Spain,-4.52615000000003,36.73234
+56,Example mansion for rent.,Una villa estupenda para arrendar.,Description of the amazing mansion for rent.,Descripción de una villa estupenda para aliquilar.,0,100000,2,2.0,1,1,Calle Sup,23,29590,Málaga,Spain,-4.52615000000003,36.73234

data/spec/views/pwb/application_layout.html.erb_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe 'layouts/pwb/application', type: :view do
   before do
     view.extend Pwb::Engine.routes.url_helpers
     view.extend Pwb::ApplicationHelper
+    view.extend Pwb::CssHelper
   end
 
   before(:each) do

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pwb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ed Tewiah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: money-rails
   requirement: !ruby/object:Gem::Requirement
@@ -142,20 +136,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: paloma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -324,6 +304,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: comfortable_mexican_sofa
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -400,6 +394,7 @@ files:
 - app/assets/images/select.png
 - app/assets/images/select@2x.png
 - app/assets/images/simple-nav-arrow.png
+- app/assets/javascripts/comfy/admin/cms/custom.js.coffee
 - app/assets/javascripts/pwb/application.js
 - app/assets/javascripts/pwb/paloma/landing.js
 - app/assets/javascripts/pwb/paloma/prop.js
@@ -413,6 +408,7 @@ files:
 - app/assets/javascripts/pwb/themes/berlin/nouislider.js
 - app/assets/javascripts/pwb/themes/berlin/slick.js
 - app/assets/javascripts/pwb_admin_panel/application.js
+- app/assets/stylesheets/comfy/admin/cms/custom.sass
 - app/assets/stylesheets/pwb/application.scss
 - app/assets/stylesheets/pwb/themes/berlin.scss
 - app/assets/stylesheets/pwb/themes/berlin/colors/bridge-theme.css
@@ -451,6 +447,7 @@ files:
 - app/assets/stylesheets/pwb_admin_panel/application.scss
 - app/controllers/pwb/admin_panel_controller.rb
 - app/controllers/pwb/api/v1/agency_controller.rb
+- app/controllers/pwb/api/v1/cms_pages_controller.rb
 - app/controllers/pwb/api/v1/lite_properties_controller.rb
 - app/controllers/pwb/api/v1/mls_controller.rb
 - app/controllers/pwb/api/v1/properties_controller.rb
@@ -463,6 +460,7 @@ files:
 - app/controllers/pwb/api_public/v1/props_controller.rb
 - app/controllers/pwb/application_api_controller.rb
 - app/controllers/pwb/application_controller.rb
+- app/controllers/pwb/comfy_controller.rb
 - app/controllers/pwb/css_controller.rb
 - app/controllers/pwb/devise/registrations_controller.rb
 - app/controllers/pwb/devise_controller.rb
@@ -480,6 +478,7 @@ files:
 - app/controllers/pwb/sections_controller.rb
 - app/controllers/pwb/welcome_controller.rb
 - app/helpers/pwb/application_helper.rb
+- app/helpers/pwb/css_helper.rb
 - app/jobs/pwb/application_job.rb
 - app/mailers/pwb/application_mailer.rb
 - app/mailers/pwb/enquiry_mailer.rb
@@ -489,6 +488,7 @@ files:
 - app/models/pwb/application_record.rb
 - app/models/pwb/client.rb
 - app/models/pwb/client_setup.rb
+- app/models/pwb/cms_page_container.rb
 - app/models/pwb/content.rb
 - app/models/pwb/content_photo.rb
 - app/models/pwb/feature.rb
@@ -504,6 +504,8 @@ files:
 - app/models/pwb/user.rb
 - app/models/pwb/website.rb
 - app/models/pwb/welcome.rb
+- app/resources/pwb/api/v1/cms_block_resource.rb
+- app/resources/pwb/api/v1/cms_page_resource.rb
 - app/resources/pwb/api/v1/lite_property_resource.rb
 - app/resources/pwb/api/v1/property_resource.rb
 - app/resources/pwb/api/v1/section_resource.rb
@@ -522,10 +524,11 @@ files:
 - app/themes/berlin/views/pwb/search/rent.html.erb
 - app/themes/berlin/views/pwb/sections/_contact_us_form.html.erb
 - app/themes/berlin/views/pwb/sections/about_us.html.erb
+- app/themes/berlin/views/pwb/sections/cms.html.erb
 - app/themes/berlin/views/pwb/sections/contact_us.html.erb
 - app/themes/berlin/views/pwb/sections/static.html.erb
-- app/themes/berlin/views/pwb/welcome/_about_us.html.erb
-- app/themes/berlin/views/pwb/welcome/_adv_search.html.erb
+- app/themes/berlin/views/pwb/welcome/_about_us_to_del.html.erb
+- app/themes/berlin/views/pwb/welcome/_adv_search_to_del.html.erb
 - app/themes/berlin/views/pwb/welcome/_landing_carousel.html.erb
 - app/themes/berlin/views/pwb/welcome/_latest_properties.html.erb
 - app/themes/berlin/views/pwb/welcome/_service.html.erb
@@ -539,6 +542,7 @@ files:
 - app/themes/default/views/pwb/search/rent.html.erb
 - app/themes/default/views/pwb/sections/_contact_us_form.html.erb
 - app/themes/default/views/pwb/sections/about_us.html.erb
+- app/themes/default/views/pwb/sections/cms.html.erb
 - app/themes/default/views/pwb/sections/contact_us.html.erb
 - app/themes/default/views/pwb/sections/static.html.erb
 - app/themes/default/views/pwb/welcome/_about_us.html.erb
@@ -563,6 +567,7 @@ files:
 - app/views/devise/unlocks/new.html.erb
 - app/views/layouts/pwb/admin_panel.html.erb
 - app/views/layouts/pwb/devise.html.erb
+- app/views/pwb/_analytics.html.erb
 - app/views/pwb/_footer.html.erb
 - app/views/pwb/_header.html.erb
 - app/views/pwb/admin_panel/show.html.erb
@@ -571,9 +576,9 @@ files:
 - app/views/pwb/ajax/contact_us_success.js.erb
 - app/views/pwb/ajax/request_info_errors.js.erb
 - app/views/pwb/ajax/request_info_success.js.erb
+- app/views/pwb/custom_css/_berlin.css.erb
+- app/views/pwb/custom_css/_default.css.erb
 - app/views/pwb/custom_css/_shared.css.erb
-- app/views/pwb/custom_css/berlin.css.erb
-- app/views/pwb/custom_css/default.css.erb
 - app/views/pwb/errors/admin_required.html.erb
 - app/views/pwb/export/properties/all.csv.erb
 - app/views/pwb/export/translations/all.csv.erb
@@ -595,6 +600,11 @@ files:
 - config/client_setups/default.json
 - config/client_setups/exp.json
 - config/client_setups/us.json
+- config/cms_page_containers/about-us.json
+- config/cms_page_containers/about.json
+- config/cms_page_containers/landing.json
+- config/cms_page_containers/legal.json
+- config/cms_page_containers/sell.json
 - config/database.yml.travis
 - config/import_mappings/api_pwb.json
 - config/import_mappings/mls_csv_jon.json
@@ -603,12 +613,15 @@ files:
 - config/import_mappings/mls_olr.json
 - config/initializers/carrierwave.rb
 - config/initializers/cloudinary.rb
+- config/initializers/comfortable_mexican_sofa.rb
 - config/initializers/devise.rb
 - config/initializers/i18n_backend.rb
 - config/initializers/money.rb
 - config/initializers/simple_form_bootstrap.rb
 - config/locales/admin.en.yml
 - config/locales/admin.es.yml
+- config/locales/admin.ru.yml
+- config/locales/admin.zh.yml.tmp
 - config/locales/de.yml
 - config/locales/devise.de.yml
 - config/locales/devise.en.yml
@@ -616,6 +629,7 @@ files:
 - config/locales/devise.fr.yml
 - config/locales/devise.pt.yml
 - config/locales/devise.ru.yml
+- config/locales/devise.zh-HK.yml
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/fr.yml
@@ -626,11 +640,167 @@ files:
 - config/locales/rails.fr.yml
 - config/locales/rails.pt.yml
 - config/locales/rails.ru.yml
+- config/locales/rails.zh-HK.yml
 - config/locales/ru.yml
+- config/locales/zh-HK.yml
 - config/rails_best_practices.yml
 - config/routes.rb
 - config/scraper_mappings/pwb.json
 - config/secrets.yml.travis
+- db/cms_fixtures/cms/categories/pages.yml
+- db/cms_fixtures/cms/files/_rerenting-landing_framed.png.yml
+- db/cms_fixtures/cms/files/rerenting-landing_framed.png
+- db/cms_fixtures/cms/layouts/about-us/attributes.yml
+- db/cms_fixtures/cms/layouts/about-us/content.html
+- db/cms_fixtures/cms/layouts/about-us/javascript.js
+- db/cms_fixtures/cms/layouts/about-us/people/attributes.yml
+- db/cms_fixtures/cms/layouts/about-us/people/content.html
+- db/cms_fixtures/cms/layouts/about-us/services/attributes.yml
+- db/cms_fixtures/cms/layouts/about-us/services/content.html
+- db/cms_fixtures/cms/layouts/about-us/services/javascript.js
+- db/cms_fixtures/cms/layouts/about-us/services/stylesheet.css
+- db/cms_fixtures/cms/layouts/about-us/stylesheet.css
+- db/cms_fixtures/cms/layouts/default-layout/attributes.yml
+- db/cms_fixtures/cms/layouts/default-layout/content.html
+- db/cms_fixtures/cms/layouts/default-layout/javascript.js
+- db/cms_fixtures/cms/layouts/default-layout/stylesheet.css
+- db/cms_fixtures/cms/pages/index/about-us/attributes.yml
+- db/cms_fixtures/cms/pages/index/about-us/people/attributes.yml
+- db/cms_fixtures/cms/pages/index/about-us/people/de/attributes.yml
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_details_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_details_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_details_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_details_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_img_url_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_img_url_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_img_url_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_img_url_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_name_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_name_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_name_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_name_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_title_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_title_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_title_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/de/person_title_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/attributes.yml
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_details_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_details_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_details_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_details_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_img_url_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_img_url_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_img_url_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_img_url_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_name_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_name_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_name_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_name_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_title_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_title_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_title_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/en/person_title_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/attributes.yml
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_details_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_details_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_details_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_details_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_img_url_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_img_url_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_img_url_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_img_url_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_name_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_name_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_name_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_name_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_title_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_title_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_title_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/es/person_title_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/attributes.yml
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/person_details_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/person_details_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/person_details_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/person_details_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/person_name_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/person_name_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/person_name_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/person_name_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/person_title_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/person_title_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/person_title_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/pt/person_title_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/attributes.yml
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_details_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_details_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_details_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_details_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_img_url_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_img_url_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_img_url_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_img_url_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_name_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_name_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_name_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_name_d.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_title_a.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_title_b.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_title_c.html
+- db/cms_fixtures/cms/pages/index/about-us/people/ru/person_title_d.html
+- db/cms_fixtures/cms/pages/index/about-us/services/attributes.yml
+- db/cms_fixtures/cms/pages/index/about-us/services/content_a.html
+- db/cms_fixtures/cms/pages/index/about-us/services/content_b.html
+- db/cms_fixtures/cms/pages/index/about-us/services/content_c.html
+- db/cms_fixtures/cms/pages/index/about-us/services/de/attributes.yml
+- db/cms_fixtures/cms/pages/index/about-us/services/de/content_a.html
+- db/cms_fixtures/cms/pages/index/about-us/services/de/content_b.html
+- db/cms_fixtures/cms/pages/index/about-us/services/de/content_c.html
+- db/cms_fixtures/cms/pages/index/about-us/services/de/title_a.html
+- db/cms_fixtures/cms/pages/index/about-us/services/de/title_b.html
+- db/cms_fixtures/cms/pages/index/about-us/services/de/title_c.html
+- db/cms_fixtures/cms/pages/index/about-us/services/en/attributes.yml
+- db/cms_fixtures/cms/pages/index/about-us/services/en/content_a.html
+- db/cms_fixtures/cms/pages/index/about-us/services/en/content_b.html
+- db/cms_fixtures/cms/pages/index/about-us/services/en/content_c.html
+- db/cms_fixtures/cms/pages/index/about-us/services/en/title_a.html
+- db/cms_fixtures/cms/pages/index/about-us/services/en/title_b.html
+- db/cms_fixtures/cms/pages/index/about-us/services/en/title_c.html
+- db/cms_fixtures/cms/pages/index/about-us/services/es/attributes.yml
+- db/cms_fixtures/cms/pages/index/about-us/services/es/content_a.html
+- db/cms_fixtures/cms/pages/index/about-us/services/es/content_b.html
+- db/cms_fixtures/cms/pages/index/about-us/services/es/content_c.html
+- db/cms_fixtures/cms/pages/index/about-us/services/es/title_a.html
+- db/cms_fixtures/cms/pages/index/about-us/services/es/title_b.html
+- db/cms_fixtures/cms/pages/index/about-us/services/es/title_c.html
+- db/cms_fixtures/cms/pages/index/about-us/services/title_a.html
+- db/cms_fixtures/cms/pages/index/about-us/services/title_b.html
+- db/cms_fixtures/cms/pages/index/about-us/services/title_c.html
+- db/cms_fixtures/cms/pages/index/attributes.yml
+- db/cms_fixtures/cms/pages/index/content.html
+- db/cms_fixtures/cms/pages/index/title.html
+- db/cms_fixtures/cms/snippets/snippet1/attributes.yml
+- db/cms_fixtures/cms/snippets/snippet1/content.html
+- db/cms_fixtures/sample-site/categories/files.yml
+- db/cms_fixtures/sample-site/categories/pages.yml
+- db/cms_fixtures/sample-site/categories/snippets.yml
+- db/cms_fixtures/sample-site/files/_sample.jpg.yml
+- db/cms_fixtures/sample-site/files/sample.jpg
+- db/cms_fixtures/sample-site/layouts/default/attributes.yml
+- db/cms_fixtures/sample-site/layouts/default/content.html
+- db/cms_fixtures/sample-site/layouts/default/javascript.js
+- db/cms_fixtures/sample-site/layouts/default/nested/attributes.yml
+- db/cms_fixtures/sample-site/layouts/default/nested/content.haml
+- db/cms_fixtures/sample-site/layouts/default/nested/javascript.js
+- db/cms_fixtures/sample-site/layouts/default/nested/stylesheet.css
+- db/cms_fixtures/sample-site/layouts/default/stylesheet.css
+- db/cms_fixtures/sample-site/pages/index/attributes.yml
+- db/cms_fixtures/sample-site/pages/index/child/attributes.yml
+- db/cms_fixtures/sample-site/pages/index/child/left.haml
+- db/cms_fixtures/sample-site/pages/index/child/right.html
+- db/cms_fixtures/sample-site/pages/index/child/thumbnail.png
+- db/cms_fixtures/sample-site/pages/index/content.html
+- db/cms_fixtures/sample-site/snippets/default/attributes.yml
+- db/cms_fixtures/sample-site/snippets/default/content.html
 - db/example_images/PropertyWebBuilder-logo.jpg
 - db/example_images/carousel_deck_chair.jpg
 - db/example_images/carousel_grass.jpg
@@ -668,13 +838,15 @@ files:
 - db/migrate/20170315205332_add_section_key_to_pwb_contents.rb
 - db/migrate/20170315212222_translate_sections.rb
 - db/migrate/20170428170615_change_prop_prices_to_big_int.rb
+- db/migrate/20170513221300_create_cms.rb
 - db/seeds/spain/translations.rb
+- db/seeds/translations_ca.rb
 - db/seeds/translations_de.rb
 - db/seeds/translations_en.rb
 - db/seeds/translations_es.rb
 - db/seeds/translations_fr.rb
-- db/seeds/translations_others.rb
 - db/seeds/translations_pt.rb
+- db/seeds/translations_ru.rb
 - db/yml_seeds/agency.yml
 - db/yml_seeds/agency_address.yml
 - db/yml_seeds/content/about_us.yml
@@ -692,7 +864,9 @@ files:
 - db/yml_seeds/users.yml
 - db/yml_seeds/website.yml
 - lib/pwb.rb
+- lib/pwb/cms_data_loader.rb
 - lib/pwb/engine.rb
+- lib/pwb/locale_loader.rb
 - lib/pwb/seeder.rb
 - lib/pwb/version.rb
 - lib/tasks/grab_screenshots.rake
@@ -751,116 +925,14 @@ files:
 - spec/dummy/config/secrets.yml.travis
 - spec/dummy/config/spring.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/apple-touch-icon-precomposed.png
 - spec/dummy/public/apple-touch-icon.png
-- spec/dummy/public/assets/application-af04b226fd7202dfc532ce7aedb95a0128277937e90d3b3a3d35e1cce9e16886.css
-- spec/dummy/public/assets/application-af04b226fd7202dfc532ce7aedb95a0128277937e90d3b3a3d35e1cce9e16886.css.gz
-- spec/dummy/public/assets/application-ec8550e416fd8df1557ddb7f132ccd38baaafd36e4c5c9aff8420fbd47c0313f.js
-- spec/dummy/public/assets/application-ec8550e416fd8df1557ddb7f132ccd38baaafd36e4c5c9aff8420fbd47c0313f.js.gz
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-13634da87d9e23f8c3ed9108ce1724d183a39ad072e73e1b3d8cbf646d2d0407.eot
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-13634da87d9e23f8c3ed9108ce1724d183a39ad072e73e1b3d8cbf646d2d0407.eot.gz
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-42f60659d265c1a3c30f9fa42abcbb56bd4a53af4d83d316d6dd7a36903c43e5.svg
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-42f60659d265c1a3c30f9fa42abcbb56bd4a53af4d83d316d6dd7a36903c43e5.svg.gz
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-a26394f7ede100ca118eff2eda08596275a9839b959c226e15439557a5a80742.woff
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-e395044093757d82afcb138957d06a1ea9361bdcf0b442d06a18a8051af57456.ttf
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-e395044093757d82afcb138957d06a1ea9361bdcf0b442d06a18a8051af57456.ttf.gz
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-fe185d11a49676890d47bb783312a0cda5a44c4039214094e7957b4c040ef11c.woff2
-- spec/dummy/public/assets/pwb/application-0dc6ff845cde8e032ed365593c17fe09c18a6966d44f551946bf1673d8d1ac51.css
-- spec/dummy/public/assets/pwb/application-0dc6ff845cde8e032ed365593c17fe09c18a6966d44f551946bf1673d8d1ac51.css.gz
-- spec/dummy/public/assets/pwb/application-b4df8e7ae7700a0d09d88175af77e7f457ca2fbe15ae08450551ebf3bfb0c4d1.js
-- spec/dummy/public/assets/pwb/application-b4df8e7ae7700a0d09d88175af77e7f457ca2fbe15ae08450551ebf3bfb0c4d1.js.gz
-- spec/dummy/public/assets/pwb/themes/berlin-279c2e3a7fa11a902fdee83a6819dcc315ff8eb240cfad21b1322cedadb07ea7.js
-- spec/dummy/public/assets/pwb/themes/berlin-279c2e3a7fa11a902fdee83a6819dcc315ff8eb240cfad21b1322cedadb07ea7.js.gz
-- spec/dummy/public/assets/pwb/themes/berlin-8038d5cfd670e73fbffb581f6bb8d8c00ac448957945622c5c34438c467d218b.css
-- spec/dummy/public/assets/pwb/themes/berlin-8038d5cfd670e73fbffb581f6bb8d8c00ac448957945622c5c34438c467d218b.css.gz
-- spec/dummy/public/assets/pwb/themes/chic-facdff61de4827adfd797b6a36ffd6c8b432072df7190ed722d039f971caa539.css
-- spec/dummy/public/assets/pwb/themes/chic-facdff61de4827adfd797b6a36ffd6c8b432072df7190ed722d039f971caa539.css.gz
-- spec/dummy/public/assets/pwb/themes/default-d697fb0c278f500986e614ddd7eb41fd7db502a54f3370b3e8166cc1714509d0.css
-- spec/dummy/public/assets/pwb/themes/default-d697fb0c278f500986e614ddd7eb41fd7db502a54f3370b3e8166cc1714509d0.css.gz
-- spec/dummy/public/assets/pwb_admin_panel/application-2d624898965d7a347eb7f365feab34257032c25051633370811ed7dfd24d7c8c.js
-- spec/dummy/public/assets/pwb_admin_panel/application-2d624898965d7a347eb7f365feab34257032c25051633370811ed7dfd24d7c8c.js.gz
-- spec/dummy/public/assets/pwb_admin_panel/application-f0e38d58d1ce32501b22edd16697f45b561fa44b5be9265398a05e8dee169885.css
-- spec/dummy/public/assets/pwb_admin_panel/application-f0e38d58d1ce32501b22edd16697f45b561fa44b5be9265398a05e8dee169885.css.gz
 - spec/dummy/public/capybara.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/img/about-us.png
-- spec/dummy/public/img/agents/agent-1.png
-- spec/dummy/public/img/agents/agent-3.png
-- spec/dummy/public/img/agents/agent-4.png
-- spec/dummy/public/img/agents/agent-5.png
-- spec/dummy/public/img/banner-ads.jpg
-- spec/dummy/public/img/blog-img-1.jpg
-- spec/dummy/public/img/blog-img-2.jpg
-- spec/dummy/public/img/blog-img-3.jpg
-- spec/dummy/public/img/client-brand-1.png
-- spec/dummy/public/img/client-brand-2.png
-- spec/dummy/public/img/client-brand-3.png
-- spec/dummy/public/img/client-brand-4.png
-- spec/dummy/public/img/client-brand-5.png
-- spec/dummy/public/img/favicon.ico
-- spec/dummy/public/img/gallery/big/1.jpg
-- spec/dummy/public/img/gallery/big/10.jpg
-- spec/dummy/public/img/gallery/big/11 - Copy.jpg
-- spec/dummy/public/img/gallery/big/12.jpg
-- spec/dummy/public/img/gallery/big/2.jpg
-- spec/dummy/public/img/gallery/big/3.jpg
-- spec/dummy/public/img/gallery/big/4.jpg
-- spec/dummy/public/img/gallery/big/5.jpg
-- spec/dummy/public/img/gallery/big/6.jpg
-- spec/dummy/public/img/gallery/big/7.jpg
-- spec/dummy/public/img/gallery/big/8.jpg
-- spec/dummy/public/img/gallery/big/9.jpg
-- spec/dummy/public/img/gallery/fancybox_buttons.png
-- spec/dummy/public/img/gallery/fancybox_loading.gif
-- spec/dummy/public/img/gallery/fancybox_loading@2x.gif
-- spec/dummy/public/img/gallery/fancybox_overlay.png
-- spec/dummy/public/img/gallery/fancybox_sprite.png
-- spec/dummy/public/img/gallery/fancybox_sprite@2x.png
-- spec/dummy/public/img/gallery/small/1.jpg
-- spec/dummy/public/img/gallery/small/10.jpg
-- spec/dummy/public/img/gallery/small/11.jpg
-- spec/dummy/public/img/gallery/small/12.jpg
-- spec/dummy/public/img/gallery/small/2.jpg
-- spec/dummy/public/img/gallery/small/3.jpg
-- spec/dummy/public/img/gallery/small/4.jpg
-- spec/dummy/public/img/gallery/small/5.jpg
-- spec/dummy/public/img/gallery/small/6.jpg
-- spec/dummy/public/img/gallery/small/7.jpg
-- spec/dummy/public/img/gallery/small/8.jpg
-- spec/dummy/public/img/gallery/small/9.jpg
-- spec/dummy/public/img/item/1.jpg
-- spec/dummy/public/img/item/2.jpg
-- spec/dummy/public/img/item/3.jpg
-- spec/dummy/public/img/item/4.jpg
-- spec/dummy/public/img/item/5.jpg
-- spec/dummy/public/img/item/6.jpg
-- spec/dummy/public/img/logo.png
-- spec/dummy/public/img/promo-banner.jpg
-- spec/dummy/public/img/property-header-bg.jpg
-- spec/dummy/public/img/property-view-2.jpg
-- spec/dummy/public/img/signin-bg.jpg
-- spec/dummy/public/img/slider/1.jpg
-- spec/dummy/public/img/slider/2.jpg
-- spec/dummy/public/img/slider/3.jpg
-- spec/dummy/public/img/slider/4.jpg
-- spec/dummy/public/img/slider/5.jpg
-- spec/dummy/public/img/slider/6.jpg
-- spec/dummy/public/img/testimonial-1.png
-- spec/dummy/public/img/testimonial-2.png
-- spec/dummy/public/img/testimonial-3.png
-- spec/dummy/public/img/testimonial-bg.jpg
-- spec/dummy/public/js/bootstrap.js
-- spec/dummy/public/js/custom.js
-- spec/dummy/public/js/jquery.fancybox.pack.js
-- spec/dummy/public/js/jquery.min.js
-- spec/dummy/public/js/jquery.mixitup.js
-- spec/dummy/public/js/nouislider.js
-- spec/dummy/public/js/slick.js
-- spec/dummy/public/system/comfy/cms/files/files/000/000/003/cms_thumb/rerenting-landing_framed.png
-- spec/dummy/public/system/comfy/cms/files/files/000/000/003/original/rerenting-landing_framed.png
 - spec/factories/pwb_addresses.rb
 - spec/factories/pwb_agencies.rb
 - spec/factories/pwb_clients.rb
@@ -876,6 +948,7 @@ files:
 - spec/factories/pwb_users.rb
 - spec/factories/pwb_websites.rb
 - spec/features/pwb/admin_spec.rb
+- spec/features/pwb/admin_spec_tmp.rb
 - spec/features/pwb/sessions_spec.rb
 - spec/features/pwb/theme_berlin/prop_search_spec.rb
 - spec/features/pwb/theme_default/prop_search_spec.rb
@@ -1011,116 +1084,14 @@ test_files:
 - spec/dummy/config/spring.rb
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/apple-touch-icon-precomposed.png
 - spec/dummy/public/apple-touch-icon.png
-- spec/dummy/public/assets/application-af04b226fd7202dfc532ce7aedb95a0128277937e90d3b3a3d35e1cce9e16886.css
-- spec/dummy/public/assets/application-af04b226fd7202dfc532ce7aedb95a0128277937e90d3b3a3d35e1cce9e16886.css.gz
-- spec/dummy/public/assets/application-ec8550e416fd8df1557ddb7f132ccd38baaafd36e4c5c9aff8420fbd47c0313f.js
-- spec/dummy/public/assets/application-ec8550e416fd8df1557ddb7f132ccd38baaafd36e4c5c9aff8420fbd47c0313f.js.gz
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-13634da87d9e23f8c3ed9108ce1724d183a39ad072e73e1b3d8cbf646d2d0407.eot
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-13634da87d9e23f8c3ed9108ce1724d183a39ad072e73e1b3d8cbf646d2d0407.eot.gz
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-42f60659d265c1a3c30f9fa42abcbb56bd4a53af4d83d316d6dd7a36903c43e5.svg
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-42f60659d265c1a3c30f9fa42abcbb56bd4a53af4d83d316d6dd7a36903c43e5.svg.gz
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-a26394f7ede100ca118eff2eda08596275a9839b959c226e15439557a5a80742.woff
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-e395044093757d82afcb138957d06a1ea9361bdcf0b442d06a18a8051af57456.ttf
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-e395044093757d82afcb138957d06a1ea9361bdcf0b442d06a18a8051af57456.ttf.gz
-- spec/dummy/public/assets/bootstrap/glyphicons-halflings-regular-fe185d11a49676890d47bb783312a0cda5a44c4039214094e7957b4c040ef11c.woff2
-- spec/dummy/public/assets/pwb/application-0dc6ff845cde8e032ed365593c17fe09c18a6966d44f551946bf1673d8d1ac51.css
-- spec/dummy/public/assets/pwb/application-0dc6ff845cde8e032ed365593c17fe09c18a6966d44f551946bf1673d8d1ac51.css.gz
-- spec/dummy/public/assets/pwb/application-b4df8e7ae7700a0d09d88175af77e7f457ca2fbe15ae08450551ebf3bfb0c4d1.js
-- spec/dummy/public/assets/pwb/application-b4df8e7ae7700a0d09d88175af77e7f457ca2fbe15ae08450551ebf3bfb0c4d1.js.gz
-- spec/dummy/public/assets/pwb/themes/berlin-279c2e3a7fa11a902fdee83a6819dcc315ff8eb240cfad21b1322cedadb07ea7.js
-- spec/dummy/public/assets/pwb/themes/berlin-279c2e3a7fa11a902fdee83a6819dcc315ff8eb240cfad21b1322cedadb07ea7.js.gz
-- spec/dummy/public/assets/pwb/themes/berlin-8038d5cfd670e73fbffb581f6bb8d8c00ac448957945622c5c34438c467d218b.css
-- spec/dummy/public/assets/pwb/themes/berlin-8038d5cfd670e73fbffb581f6bb8d8c00ac448957945622c5c34438c467d218b.css.gz
-- spec/dummy/public/assets/pwb/themes/chic-facdff61de4827adfd797b6a36ffd6c8b432072df7190ed722d039f971caa539.css
-- spec/dummy/public/assets/pwb/themes/chic-facdff61de4827adfd797b6a36ffd6c8b432072df7190ed722d039f971caa539.css.gz
-- spec/dummy/public/assets/pwb/themes/default-d697fb0c278f500986e614ddd7eb41fd7db502a54f3370b3e8166cc1714509d0.css
-- spec/dummy/public/assets/pwb/themes/default-d697fb0c278f500986e614ddd7eb41fd7db502a54f3370b3e8166cc1714509d0.css.gz
-- spec/dummy/public/assets/pwb_admin_panel/application-2d624898965d7a347eb7f365feab34257032c25051633370811ed7dfd24d7c8c.js
-- spec/dummy/public/assets/pwb_admin_panel/application-2d624898965d7a347eb7f365feab34257032c25051633370811ed7dfd24d7c8c.js.gz
-- spec/dummy/public/assets/pwb_admin_panel/application-f0e38d58d1ce32501b22edd16697f45b561fa44b5be9265398a05e8dee169885.css
-- spec/dummy/public/assets/pwb_admin_panel/application-f0e38d58d1ce32501b22edd16697f45b561fa44b5be9265398a05e8dee169885.css.gz
 - spec/dummy/public/capybara.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/img/about-us.png
-- spec/dummy/public/img/agents/agent-1.png
-- spec/dummy/public/img/agents/agent-3.png
-- spec/dummy/public/img/agents/agent-4.png
-- spec/dummy/public/img/agents/agent-5.png
-- spec/dummy/public/img/banner-ads.jpg
-- spec/dummy/public/img/blog-img-1.jpg
-- spec/dummy/public/img/blog-img-2.jpg
-- spec/dummy/public/img/blog-img-3.jpg
-- spec/dummy/public/img/client-brand-1.png
-- spec/dummy/public/img/client-brand-2.png
-- spec/dummy/public/img/client-brand-3.png
-- spec/dummy/public/img/client-brand-4.png
-- spec/dummy/public/img/client-brand-5.png
-- spec/dummy/public/img/favicon.ico
-- spec/dummy/public/img/gallery/big/1.jpg
-- spec/dummy/public/img/gallery/big/10.jpg
-- spec/dummy/public/img/gallery/big/11 - Copy.jpg
-- spec/dummy/public/img/gallery/big/12.jpg
-- spec/dummy/public/img/gallery/big/2.jpg
-- spec/dummy/public/img/gallery/big/3.jpg
-- spec/dummy/public/img/gallery/big/4.jpg
-- spec/dummy/public/img/gallery/big/5.jpg
-- spec/dummy/public/img/gallery/big/6.jpg
-- spec/dummy/public/img/gallery/big/7.jpg
-- spec/dummy/public/img/gallery/big/8.jpg
-- spec/dummy/public/img/gallery/big/9.jpg
-- spec/dummy/public/img/gallery/fancybox_buttons.png
-- spec/dummy/public/img/gallery/fancybox_loading.gif
-- spec/dummy/public/img/gallery/fancybox_loading@2x.gif
-- spec/dummy/public/img/gallery/fancybox_overlay.png
-- spec/dummy/public/img/gallery/fancybox_sprite.png
-- spec/dummy/public/img/gallery/fancybox_sprite@2x.png
-- spec/dummy/public/img/gallery/small/1.jpg
-- spec/dummy/public/img/gallery/small/10.jpg
-- spec/dummy/public/img/gallery/small/11.jpg
-- spec/dummy/public/img/gallery/small/12.jpg
-- spec/dummy/public/img/gallery/small/2.jpg
-- spec/dummy/public/img/gallery/small/3.jpg
-- spec/dummy/public/img/gallery/small/4.jpg
-- spec/dummy/public/img/gallery/small/5.jpg
-- spec/dummy/public/img/gallery/small/6.jpg
-- spec/dummy/public/img/gallery/small/7.jpg
-- spec/dummy/public/img/gallery/small/8.jpg
-- spec/dummy/public/img/gallery/small/9.jpg
-- spec/dummy/public/img/item/1.jpg
-- spec/dummy/public/img/item/2.jpg
-- spec/dummy/public/img/item/3.jpg
-- spec/dummy/public/img/item/4.jpg
-- spec/dummy/public/img/item/5.jpg
-- spec/dummy/public/img/item/6.jpg
-- spec/dummy/public/img/logo.png
-- spec/dummy/public/img/promo-banner.jpg
-- spec/dummy/public/img/property-header-bg.jpg
-- spec/dummy/public/img/property-view-2.jpg
-- spec/dummy/public/img/signin-bg.jpg
-- spec/dummy/public/img/slider/1.jpg
-- spec/dummy/public/img/slider/2.jpg
-- spec/dummy/public/img/slider/3.jpg
-- spec/dummy/public/img/slider/4.jpg
-- spec/dummy/public/img/slider/5.jpg
-- spec/dummy/public/img/slider/6.jpg
-- spec/dummy/public/img/testimonial-1.png
-- spec/dummy/public/img/testimonial-2.png
-- spec/dummy/public/img/testimonial-3.png
-- spec/dummy/public/img/testimonial-bg.jpg
-- spec/dummy/public/js/bootstrap.js
-- spec/dummy/public/js/custom.js
-- spec/dummy/public/js/jquery.fancybox.pack.js
-- spec/dummy/public/js/jquery.min.js
-- spec/dummy/public/js/jquery.mixitup.js
-- spec/dummy/public/js/nouislider.js
-- spec/dummy/public/js/slick.js
-- spec/dummy/public/system/comfy/cms/files/files/000/000/003/cms_thumb/rerenting-landing_framed.png
-- spec/dummy/public/system/comfy/cms/files/files/000/000/003/original/rerenting-landing_framed.png
 - spec/dummy/Rakefile
 - spec/factories/pwb_addresses.rb
 - spec/factories/pwb_agencies.rb
@@ -1137,6 +1108,7 @@ test_files:
 - spec/factories/pwb_users.rb
 - spec/factories/pwb_websites.rb
 - spec/features/pwb/admin_spec.rb
+- spec/features/pwb/admin_spec_tmp.rb
 - spec/features/pwb/sessions_spec.rb
 - spec/features/pwb/theme_berlin/prop_search_spec.rb
 - spec/features/pwb/theme_default/prop_search_spec.rb