coalla-cms 0.4.2.0 → 0.4.4.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +8 -8
  2. data/Gemfile.lock +95 -72
  3. data/app/assets/javascripts/admin/admin.js +2 -2
  4. data/app/assets/stylesheets/admin/admin.scss +1 -1
  5. data/app/controllers/admin/lookups_controller.rb +1 -1
  6. data/coalla-cms.gemspec +16 -15
  7. data/lib/coalla/cms/version.rb +1 -1
  8. data/lib/coalla-cms.rb +2 -1
  9. data/lib/generators/coalla/cms/init_generator.rb +50 -23
  10. data/lib/generators/coalla/cms/templates/errors/404.html +39 -0
  11. data/lib/generators/coalla/cms/templates/errors/422.html +39 -0
  12. data/lib/generators/coalla/cms/templates/errors/500.html +39 -0
  13. metadata +88 -71
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZDkxZmY0MjUwNWIyYTdkNzkxZDUxMTA3M2I3MDUyYTkyMWFkMDI2Mw==
4
+ NzU3MGY1ODZkMTkzODU0ZDk5MzZlN2VhNmQ3NDExMjE2MDcyNjA0Ng==
5
5
  data.tar.gz: !binary |-
6
- NmIwZmU3OTE4YWZhZjNjY2IwYTgzMWNhYjQ2ODY2ZDE5ZDUwM2I0Ng==
6
+ ODAzZDkxNjU3YTk4ZGY0NGJlYTU2ZjUzYWM1NGM4NDFmNWZlNDg5OA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YzEwZTIwMjM2MDdmOGRkYzI3ZGJlOTM2MWMxMzAxNjhmMDE3MDIyNmJmNmM3
10
- NTcyZTA2NDQ2ZTRkOWRhYTc3ZDE1NTQ5MWI4NGQwMmE5ZGRkMTM5ZjI3NmJm
11
- ZDVlN2QxMmQ5YjE2M2NiNWRjOTVkZjlkZThmYmIxMGU3NjZiZTg=
9
+ NWI3NzcyNDQ2NjIxYmM1YjBlZTdjYzMxMDk0YTYzNGZjODBmMTFmMjg5Mzk3
10
+ NzcyMTUwMjhlNjAzNDZmM2ZhYTMwN2VjYzgwOTRjODllZjU5OTE1ODBhM2Fj
11
+ ZWRlZTcyNGRjMzliZmRjYTc3MTc4YzExNTJiNDNkYmZmNmYwMGI=
12
12
  data.tar.gz: !binary |-
13
- NWExOGYzODgxNDFhYTZkZWUxN2U4MjRmNDYxZjdkNDIwNGE3YzhkOGFjNDk0
14
- ZGZlZmNjZmNhNzZlMzc4NTg5OWViNmIxY2I5YjQxNGMzNTE3N2U4NDZmNDNj
15
- YzU2MDZhMDdiNmMxMjA2YTNjYTFhM2YxNjQ4ODk2MGU1MzMxZmU=
13
+ NDlhOTliOTNlMDEyOTVmZmMzOGQxZWFjZWUxMjY2YjQ0YWE1YjM4ZGJlNzdk
14
+ ZmM1MDdmYWEwMTc3MGZlZTExN2Y1NTJkOWRiYjBjZDRhY2MzZDA1YWY1Yjc1
15
+ OTNlNThiMGI1YmI2ZGIwYWE4N2QwYzA2NTRiM2M3Y2VmNTg1YzI=
data/Gemfile.lock CHANGED
@@ -1,56 +1,66 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- coalla-cms (0.4.1.6)
5
- carrierwave (~> 0.9)
6
- ckeditor (= 4.1.0)
4
+ coalla-cms (0.4.4.2)
5
+ carrierwave
6
+ ckeditor
7
7
  coalla-deploy (~> 0.1)
8
- coffee-rails (~> 4.0.0)
9
- devise (~> 3.2)
10
- foreigner (~> 1.6.0)
11
- haml (~> 4.0)
12
- jquery-rails (~> 3.0.4)
13
- jquery-timepicker-addon-rails (~> 1.4.1)
14
- jquery-ui-rails (~> 4.1.1)
15
- js-routes (= 0.9.8)
16
- mini_magick (~> 4.0.0)
17
- rails (~> 4.1.0)
8
+ coffee-rails
9
+ devise
10
+ haml
11
+ jquery-rails
12
+ jquery-timepicker-addon-rails
13
+ jquery-ui-rails
14
+ js-routes
15
+ mini_magick
16
+ rails (~> 4.0)
18
17
  railties (~> 4.0)
19
- sanitize (~> 3.1.0)
20
- sass-rails (~> 4.0.0)
21
- uglifier (>= 1.3.0)
18
+ remotipart
19
+ rmagick
20
+ sanitize
21
+ sass-rails
22
+ will_paginate
22
23
 
23
24
  GEM
24
25
  remote: http://rubygems.org/
25
26
  specs:
26
- actionmailer (4.1.9)
27
- actionpack (= 4.1.9)
28
- actionview (= 4.1.9)
27
+ actionmailer (4.2.1)
28
+ actionpack (= 4.2.1)
29
+ actionview (= 4.2.1)
30
+ activejob (= 4.2.1)
29
31
  mail (~> 2.5, >= 2.5.4)
30
- actionpack (4.1.9)
31
- actionview (= 4.1.9)
32
- activesupport (= 4.1.9)
33
- rack (~> 1.5.2)
32
+ rails-dom-testing (~> 1.0, >= 1.0.5)
33
+ actionpack (4.2.1)
34
+ actionview (= 4.2.1)
35
+ activesupport (= 4.2.1)
36
+ rack (~> 1.6)
34
37
  rack-test (~> 0.6.2)
35
- actionview (4.1.9)
36
- activesupport (= 4.1.9)
38
+ rails-dom-testing (~> 1.0, >= 1.0.5)
39
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
40
+ actionview (4.2.1)
41
+ activesupport (= 4.2.1)
37
42
  builder (~> 3.1)
38
43
  erubis (~> 2.7.0)
39
- activemodel (4.1.9)
40
- activesupport (= 4.1.9)
44
+ rails-dom-testing (~> 1.0, >= 1.0.5)
45
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
46
+ activejob (4.2.1)
47
+ activesupport (= 4.2.1)
48
+ globalid (>= 0.3.0)
49
+ activemodel (4.2.1)
50
+ activesupport (= 4.2.1)
41
51
  builder (~> 3.1)
42
- activerecord (4.1.9)
43
- activemodel (= 4.1.9)
44
- activesupport (= 4.1.9)
45
- arel (~> 5.0.0)
46
- activesupport (4.1.9)
47
- i18n (~> 0.6, >= 0.6.9)
52
+ activerecord (4.2.1)
53
+ activemodel (= 4.2.1)
54
+ activesupport (= 4.2.1)
55
+ arel (~> 6.0)
56
+ activesupport (4.2.1)
57
+ i18n (~> 0.7)
48
58
  json (~> 1.7, >= 1.7.7)
49
59
  minitest (~> 5.1)
50
- thread_safe (~> 0.1)
60
+ thread_safe (~> 0.3, >= 0.3.4)
51
61
  tzinfo (~> 1.1)
52
- arel (5.0.1.20140414130214)
53
- bcrypt (3.1.9)
62
+ arel (6.0.0)
63
+ bcrypt (3.1.10)
54
64
  builder (3.2.2)
55
65
  carrierwave (0.10.0)
56
66
  activemodel (>= 3.2.0)
@@ -60,16 +70,16 @@ GEM
60
70
  ckeditor (4.1.0)
61
71
  mime-types
62
72
  orm_adapter (~> 0.5.0)
63
- coalla-deploy (0.1.8)
73
+ coalla-deploy (0.1.10)
64
74
  railties (~> 4.0)
65
75
  thor (~> 0.18)
66
- coffee-rails (4.0.1)
76
+ coffee-rails (4.1.0)
67
77
  coffee-script (>= 2.2.0)
68
78
  railties (>= 4.0.0, < 5.0)
69
- coffee-script (2.3.0)
79
+ coffee-script (2.4.1)
70
80
  coffee-script-source
71
81
  execjs
72
- coffee-script-source (1.8.0)
82
+ coffee-script-source (1.9.1.1)
73
83
  crass (1.0.1)
74
84
  devise (3.4.1)
75
85
  bcrypt (~> 3.0)
@@ -79,15 +89,16 @@ GEM
79
89
  thread_safe (~> 0.1)
80
90
  warden (~> 1.2.3)
81
91
  erubis (2.7.0)
82
- execjs (2.2.2)
83
- foreigner (1.6.1)
84
- activerecord (>= 3.0.0)
92
+ execjs (2.5.2)
93
+ globalid (0.3.3)
94
+ activesupport (>= 4.1.0)
85
95
  haml (4.0.6)
86
96
  tilt
87
97
  hike (1.2.3)
88
98
  i18n (0.7.0)
89
- jquery-rails (3.0.4)
90
- railties (>= 3.0, < 5.0)
99
+ jquery-rails (4.0.3)
100
+ rails-dom-testing (~> 1.0)
101
+ railties (>= 4.2.0)
91
102
  thor (>= 0.14, < 2.0)
92
103
  jquery-timepicker-addon-rails (1.4.1)
93
104
  railties (>= 3.1)
@@ -97,49 +108,63 @@ GEM
97
108
  railties (>= 3.2)
98
109
  sprockets-rails
99
110
  json (1.8.2)
111
+ loofah (2.0.1)
112
+ nokogiri (>= 1.5.9)
100
113
  mail (2.6.3)
101
114
  mime-types (>= 1.16, < 3)
102
115
  mime-types (2.4.3)
103
- mini_magick (4.0.2)
116
+ mini_magick (4.0.4)
104
117
  mini_portile (0.6.2)
105
118
  minitest (5.5.1)
106
- multi_json (1.10.1)
119
+ multi_json (1.11.0)
107
120
  nokogiri (1.6.6.2)
108
121
  mini_portile (~> 0.6.0)
109
122
  nokogumbo (1.2.0)
110
123
  nokogiri
111
124
  orm_adapter (0.5.0)
112
- rack (1.5.2)
125
+ rack (1.6.0)
113
126
  rack-test (0.6.3)
114
127
  rack (>= 1.0)
115
- rails (4.1.9)
116
- actionmailer (= 4.1.9)
117
- actionpack (= 4.1.9)
118
- actionview (= 4.1.9)
119
- activemodel (= 4.1.9)
120
- activerecord (= 4.1.9)
121
- activesupport (= 4.1.9)
128
+ rails (4.2.1)
129
+ actionmailer (= 4.2.1)
130
+ actionpack (= 4.2.1)
131
+ actionview (= 4.2.1)
132
+ activejob (= 4.2.1)
133
+ activemodel (= 4.2.1)
134
+ activerecord (= 4.2.1)
135
+ activesupport (= 4.2.1)
122
136
  bundler (>= 1.3.0, < 2.0)
123
- railties (= 4.1.9)
124
- sprockets-rails (~> 2.0)
125
- railties (4.1.9)
126
- actionpack (= 4.1.9)
127
- activesupport (= 4.1.9)
137
+ railties (= 4.2.1)
138
+ sprockets-rails
139
+ rails-deprecated_sanitizer (1.0.3)
140
+ activesupport (>= 4.2.0.alpha)
141
+ rails-dom-testing (1.0.6)
142
+ activesupport (>= 4.2.0.beta, < 5.0)
143
+ nokogiri (~> 1.6.0)
144
+ rails-deprecated_sanitizer (>= 1.0.1)
145
+ rails-html-sanitizer (1.0.2)
146
+ loofah (~> 2.0)
147
+ railties (4.2.1)
148
+ actionpack (= 4.2.1)
149
+ activesupport (= 4.2.1)
128
150
  rake (>= 0.8.7)
129
151
  thor (>= 0.18.1, < 2.0)
130
152
  rake (10.4.2)
131
- responders (1.1.2)
132
- railties (>= 3.2, < 4.2)
133
- sanitize (3.1.0)
153
+ remotipart (1.2.1)
154
+ responders (2.1.0)
155
+ railties (>= 4.2.0, < 5)
156
+ rmagick (2.13.4)
157
+ sanitize (3.1.2)
134
158
  crass (~> 1.0.1)
135
159
  nokogiri (>= 1.4.4)
136
160
  nokogumbo (= 1.2.0)
137
- sass (3.2.19)
138
- sass-rails (4.0.5)
161
+ sass (3.4.13)
162
+ sass-rails (5.0.1)
139
163
  railties (>= 4.0.0, < 5.0)
140
- sass (~> 3.2.2)
141
- sprockets (~> 2.8, < 3.0)
142
- sprockets-rails (~> 2.0)
164
+ sass (~> 3.1)
165
+ sprockets (>= 2.8, < 4.0)
166
+ sprockets-rails (>= 2.0, < 4.0)
167
+ tilt (~> 1.1)
143
168
  sprockets (2.12.3)
144
169
  hike (~> 1.2)
145
170
  multi_json (~> 1.0)
@@ -150,15 +175,13 @@ GEM
150
175
  activesupport (>= 3.0)
151
176
  sprockets (>= 2.8, < 4.0)
152
177
  thor (0.19.1)
153
- thread_safe (0.3.4)
178
+ thread_safe (0.3.5)
154
179
  tilt (1.4.1)
155
180
  tzinfo (1.2.2)
156
181
  thread_safe (~> 0.1)
157
- uglifier (2.7.0)
158
- execjs (>= 0.3.0)
159
- json (>= 1.8.0)
160
182
  warden (1.2.3)
161
183
  rack (>= 1.0)
184
+ will_paginate (3.0.7)
162
185
 
163
186
  PLATFORMS
164
187
  ruby
data/app/assets/javascripts/admin/admin.js CHANGED
@@ -12,8 +12,8 @@
12
12
  //
13
13
  //= require jquery
14
14
  //= require admin/jquery-migrate.min
15
- //= require jquery.ui.all
16
- //= require jquery.ui.datepicker-ru
15
+ //= require jquery-ui
16
+ //= require jquery-ui/datepicker-ru
17
17
  //= require jquery-ui-timepicker-addon
18
18
  //= require admin/vendor/jquery-ui-timepicker-addon-ru
19
19
  //= require jquery_ujs
data/app/assets/stylesheets/admin/admin.scss CHANGED
@@ -12,7 +12,7 @@
12
12
  *= require admin/vendor/token-input.patched
13
13
  *= require admin/vendor/token-input-facebook.patched
14
14
  *= require admin/vendor/jquery.tagsinput
15
- *= require jquery.ui.all
15
+ *= require jquery-ui
16
16
  *= require jquery-ui-timepicker-addon
17
17
  *= require_self
18
18
  *= require admin/custom_admin
data/app/controllers/admin/lookups_controller.rb CHANGED
@@ -3,7 +3,7 @@ module Admin
3
3
  class LookupsController < BaseController
4
4
 
5
5
  def index
6
- @lookups = Lookup.order(:created_at)
6
+ @lookups = Lookup.order(:code, :created_at)
7
7
  end
8
8
 
9
9
  def new
data/coalla-cms.gemspec CHANGED
@@ -19,21 +19,22 @@ Gem::Specification.new do |s|
19
19
  s.require_paths = ["lib"]
20
20
 
21
21
  s.add_dependency 'railties', '~> 4.0'
22
- s.add_dependency 'rails', '~> 4.1.0'
23
- s.add_dependency 'devise', '~> 3.2'
24
- s.add_dependency 'haml', '~> 4.0'
25
- s.add_dependency 'coffee-rails', '~> 4.0.0'
26
- s.add_dependency 'sass-rails', '~> 5.0.1'
27
- s.add_dependency 'uglifier', '>= 1.3.0'
22
+ s.add_dependency 'rails', '~> 4.0'
23
+ s.add_dependency 'devise'
24
+ s.add_dependency 'haml'
25
+ s.add_dependency 'coffee-rails'
26
+ s.add_dependency 'sass-rails'
28
27
  s.add_dependency 'coalla-deploy', '~> 0.1'
29
- s.add_dependency 'jquery-rails', '~> 3.0.4'
30
- s.add_dependency 'jquery-ui-rails', '~> 4.1.1'
31
- s.add_dependency 'jquery-timepicker-addon-rails', '~> 1.4.1'
32
- s.add_dependency 'foreigner', '~> 1.6.0'
33
- s.add_dependency 'js-routes', '0.9.8'
34
- s.add_dependency 'carrierwave', '~> 0.9'
35
- s.add_dependency 'ckeditor', '4.1.0'
36
- s.add_dependency 'mini_magick', '~> 4.0.0'
37
- s.add_dependency 'sanitize', '~> 3.1.0'
28
+ s.add_dependency 'jquery-rails'
29
+ s.add_dependency 'jquery-ui-rails'
30
+ s.add_dependency 'jquery-timepicker-addon-rails'
31
+ s.add_dependency 'js-routes'
32
+ s.add_dependency 'carrierwave'
33
+ s.add_dependency 'ckeditor'
34
+ s.add_dependency 'mini_magick'
35
+ s.add_dependency 'sanitize'
36
+ s.add_dependency 'remotipart'
37
+ s.add_dependency 'rmagick'
38
+ s.add_dependency 'will_paginate'
38
39
 
39
40
  end
data/lib/coalla/cms/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Coalla
2
2
  module Cms
3
- VERSION = '0.4.2.0'
3
+ VERSION = '0.4.4.3'
4
4
  end
5
5
  end
data/lib/coalla-cms.rb CHANGED
@@ -5,11 +5,12 @@ require 'carrierwave'
5
5
  require 'jquery-rails'
