enjoy_cms 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7396a7e0de757550c9c23cd91c1a04cfa089a67b
-  data.tar.gz: 35134eb111a84278479d77e1f4f1d85f56da950b
+  metadata.gz: 6b716ab79a5d4ea81e6b859c0c8456b683e62d48
+  data.tar.gz: 6b176e5cd1d3b85592e68d759d9b1f307805e300
 SHA512:
-  metadata.gz: 71d0e398cf285ef3da4687a6ec70d09c9350611413a8d11af1f4eb4271b16e2309ddbe5fff4b733d5ba5a1a5827459c3bd5e75ecba6c2c3b8960043f8cf53b05
-  data.tar.gz: c8f2350501b3add07a6b876a1295bb4b92dfc4dcd9c4b35004c24e26d4c30e90f59810663dd90c72b6dbdab7280821695bcd42c357606943758a214b5efac8c1
+  metadata.gz: 30266bf6706c48215330362675aedcecef219b6fd64322c38b2ce7ff3942c3d7270582b7f465481f7ecc4f6ecce3b3dca16333cc2072933680f09b5667d8d2f9
+  data.tar.gz: 8e7699946577593cd4cd10d486ef578c30fdfbf655f98ea45c004d6eea503c4288e597394733b3cbf2104e04633682ea7707ab1574fbbe99c38cd58085269d02

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.5)
+    enjoy_cms (0.3.6)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -109,8 +109,8 @@ GEM
       tilt
     htmlentities (4.3.4)
     i18n (0.7.0)
