pwb 1.0.0 → 1.1.1

data/config/cms_page_containers/about-us.json

@@ -0,0 +1,18 @@
+// legacy about us
+[{
+  "name": "about-us",
+  "id": "about-us",
+  "tabValue": "about-us",
+  "pageTitleKey": "pages.aboutUs",
+  "isLegacy": true,
+  // "tabTitleKey": "webContentSections.about",
+  "cmsPartsList": [{
+    "tabValue": "about-us",
+    "tabTitleKey": "pages.aboutUs",
+    // "tabInfoKey": "pageSections.people.info",
+    // "label": "about_us_people",
+    "editorBlocks": [
+    ]
+  }]
+
+}]

data/config/cms_page_containers/about.json

@@ -0,0 +1,107 @@
+[{
+  "name": "about",
+  "id": "about",
+  "tabValue": "about",
+  "pageTitleKey": "pages.aboutUs",
+  // "tabTitleKey": "webContentSections.aboutUs",
+  "cmsPartsList": [{
+    "tabValue": "raw",
+    "tabTitleKey": "pageSections.raw.title",
+    "tabInfoKey": "pageSections.raw.info",
+    "label": "about_us_raw",
+    "editorBlocks": [
+      [{
+        "label": "content_a",
+        "isMultipleLineText": "true"
+      }]
+    ]
+  }, {
+    "tabValue": "services",
+    "tabTitleKey": "pageSections.services.title",
+    "tabInfoKey": "pageSections.services.info",
+    "label": "about_us_services",
+    "editorBlocks": [
+      [{
+        "label": "title_a",
+        "isSingleLineText": "true"
+      }, {
+        "label": "content_a",
+        "isMultipleLineText": "true"
+      }],
+      [{
+        "label": "title_b",
+        "isSingleLineText": "true"
+      }, {
+        "label": "content_b",
+        "isMultipleLineText": "true"
+      }],
+      [{
+        "label": "title_c",
+        "isSingleLineText": "true"
+      }, {
+        "label": "content_c",
+        "isMultipleLineText": "true"
+      }]
+    ]
+  }, {
+    "tabValue": "people",
+    "tabTitleKey": "pageSections.people.title",
+    "tabInfoKey": "pageSections.people.info",
+    "label": "about_us_people",
+    "editorBlocks": [
+      [{
+        "label": "person_img_url_a",
+        "isImage": "true"
+      }, {
+        "label": "person_name_a",
+        "isSingleLineText": "true"
+      }, {
+        "label": "person_title_a",
+        "isSingleLineText": "true"
+      }, {
+        "label": "person_details_a",
+        "isMultipleLineText": "true"
+      }],
+      [{
+        "label": "person_img_url_b",
+        "isImage": "true"
+      }, {
+        "label": "person_name_b",
+        "isSingleLineText": "true"
+      }, {
+        "label": "person_title_b",
+        "isSingleLineText": "true"
+      }, {
+        "label": "person_details_b",
+        "isMultipleLineText": "true"
+      }],
+      [{
+        "label": "person_img_url_c",
+        "isImage": "true"
+      }, {
+        "label": "person_name_c",
+        "isSingleLineText": "true"
+      }, {
+        "label": "person_title_c",
+        "isSingleLineText": "true"
+      }, {
+        "label": "person_details_c",
+        "isMultipleLineText": "true"
+      }],
+      [{
+        "label": "person_img_url_d",
+        "isImage": "true"
+      }, {
+        "label": "person_name_d",
+        "isSingleLineText": "true"
+      }, {
+        "label": "person_title_d",
+        "isSingleLineText": "true"
+      }, {
+        "label": "person_details_d",
+        "isMultipleLineText": "true"
+      }]
+    ]
+  }]
+
+}]

data/config/cms_page_containers/landing.json

@@ -0,0 +1,19 @@
+// legacy landing
+[{
+  "name": "landing",
+  "id": "landing",
+  "tabValue": "landing",
+  "pageTitleKey": "pages.landing",
+  "isLegacy": true,
+  // "tabTitleKey": "webContentSections.about",
+  "cmsPartsList": [{
+    "tabValue": "landing-carousel",
+    "tabTitleKey": "webContentSections.landingCarousel",
+    "editorBlocks": []
+  }, {
+    "tabValue": "content-area-cols",
+    "tabTitleKey": "webContentSections.contentAreaCols",
+    "editorBlocks": []
+  }]
+
+}]

data/config/cms_page_containers/legal.json

@@ -0,0 +1,17 @@
+[{
+  "name": "legal",
+  "id": "legal",
+  "tabValue": "legal",
+  "pageTitleKey": "pages.legal",
+  "isLegacy": true,
+  // "tabTitleKey": "webContentSections.legal",
+  "cmsPartsList": [{
+    "tabValue": "legal",
+    "tabTitleKey": "pages.legal",
+    // "tabInfoKey": "pageSections.people.info",
+    // "label": "about_us_people",
+    "editorBlocks": [
+    ]
+  }]
+
+}]

data/config/cms_page_containers/sell.json

@@ -0,0 +1,96 @@
+[{
+  "name": "sell",
+  "id": "sell",
+  "tabValue": "sell",
+  "pageTitleKey": "pages.sell",
+  // "tabTitleKey": "webContentSections.sell",
+  "cmsPartsList": [{
+    "tabValue": "services",
+    "tabTitleKey": "pageSections.services.title",
+    "tabInfoKey": "pageSections.services.info",
+    "label": "about_us_services",
+    "editorBlocks": [
+      [{
+        "label": "title_a",
+        "isSingleLineText": "true"
+      }, {
+        "label": "content_a",
+        "isMultipleLineText": "true"
+      }],
+      [{
+        "label": "title_b",
+        "isSingleLineText": "true"
+      }, {
+        "label": "content_b",
+        "isMultipleLineText": "true"
+      }],
+      [{
+        "label": "title_c",
+        "isSingleLineText": "true"
+      }, {
+        "label": "content_c",
+        "isMultipleLineText": "true"
+      }]
+    ]
+  }, {
+    "tabValue": "people",
+    "tabTitleKey": "pageSections.people.title",
+    "tabInfoKey": "pageSections.people.info",
+    "label": "about_us_people",
+    "editorBlocks": [
+      [{
+        "label": "person_img_url_a",
+        "isImage": "true"
+      },{
+        "label": "person_name_a",
+        "isSingleLineText": "true"
+      },{
+        "label": "person_title_a",
+        "isSingleLineText": "true"
+      }, {
+        "label": "person_details_a",
+        "isMultipleLineText": "true"
+      }],
+      [{
+        "label": "person_img_url_b",
+        "isImage": "true"
+      },{
+        "label": "person_name_b",
+        "isSingleLineText": "true"
+      },{
+        "label": "person_title_b",
+        "isSingleLineText": "true"
+      }, {
+        "label": "person_details_b",
+        "isMultipleLineText": "true"
+      }],
+      [{
+        "label": "person_img_url_c",
+        "isImage": "true"
+      },{
+        "label": "person_name_c",
+        "isSingleLineText": "true"
+      },{
+        "label": "person_title_c",
+        "isSingleLineText": "true"
+      }, {
+        "label": "person_details_c",
+        "isMultipleLineText": "true"
+      }],
+      [{
+        "label": "person_img_url_d",
+        "isImage": "true"
+      },{
+        "label": "person_name_d",
+        "isSingleLineText": "true"
+      },{
+        "label": "person_title_d",
+        "isSingleLineText": "true"
+      }, {
+        "label": "person_details_d",
+        "isMultipleLineText": "true"
+      }]
+    ]
+  }]
+
+}]

data/config/initializers/cloudinary.rb

@@ -7,5 +7,8 @@ Cloudinary.config do |config|
     config.api_key = uri.user
     config.api_secret = uri.password
     config.cloud_name = uri.host
+    Rails.application.config.use_cloudinary = true
+  else
+    Rails.application.config.use_cloudinary = false
   end
 end

data/config/initializers/comfortable_mexican_sofa.rb