6
6
  require 'jquery-ui-rails'
7
7
  require 'jquery-timepicker-addon-rails'
8
- require 'foreigner'
9
8
  require 'js-routes'
10
9
  require 'mini_magick'
11
10
  require 'ckeditor'
12
11
  require 'sanitize'
12
+ require 'remotipart'
13
+ require 'will_paginate'
13
14
 
14
15
  require 'coalla/cms/engine'
15
16
  require 'coalla/cms/version'
data/lib/generators/coalla/cms/init_generator.rb CHANGED
@@ -15,32 +15,31 @@ module Coalla
15
15
  def include_common_gems
16
16
  #add_source 'http://gems.coalla.ru'
17
17
 
18
- gem 'pg', '0.16.0'
19
- gem 'russian', '~> 0.6.0'
20
-
21
- gem 'acts_as_list', '0.2.0'
22
-
18
+ gem 'pg', '0.18.1'
19
+ gem 'russian', '0.6.0'
20
+ gem 'acts_as_list', '0.6.0'
23
21
  gem 'remotipart', '1.2.1'
24
-
25
22
  gem 'rmagick', '2.13.2', require: false
26
- gem 'will_paginate', '3.0.5'
27
-
28
- gem 'cancan', '1.6.7'
29
- gem 'active_attr', '0.8.3'
30
-
23
+ gem 'will_paginate', '3.0.7'
24
+ gem 'cancan', '1.6.10'
25
+ gem 'active_attr', '0.8.5'
31
26
  gem 'sitemap_generator', '5.0.5'
32
- gem 'whenever', '0.7.3', require: false
33
- gem 'holder_rails', '2.0.0'
34
-
35
- gem 'tzinfo-data' , '1.2014.3'
27
+ gem 'whenever', '0.9.4'
28
+ gem 'holder_rails', '2.6.0'
29
+ gem 'tzinfo-data', '1.2015.2'
30
+ gem 'jbuilder', '2.2.13'
31
+ gem 'uglifier', '2.7.1'
36
32
 
37
33
  gem_group :development do
38
- gem 'ruby-prof', '0.15.1'
39
- gem 'thin', '1.5.1'
40
- gem 'eventmachine', '1.0.3'
41
- gem 'haml-rails', '0.5.3'
42
- gem 'letter_opener', '~> 1.1.0'
43
- gem 'quiet_assets', '1.0.2'
34
+ gem 'ruby-prof', '0.15.6'
35
+ gem 'thin', '1.6.3'
36
+ gem 'eventmachine', '1.0.7'
37
+ gem 'haml-rails', '0.9.0'
38
+ gem 'letter_opener', '1.3.0'
39
+ gem 'quiet_assets', '1.1.0'
40
+ gem 'byebug', '4.0.5'
41
+ gem 'web-console', '2.1.2'
42
+ gem 'spring', '1.3.4'
44
43
  end
45
44
 
46
45
  copy_file 'activerecord.ru.yml', 'config/locales/activerecord.ru.yml'
@@ -52,6 +51,15 @@ module Coalla
52
51
  copy_file '.gitignore', '.gitignore'
53
52
  copy_file '.gitattributes', '.gitattributes'
54
53
 
54
+ remove_file 'public/500.html'
55
+ remove_file 'public/404.html'
56
+ remove_file 'public/422.html'
57
+
58
+ copy_file 'errors/500.html', 'public/500.html'
59
+ copy_file 'errors/404.html', 'public/404.html'
60
+ copy_file 'errors/422.html', 'public/422.html'
61
+
62
+
55
63
  template 'controllers/home_controller.rb.erb', 'app/controllers/home_controller.rb'
56
64
  empty_directory 'app/views/home'
57
65
  template 'views/home/index.html.haml.erb', 'app/views/home/index.html.haml'
@@ -100,10 +108,29 @@ CONFIG
100
108
  copy_file 'assets.rb', 'config/initializers/assets.rb'
101
109
  end
102
110
 
111
+ def basic_http_auth
112
+ gsub_file 'app/controllers/application_controller.rb', /protect_from_forgery with: :exception/ do |match|
113
+ c = <<-RUBY
114
+
115
+
116
+ before_action :basic_http_auth if Rails.env.staging?
117
+
118
+ def basic_http_auth
119
+ if Rails.env.staging?
120
+ authenticate_or_request_with_http_basic do |username, password|
121
+ username == 'demo' && password == "#{generate_password(4)}"
122
+ end
123
+ end
124
+ end
125
+ RUBY
126
+ match << c
127
+ end
128
+ end
129
+
103
130
  private
