ack_rocket_cms 0.7.2.4 → 0.7.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ce2df31034d42e0b58755c489694203da0eb5639
4
- data.tar.gz: 219d49e526e2453ff5ea1e9e0000d5b0988e21e3
3
+ metadata.gz: 0cc38c3d9b0add3ff8ce4705b457fbbe27c622c3
4
+ data.tar.gz: 5b4a80cce1c8603faa19171be9613bc8582f5342
5
5
  SHA512:
6
- metadata.gz: 5f22e992c385bc334cb275f58064e946b33bb6b47e27b26d2e7fb382712cc69b19fed70aa68baa59ed96d38aabb77f4099994881ff51e9309a5b486b4064cd77
7
- data.tar.gz: 6d33eeced920b6ea0d17556775ca83315e4eaa9f7bd88f8f10ebc8f7e0df3ea981d38c964e0b18b93e29e7fc3b74ce120096096786e653754d2dfb00f06bbe9e
6
+ metadata.gz: 07d9c27dd6f796317a2e4a3dd671bbc40bcd67f113f283c8db2e29f0530c07816c98f7411b230fc441d8f75f8bef80c07daa28e7e04e2842d676c22abcdf81e7
7
+ data.tar.gz: 512331b81ea64b126a25d6c6ebc41f86eee7ac2dc079d1e352b288fee9571c1a6fdba32a78b8790adf11afea284b490b46bbf1e0eaf97fa90a28b8cc4e1ac485
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- ack_rocket_cms (0.7.2.4)
4
+ ack_rocket_cms (0.7.3)
5
5
  addressable
6
6
  ckeditor
7
7
  coffee-rails
@@ -92,7 +92,7 @@ GEM
92
92
  thread_safe (~> 0.1)
93
93
  warden (~> 1.2.3)
94
94
  erubis (2.7.0)
95
- execjs (2.3.0)
95
+ execjs (2.4.0)
96
96
  font-awesome-rails (4.3.0.0)
97
97
  railties (>= 3.2, < 5.0)
98
98
  geocoder (1.2.7)
@@ -130,7 +130,7 @@ GEM
130
130
  bson (~> 2.2)
131
131
  connection_pool (~> 2.0)
132
132
  optionable (~> 0.2.0)
133
- multi_json (1.10.1)
133
+ multi_json (1.11.0)
134
134
  nested_form (0.3.2)
135
135
  nokogiri (1.6.6.2)
136
136
  mini_portile (~> 0.6.0)
@@ -160,7 +160,7 @@ GEM
160
160
  activesupport (>= 4.2.0.beta, < 5.0)
161
161
  nokogiri (~> 1.6.0)
162
162
  rails-deprecated_sanitizer (>= 1.0.1)
163
- rails-html-sanitizer (1.0.1)
163
+ rails-html-sanitizer (1.0.2)
164
164
  loofah (~> 2.0)
165
165
  rails_admin (0.6.6)
166
166
  builder (~> 3.1)
@@ -224,7 +224,7 @@ GEM
224
224
  sprockets (>= 2.8, < 4.0)
225
225
  stringex (2.5.2)
226
226
  thor (0.19.1)
227
- thread_safe (0.3.4)
227
+ thread_safe (0.3.5)
228
228
  tilt (1.4.1)
229
229
  turbolinks (2.5.3)
230
230
  coffee-rails
@@ -46,7 +46,8 @@ module RsErrors
46
46
  capture_exception(exception) if defined?(Raven)
47
47
  begin
48
48
  if rails_admin_controller?
49
- return render text: 'Внутренняя ошибка'
49
+ render text: 'Внутренняя ошибка', status: 500
50
+ return
50
51
  end
51
52
  rescue
52
53
  end
@@ -6,11 +6,14 @@ module SortField
6
6
  prefix = "#{prefix}_" unless prefix == ''
7
7
 
8
8
  if RocketCMS.mongoid?
9
- field "#{prefix}sort".to_sym, type: Integer
10
- scope "#{prefix}sorted".to_sym, -> { asc("#{prefix}sort".to_sym) }
9
+ field "#{prefix}order".to_sym, type: Integer
10
+ alias_method "#{prefix}sort", "#{prefix}order"
11
+ scope "#{prefix}ordered".to_sym, -> { asc("#{prefix}order".to_sym) }
12
+ scope "#{prefix}sorted".to_sym, -> { asc("#{prefix}order".to_sym) }
11
13
  end
12
14
  if RocketCMS.active_record?
13
- scope "#{prefix}sorted".to_sym, -> { order("#{prefix}sort".to_sym => :asc) }
15
+ scope "#{prefix}ordered".to_sym, -> { order("#{prefix}order".to_sym => :asc) }
16
+ scope "#{prefix}sorted".to_sym, -> { order("#{prefix}order".to_sym => :asc) }
14
17
  end
15
18
  end
16
19
  end
@@ -0,0 +1,13 @@
1
+ if RocketCMS.mongoid?
2
+ class EmbeddedGalleryImage
3
+ include RocketCMS::Models::EmbeddedGalleryImage
4
+ RocketCMS.apply_patches self
5
+
6
+ # use it in inherited model
7
+ #rails_admin &RocketCMS.embedded_image_config
8
+
9
+ # use it in rails_admin in parent model for sort
10
+ # sort_embedded({fields: [:embedded_field_1, :embedded_field_2...]})
11
+ # or u need to override rails_admin in inherited model to add sort field
12
+ end
13
+ end
@@ -0,0 +1,8 @@
1
+ if RocketCMS.mongoid?
2
+ class Gallery
3
+ include RocketCMS::Models::Gallery
4
+ RocketCMS.apply_patches self
5
+
6
+ rails_admin &RocketCMS.gallery_config
7
+ end
8
+ end
@@ -0,0 +1,8 @@
1
+ if RocketCMS.mongoid?
2
+ class GalleryImage
3
+ include RocketCMS::Models::GalleryImage
4
+ RocketCMS.apply_patches self
5
+
6
+ rails_admin &RocketCMS.image_config
7
+ end
8
+ end
@@ -5,11 +5,12 @@
5
5
  - if obj.content.blank?
6
6
  - unless @seo_page.nil?
7
7
  = raw @seo_page.page_content
8
- = render 'shared/admin_link', obj: @seo_page
9
8
  - else
10
9
  = raw obj.content
11
- - if !obj.nil? && (@seo_page.nil? || obj.id != @seo_page.id || obj.class.name != @seo_page.class.name)
10
+ - if !obj.nil?
12
11
  = render 'shared/admin_link', obj: obj
12
+ - if !@seo_page.nil? && (@seo_page.id != obj.id || @seo_page.class.name != obj.class.name)
13
+ = render 'shared/admin_link', obj: @seo_page
13
14
 
14
15
  - content_for :meta do
15
16
  = render 'shared/meta', obj: obj
@@ -1,5 +1,6 @@
1
1
  en:
2
2
  rs:
3
+ gallery: "Gallery"
3
4
  cms: "CMS"
4
5
  menu: "Menu"
5
6
  settings: 'Settings'
@@ -43,6 +43,10 @@ ru:
43
43
  page: Страница
44
44
  contact_message: Сообщение
45
45
  news: Новость
46
+
47
+ gallery: Фотогалерея
48
+ gallery_image: Фото в фотогалерее
49
+ embeddede_gallery_image: Фото в фотогалерее
46
50
  attributes:
47
51
  user:
48
52
  email: E-mail
@@ -72,6 +76,10 @@ ru:
72
76
  email: Ваш е-мейл
73
77
  phone: Ваш телефон
74
78
  content: Ваше сообщение
79
+ gallery:
80
+ gallery_image:
81
+ gallery: Фотогалерея
82
+ embeddede_gallery_image:
75
83
  errors:
76
84
  models:
77
85
  contact_message:
@@ -1,5 +1,6 @@
1
1
  ru:
2
2
  rs:
3
+ gallery: "Галерея"
3
4
  cms: "CMS"
4
5
  menu: "Меню"
5
6
  settings: 'Настройки'
@@ -4,7 +4,8 @@ class Ability
4
4
  def initialize(user)
5
5
  if !user.nil? and (user.admin? or user.manager?)
6
6
  can :read, :all
7
- can :manage, :all
7
+ can :access, :rails_admin # grant access to rails_admin
8
+ can :dashboard # grant access to the dashboard
8
9
  if user.admin?
9
10
  admin_ui(user)
10
11
  elsif user.manager?
@@ -14,13 +15,10 @@ class Ability
14
15
  end
15
16
 
16
17
  def admin_ui(user)
17
- can :access, :rails_admin # grant access to rails_admin
18
- can :dashboard # grant access to the dashboard
18
+ can :manage, :all
19
19
  end
20
20
 
21
21
  def manager_ui(user)
22
- can :access, :rails_admin # grant access to rails_admin
23
- can :dashboard # grant access to the dashboard
24
22
  cannot :manage, Menu
25
23
  cannot [:edit, :destroy, :new, :create], User
26
24
  can :edit, user
@@ -17,7 +17,7 @@ RailsAdmin.config do |config|
17
17
  config.authorize_with :cancan
18
18
  <% if RocketCMS.mongoid? %>
19
19
  ## == MongoidAudit
20
- #config.audit_with :mongoid_audit, 'HistoryTracker'
20
+ config.audit_with :mongoid_audit, 'HistoryTracker'
21
21
  <% elsif RocketCMS.active_record? %>
22
22
  config.audit_with :paper_trail, 'User', 'PaperTrail::Version'
23
23
  <% end %>
@@ -42,13 +42,14 @@ RailsAdmin.config do |config|
42
42
 
43
43
  nested_set do
44
44
  visible do
45
- ['Page'].include? bindings[:abstract_model].model_name
45
+ ['Page', 'Gallery', 'GalleryImage'].include? bindings[:abstract_model].model_name
46
46
  end
47
47
  end
48
48
 
49
49
  custom_show_in_app do
50
50
  visible do
51
- ['Page', 'News'].include? bindings[:abstract_model].model_name
51
+ #temporary
52
+ false #['Page', 'News'].include? bindings[:abstract_model].model_name
52
53
  end
53
54
  end
54
55
 
@@ -62,6 +63,7 @@ RailsAdmin.config do |config|
62
63
  config.excluded_models = [
63
64
  'RailsAdmin::CustomShowInApp', 'HistoryTracker',
64
65
  'Ckeditor::Asset', 'Ckeditor::AttachmentFile', 'Ckeditor::Picture',
66
+ 'EmbeddedGalleryImage'
65
67
  ]
66
68
  end
67
69
 
@@ -6,7 +6,7 @@ class Dl < Cloner::Base
6
6
  File.expand_path("../../../config/environment", __FILE__)
7
7
  end
8
8
  def ssh_host
9
- '<%= domain %>.ru'
9
+ '<%= domain %>'
10
10
  end
11
11
  def ssh_user
12
12
  '<%= app_name.downcase %>'
@@ -15,7 +15,7 @@ class Dl < Cloner::Base
15
15
  '<%= tmp_path %>'
16
16
  end
17
17
  def remote_app_path
18
- '<%= deploy_to %>'
18
+ '<%= deploy_to %>/current'
19
19
  end
20
20
  end
21
21
 
data/lib/rocket_cms.rb CHANGED
@@ -61,11 +61,19 @@ module RocketCMS
61
61
  autoload :News, 'rocket_cms/models/news'
62
62
  autoload :ContactMessage, 'rocket_cms/models/contact_message'
63
63
 
64
+ autoload :EmbeddedGalleryImage, 'rocket_cms/models/embedded_gallery_image'
65
+ autoload :GalleryImage, 'rocket_cms/models/gallery_image'
66
+ autoload :Gallery, 'rocket_cms/models/gallery'
67
+
64
68
  module Mongoid
65
69
  autoload :Menu, 'rocket_cms/models/mongoid/menu'
66
70
  autoload :Page, 'rocket_cms/models/mongoid/page'
67
71
  autoload :News, 'rocket_cms/models/mongoid/news'
68
72
  autoload :ContactMessage, 'rocket_cms/models/mongoid/contact_message'
73
+
74
+ autoload :EmbeddedGalleryImage, 'rocket_cms/models/mongoid/embedded_gallery_image'
75
+ autoload :GalleryImage, 'rocket_cms/models/mongoid/gallery_image'
76
+ autoload :Gallery, 'rocket_cms/models/mongoid/gallery'
69
77
  end
70
78
 
71
79
  module ActiveRecord
@@ -161,5 +161,49 @@ module RocketCMS
161
161
  field :sitemap_priority
162
162
  }
163
163
  end
164
+
165
+
166
+
167
+ def embedded_image_config
168
+ Proc.new {
169
+ field :enabled, :toggle
170
+ field :name, :string
171
+ field :image
172
+ }
173
+
174
+ end
175
+
176
+ def gallery_config
177
+ Proc.new {
178
+ navigation_label I18n.t('rs.gallery')
179
+ field :enabled, :toggle
180
+
181
+ field :name, :string
182
+ field :slugs, :enum do
183
+ enum_method do
184
+ :slugs
185
+ end
186
+ visible do
187
+ bindings[:view].current_user.admin?
188
+ end
189
+ multiple do
190
+ true
191
+ end
192
+ end
193
+ field :text_slug
194
+
195
+ field :image
196
+ }
197
+ end
198
+
199
+ def image_config
200
+ Proc.new {
201
+ navigation_label I18n.t('rs.gallery')
202
+ field :enabled, :toggle
203
+ field :gallery
204
+ field :name, :string
205
+ field :image
206
+ }
207
+ end
164
208
  end
165
209
  end
