ack_rocket_cms 0.7.5.1 → 0.7.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a54f2f0a203569ea4c0b9d28e1b922ff781b87d
-  data.tar.gz: a71430c56911ca3ff01418e83d4ab2ceb4095397
+  metadata.gz: ec774db647ab685e73a3a63f4c747cdabd10d317
+  data.tar.gz: d1ce5bc5c4bc708298f4ae8cb39733b586f4f32b
 SHA512:
-  metadata.gz: 71d4e0849d89ba93af2786866f20e522178fdb570ed95fba9630b06af77d945e653dc4603495fd2422d5fb9a762d5c9bbd5001e6b8d7ee6ad9a1ff88e10ad20e
-  data.tar.gz: 559d5e4a7a44bd81e7f6c576d8d77a36b199744ea11cf9bfcb00f5fa9c014b9be5cdeaf1f3509bce458a10cc6a1e9a893028a93bb8225422070f80f176add37a
+  metadata.gz: 1f44ad69726b3e48315c87872d1c3a104462ce3cba439b741e2a83e86e1c434dd2fde86821d7cd435480971a0ce46ede0f401bea1836084079835d5bb907f008
+  data.tar.gz: 4355ee4cebe1a84442e3948ded4b834e765a32b2fc85798535647889c6cb537e01854289f118e51793dcf5bcd1087049f0a645dbd5207d98f8c77057f3639415

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.7.5.1)
+    ack_rocket_cms (0.7.5.2)
       addressable
       ckeditor
       coffee-rails
@@ -203,7 +203,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
-    simple-navigation (3.14.0)
+    simple-navigation (4.0.1)
       activesupport (>= 2.3.2)
     simple_form (3.1.0)
       actionpack (~> 4.0)

data/config/locales/en.rs.yml

@@ -14,6 +14,7 @@ en:
     sitemap_data: 'Sitemap data'
     edit: Edit
     send: Send
+    format_time: "%-m/%-d/%Y"
     m:
       enabled: 'added to menu "%{menu}"'
       disabled: 'deleted from menu "%{menu}"'

data/config/locales/ru.rs.yml

@@ -14,6 +14,7 @@ ru:
     sitemap_data: 'Данные для карты сайта'
     edit: Редактировать
     send: Отправить
+    format_time: "%d.%m.%Y"
     m:
       enabled: 'добавлено в меню "%{menu}"'
       disabled: 'удалено из меню "%{menu}"'

data/lib/rocket_cms/admin.rb

@@ -31,7 +31,7 @@ module RocketCMS
       }
     end
     
-    def page_config
+    def page_config(fields = {})
       Proc.new {
         RocketCMS.apply_patches self
         navigation_label I18n.t('rs.cms')
@@ -69,6 +69,13 @@ module RocketCMS
             end
             field :text_slug
           end
+          fields.each_pair do |name, type|
+            if type.nil?
+              field name
+            else
+              field name, type
+            end
+          end
           group :seo, &RocketCMS.seo_config
           group :sitemap_data, &RocketCMS.sitemap_data_config
         end
@@ -108,7 +115,7 @@ module RocketCMS
       }
     end
 
-    def news_config
+    def news_config(fields = {})
       Proc.new {
         navigation_label I18n.t('rs.cms')
         list do
@@ -139,6 +146,13 @@ module RocketCMS
 
         edit do
           field :content, :ck_editor
+          fields.each_pair do |name, type|
+            if type.nil?
+              field name
+            else
+              field name, type
+            end
+          end
           RocketCMS.apply_patches self
           group :seo, &RocketCMS.seo_config
           group :sitemap_data, &RocketCMS.sitemap_data_config
@@ -180,12 +194,10 @@ module RocketCMS
       }
     end
 
-    def embedded_image_config
+    def embedded_image_config(fields = {})
       RocketCMS.embedded_element_config(
           nil,
-          {
-              image: nil
-          }
+          {image: nil}.merge(fields)
       )
     end
 
@@ -212,7 +224,7 @@ module RocketCMS
       }
     end
 
-    def image_config(without_gallery = false)
+    def image_config(without_gallery = false, fields = {})
       Proc.new {
         navigation_label I18n.t('rs.gallery')
         field :enabled, :toggle
@@ -221,6 +233,13 @@ module RocketCMS
         end
         field :name, :string
         field :image
+        fields.each_pair do |name, type|
+          if type.nil?
+            field name
+          else
+            field name, type
+          end
+        end
       }
     end
   end

data/lib/rocket_cms/models/news.rb

@@ -42,7 +42,7 @@ module RocketCMS
         time.strftime('%Y-%m-%d')
       end
       def format_date
-        time.strftime('%d.%m.%Y')
+        time.strftime(I18n.t('rs.format_time'))
       end
     end
   end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.7.5.1"
+  VERSION = "0.7.5.2"
 end

data/template.rb

@@ -95,7 +95,7 @@ create_file '.gitignore' do <<-TEXT
 /log/*.log
 /tmp/*
 /public/assets
-/public/ckeditor
+/public/ckeditor_assets
 TEXT
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.5.1
+  version: 0.7.5.2
 platform: ruby
 authors:
 - glebtv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler