rocket_cms 0.13.6 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb5c88210653666ea04fdfcfb2d10c8dd8f2bfcf
-  data.tar.gz: 05e9b96ef57111228391810d2764fecdfad75faf
+  metadata.gz: 9f65442d32f6e3b45a3d95d120d36ca2622864d1
+  data.tar.gz: e2a3b86bbf097a5930c38c800b50454a2f6e8815
 SHA512:
-  metadata.gz: 03c6e719619ce146918bafcb3c140d357f42c2e21f0982d12182243331729cb3432813d2aa63b867a3a4149d5cb9ccb1f3bcd3e829a24d394a5c5f360d196335
-  data.tar.gz: 6f93d5c304b20f95e1069a630f71f4b19759d1bafe04c278c94c7cfec18d34bdd52f6eccaf77327d645f90686ac279c60ad0f26e09ef516f7a5c8489a7318eab
+  metadata.gz: 1af6c77eb6f1b4c55bf932ecdf5d3e46c06cd0d7929b03eb1588fde6cc78c3294920fa52c59c6280df28775e5516f376dc2ea4e4c9615bfba356cafd3ad299a3
+  data.tar.gz: c66f5819a3b36d2025696ef27b2ac42094fd568cb662a252cb5a8345aaf099a9197003a4778ede51612137fa535b4b8b9ccffca021d48707a24fe18b4edf3cc8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.13.6)
+    rocket_cms (0.14.0)
       addressable
       coffee-rails
       jquery-rails
@@ -16,45 +16,45 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0)
-      actionpack (= 5.0.0)
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.0.1)
       nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0)
-      actionpack (= 5.0.0)
-      actionview (= 5.0.0)
-      activejob (= 5.0.0)
+    actionmailer (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.0)
-      actionview (= 5.0.0)
-      activesupport (= 5.0.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0)
-      activesupport (= 5.0.0)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0)
-      activesupport (= 5.0.0)
+    activejob (5.0.0.1)
+      activesupport (= 5.0.0.1)
       globalid (>= 0.3.6)
-    activemodel (5.0.0)
-      activesupport (= 5.0.0)
-    activerecord (5.0.0)
-      activemodel (= 5.0.0)
-      activesupport (= 5.0.0)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       arel (~> 7.0)
-    activesupport (5.0.0)
+    activesupport (5.0.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    arel (7.0.0)
+    arel (7.1.1)
     builder (3.2.2)
     coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
@@ -66,7 +66,7 @@ GEM
     concurrent-ruby (1.0.2)
     erubis (2.7.0)
     execjs (2.7.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     htmlentities (4.3.4)
     i18n (0.7.0)
@@ -95,26 +95,26 @@ GEM
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.0)
-      actioncable (= 5.0.0)
-      actionmailer (= 5.0.0)
-      actionpack (= 5.0.0)
-      actionview (= 5.0.0)
-      activejob (= 5.0.0)
-      activemodel (= 5.0.0)
-      activerecord (= 5.0.0)
-      activesupport (= 5.0.0)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0)
+      railties (= 5.0.0.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.1)
       activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.0)
-      actionpack (= 5.0.0)
-      activesupport (= 5.0.0)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -122,17 +122,17 @@ GEM
     smart_excerpt (0.1.5)
       activesupport
       htmlentities
-    sprockets (3.6.3)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stringex (2.6.0)
+    stringex (2.6.1)
     thor (0.19.1)
     thread_safe (0.3.5)
-    turbolinks (5.0.0)
+    turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.0)
     tzinfo (1.2.2)

data/lib/rocket_cms.rb

@@ -63,6 +63,7 @@ module RocketCMS
     end
   end
 
+  autoload :Menu, 'rocket_cms/menu'
   autoload :Migration, 'rocket_cms/migration'
   autoload :UrlHelper, 'rocket_cms/url_helper'
 
@@ -98,4 +99,17 @@ module RocketCMS
   end
 end
 
+require 'rails_admin_nested_set/helper'
+
+module RailsAdminNestedSet::Helper
+  def extra_fields(node)
+    if node.class.name == 'Page'
+      ret = RocketCMS::Menu.build_toggles(self, node.class, node, 'xs', '')
+      ('<div style="white-space: normal; display: inline-block; margin-left: 10px;">' + ret.join(' ') + '</div>').html_safe
+    else
+      "".html_safe
+    end
+  end
+end
+
 require 'manual_slug'