104
131
 
105
- def generate_password
106
- SecureRandom.base64(15).tr('+/=lIO0', 'pqrsxyz')
132
+ def generate_password(ln=15)
133
+ SecureRandom.base64(ln).tr('+/=lIO0', 'pqrsxyz')
107
134
  end
108
135
 
109
136
  end
data/lib/generators/coalla/cms/templates/errors/404.html ADDED
@@ -0,0 +1,39 @@
1
+ <head>
2
+ <meta charset='utf-8'>
3
+ <meta content='width=device-width,initial-scale=1' name='viewport'>
4
+ <title>Не найдено</title>
5
+ <style>
6
+ body {
7
+ margin: 0;
8
+ font-family: Arial, sans-serif;
9
+ color: #2E2F30;
10
+ text-align: center;
11
+ }
12
+
13
+ div.dialog {
14
+ width: 50%;
15
+ padding: 80px 0;
16
+ margin: 0 auto;
17
+ color: #666;
18
+ }
19
+
20
+ h1 {
21
+ margin-bottom: 20px;
22
+ color: #730E15;
23
+ font-size: 100%;
24
+ line-height: 1.5;
25
+ }
26
+ </style>
27
+ </head>
28
+ <body>
29
+ <div class='dialog'>
30
+ <div>
31
+ <h1>
32
+ Не найдено
33
+ </h1>
34
+ </div>
35
+ <p>
36
+ Кто ищет - тот всегда найдёт!
37
+ </p>
38
+ </div>
39
+ </body>
data/lib/generators/coalla/cms/templates/errors/422.html ADDED
@@ -0,0 +1,39 @@
1
+ <head>
2
+ <meta charset='utf-8'>
3
+ <meta content='width=device-width,initial-scale=1' name='viewport'>
4
+ <title>Unprocessable Entity</title>
5
+ <style>
6
+ body {
7
+ margin: 0;
8
+ font-family: Arial, sans-serif;
9
+ color: #2E2F30;
10
+ text-align: center;
11
+ }
12
+
13
+ div.dialog {
14
+ width: 50%;
15
+ padding: 80px 0;
16
+ margin: 0 auto;
17
+ color: #666;
18
+ }
19
+
20
+ h1 {
21
+ margin-bottom: 20px;
22
+ color: #730E15;
23
+ font-size: 100%;
24
+ line-height: 1.5;
25
+ }
26
+ </style>
27
+ </head>
28
+ <body>
29
+ <div class='dialog'>
30
+ <div>
31
+ <h1>
32
+ Unprocessable Entity
33
+ </h1>
34
+ </div>
35
+ <p>
36
+ Проверте запрос.
37
+ </p>
38
+ </div>
39
+ </body>
data/lib/generators/coalla/cms/templates/errors/500.html ADDED
@@ -0,0 +1,39 @@
1
+ <head>
2
+ <meta charset='utf-8'>
3
+ <meta content='width=device-width,initial-scale=1' name='viewport'>
4
+ <title>Сожалеем, но что-то пошло не так.</title>
5
+ <style>
6
+ body {
7
+ margin: 0;
8
+ font-family: Arial, sans-serif;
9
+ color: #2E2F30;
10
+ text-align: center;
11
+ }
12
+
13
+ div.dialog {
14
+ width: 50%;
15
+ padding: 80px 0;
16
+ margin: 0 auto;
17
+ color: #666;
18
+ }
19
+
20
+ h1 {
21
+ margin-bottom: 20px;
22
+ color: #730E15;
23
+ font-size: 100%;
24
+ line-height: 1.5;
25
+ }
26
+ </style>
27
+ </head>
28
+ <body>
29
+ <div class='dialog'>
30
+ <div>
31
+ <h1>
32
+ Сожалеем, но что-то пошло не так.
33
+ </h1>
34
+ </div>
35
+ <p>
36
+ Мы были уведомлены об этой проблеме и и решим её в ближайшее время.
37
+ </p>
38
+ </div>
39
+ </body>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: coalla-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.2.0
4
+ version: 0.4.4.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - coalla
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-25 00:00:00.000000000 Z
11
+ date: 2015-05-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties
@@ -30,224 +30,238 @@ dependencies:
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 4.1.0
33
+ version: '4.0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ~>
39
39
  - !ruby/object:Gem::Version
40
- version: 4.1.0
40
+ version: '4.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: devise
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - ! '>='
46
46
  - !ruby/object:Gem::Version
47
- version: '3.2'
47
+ version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - ! '>='
53
53
  - !ruby/object:Gem::Version
