enjoy_cms 0.3.7.4 → 0.4.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d2178b8486c9fceedc7da68b3588e0886ccbbd4
-  data.tar.gz: db4da82c99d738dbbb25b892a357e2f4526092e8
+  metadata.gz: 0a5d6147bb0eb040d5049c6ec15332854109a4bb
+  data.tar.gz: ac05ab418b17b705a7541eb7b8ca7e2819445495
 SHA512:
-  metadata.gz: a81a9fc93c30230064dbd794042100ab4367603e5177ad1361534b2543e86bf8223460af626d8e9862a5c6b584276fd498f2a0a6485fbcf662ddad2e12734ad7
-  data.tar.gz: 09a3101fa5f966405c1598746913905448614388b59a5de5395e99729697a46935acab231cbe0115ab9b5647d155ddc98a1b4c7ad476dd117c2d15c22a4eb574
+  metadata.gz: 1122136245369984ddb261ea6d1d3092eda5a8dab2d07367b2c1bf5f89767c35c173e7aaa66d1b85215563129f0bc6a1a650073316d9b2151bf26c764e579a6b
+  data.tar.gz: f0405c8bc242b332325098247b6c88fd5df0ed3fea92c0afaf70b8997106afd73a4f8df1121e5a29776e4a20cb60838356dba3b822e6df3680507fb2a9f8e6ee

data/.gitignore

@@ -17,5 +17,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
 mongoid/Gemfile.lock
 activerecord/Gemfile.lock
+/Gemfile.lock

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.1

data/Gemfile.lock

@@ -1,79 +1,60 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.7.4)
-      ack_rails_admin_jcrop
-      addressable
+    enjoy_cms (0.4.0.beta3)
       ckeditor
       coffee-rails
       devise
       geocoder
-      glebtv-simple_captcha
       jquery-rails
       kaminari
-      rails (= 4.2.4)
+      rails (= 4.2.6)
       rails_admin (~> 0.8.1)
-      rails_admin_mongoid_localize_field
       rails_admin_nested_set
       rails_admin_settings
-      rails_admin_sort_embedded
       rails_admin_toggleable
-      simple-navigation
       simple_form
-      sitemap_generator
-      smart_excerpt
-      stringex
-      thor
-      turbolinks
-      validates_email_format_of
-      x-real-ip
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ack_rails_admin_jcrop (0.0.7)
-      mini_magick
-      rails (>= 3.0.0)
-      rails_admin (>= 0.3.0)
-    actionmailer (4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.4)
-      activesupport (= 4.2.4)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.4)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
     arel (6.0.3)
     bcrypt (3.1.11)
-    bson (4.0.4)
     builder (3.2.2)
     ckeditor (4.1.6)
       cocaine
@@ -82,32 +63,29 @@ GEM
       activesupport (>= 3.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    coffee-rails (4.1.1)
+    coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.1.x)
+      railties (>= 4.0.0, < 5.2.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.1)
-    devise (3.5.6)
+    concurrent-ruby (1.0.2)
+    devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
-    execjs (2.6.0)
-    font-awesome-rails (4.5.0.1)
+    execjs (2.7.0)
+    font-awesome-rails (4.6.3.1)
       railties (>= 3.2, < 5.1)
-    geocoder (1.3.1)
-    glebtv-simple_captcha (0.6.7)
+    geocoder (1.3.7)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     haml (4.0.7)
       tilt
-    htmlentities (4.3.4)
     i18n (0.7.0)
     jquery-rails (4.1.1)
       rails-dom-testing (>= 1, < 3)
@@ -116,45 +94,40 @@ GEM
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     json (1.8.3)
-    kaminari (0.16.3)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.99.1)
-    mini_magick (4.4.0)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    mongo (2.2.4)
-      bson (~> 4.0)
-    mongoid (5.1.1)
-      activemodel (~> 4.0)
-      mongo (~> 2.1)
-      origin (~> 2.2)
-      tzinfo (>= 0.3.37)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
     nested_form (0.3.2)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    origin (2.2.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     orm_adapter (0.5.0)
+    pkg-config (1.1.7)
     rack (1.6.4)
     rack-pjax (0.8.0)
       nokogiri (~> 1.5)
       rack (~> 1.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.4)
-      actionmailer (= 4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      activemodel (= 4.2.4)
-      activerecord (= 4.2.4)
-      activesupport (= 4.2.4)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.4)
+      railties (= 4.2.6)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -178,67 +151,45 @@ GEM
       remotipart (~> 1.0)
       safe_yaml (~> 1.0)
       sass-rails (>= 4.0, < 6)
-    rails_admin_mongoid_localize_field (0.1.3)
-      haml
-      mongoid (>= 3.0)
-      rails (>= 3.0)
-      rails_admin (>= 0.5)
-    rails_admin_nested_set (0.5.0)
+    rails_admin_nested_set (0.5.1)
       rails_admin
     rails_admin_settings (1.1.3)
-    rails_admin_sort_embedded (0.1.4)
-      rails_admin
-    rails_admin_toggleable (0.6.0)
+    rails_admin_toggleable (0.7.1)
       rails_admin
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.1.1)
+    rake (11.2.2)
     remotipart (1.2.1)