@@ -0,0 +1,11 @@
1
+ module RocketCMS
2
+ module Models
3
+ module EmbeddedGalleryImage
4
+ extend ActiveSupport::Concern
5
+ include RocketCMS::Model
6
+ include Enableable
7
+ include Sortable
8
+ include RocketCMS.orm_specific('EmbeddedGalleryImage')
9
+ end
10
+ end
11
+ end
@@ -0,0 +1,17 @@
1
+ module RocketCMS
2
+ module Models
3
+ module Gallery
4
+ extend ActiveSupport::Concern
5
+ include RocketCMS::Model
6
+ include Enableable
7
+ include ManualSlug
8
+ include SitemapData
9
+ include RocketCMS.orm_specific('Gallery')
10
+
11
+ included do
12
+ has_many :gallery_images
13
+ field :name, type: String, localize: RocketCMS.configuration.localize
14
+ end
15
+ end
16
+ end
17
+ end
@@ -0,0 +1,15 @@
1
+ module RocketCMS
2
+ module Models
3
+ module GalleryImage
4
+ extend ActiveSupport::Concern
5
+ include RocketCMS::Model
6
+ include Enableable
7
+ include RocketCMS.orm_specific('GalleryImage')
8
+
9
+ included do
10
+ belongs_to :gallery
11
+ field :name, type: String
12
+ end
13
+ end
14
+ end
15
+ end
@@ -4,12 +4,12 @@ module RocketCMS
4
4
  extend ActiveSupport::Concern
5
5
  include RocketCMS::Model
6
6
  include Enableable
7
- include RocketCMS.orm_specific('Menu')
8
7
  include ManualSlug
8
+ include RocketCMS.orm_specific('Menu')
9
9
 
10
10
  included do
11
11
 
12
- field :name, type: String, localize: true
12
+ field :name, type: String, localize: RocketCMS.configuration.localize
13
13
  manual_slug :name
14
14
 
15
15
  after_save do
@@ -0,0 +1,27 @@
1
+ module RocketCMS
2
+ module Models
3
+ module Mongoid
4
+ module EmbeddedGalleryImage
5
+ extend ActiveSupport::Concern
6
+ include ::Mongoid::Paperclip
7
+
8
+ included do
9
+ #embedded_in :model # need to override
10
+
11
+ field :name, type: String
12
+
13
+ has_mongoid_attached_file :image # need to override
14
+ validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
15
+
16
+ def image_file_name=(val)
17
+ val = val.to_s
18
+ return if val.blank?
19
+ extension = File.extname(val)[1..-1]
20
+ file_name = val[0..val.size-extension.size-1]
21
+ self[:image_file_name] = "#{file_name.filename_to_slug}.#{extension.filename_to_slug}"
22
+ end
23
+ end
24
+ end
25
+ end
26
+ end
27
+ end
@@ -0,0 +1,28 @@
1
+ module RocketCMS
2
+ module Models
3
+ module Mongoid
4
+ module Gallery
5
+ extend ActiveSupport::Concern
6
+ include ::Mongoid::Paperclip
7
+
8
+ included do
9
+ manual_slug :name
10
+
11
+ acts_as_nested_set
12
+ scope :sorted, -> { order_by([:lft, :asc]) }
13
+
14
+ has_mongoid_attached_file :image # need to override
15
+ validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
16
+
17
+ def image_file_name=(val)
18
+ val = val.to_s
19
+ return if val.blank?
20
+ extension = File.extname(val)[1..-1]
21
+ file_name = val[0..val.size-extension.size-1]
22
+ self[:image_file_name] = "#{file_name.filename_to_slug}.#{extension.filename_to_slug}"
23
+ end
24
+ end
25
+ end
26
+ end
27
+ end
28
+ end
@@ -0,0 +1,26 @@
1
+ module RocketCMS
2
+ module Models
3
+ module Mongoid
4
+ module GalleryImage
5
+ extend ActiveSupport::Concern
6
+ include ::Mongoid::Paperclip
7
+
8
+ included do
9
+ acts_as_nested_set
10
+ scope :sorted, -> { order_by([:lft, :asc]) }
11
+
12
+ has_mongoid_attached_file :image # need to override
13
+ validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
14
+
15
+ def image_file_name=(val)
16
+ val = val.to_s
17
+ return if val.blank?
18
+ extension = File.extname(val)[1..-1]
19
+ file_name = val[0..val.size-extension.size-1]
20
+ self[:image_file_name] = "#{file_name.filename_to_slug}.#{extension.filename_to_slug}"
21
+ end
22
+ end
23
+ end
24
+ end
25
+ end
26
+ end
@@ -5,9 +5,9 @@ module RocketCMS
5
5
  include RocketCMS::Model