54
- version: '3.2'
54
+ version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: haml
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - ! '>='
60
60
  - !ruby/object:Gem::Version
61
- version: '4.0'
61
+ version: '0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - ! '>='
67
67
  - !ruby/object:Gem::Version
68
- version: '4.0'
68
+ version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: coffee-rails
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - ! '>='
74
74
  - !ruby/object:Gem::Version
75
- version: 4.0.0
75
+ version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - ! '>='
81
81
  - !ruby/object:Gem::Version
82
- version: 4.0.0
82
+ version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: sass-rails
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - ! '>='
88
+ - !ruby/object:Gem::Version
89
+ version: '0'
90
+ type: :runtime
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ! '>='
95
+ - !ruby/object:Gem::Version
96
+ version: '0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: coalla-deploy
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
101
  - - ~>
88
102
  - !ruby/object:Gem::Version
89
- version: 5.0.1
103
+ version: '0.1'
90
104
  type: :runtime
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
108
  - - ~>
95
109
  - !ruby/object:Gem::Version
96
- version: 5.0.1
110
+ version: '0.1'
97
111
  - !ruby/object:Gem::Dependency
98
- name: uglifier
112
+ name: jquery-rails
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
115
  - - ! '>='
102
116
  - !ruby/object:Gem::Version
103
- version: 1.3.0
117
+ version: '0'
104
118
  type: :runtime
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
122
  - - ! '>='
109
123
  - !ruby/object:Gem::Version
110
- version: 1.3.0
124
+ version: '0'
111
125
  - !ruby/object:Gem::Dependency
112
- name: coalla-deploy
126
+ name: jquery-ui-rails
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
- - - ~>
129
+ - - ! '>='
116
130
  - !ruby/object:Gem::Version
117
- version: '0.1'
131
+ version: '0'
118
132
  type: :runtime
119
133
  prerelease: false
120
134
  version_requirements: !ruby/object:Gem::Requirement
121
135
  requirements:
122
- - - ~>
136
+ - - ! '>='
123
137
  - !ruby/object:Gem::Version
124
- version: '0.1'
138
+ version: '0'
125
139
  - !ruby/object:Gem::Dependency
126
- name: jquery-rails
140
+ name: jquery-timepicker-addon-rails
127
141
  requirement: !ruby/object:Gem::Requirement
128
142
  requirements:
129
- - - ~>
143
+ - - ! '>='
130
144
  - !ruby/object:Gem::Version
131
- version: 3.0.4
145
+ version: '0'
132
146
  type: :runtime
133
147
  prerelease: false
134
148
  version_requirements: !ruby/object:Gem::Requirement
135
149
  requirements:
136
- - - ~>
150
+ - - ! '>='
137
151
  - !ruby/object:Gem::Version
138
- version: 3.0.4
152
+ version: '0'
139
153
  - !ruby/object:Gem::Dependency
140
- name: jquery-ui-rails
154
+ name: js-routes
141
155
  requirement: !ruby/object:Gem::Requirement
142
156
  requirements:
143
- - - ~>
157
+ - - ! '>='
144
158
  - !ruby/object:Gem::Version
145
- version: 4.1.1
159
+ version: '0'
146
160
  type: :runtime
147
161
  prerelease: false
148
162
  version_requirements: !ruby/object:Gem::Requirement
149
163
  requirements:
150
- - - ~>
164
+ - - ! '>='
151
165
  - !ruby/object:Gem::Version
152
- version: 4.1.1
166
+ version: '0'
153
167
  - !ruby/object:Gem::Dependency
154
- name: jquery-timepicker-addon-rails
168
+ name: carrierwave
155
169
  requirement: !ruby/object:Gem::Requirement
156
170
  requirements:
157
- - - ~>
171
+ - - ! '>='
158
172
  - !ruby/object:Gem::Version
159
- version: 1.4.1
173
+ version: '0'
160
174
  type: :runtime
161
175
  prerelease: false
162
176
  version_requirements: !ruby/object:Gem::Requirement
163
177
  requirements:
164
- - - ~>
178
+ - - ! '>='
165
179
  - !ruby/object:Gem::Version
166
- version: 1.4.1
180
+ version: '0'
167
181
  - !ruby/object:Gem::Dependency
168
- name: foreigner
182
+ name: ckeditor
169
183
  requirement: !ruby/object:Gem::Requirement
170
184
  requirements:
171
- - - ~>
185
+ - - ! '>='
172
186
  - !ruby/object:Gem::Version