@@ -0,0 +1,142 @@
+# encoding: utf-8
+
+ComfortableMexicanSofa.configure do |config|
+  # Title of the admin area
+  #   config.cms_title = 'ComfortableMexicanSofa CMS Engine'
+
+  # Controller that is inherited from CmsAdmin::BaseController
+  #   config.base_controller = 'ApplicationController'
+
+  # Module responsible for authentication. You can replace it with your own.
+  # It simply needs to have #authenticate method. See http_auth.rb for reference.
+  #   config.admin_auth = 'ComfyAdminAuthentication'
+  config.admin_auth = 'CmsDeviseAuth'
+
+  # Module responsible for authorization on admin side. It should have #authorize
+  # method that returns true or false based on params and loaded instance
+  # variables available for a given controller.
+  #   config.admin_authorization = 'ComfyAdminAuthorization'
+
+  # Module responsible for public authentication. Similar to the above. You also
+  # will have access to @cms_site, @cms_layout, @cms_page so you can use them in
+  # your logic. Default module doesn't do anything.
+  #   config.public_auth = 'ComfyPublicAuthentication'
+
+  # Module responsible for public authorization. It should have #authorize
+  # method that returns true or false based on params and loaded instance
+  # variables available for a given controller.
+  #   config.public_authorization = 'ComfyPublicAuthorization'
+
+  # When arriving at /cms-admin you may chose to redirect to arbirtary path,
+  # for example '/cms-admin/users'
+  #   config.admin_route_redirect = ''
+
+  # File uploads use Paperclip and can support filesystem or s3 uploads.  Override
+  # the upload method and appropriate settings based on Paperclip.  For S3 see:
+  # http://rdoc.info/gems/paperclip/2.3.8/Paperclip/Storage/S3, and for
+  # filesystem see: http://rdoc.info/gems/paperclip/2.3.8/Paperclip/Storage/Filesystem
+  # If you are using S3 and HTTPS, pass :s3_protocol => '' to have URLs that use the protocol of the page
+  #   config.upload_file_options = {:url => '/system/:class/:id/:attachment/:style/:filename'}
+
+  # Sofa allows you to setup entire site from files. Database is updated with each
+  # request (if necessary). Please note that database entries are destroyed if there's
+  # no corresponding file. Fixtures are disabled by default.
+  #   config.enable_fixtures = false
+
+  # Path where fixtures can be located.
+    config.fixtures_path = File.expand_path('db/cms_fixtures', Pwb::Engine.root)
+
+  # Importing fixtures into Database
+  # To load fixtures into the database just run this rake task:
+  #   local: $ rake comfortable_mexican_sofa:fixtures:import FROM=example.local TO=localhost
+  #   Heroku: $ heroku run rake comfortable_mexican_sofa:fixtures:import FROM=example.local TO=yourapp.herokuapp.com
+  # From indicates folder the fixtures are in and to is the Site hostname you have defined in the database.
+
+  # Exporting fixtures into Files
+  # If you need to dump database contents into fixture files run:
+  #   local: $ rake comfortable_mexican_sofa:fixtures:export FROM=localhost TO=example.local
+  #   Heroku: $ heroku run rake comfortable_mexican_sofa:fixtures:export FROM=yourapp.herokuapp.com TO=example.local
+  # This will create example.local folder and dump all content from example.com Site.
+
+  # Content for Layouts, Pages and Snippets has a revision history. You can revert
+  # a previous version using this system. You can control how many revisions per
+  # object you want to keep. Set it to 0 if you wish to turn this feature off.
+  #   config.revisions_limit = 25
+
+  # Locale definitions. If you want to define your own locale merge
+  # {:locale => 'Locale Title'} with this.
+  #   config.locales = {:en => 'English', :es => 'Español'}
+
+  # Admin interface will respect the locale of the site being managed. However you can
+  # force it to English by setting this to `:en`
+  #   config.admin_locale = nil
+
+  # A class that is included as a sweeper to admin base controller if it's set
+  #   config.admin_cache_sweeper = nil
+
+  # By default you cannot have irb code inside your layouts/pages/snippets.
+  # Generally this is to prevent putting something like this:
+  # <% User.delete_all %> but if you really want to allow it...
+  #   config.allow_irb = false
+
+  # Whitelist of all helper methods that can be used via {{cms:helper}} tag. By default
+  # all helpers are allowed except `eval`, `send`, `call` and few others. Empty array
+  # will prevent rendering of all helpers.
+  #   config.allowed_helpers = nil
+
+  # Whitelist of partials paths that can be used via {{cms:partial}} tag. All partials
+  # are accessible by default. Empty array will prevent rendering of all partials.
+  #   config.allowed_partials = nil
+
+  # Site aliases, if you want to have aliases for your site. Good for harmonizing
+  # production env with dev/testing envs.
+  # e.g. config.hostname_aliases = {'host.com' => 'host.inv', 'host_a.com' => ['host.lvh.me', 'host.dev']}
+  # Default is nil (not used)
+  #   config.hostname_aliases = nil
+
+  # Reveal partials that can be overwritten in the admin area.
+  # Default is false.
+  #   config.reveal_cms_partials = false
+
+end
+
+# Default credentials for ComfortableMexicanSofa::AccessControl::AdminAuthentication
+# YOU REALLY WANT TO CHANGE THIS BEFORE PUTTING YOUR SITE LIVE
+# ComfortableMexicanSofa::AccessControl::AdminAuthentication.username = 'username'
+# ComfortableMexicanSofa::AccessControl::AdminAuthentication.password = 'password'
+
+
+# Uncomment this module and `config.admin_auth` above to use custom admin authentication
+# module ComfyAdminAuthentication
+#   def authenticate
+#     return true
+#   end
+# end
+module CmsDeviseAuth
+  def authenticate
+    unless current_user && current_user.admin?
+      redirect_to pwb.new_user_session_path
+    end
+  end
+end
+
+# Uncomment this module and `config.admin_authorization` above to use custom admin authorization
+# module ComfyAdminAuthorization
+#   def authorize
+#     return true
+#   end
+# end
+
+# Uncomment this module and `config.public_auth` above to use custom public authentication
+# module ComfyPublicAuthentication
+#   def authenticate
+#     return true
+#   end
+# end
+
+# Uncomment this module and `config.public_authorization` above to use custom public authorization
+# module ComfyPublicAuthorization
+#   def authorize
+#     return true
+#   end
+# end