data/lib/rocket_cms/menu.rb

@@ -0,0 +1,56 @@
+module RocketCMS
+  module Menu
+    class << self
+      def get_menus
+        Rails.cache.fetch 'menus', expires_in: 10.minutes do
+          if RocketCMS.mongoid?
+            ::Menu.all.map { |m| {id: m.id.to_s, name: m.name } }
+          else
+            ::Menu.all.map { |m| {id: m.id, name: m.name } }
+          end
+        end
+      end
+
+      def btn_js
+        <<-END.strip_heredoc.gsub("\n", ' ').gsub(/ +/, ' ')
+          var $t = $(this);
+          $.ajax({
+            type: "POST",
+            url: $t.attr("href"),
+            data: {ajax: true},
+            success: function(r) {
+              $t.attr("href", r.href);
+              $t.removeClass("btn-success btn-danger");
+              $t.addClass(r.class);
+            },
+            error: function(e) {
+              alert(e.responseText);
+            }
+          });
+          return false;
+        END
+      end
+
+      def build_toggles(view, model, obj, btn_size, btn_style = '')
+        ret = []
+        get_menus.each do |m|
+          if RocketCMS.mongoid?
+            on = obj.menu_ids.include?(BSON::ObjectId.from_string(m[:id]))
+          else
+            on = obj.menu_ids.include?(m[:id].to_i)
+          end
+          ret << view.link_to(
+            m[:name],
+            view.toggle_menu_path(model_name: model, id: obj.id, menu: m[:id], on: !on),
+            #method: :post,
+            title: m[:name],
+            class: "btn btn-#{btn_size} #{on ? "btn-success" : "btn-danger"}",
+            style: btn_style,
+            onclick: btn_js
+          )
+        end
+        ret
+      end
+    end
+  end
+end

data/lib/rocket_cms/rails_admin_menu.rb

@@ -9,30 +9,7 @@ module RailsAdmin
 
           register_instance_option :pretty_value do
             obj = bindings[:object]
-            ret = []
-            menus = Rails.cache.fetch 'menus', expires_in: 10.minutes do
-              if RocketCMS.mongoid?
-                ::Menu.all.map { |m| {id: m.id.to_s, name: m.name } }
-              else
-                ::Menu.all.map { |m| {id: m.id, name: m.name } }
-              end
-            end
-            menus.each do |m|
-              if RocketCMS.mongoid?
-                on = obj.menu_ids.include?(BSON::ObjectId.from_string(m[:id]))
-              else
-                on = obj.menu_ids.include?(m[:id].to_i)
-              end
-              ret << bindings[:view].link_to(
-                m[:name],
-                bindings[:view].toggle_menu_path(model_name: @abstract_model, id: obj.id, menu: m[:id], on: !on),
-                #method: :post,
-                title: m[:name],
-                class: "btn btn-mini #{on ? "btn-success" : "btn-danger"}",
-                style: 'margin-bottom: 5px;',
-                onclick: 'var $t = $(this); $.ajax({type: "POST", url: $t.attr("href"), data: {ajax:true}, success: function(r) { $t.attr("href", r.href); $t.attr("class", r.class); }, error: function(e) { alert(e.responseText); }}); return false;'
-              )
-            end
+            ret = RocketCMS::Menu.build_toggles(bindings[:view], @abstract_model, obj, 'sm', 'margin-bottom: 5px;')
             ('<div style="white-space: normal;">' + ret.join(' ') + '</div>').html_safe
           end
 
@@ -78,7 +55,7 @@ module RailsAdmin
             ajax_link = Proc.new do |am, obj, menu, on|
               render json: {
                 href: toggle_menu_path(model_name: am, id: obj.id, menu: menu.id, on: !on),
-                class: "btn btn-mini #{on ? "btn-success" : "btn-danger"}",
+                class: on ? "btn-success" : "btn-danger",
               }
             end
             if params['id'].present?

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.13.6"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.13.6
+  version: 0.14.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -299,6 +299,7 @@ files:
 - lib/rocket_cms/controllers/pages.rb
 - lib/rocket_cms/controllers/search.rb
 - lib/rocket_cms/engine.rb
+- lib/rocket_cms/menu.rb
 - lib/rocket_cms/migration.rb
 - lib/rocket_cms/model.rb
 - lib/rocket_cms/models/active_record/contact_message.rb