-    jquery-rails (4.1.0)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
@@ -195,7 +195,7 @@ GEM
       activesupport (= 4.2.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (11.0.1)
     remotipart (1.2.1)
     responders (2.1.1)
       railties (>= 4.2.0, < 5.1)

data/app/assets/javascripts/enjoy_cms.coffee

@@ -4,3 +4,4 @@
 #= require head.load.js
 #= require enjoy_cms/map
 #= require enjoy_cms/flash
+#= require enjoy_cms/contacts

data/app/assets/javascripts/enjoy_cms/contacts.coffee

@@ -0,0 +1,11 @@
+window.create_enjoy_cms_feedback_ajax_form = (form_selector = "#new_contact_message", wrapper_selector = "#enjoy_cms_contact_form" )->
+
+  $(document).delegate form_id, "ajax:complete", (event, xhr, status)->
+    $(event.currentTarget).closest().html(xhr.responseText)
+
+  $(document).delegate form_selector + " .input", 'click', (e) ->
+    e.preventDefault()
+    $(e.currentTarget).removeClass("field_with_errors").find('span.error').hide()
+    return false
+
+create_enjoy_cms_feedback_ajax_form()

data/app/views/enjoy/contacts/_form.html.slim

@@ -0,0 +1,7 @@
+= simple_form_for @contact_message, url: enjoy_contacts_path do |f|
+  = f.input :name
+  = f.input :email
+  = f.input :phone
+  = f.input :content, as: :text
+  = f.input :captcha, as: :simple_captcha
+  = f.submit t('enjoy.send')

data/app/views/enjoy/contacts/index.html.slim

@@ -1,10 +1,4 @@
 = render 'shared/obj', obj: @seo_page
 
 #enjoy_cms_contact_form
-  = simple_form_for @contact_message, url: enjoy_contacts_path do |f|
-    = f.input :name
-    = f.input :email
-    = f.input :phone
-    = f.input :content
-    = f.input :captcha, as: :simple_captcha
-    = f.submit t('enjoy.send')
+  = render partial: "enjoy/contacts/form"

data/app/views/enjoy/contacts/new.html.slim

@@ -1,10 +1,4 @@
 = render 'shared/obj', obj: @seo_page
 
 #enjoy_cms_contact_form
-  = simple_form_for @contact_message, url: enjoy_contacts_path do |f|
-    = f.input :name
-    = f.input :email
-    = f.input :phone
-    = f.input :content
-    = f.input :captcha, as: :simple_captcha
-    = f.submit t('enjoy.send')
+  = render partial: "enjoy/contacts/form"

data/app/views/layouts/application.html.slim

@@ -1,17 +1,18 @@
 doctype html
 html lang="ru"
   head
-    meta chaenjoyet="UTF-8"
+    meta charset="UTF-8"
     meta name="viewport" content="width=device-width, maximum-scale=1"
     title= page_title
     = yield :meta
     = csrf_meta_tags
     = render partial: "blocks/favicon"
     
-    = stylesheet_link_tag "application", media: "all", async: Rails.env == "production"
-    = javascript_include_tag "application", async: Rails.env == "production"
+    - async = Rails.env == "production"
+    = stylesheet_link_tag "application", media: "all", async: async
+    = javascript_include_tag "application", async: async
     /[if lt IE 9]
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: Rails.env == "production"
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js", async: async
       
   body
     #root

data/app/views/shared/_obj.html.slim

@@ -8,11 +8,12 @@
         = raw @seo_page.page_content
     - else
       = raw obj.content
-  .admin_button
     - if !obj.nil?
-      = render 'shared/admin_link', obj: obj
+      .admin_button
+        = render 'shared/admin_link', obj: obj
     - if !@seo_page.nil? && (@seo_page.id != obj.id || @seo_page.class.name != obj.class.name)
-      = render 'shared/admin_link', obj: @seo_page
+      .admin_button
+        = render 'shared/admin_link', obj: @seo_page
 
   - content_for :meta do
     = render 'shared/meta', obj: obj

data/config/locales/ru.models.yml

@@ -55,6 +55,9 @@ ru:
       enjoy/embeddede_gallery_image: Фото в фотогалерее
       enjoy/seo: SEO
       enjoy/sitemap_data: Карта сайта
+
+      enjoy/page_blockset: Блоки
+      enjoy/page_block: Блок
     attributes:
       user:
         email: E-mail
@@ -86,7 +89,9 @@ ru:
       enjoy/gallery:
       enjoy/gallery_image:
        gallery: Фотогалерея
-      enjoy/embeddede_gallery_image:
+      enjoy/embeddeded_gallery_image:
+      enjoy/page_blockset:
+        blocks: Блоки
     errors:
       models:
         contact_message:

data/lib/enjoy/admin/contact_message.rb

@@ -21,7 +21,6 @@ module Enjoy
             end
           end
 
-
           Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
           if block_given?

data/lib/enjoy/controllers/contacts.rb

@@ -38,7 +38,8 @@ module Enjoy
       private
       def render_contacts_error
         if request.xhr? && process_ajax
-          render json: {errors: @contact_message.errors}, status: 422
+          render partial: form_partial
+          # render json: {errors: @contact_message.errors}, status: 422
         else
           flash.now[:alert] = @contact_message.errors.full_messages.join("\n")
           render action: Enjoy.configuration.recreate_contact_message_action, status: 422
@@ -54,16 +55,23 @@ module Enjoy
         redirect_to :contacts_sent
       end
       def after_initialize
-        # overrideable hook for updating message
+        if request.xhr?
+          render partial: form_partial
+        end
       end
       def after_create
         # overrideable hook for updating message
       end
+      def form_partial
+        "enjoy/contacts/form"
+      end
       def model
         Enjoy::ContactMessage
       end
       def message_params
-        params.require(:contact_message).permit(Enjoy.config.contacts_fields.keys + [:name, :email, :phone, :content, :captcha, :captcha_key])
+        params.require(model.to_param.gsub("::", "").underscore).permit(
+          Enjoy.config.contacts_fields.keys + [:name, :email, :phone, :content, :captcha, :captcha_key]
+        )
       end
     end
   end

data/lib/enjoy/routes.rb

@@ -15,7 +15,7 @@ module ActionDispatch::Routing
       scope module: 'enjoy' do
         if routes_config[:use_contacts_path]
           get 'contacts' => 'contacts#new', as: :enjoy_contacts
-          post 'contacts' => 'contacts#create', as: :enjoy_create_contacts
+          post 'contacts' => 'contacts#create', as: :create_enjoy_contacts
           get 'contacts/sent' => 'contacts#sent', as: :enjoy_contacts_sent
         end
 

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -405,8 +405,9 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/enjoy_cms.coffee
-- app/assets/javascripts/enjoy_cms/flash.js.coffee
-- app/assets/javascripts/enjoy_cms/map.js.coffee
+- app/assets/javascripts/enjoy_cms/contacts.coffee
+- app/assets/javascripts/enjoy_cms/flash.coffee
+- app/assets/javascripts/enjoy_cms/map.coffee
 - app/assets/javascripts/head.load.js
 - app/assets/javascripts/jquery.placeholder.js
 - app/assets/stylesheets/enjoy_cms.sass
@@ -480,6 +481,7 @@ files:
 - app/views/devise/sessions/new.html.slim
 - app/views/devise/shared/_links.html.slim
 - app/views/enjoy/contact_mailer/new_message_email.html.slim
+- app/views/enjoy/contacts/_form.html.slim
 - app/views/enjoy/contacts/index.html.slim
 - app/views/enjoy/contacts/new.html.slim
 - app/views/enjoy/contacts/sent.html.slim