173
- version: 1.6.0
187
+ version: '0'
174
188
  type: :runtime
175
189
  prerelease: false
176
190
  version_requirements: !ruby/object:Gem::Requirement
177
191
  requirements:
178
- - - ~>
192
+ - - ! '>='
179
193
  - !ruby/object:Gem::Version
180
- version: 1.6.0
194
+ version: '0'
181
195
  - !ruby/object:Gem::Dependency
182
- name: js-routes
196
+ name: mini_magick
183
197
  requirement: !ruby/object:Gem::Requirement
184
198
  requirements:
185
- - - '='
199
+ - - ! '>='
186
200
  - !ruby/object:Gem::Version
187
- version: 0.9.8
201
+ version: '0'
188
202
  type: :runtime
189
203
  prerelease: false
190
204
  version_requirements: !ruby/object:Gem::Requirement
191
205
  requirements:
192
- - - '='
206
+ - - ! '>='
193
207
  - !ruby/object:Gem::Version
194
- version: 0.9.8
208
+ version: '0'
195
209
  - !ruby/object:Gem::Dependency
196
- name: carrierwave
210
+ name: sanitize
197
211
  requirement: !ruby/object:Gem::Requirement
198
212
  requirements:
199
- - - ~>
213
+ - - ! '>='
200
214
  - !ruby/object:Gem::Version
201
- version: '0.9'
215
+ version: '0'
202
216
  type: :runtime
203
217
  prerelease: false
204
218
  version_requirements: !ruby/object:Gem::Requirement
205
219
  requirements:
206
- - - ~>
220
+ - - ! '>='
207
221
  - !ruby/object:Gem::Version
208
- version: '0.9'
222
+ version: '0'
209
223
  - !ruby/object:Gem::Dependency
210
- name: ckeditor
224
+ name: remotipart
211
225
  requirement: !ruby/object:Gem::Requirement
212
226
  requirements:
213
- - - '='
227
+ - - ! '>='
214
228
  - !ruby/object:Gem::Version
215
- version: 4.1.0
229
+ version: '0'
216
230
  type: :runtime
217
231
  prerelease: false
218
232
  version_requirements: !ruby/object:Gem::Requirement
219
233
  requirements:
220
- - - '='
234
+ - - ! '>='
221
235
  - !ruby/object:Gem::Version
222
- version: 4.1.0
236
+ version: '0'
223
237
  - !ruby/object:Gem::Dependency
224
- name: mini_magick
238
+ name: rmagick
225
239
  requirement: !ruby/object:Gem::Requirement
226
240
  requirements:
227
- - - ~>
241
+ - - ! '>='
228
242
  - !ruby/object:Gem::Version
229
- version: 4.0.0
243
+ version: '0'
230
244
  type: :runtime
231
245
  prerelease: false
232
246
  version_requirements: !ruby/object:Gem::Requirement
233
247
  requirements:
234
- - - ~>
248
+ - - ! '>='
235
249
  - !ruby/object:Gem::Version
236
- version: 4.0.0
250
+ version: '0'
237
251
  - !ruby/object:Gem::Dependency
238
- name: sanitize
252
+ name: will_paginate
239
253
  requirement: !ruby/object:Gem::Requirement
240
254
  requirements:
241
- - - ~>
255
+ - - ! '>='
242
256
  - !ruby/object:Gem::Version
243
- version: 3.1.0
257
+ version: '0'
244
258
  type: :runtime
245
259
  prerelease: false
246
260
  version_requirements: !ruby/object:Gem::Requirement
247
261
  requirements:
248
- - - ~>
262
+ - - ! '>='
249
263
  - !ruby/object:Gem::Version
250
- version: 3.1.0
264
+ version: '0'
251
265
  description: Coalla CMS gem
252
266
  email:
253
267
  - dev@coalla.ru
@@ -454,6 +468,9 @@ files:
454
468
  - lib/generators/coalla/cms/templates/controllers/home_controller.rb.erb
455
469
  - lib/generators/coalla/cms/templates/database.yml.erb
456
470
  - lib/generators/coalla/cms/templates/devise.ru.yml
471
+ - lib/generators/coalla/cms/templates/errors/404.html
472
+ - lib/generators/coalla/cms/templates/errors/422.html
473
+ - lib/generators/coalla/cms/templates/errors/500.html
457
474
  - lib/generators/coalla/cms/templates/initializers/carrierwave.rb
458
475
  - lib/generators/coalla/cms/templates/migration.rb
459
476
  - lib/generators/coalla/cms/templates/migration_existing.rb