data/config/locales/admin.en.yml

@@ -39,6 +39,20 @@ en:
     brl: Brazilian Real
     zar: South African Rand
     hkd: Hong Kong Dollar
+    pages:
+      aboutUs: About us
+      sell: Sell
+      landing: Landing
+      legal: Legal
+    pageSections:
+      services: 
+        title: Services you offer
+        info: An overview of the services you offer
+      people: 
+        title: Your team
+        info: Summary info about your team
+    editor:
+      pickPhoto: Pick photo
     inTabLabels:
       topNav: Top Navigation
       footer: Footer
@@ -65,6 +79,7 @@ en:
       legalAdvice: "Legal Notice"
       privacyPolicy: "Privacy Policy"
     adminSections:
+      pages: Pages
       import: Import Data
       start: Home
       agencyDetails: Agency
@@ -243,3 +258,201 @@ en:
       visible: Visible
       reference: Ref
       type: Type
+
+    # TODO - move Spanish versions of below to server side
+    save: Save
+    cancel: Cancel
+    edit: Edit
+    preview: Preview
+    close: Close
+    addLogo: Add Logo
+    addPhotos: Add Photos
+    create: Create
+    delete: Delete
+    show: Show
+    hide: Hide
+    logo: Logo
+    aboutUsPhoto: About Us photo
+    addAboutUsPhoto: Add About Us photo
+
+    visible: Visible
+    hidden: Hidden
+
+    editWebsite: Edit Website
+    settingsForWebsite: Settings for Website
+    contentForWebsite: Content for Website 
+    sectionsForWebsite: Website Sections
+    themesForWebsite: Website Themes
+    importExport: Import and export data
+    returnToWebsite: Return to web
+    settingsForProperties: Settings for properties
+    returnToProperties: Return to properties
+    addProperty: Add property
+    addClient: Add client
+    newProperty: New Property
+    newClient: New Client
+    propertiesList: Properties list
+    clientsList: Clients list
+
+    prompts: 
+      fixErrors: Please correct the errors below
+
+    todos: 
+      createContent: Create some content
+      companyDetails: Set up your company details
+
+    locationTab: 
+      confirmAddress: Confirm new location
+
+    agencySections: 
+      general: Agency Details
+      location: Location
+      user: User Details
+
+    siteLayout: 
+      wide: Wide
+      boxed: Boxed
+
+    propertySections: 
+      general: General
+      location: Location
+      text: Text
+      extras: Features
+      photos: Photos
+      sale: Sale / Rental
+      owner: Owner
+
+    propertyGeneralSections: 
+      sale: Sale
+      longtermRental: Long term rental
+      seasonalRental: Seasonal rental
+      visibility: Visibility
+      generalData: General Data
+      characteristics: Characteristics
+      portals: Web Portals
+      extras: Features
+
+    translationsSections: 
+      extras: Features
+      propertyTypes: Property Types
+      propertyOrigins: Property Origins
+      propertyStates: Property States
+      propertyLabels: Property Labels
+      provinces: Provinces
+
+    toolTips: 
+      forSale: Select if property is available for sale
+      priceSaleCurrent: Current selling price
+      saleDiscount: saleDiscount
+      priceSaleOriginal: Original selling price
+      longTermRental: Select 'Yes' if property is available for long term rental
+      priceRentalMonthlyCurrent: Current rental price
+      priceRentalMonthlyOriginal: Original rental price
+
+      addNewEntry: Add New Entry
+      visible: Select 'Yes' to publish property on the website
+      highlighted: Select 'Yes' to highlight property on the website
+      seasonalRental: Select 'Yes' if property is rentened seasonaly
+      ref: Reference number for property
+
+    alerts: 
+      changesDetected: You have unsaved changes.
+      deletingProperty: Are you sure you want to delete this property.  This action cannot be undone.
+      navigatingFromChanges: You have unsaved changes. Please save or cancel your changes.
+      visibleProperties: These properties are visible on your website
+      hiddenProperties: These properties will not be shown on your website
+      clickMapToUpdate: Click on map to select address or type directly below.
+
+    datatables: 
+      sInfo: Showing items from _START_ al _END_ from a total of _TOTAL_ properties
+      sInfoEmpty: Showing items from 0 al 0 from a total of 0 properties
+      sInfoPostFix: ""
+      sSearch: Search
+      sUrl: ""
+      sInfoThousands: ","
+      oPaginate: 
+        sFirst: "<<"
+        sLast: ">>"
+        sNext: ">"
+        sPrevious: "<"
+
+    alert: 
+      deleteItem: Are you sure you want to delete this item?
+      deleteButton: Yes, delete it!
+
+    street: Street
+    streetAddress: Street Address
+    streetNumber: Street Number
+    city: City
+    postCode: Post Code
+    region: Region
+    zone: Zone
+    locality: Locality
+    country: Country
+
+    properties: Properties
+
+    cards: 
+      website: Website
+      websitePrompt: Website actions
+      websiteLink: Go to web control panel
+      properties: Properties
+      propertiesPrompt: Property actions
+      propertiesLink: Go to properties
+    tasks: 
+      addProperty: Add a property
+      addPropertyPrompt: properties / Add property
+      manageProperties: Manage properties
+      managePropertiesPrompt: Properties / Edit property
+      changeLogo: Manage logo, languages and appearance
+      changeLogoPrompt: Web Configuration
+      changeLang: Change web language
+      changeLangPrompt: Web Configuration
+      changeLegalText: Change 'Legal' texts
+      manageLandingCarousel: Manage landing page carousel
+      changeAboutUsText: Change 'About Us' text
+      managePropertyTypes: Manage property types
+      managePropertyExtras: Manage property features
+
+    buttonLabels: 
+      configureAvailableExtras: Configure available features
+      selectImagesToAdd: Select images to add
+      selectRemoteImages: Add images from urls
+
+    errors:
+      genericServerError: Sorry, there has been an error
+      languageRequired: You must select at least one language
+      inclusion: is not included in the list
+      exclusion: is reserved
+      invalid: is invalid
+      confirmation: "doesn't match {{attribute}}"
+      accepted: must be accepted
+      empty: "can't be empty"
+      blank: "can't be blank"
+      present: must be blank
+      tooLong: is too long (maximum is {{count}} characters)
+      tooShort: is too short (minimum is {{count}} characters)
+      wrongLength: is the wrong length (should be {{count}} characters)
+      notANumber: is not a number
+      notAnInteger: must be an integer
+      greaterThan: must be greater than {{count}}
+      greaterThanOrEqualTo: must be greater than or equal to {{count}}
+      equalTo: must be equal to {{count}}
+      lessThan: must be less than {{count}}
+      lessThanOrEqualTo: must be less than or equal to {{count}}
+      otherThan: must be other than {{count}}
+      odd: must be odd
+      even: must be even
+      tooShortVjs: is too short
+      notAUrlVjs: is not a valid URL
+
+    ar: Arabic
+    en: English
+    es: Spanish
+    ca: Catalan
+    fr: French
+    ru: Russian
+    nl: Dutch
+    it: Italian
+    de: German
+    pt: Portuguese