-    responders (2.1.1)
+    responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
     safe_yaml (1.0.4)
-    sass (3.4.21)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    sass (3.4.22)
+    sass-rails (5.0.5)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    simple-navigation (4.0.3)
-      activesupport (>= 2.3.2)
     simple_form (3.2.1)
       actionpack (> 4, < 5.1)
       activemodel (> 4, < 5.1)
-    sitemap_generator (5.1.0)
-      builder
-    smart_excerpt (0.1.5)
-      activesupport
-      htmlentities
-    sprockets (3.5.2)
+    sprockets (3.6.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stringex (2.6.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.2)
-    turbolinks (2.5.3)
-      coffee-rails
+    tilt (2.0.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    validates_email_format_of (1.6.3)
-      i18n
     warden (1.2.6)
       rack (>= 1.0)
-    x-real-ip (0.2.1)
-      activesupport
-      rack
 
 PLATFORMS
   ruby
@@ -249,4 +200,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/app/assets/javascripts/enjoy/cms/init.coffee

@@ -0,0 +1 @@
+window.enjoy_cms ||= {}

data/app/assets/javascripts/enjoy/cms.coffee

@@ -0,0 +1,11 @@
+#= require jquery
+#= require jquery_ujs
+
+# require turbolinks
+
+#= require ../head.load.js
+#= require ../jquery.placeholder.js
+
+#= require ./cms/init
+#= require ./cms/map
+#= require ./cms/flash

data/app/assets/javascripts/enjoy/rails_admin/cms.ui.coffee

@@ -0,0 +1,26 @@
+window.enjoy_cms ||= {}
+window.enjoy_cms.multiselect_dblclick = (selector)->
+  $(document).delegate selector + ' .ra-multiselect-left select option', 'dblclick', (e)->
+    $(e.currentTarget).closest('.ra-multiselect').find('.ra-multiselect-center .ra-multiselect-item-add').click()
+
+  $(document).delegate selector + ' .ra-multiselect-right select option', 'dblclick', (e)->
+    $(e.currentTarget).closest('.ra-multiselect').find('.ra-multiselect-center .ra-multiselect-item-remove').click()
+
+
+
+
+$(document).delegate '.sidebar-nav .nav .dropdown-header', 'click', (e)->
+  e.preventDefault()
+  _target = $(e.currentTarget).toggleClass('opened')
+  li = _target.next()
+  loop
+    li.toggleClass('visible')
+    li = li.next()
+    break if li.length == 0 or li.hasClass('dropdown-header')
+
+$(document).on 'pjax:complete ready', ()->
+  active_nav_element = $(".sidebar-nav .nav .active")
+  if active_nav_element.length > 0
+    _parent = active_nav_element.prevAll(".dropdown-header:first")
+    if _parent.length > 0 and !_parent.hasClass('opened')
+      _parent.click()

data/app/assets/javascripts/rails_admin/custom/ui.coffee

@@ -1,2 +1,2 @@
-#= require enjoy_cms/rails_admin/cms.ui
-#= require enjoy_cms/rails_admin/custom/ui
+#= require enjoy/rails_admin/cms.ui
+#= require enjoy/rails_admin/custom/ui

data/app/assets/stylesheets/{enjoy_cms.sass → enjoy/cms.sass}

@@ -1,4 +1,6 @@
-@import enjoy_cms/*
+@import enjoy/cms/flash
+@import enjoy/cms/normalize
+@import enjoy/cms/powered
 
 html
   -moz-font-smoothing: antialiased

data/app/assets/stylesheets/enjoy/rails_admin/cms.ui.sass

@@ -0,0 +1,117 @@
+.navbar-brand
+  margin-left: 0 !important
+
+.input-small
+  width: 150px
+
+.container-fluid
+  input[type=text]
+    width: 380px !important
+  input.ra-filtering-select-input[type=text]
+    width: 180px !important
+  input.hasDatepicker
+    width: 180px !important
+
+.sidebar-nav
+  a
+    padding: 6px 10px !important
+  .dropdown-header
+    padding: 10px 0px 3px 9px
+
+.label-important
+  background-color: #d9534f
+.alert-notice
+  color: #5bc0de
+
+.page-header
+  display: none
+.breadcrumb
+  margin-top: 20px
+
+.control-group
+  clear: both
+
+.container-fluid
+  padding-left: 0
+  > .row
+    margin: 51px 0px 0px 0px !important
+
+.last.links
+  a
+    display: inline-block
+    padding: 3px
+    font-size: 20px
+
+.remove_nested_fields
+  opacity: 1 !important
+
+body.rails_admin .modal
+  margin: 0 auto !important
+  .modal-dialog
+    width: 990px !important
+
+input[type=checkbox]
+  width: 30px !important
+
+.nav.root_links
+
+  > li
+    display: inline-block
+
+.dropdown-header
+  border-top: 2px solid #777777
+  text-align: right
+
+  &:first-child
+    border-top: none
+
+.bank_row .logo_field, #edit_bank img
+  background: #ccc !important
+
+.ui-menu-item
+  border: 1px solid transparent
+
+.content > .alert
+  margin-top: 20px
+
+.badge-important
+  background: red
+.badge-success
+  background: green
+
+.sidebar-nav
+  // margin-top: 51px
+  i
+    margin-right: 5px
+
+  .nav
+    li
+      display: none
+      &.dropdown-header
+        cursor: pointer
+        display: block
+        &.opened
+      &.visible
+        display: block
+
+
+body.rails_admin .table td.paperclip_type, body.rails_admin .table td.carrierwave_type, body.rails_admin .table td.jcrop_type
+  img
+    max-width: 150px
+    max-height: 100p
+
+
+#list
+  .input-group
+    .input-group-btn
+      .btn-info
+        height: 33px
+
+.table-condensed
+  > tbody, > thead
+    > tr
+      > td
+        padding: 6px 4px 0px 5px
+
+        &.toggle_type
+          padding-top: 14px

data/app/assets/stylesheets/rails_admin/custom/theming.sass

@@ -0,0 +1,2 @@
+@import enjoy/rails_admin/cms.ui
+@import enjoy/rails_admin/custom/ui

data/app/controllers/concerns/enjoy/errors.rb

@@ -84,7 +84,7 @@ module Enjoy::Errors
   end
 
   def render_error(code = 500)
-    render template: "errors/error_#{code}", formats: [:html], handlers: [:slim], layout: Enjoy.config.error_layout, status: code
+    render template: "enjoy/errors/error_#{code}", formats: [:html], handlers: [:slim], layout: Enjoy.config.error_layout, status: code
   end
 
   def rails_admin?

data/app/controllers/enjoy/registrations_controller.rb

@@ -0,0 +1,20 @@
+class Enjoy::RegistrationsController < Devise::RegistrationsController
+  prepend_before_action :check_recaptcha, only: [:create]
+
+  private
+  def check_recaptcha
+    if Enjoy.config.recaptcha_support
+      if verify_recaptcha
+        true
+      else
+        self.resource = resource_class.new sign_up_params
+        self.resource.valid?
+        respond_with_navigational(resource) { render :new }
+      end
+
+    else
+      true
+    end
+  end
+
+end

data/app/controllers/enjoy/sessions_controller.rb

@@ -0,0 +1,19 @@
+class Enjoy::SessionsController < Devise::SessionsController
+  prepend_before_action :check_recaptcha, only: [:create]
+
+  private
+  def check_recaptcha
+    if Enjoy.config.recaptcha_support
+      if verify_recaptcha
+        true
+      else
+        self.resource = resource_class.new sign_in_params
+        respond_with_navigational(resource) { render :new }
+      end
+
+    else
+      true
+    end
+  end
+
+end

data/app/helpers/enjoy/home_helper.rb

@@ -0,0 +1,2 @@
+module Enjoy::HomeHelper
+end

data/app/helpers/enjoy/powered_helper.rb

@@ -1,5 +1,5 @@
 module Enjoy::PoweredHelper
-  def render_powered_block
+  def render_enjoy_powered_block
     content_tag :div, class: 'powered' do
       ret = []
       ret << content_tag(:span, class: 'powered') do

data/app/models/concerns/enjoy/html_field.rb

@@ -18,6 +18,9 @@ if Enjoy.mongoid?
             return self.#{_html_field_name} unless self.#{name}_clear
             clean_#{name}
           end
+          def #{name}=(val)
+            self.#{_html_field_name} = val
+          end
 
           def clean_#{name}
             self.#{_html_field_name} ||= ""