6
6
  include Seoable
7
7
  include Enableable
8
- include RocketCMS.orm_specific('News')
9
8
  include ManualSlug
10
9
  include SitemapData
10
+ include RocketCMS.orm_specific('News')
11
11
 
12
12
  if RocketCMS.configuration.search_enabled
13
13
  include RocketCMS::ElasticSearch
@@ -1,3 +1,3 @@
1
1
  module RocketCMS
2
- VERSION = "0.7.2.4"
2
+ VERSION = "0.7.3"
3
3
  end
data/template.rb CHANGED
@@ -78,8 +78,6 @@ group :production do
78
78
  gem "god"
79
79
  end
80
80
 
81
- gem "rails_admin_sort_embedded"
82
-
83
81
  TEXT
84
82
  end
85
83
 
@@ -96,6 +94,8 @@ create_file '.gitignore' do <<-TEXT
96
94
  /.bundle
97
95
  /log/*.log
98
96
  /tmp/*
97
+ /public/assets
98
+ /public/ckeditor
99
99
  TEXT
100
100
  end
101
101
 
@@ -360,6 +360,8 @@ if Rails.env.development?
360
360
  end
361
361
  end
362
362
  end
363
+
364
+ Rack::Utils.multipart_part_limit = 0
363
365
  TEXT
364
366
  end
365
367
 
@@ -370,12 +372,13 @@ create_file 'app/assets/stylesheets/rails_admin/custom/theming.css.sass' do <<-T
370
372
  .input-small
371
373
  width: 150px
372
374
 
373
- input[type=text]
374
- width: 380px !important
375
- input.ra-filtering-select-input[type=text]
376
- width: 180px !important
377
- input.hasDatepicker
378
- width: 180px !important
375
+ .container-fluid
376
+ input[type=text]
377
+ width: 380px !important
378
+ input.ra-filtering-select-input[type=text]
379
+ width: 180px !important
380
+ input.hasDatepicker
381
+ width: 180px !important
379
382
 
380
383
  .sidebar-nav
381
384
  a
@@ -413,10 +416,6 @@ input.hasDatepicker
413
416
  right: 0
414
417
  left: auto
415
418
 
416
- .modal
417
- width: 800px !important
418
-
419
-
420
419
  body.rails_admin .modal
421
420
  margin: 0 auto !important
422
421
  .modal-dialog
@@ -448,6 +447,18 @@ body.rails_admin
448
447
  .content > .alert
449
448
  margin-top: 20px
450
449
 
450
+ .badge-important
451
+ background: red
452
+ .badge-success
453
+ background: green
454
+
455
+ .sidebar-nav i
456
+ margin-right: 5px
457
+
458
+ body.rails_admin .table td.paperclip_type, body.rails_admin .table td.carrierwave_type,
459
+ img
460
+ max-width: 150px
461
+ max-height: 100px
451
462
  TEXT
452
463
  end
453
464
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ack_rocket_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.2.4
4
+ version: 0.7.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - glebtv
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-03-03 00:00:00.000000000 Z
12
+ date: 2015-03-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -412,6 +412,9 @@ files:
412
412
  - app/models/concerns/sort_field.rb
413
413
  - app/models/concerns/sortable.rb
414
414
  - app/models/contact_message.rb
415
+ - app/models/embedded_gallery_image.rb
416
+ - app/models/gallery.rb
417
+ - app/models/gallery_image.rb
415
418
  - app/models/menu.rb
416
419
  - app/models/news.rb
417
420
  - app/models/page.rb
@@ -490,8 +493,14 @@ files:
490
493
  - lib/rocket_cms/models/active_record/news.rb
491
494
  - lib/rocket_cms/models/active_record/page.rb
492
495
  - lib/rocket_cms/models/contact_message.rb
496
+ - lib/rocket_cms/models/embedded_gallery_image.rb
497
+ - lib/rocket_cms/models/gallery.rb
498
+ - lib/rocket_cms/models/gallery_image.rb
493
499
  - lib/rocket_cms/models/menu.rb
494
500
  - lib/rocket_cms/models/mongoid/contact_message.rb
501
+ - lib/rocket_cms/models/mongoid/embedded_gallery_image.rb
502
+ - lib/rocket_cms/models/mongoid/gallery.rb
503
+ - lib/rocket_cms/models/mongoid/gallery_image.rb
495
504
  - lib/rocket_cms/models/mongoid/menu.rb
496
505
  - lib/rocket_cms/models/mongoid/news.rb
497
506
  - lib/rocket_cms/models/mongoid/page.rb