locomotive_cms 2.4.1 → 2.5.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +1 -1
- data/README.textile +3 -3
- data/app/assets/images/locomotive/icons/flags/sk.png +0 -0
- data/app/assets/javascripts/aloha/plugins/custom/locomotive_media/lib/locomotive_media-plugin.js +1 -1
- data/app/assets/javascripts/locomotive/models/content_asset.js.coffee +7 -1
- data/app/assets/javascripts/locomotive/utils/aloha_settings.js.coffee +1 -1
- data/app/assets/javascripts/locomotive/utils/core_ext.js +1 -1
- data/app/assets/javascripts/locomotive/views/content_assets/picker_item_view.js.coffee +12 -0
- data/app/assets/javascripts/locomotive/views/content_assets/picker_view.js.coffee +149 -15
- data/app/assets/javascripts/locomotive/views/shared/asset_picker_view.js.coffee +16 -4
- data/app/assets/javascripts/locomotive/views/shared/form_view.js.coffee +1 -1
- data/app/assets/javascripts/locomotive/views/shared/list_item_view.js.coffee +1 -1
- data/app/assets/javascripts/tinymce/plugins/locomotive_media/editor_plugin.js +1 -1
- data/app/assets/stylesheets/locomotive/backoffice/_buttons.css.scss +56 -0
- data/app/assets/stylesheets/locomotive/backoffice/application.css.scss +6 -0
- data/app/assets/stylesheets/locomotive/backoffice/content_assets.css.scss +74 -4
- data/app/assets/stylesheets/locomotive/backoffice/dialog_changes.css.scss +4 -0
- data/app/assets/stylesheets/locomotive/shared/common.css.scss +7 -0
- data/app/controllers/locomotive/api/documentation_controller.rb +8 -2
- data/app/controllers/locomotive/api/pages_controller.rb +1 -1
- data/app/controllers/locomotive/content_assets_controller.rb +4 -0
- data/app/models/locomotive/content_asset.rb +5 -1
- data/app/models/locomotive/content_entry.rb +7 -2
- data/app/models/locomotive/content_type.rb +1 -1
- data/app/models/locomotive/editable_element.rb +1 -0
- data/app/models/locomotive/extensions/asset/types.rb +9 -4
- data/app/models/locomotive/extensions/asset/vignette.rb +2 -0
- data/app/models/locomotive/extensions/content_entry/csv.rb +2 -2
- data/app/models/locomotive/extensions/content_entry/localized.rb +18 -0
- data/app/models/locomotive/page.rb +2 -2
- data/app/models/locomotive/snippet.rb +8 -7
- data/app/models/locomotive/theme_asset.rb +12 -6
- data/app/models/locomotive/translation.rb +1 -1
- data/app/views/locomotive/content_assets/_picker.html.haml +23 -2
- data/app/views/locomotive/pages/_page.html.haml +2 -0
- data/app/views/locomotive/shared/_header.html.haml +3 -1
- data/app/views/locomotive/shared/_main_app_header.html.haml +1 -0
- data/app/views/locomotive/translations/index.html.haml +1 -1
- data/config/locales/admin_ui.bg.yml +1 -0
- data/config/locales/admin_ui.cs.yml +1 -0
- data/config/locales/admin_ui.de.yml +1 -0
- data/config/locales/admin_ui.en.yml +7 -0
- data/config/locales/admin_ui.es.yml +1 -0
- data/config/locales/admin_ui.et.yml +1 -0
- data/config/locales/admin_ui.fr.yml +12 -2
- data/config/locales/admin_ui.it.yml +1 -0
- data/config/locales/admin_ui.ja.yml +1 -0
- data/config/locales/admin_ui.nb.yml +1 -0
- data/config/locales/admin_ui.nl.yml +1 -0
- data/config/locales/admin_ui.pl.yml +1 -0
- data/config/locales/admin_ui.pt-BR.yml +1 -0
- data/config/locales/admin_ui.ru.yml +8 -4
- data/config/locales/admin_ui.sk.yml +360 -0
- data/config/locales/admin_ui.zh-CN.yml +1 -0
- data/config/locales/carrierwave.sk.yml +4 -0
- data/config/locales/default.fr.yml +3 -0
- data/config/locales/default.ru.yml +18 -7
- data/config/locales/default.sk.yml +249 -0
- data/config/locales/devise.sk.yml +64 -0
- data/config/locales/flash.sk.yml +115 -0
- data/config/locales/formtastic.fr.yml +7 -1
- data/config/locales/formtastic.sk.yml +125 -0
- data/config/routes.rb +2 -0
- data/lib/generators/locomotive/install/install_generator.rb +6 -0
- data/lib/generators/locomotive/install/templates/dragonfly.rb +16 -13
- data/lib/generators/locomotive/install/templates/locomotive.rb +7 -2
- data/lib/locomotive.rb +3 -15
- data/lib/locomotive/action_controller/responder.rb +8 -1
- data/lib/locomotive/carrierwave/asset.rb +0 -4
- data/lib/locomotive/configuration.rb +4 -3
- data/lib/locomotive/dragonfly.rb +20 -5
- data/lib/locomotive/liquid/drops/content_entry.rb +1 -1
- data/lib/locomotive/liquid/filters/base.rb +4 -0
- data/lib/locomotive/liquid/filters/translate.rb +4 -0
- data/lib/locomotive/liquid/tags/path_helper.rb +5 -2
- data/lib/locomotive/middlewares.rb +2 -1
- data/lib/locomotive/misc/api_documentation.rb +3 -1
- data/lib/locomotive/render.rb +7 -6
- data/lib/locomotive/version.rb +1 -1
- data/lib/tasks/development.rake +21 -0
- data/spec/dummy/config/initializers/dragonfly.rb +16 -13
- data/spec/dummy/config/initializers/locomotive.rb +9 -5
- data/spec/fixtures/assets/specs.pdf +0 -0
- data/spec/lib/locomotive/liquid/filters/html_spec.rb +22 -13
- data/spec/models/locomotive/content_asset_spec.rb +9 -0
- data/spec/models/locomotive/content_entry_spec.rb +57 -6
- data/spec/models/locomotive/extensions/content_entry/csv_spec.rb +30 -0
- data/spec/support/locomotive.rb +2 -1
- data/vendor/assets/javascripts/locomotive/ICanHandlebarz.js +1 -1
- data/vendor/assets/javascripts/locomotive/backbone.sync.js +14 -1
- metadata +34 -9
- data/lib/locomotive/middlewares/cache.rb +0 -27
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: locomotive_cms
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.5.0.rc1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Didier Lafforgue
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2014-04-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|
|
@@ -30,14 +30,14 @@ dependencies:
|
|
|
30
30
|
requirements:
|
|
31
31
|
- - ~>
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 3.2.
|
|
33
|
+
version: 3.2.17
|
|
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: 3.2.
|
|
40
|
+
version: 3.2.17
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: devise
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -136,6 +136,20 @@ dependencies:
|
|
|
136
136
|
- - ~>
|
|
137
137
|
- !ruby/object:Gem::Version
|
|
138
138
|
version: 4.1.1
|
|
139
|
+
- !ruby/object:Gem::Dependency
|
|
140
|
+
name: mime-types
|
|
141
|
+
requirement: !ruby/object:Gem::Requirement
|
|
142
|
+
requirements:
|
|
143
|
+
- - ~>
|
|
144
|
+
- !ruby/object:Gem::Version
|
|
145
|
+
version: '1.19'
|
|
146
|
+
type: :runtime
|
|
147
|
+
prerelease: false
|
|
148
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
149
|
+
requirements:
|
|
150
|
+
- - ~>
|
|
151
|
+
- !ruby/object:Gem::Version
|
|
152
|
+
version: '1.19'
|
|
139
153
|
- !ruby/object:Gem::Dependency
|
|
140
154
|
name: custom_fields
|
|
141
155
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -422,14 +436,14 @@ dependencies:
|
|
|
422
436
|
requirements:
|
|
423
437
|
- - ~>
|
|
424
438
|
- !ruby/object:Gem::Version
|
|
425
|
-
version: 0.
|
|
439
|
+
version: 1.0.3
|
|
426
440
|
type: :runtime
|
|
427
441
|
prerelease: false
|
|
428
442
|
version_requirements: !ruby/object:Gem::Requirement
|
|
429
443
|
requirements:
|
|
430
444
|
- - ~>
|
|
431
445
|
- !ruby/object:Gem::Version
|
|
432
|
-
version: 0.
|
|
446
|
+
version: 1.0.3
|
|
433
447
|
- !ruby/object:Gem::Dependency
|
|
434
448
|
name: rack-cache
|
|
435
449
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -543,6 +557,7 @@ files:
|
|
|
543
557
|
- app/assets/images/locomotive/icons/flags/pl.png
|
|
544
558
|
- app/assets/images/locomotive/icons/flags/pt-BR.png
|
|
545
559
|
- app/assets/images/locomotive/icons/flags/ru.png
|
|
560
|
+
- app/assets/images/locomotive/icons/flags/sk.png
|
|
546
561
|
- app/assets/images/locomotive/icons/flags/zh-CN.png
|
|
547
562
|
- app/assets/images/locomotive/icons/start.png
|
|
548
563
|
- app/assets/images/locomotive/list/empty.png
|
|
@@ -899,6 +914,7 @@ files:
|
|
|
899
914
|
- app/views/locomotive/shared/_locale_picker_link.html.haml
|
|
900
915
|
- app/views/locomotive/shared/_main_app_head.html.haml
|
|
901
916
|
- app/views/locomotive/shared/_main_app_head_before_backbone.html.haml
|
|
917
|
+
- app/views/locomotive/shared/_main_app_header.html.haml
|
|
902
918
|
- app/views/locomotive/shared/_site_picker.html.haml
|
|
903
919
|
- app/views/locomotive/shared/actions/_contents.html.haml
|
|
904
920
|
- app/views/locomotive/shared/menu/_contents.html.haml
|
|
@@ -942,6 +958,7 @@ files:
|
|
|
942
958
|
- config/locales/admin_ui.pl.yml
|
|
943
959
|
- config/locales/admin_ui.pt-BR.yml
|
|
944
960
|
- config/locales/admin_ui.ru.yml
|
|
961
|
+
- config/locales/admin_ui.sk.yml
|
|
945
962
|
- config/locales/admin_ui.zh-CN.yml
|
|
946
963
|
- config/locales/carrierwave.bg.yml
|
|
947
964
|
- config/locales/carrierwave.cs.yml
|
|
@@ -957,6 +974,7 @@ files:
|
|
|
957
974
|
- config/locales/carrierwave.pl.yml
|
|
958
975
|
- config/locales/carrierwave.pt-BR.yml
|
|
959
976
|
- config/locales/carrierwave.ru.yml
|
|
977
|
+
- config/locales/carrierwave.sk.yml
|
|
960
978
|
- config/locales/carrierwave.zh-CN.yml
|
|
961
979
|
- config/locales/default.bg.yml
|
|
962
980
|
- config/locales/default.cs.yml
|
|
@@ -972,6 +990,7 @@ files:
|
|
|
972
990
|
- config/locales/default.pl.yml
|
|
973
991
|
- config/locales/default.pt-BR.yml
|
|
974
992
|
- config/locales/default.ru.yml
|
|
993
|
+
- config/locales/default.sk.yml
|
|
975
994
|
- config/locales/default.zh-CN.yml
|
|
976
995
|
- config/locales/devise.bg.yml
|
|
977
996
|
- config/locales/devise.cs.yml
|
|
@@ -987,6 +1006,7 @@ files:
|
|
|
987
1006
|
- config/locales/devise.pl.yml
|
|
988
1007
|
- config/locales/devise.pt-BR.yml
|
|
989
1008
|
- config/locales/devise.ru.yml
|
|
1009
|
+
- config/locales/devise.sk.yml
|
|
990
1010
|
- config/locales/devise.zh-CN.yml
|
|
991
1011
|
- config/locales/flash.bg.yml
|
|
992
1012
|
- config/locales/flash.cs.yml
|
|
@@ -1002,6 +1022,7 @@ files:
|
|
|
1002
1022
|
- config/locales/flash.pl.yml
|
|
1003
1023
|
- config/locales/flash.pt-BR.yml
|
|
1004
1024
|
- config/locales/flash.ru.yml
|
|
1025
|
+
- config/locales/flash.sk.yml
|
|
1005
1026
|
- config/locales/flash.zh-CN.yml
|
|
1006
1027
|
- config/locales/formtastic.bg.yml
|
|
1007
1028
|
- config/locales/formtastic.cs.yml
|
|
@@ -1017,6 +1038,7 @@ files:
|
|
|
1017
1038
|
- config/locales/formtastic.pl.yml
|
|
1018
1039
|
- config/locales/formtastic.pt-BR.yml
|
|
1019
1040
|
- config/locales/formtastic.ru.yml
|
|
1041
|
+
- config/locales/formtastic.sk.yml
|
|
1020
1042
|
- config/locales/formtastic.zh-CN.yml
|
|
1021
1043
|
- config/routes.rb
|
|
1022
1044
|
- lib/generators/locomotive/install/install_generator.rb
|
|
@@ -1096,7 +1118,6 @@ files:
|
|
|
1096
1118
|
- lib/locomotive/liquid.rb
|
|
1097
1119
|
- lib/locomotive/logger.rb
|
|
1098
1120
|
- lib/locomotive/markdown.rb
|
|
1099
|
-
- lib/locomotive/middlewares/cache.rb
|
|
1100
1121
|
- lib/locomotive/middlewares/inline_editor.rb
|
|
1101
1122
|
- lib/locomotive/middlewares/permalink.rb
|
|
1102
1123
|
- lib/locomotive/middlewares/seo_trailing_slash.rb
|
|
@@ -1278,6 +1299,7 @@ files:
|
|
|
1278
1299
|
- spec/fixtures/assets/5k_2.png
|
|
1279
1300
|
- spec/fixtures/assets/application.js
|
|
1280
1301
|
- spec/fixtures/assets/main.css
|
|
1302
|
+
- spec/fixtures/assets/specs.pdf
|
|
1281
1303
|
- spec/fixtures/assets/wrong.txt
|
|
1282
1304
|
- spec/fixtures/images/logo1.jpg
|
|
1283
1305
|
- spec/fixtures/images/logo2.jpg
|
|
@@ -1319,6 +1341,7 @@ files:
|
|
|
1319
1341
|
- spec/models/locomotive/editable_control_spec.rb
|
|
1320
1342
|
- spec/models/locomotive/editable_file_spec.rb
|
|
1321
1343
|
- spec/models/locomotive/editable_text_spec.rb
|
|
1344
|
+
- spec/models/locomotive/extensions/content_entry/csv_spec.rb
|
|
1322
1345
|
- spec/models/locomotive/extensions/page/editable_elements_spec.rb
|
|
1323
1346
|
- spec/models/locomotive/extensions/page/redirect_spec.rb
|
|
1324
1347
|
- spec/models/locomotive/extensions/page/render_spec.rb
|
|
@@ -1388,9 +1411,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
1388
1411
|
version: '0'
|
|
1389
1412
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1390
1413
|
requirements:
|
|
1391
|
-
- - '
|
|
1414
|
+
- - '>'
|
|
1392
1415
|
- !ruby/object:Gem::Version
|
|
1393
|
-
version:
|
|
1416
|
+
version: 1.3.1
|
|
1394
1417
|
requirements: []
|
|
1395
1418
|
rubyforge_project:
|
|
1396
1419
|
rubygems_version: 2.0.7
|
|
@@ -1494,6 +1517,7 @@ test_files:
|
|
|
1494
1517
|
- spec/fixtures/assets/5k_2.png
|
|
1495
1518
|
- spec/fixtures/assets/application.js
|
|
1496
1519
|
- spec/fixtures/assets/main.css
|
|
1520
|
+
- spec/fixtures/assets/specs.pdf
|
|
1497
1521
|
- spec/fixtures/assets/wrong.txt
|
|
1498
1522
|
- spec/fixtures/images/logo1.jpg
|
|
1499
1523
|
- spec/fixtures/images/logo2.jpg
|
|
@@ -1535,6 +1559,7 @@ test_files:
|
|
|
1535
1559
|
- spec/models/locomotive/editable_control_spec.rb
|
|
1536
1560
|
- spec/models/locomotive/editable_file_spec.rb
|
|
1537
1561
|
- spec/models/locomotive/editable_text_spec.rb
|
|
1562
|
+
- spec/models/locomotive/extensions/content_entry/csv_spec.rb
|
|
1538
1563
|
- spec/models/locomotive/extensions/page/editable_elements_spec.rb
|
|
1539
1564
|
- spec/models/locomotive/extensions/page/redirect_spec.rb
|
|
1540
1565
|
- spec/models/locomotive/extensions/page/render_spec.rb
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
require 'rack/cache'
|
|
2
|
-
|
|
3
|
-
module Locomotive
|
|
4
|
-
module Middlewares
|
|
5
|
-
class Cache
|
|
6
|
-
|
|
7
|
-
def initialize(app, opts = {}, &block)
|
|
8
|
-
url_format = Locomotive::Dragonfly.app.configuration[:url_format]
|
|
9
|
-
base_format = url_format.split('/:').first rescue '/images/dynamic'
|
|
10
|
-
|
|
11
|
-
@app = app
|
|
12
|
-
@regexp = %r{^#{base_format}/}
|
|
13
|
-
@context = ::Rack::Cache.new(app, opts, &block)
|
|
14
|
-
end
|
|
15
|
-
|
|
16
|
-
def call(env)
|
|
17
|
-
if env['PATH_INFO'] =~ @regexp
|
|
18
|
-
@context.call(env)
|
|
19
|
-
else
|
|
20
|
-
@app.call(env)
|
|
21
|
-
end
|
|
22
|
-
end
|
|
23
|
-
|
|
24
|
-
end
|
|
25
|
-
|
|
26
|
-
end
|
|
27
|
-
end
|