rocket_cms 0.6.11 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04e686655499a3ed00fb7564f6ae3eb71535c76d
-  data.tar.gz: 47598399a4d7a1d4f38c8bcb7b7aa03e0a53168b
+  metadata.gz: 8bfd7f173982a33ce1f8710d4510b47dd9a3a450
+  data.tar.gz: 6aeb612b8738043a0040d4bd6bf988195aaf88b2
 SHA512:
-  metadata.gz: 8d683d18e9075ebe9a8bb2805b4d3dbf6204f13a52bdadad678cdbca57fbd14ed30c4f7383f5cabd35b24e3c818ccbdd87a2dfcd191d9dedd750e051ba1ac9c9
-  data.tar.gz: 9ef1e049d16e6b7c904872268a3abd88187baf76907e00f1c1c951fe3299b8d72c45f0eb70a6216ba967bc439dda0d40ddd8bd4635b0d6792320394c4f251db1
+  metadata.gz: fe92838d94cd76149ac1fd21897ca8a40411b9c5b074dbe02ee30be819bfda282549dd41ce147bff5455f47f201540f6a93d3a8540f4dc4917713d3f1eea8c32
+  data.tar.gz: da6b8921e62a215eced41bf704977bd6b72b5984ada72fd4abe3e39340e0ddb88bd50ede1962649286e8f1585d32e335c1d0711cde7f971ed793676c9362ffbf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.6.11)
+    rocket_cms (0.6.12)
       addressable
       coffee-rails
       devise
@@ -81,12 +81,13 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
-    execjs (2.3.0)
+    execjs (2.4.0)
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     geocoder (1.2.7)
-    glebtv-ckeditor (4.4.7)
+    glebtv-ckeditor (4.4.7.3)
       mime-types
+      mini_magick
       orm_adapter (~> 0.5.0)
       rails (~> 4.0)
     glebtv-simple_captcha (0.6.7)
@@ -112,9 +113,10 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
+    mini_magick (4.1.0)
     mini_portile (0.6.2)
     minitest (5.5.1)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     nested_form (0.3.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
@@ -138,13 +140,13 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.6)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    rails_admin (0.6.6)
+    rails_admin (0.6.7)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
       font-awesome-rails (>= 3.0, < 5)
@@ -158,7 +160,7 @@ GEM
       remotipart (~> 1.0)
       safe_yaml (~> 1.0)
       sass-rails (>= 4.0, < 6)
-    rails_admin_nested_set (0.4.0)
+    rails_admin_nested_set (0.4.1)
       rails_admin (~> 0.6.6)
     rails_admin_settings (0.9.1)
     rails_admin_toggleable (0.5.0)
@@ -201,7 +203,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
     stringex (2.5.2)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     turbolinks (2.5.3)
       coffee-rails

data/lib/rails_admin/custom_show_in_app.rb

@@ -15,7 +15,11 @@ module RailsAdmin
         register_instance_option :controller do
           Proc.new do
             if @object.class.name == 'Page'
-              redirect_to main_app.page_url(@object)
+              if @object.fullpath.blank?
+                redirect_to main_app.page_url(@object)
+              else
+                redirect_to @object.fullpath
+              end
             elsif @object.class.name == 'News'
               redirect_to main_app.news_url(@object)
             elsif @object.class.name == 'Obj'

data/lib/rocket_cms/controllers/contacts.rb

@@ -23,7 +23,7 @@ module RocketCMS
             redirect_after_done
           end
         else
-          render_error
+          render_contacts_error
         end
       end
 
@@ -31,7 +31,7 @@ module RocketCMS
       end
 
       private
-      def render_error
+      def render_contacts_error
         if request.xhr? && process_ajax
           render json: {errors: @contact_message.errors}, status: 422
         else

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.6.11"
+  VERSION = "0.6.12"
 end

data/template.rb

@@ -262,12 +262,13 @@ create_file 'app/assets/stylesheets/rails_admin/custom/theming.css.sass' do <<-T
 .input-small
   width: 150px
 
-input[type=text]
-  width: 380px !important
-input.ra-filtering-select-input[type=text]
-  width: 180px !important
-input.hasDatepicker
-  width: 180px !important
+.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
@@ -305,17 +306,19 @@ input.hasDatepicker
   right: 0
   left: auto
 
-.modal
+.model-dialog
   width: 800px !important
 
-.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 i
+  margin-right: 5px
 TEXT
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler