trusty-cms 4.0.2 → 4.1.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (221) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -3
  3. data/Gemfile.lock +89 -89
  4. data/Rakefile +7 -7
  5. data/app/assets/images/admin/spinner.gif +0 -0
  6. data/app/assets/javascripts/admin.js +3 -0
  7. data/app/assets/javascripts/admin/more-or-less.js +2 -2
  8. data/app/assets/javascripts/admin/tabcontrol.js.erb +1 -2
  9. data/app/assets/javascripts/rad_social/rad_ajax_form.js +3 -0
  10. data/app/assets/javascripts/rad_social/rad_email.js +0 -1
  11. data/app/assets/javascripts/rad_social/rad_email_form.js +2 -7
  12. data/app/assets/stylesheets/admin/_base.scss +22 -6
  13. data/app/assets/stylesheets/admin/_multi_site_main.scss +28 -29
  14. data/app/assets/stylesheets/admin/_reset.scss +5 -4
  15. data/app/assets/stylesheets/admin/_site_chooser.scss +44 -69
  16. data/app/assets/stylesheets/admin/assets.scss +138 -141
  17. data/app/assets/stylesheets/admin/main.scss +10 -12
  18. data/app/assets/stylesheets/admin/modules/_boxes.scss +0 -3
  19. data/app/assets/stylesheets/admin/modules/_buttons.scss +30 -0
  20. data/app/assets/stylesheets/admin/modules/_links.scss +1 -1
  21. data/app/assets/stylesheets/admin/partials/_actions.scss +29 -46
  22. data/app/assets/stylesheets/admin/partials/_avatars.scss +3 -2
  23. data/app/assets/stylesheets/admin/partials/_content.scss +15 -38
  24. data/app/assets/stylesheets/admin/partials/_dateinput.scss +23 -14
  25. data/app/assets/stylesheets/admin/partials/_drawer.scss +78 -0
  26. data/app/assets/stylesheets/admin/partials/_dropdown.scss +9 -12
  27. data/app/assets/stylesheets/admin/partials/_footer.scss +4 -3
  28. data/app/assets/stylesheets/admin/partials/_forms.scss +64 -493
  29. data/app/assets/stylesheets/admin/partials/_header.scss +9 -118
  30. data/app/assets/stylesheets/admin/partials/_layout.scss +26 -2
  31. data/app/assets/stylesheets/admin/partials/_login_form.scss +28 -0
  32. data/app/assets/stylesheets/admin/partials/_messages.scss +10 -5
  33. data/app/assets/stylesheets/admin/partials/_popup.scss +61 -50
  34. data/app/assets/stylesheets/admin/partials/_preferences.scss +37 -0
  35. data/app/assets/stylesheets/admin/partials/_sidebar.scss +55 -0
  36. data/app/assets/stylesheets/admin/partials/_tabcontrol.scss +24 -36
  37. data/app/assets/stylesheets/admin/partials/{_index.scss → _table.scss} +53 -84
  38. data/app/assets/stylesheets/admin/partials/_toolbar.scss +11 -6
  39. data/app/assets/stylesheets/admin/partials/_treetable.scss +1 -71
  40. data/app/assets/stylesheets/admin/partials/_typography.scss +30 -55
  41. data/app/assets/stylesheets/admin/partials/_validations.scss +6 -5
  42. data/app/assets/stylesheets/rad_social/rad_screen.scss +64 -67
  43. data/app/controllers/admin/assets_controller.rb +21 -31
  44. data/app/controllers/admin/configuration_controller.rb +9 -11
  45. data/app/controllers/admin/extensions_controller.rb +3 -3
  46. data/app/controllers/admin/layouts_controller.rb +3 -4
  47. data/app/controllers/admin/page_attachments_controller.rb +5 -5
  48. data/app/controllers/admin/page_fields_controller.rb +3 -4
  49. data/app/controllers/admin/page_parts_controller.rb +4 -5
  50. data/app/controllers/admin/pages_controller.rb +55 -56
  51. data/app/controllers/admin/references_controller.rb +1 -1
  52. data/app/controllers/admin/resource_controller.rb +132 -130
  53. data/app/controllers/admin/sites_controller.rb +4 -4
  54. data/app/controllers/admin/snippets_controller.rb +3 -4
  55. data/app/controllers/admin/users_controller.rb +16 -16
  56. data/app/controllers/application_controller.rb +47 -48
  57. data/app/controllers/site_controller.rb +51 -48
  58. data/app/controllers/social_mailer_controller.rb +12 -22
  59. data/app/helpers/admin/configuration_helper.rb +19 -20
  60. data/app/helpers/admin/layouts_helper.rb +0 -1
  61. data/app/helpers/admin/node_helper.rb +27 -24
  62. data/app/helpers/admin/pages_helper.rb +2 -2
  63. data/app/helpers/admin/preferences_helper.rb +0 -1
  64. data/app/helpers/admin/references_helper.rb +9 -10
  65. data/app/helpers/admin/regions_helper.rb +3 -3
  66. data/app/helpers/application_helper.rb +34 -35
  67. data/app/helpers/rad_social_helper.rb +8 -11
  68. data/app/helpers/scoped_helper.rb +1 -3
  69. data/app/helpers/sites_helper.rb +4 -4
  70. data/app/mailers/devise_mailer.rb +3 -4
  71. data/app/mailers/rad_social_mailer.rb +8 -8
  72. data/app/models/asset.rb +62 -63
  73. data/app/models/asset_type.rb +38 -39
  74. data/app/models/deprecated_tags.rb +3 -4
  75. data/app/models/file_not_found_page.rb +1 -3
  76. data/app/models/haml_filter.rb +1 -1
  77. data/app/models/layout.rb +4 -5
  78. data/app/models/legacy_user.rb +2 -2
  79. data/app/models/menu_renderer.rb +16 -18
  80. data/app/models/page.rb +96 -93
  81. data/app/models/page_attachment.rb +1 -2
  82. data/app/models/page_context.rb +11 -12
  83. data/app/models/page_part.rb +3 -4
  84. data/app/models/rails_page.rb +10 -12
  85. data/app/models/site.rb +22 -21
  86. data/app/models/snippet.rb +6 -8
  87. data/app/models/snippet_finder.rb +3 -3
  88. data/app/models/snippet_tags.rb +4 -4
  89. data/app/models/standard_tags.rb +258 -252
  90. data/app/models/status.rb +8 -8
  91. data/app/models/trusty_cms/config.rb +25 -25
  92. data/app/models/trusty_cms/page_response_cache_director.rb +2 -3
  93. data/app/models/user.rb +15 -14
  94. data/app/models/user_action_observer.rb +3 -3
  95. data/app/users/_choose_site.html.haml +3 -7
  96. data/app/views/admin/assets/_form.html.haml +2 -1
  97. data/app/views/admin/assets/_search.html.haml +2 -1
  98. data/app/views/admin/assets/edit.html.haml +2 -10
  99. data/app/views/admin/assets/index.html.haml +4 -2
  100. data/app/views/admin/assets/new.html.haml +4 -8
  101. data/app/views/admin/assets/remove.html.haml +2 -1
  102. data/app/views/admin/configuration/edit.html.haml +7 -7
  103. data/app/views/admin/configuration/show.html.haml +6 -8
  104. data/app/views/admin/layouts/_choose_site.html.haml +2 -3
  105. data/app/views/admin/layouts/_form.html.haml +13 -12
  106. data/app/views/admin/layouts/_site_chooser.html.haml +2 -2
  107. data/app/views/admin/layouts/index.html.haml +11 -4
  108. data/app/views/admin/layouts/remove.html.haml +6 -5
  109. data/app/views/admin/page_attachments/_attachment.html.haml +2 -2
  110. data/app/views/admin/page_fields/_page_field.html.haml +3 -3
  111. data/app/views/admin/page_parts/_page_part.html.haml +5 -6
  112. data/app/views/admin/pages/_asset_popups.html.haml +15 -16
  113. data/app/views/admin/pages/_assets.html.haml +8 -7
  114. data/app/views/admin/pages/_fields.html.haml +16 -13
  115. data/app/views/admin/pages/_node.html.haml +3 -3
  116. data/app/views/admin/pages/_popups.html.haml +11 -11
  117. data/app/views/admin/pages/edit.html.haml +2 -2
  118. data/app/views/admin/pages/index.html.haml +5 -2
  119. data/app/views/admin/pages/new.html.haml +3 -3
  120. data/app/views/admin/pages/remove.html.haml +4 -3
  121. data/app/views/admin/preferences/edit.html.haml +5 -5
  122. data/app/views/admin/references/filters.haml +1 -1
  123. data/app/views/admin/references/tags.haml +3 -3
  124. data/app/views/admin/removed/_assets_bucket.html.haml +3 -3
  125. data/app/views/admin/removed/_assets_container.html.haml +18 -18
  126. data/app/views/admin/removed/_bucket.html.haml +1 -1
  127. data/app/views/admin/removed/_bucket_asset.html.haml +3 -3
  128. data/app/views/admin/removed/_show_bucket_link.html.haml +1 -1
  129. data/app/views/admin/removed/_upload_to_page.html.haml +5 -5
  130. data/app/views/admin/sites/_form.haml +18 -18
  131. data/app/views/admin/sites/edit.haml +1 -1
  132. data/app/views/admin/sites/index.haml +8 -4
  133. data/app/views/admin/sites/new.haml +1 -1
  134. data/app/views/admin/snippets/_choose_site.html.haml +4 -5
  135. data/app/views/admin/snippets/_form.html.haml +8 -9
  136. data/app/views/admin/snippets/edit.html.haml +1 -1
  137. data/app/views/admin/snippets/index.html.haml +11 -4
  138. data/app/views/admin/snippets/new.html.haml +1 -1
  139. data/app/views/admin/snippets/remove.html.haml +7 -6
  140. data/app/views/admin/users/_avatar.html.haml +2 -2
  141. data/app/views/admin/users/_choose_site.html.haml +3 -7
  142. data/app/views/admin/users/_form.html.haml +18 -21
  143. data/app/views/admin/users/_password_fields.html.haml +6 -6
  144. data/app/views/admin/users/index.html.haml +13 -6
  145. data/app/views/admin/users/remove.html.haml +4 -4
  146. data/app/views/admin/welcome/login.html.haml +8 -8
  147. data/app/views/devise/passwords/edit.html.haml +6 -6
  148. data/app/views/devise/passwords/new.html.haml +3 -3
  149. data/app/views/devise/sessions/new.html.haml +8 -8
  150. data/app/views/devise/shared/_links.html.haml +2 -2
  151. data/app/views/layouts/application.html.haml +24 -19
  152. data/app/views/rad_social_mailer/social_mail_form.html.haml +15 -17
  153. data/app/views/widget/_email_form.html.haml +13 -18
  154. data/app/views/widget/_horizontal_widget.html.haml +5 -5
  155. data/bin/rails +4 -4
  156. data/bin/trusty_cms +3 -5
  157. data/config.ru +1 -1
  158. data/config/application.rb +14 -15
  159. data/config/boot.rb +1 -2
  160. data/config/environment.rb +1 -1
  161. data/config/environments/production.rb +0 -1
  162. data/config/environments/test.rb +1 -2
  163. data/config/initializers/devise.rb +1 -1
  164. data/config/initializers/kraken.rb +2 -2
  165. data/config/initializers/tmp.rb +1 -1
  166. data/config/initializers/trusty_cms_config.rb +48 -48
  167. data/config/locales/en.yml +8 -8
  168. data/config/routes.rb +6 -7
  169. data/lib/active_record_extensions/active_record_extensions.rb +1 -2
  170. data/lib/annotatable.rb +3 -5
  171. data/lib/configuration_extensions/configuration_extensions.rb +1 -1
  172. data/lib/inheritable_class_attributes.rb +13 -9
  173. data/lib/login_system.rb +73 -73
  174. data/lib/method_observer.rb +13 -12
  175. data/lib/ostruct.rb +7 -10
  176. data/lib/simpleton.rb +0 -4
  177. data/lib/string_extensions/string_extensions.rb +3 -3
  178. data/lib/symbol_extensions/symbol_extensions.rb +1 -1
  179. data/lib/tasks/database.rake +28 -28
  180. data/lib/tasks/extensions.rake +18 -18
  181. data/lib/tasks/framework.rake +68 -68
  182. data/lib/tasks/radiant_config.rake +4 -4
  183. data/lib/tasks/snippets_extension_tasks.rake +11 -11
  184. data/lib/tasks/translate.rake +14 -14
  185. data/lib/tasks/upgrade_to_devise.rake +1 -1
  186. data/lib/translation_support.rb +22 -22
  187. data/lib/trusty_cms.rb +2 -2
  188. data/lib/trusty_cms/admin_ui.rb +19 -16
  189. data/lib/trusty_cms/admin_ui/region_partials.rb +4 -3
  190. data/lib/trusty_cms/admin_ui/region_set.rb +4 -5
  191. data/lib/trusty_cms/available_locales.rb +2 -4
  192. data/lib/trusty_cms/config/definition.rb +11 -8
  193. data/lib/trusty_cms/engine.rb +13 -14
  194. data/lib/trusty_cms/extension.rb +14 -16
  195. data/lib/trusty_cms/extension_loader.rb +6 -6
  196. data/lib/trusty_cms/extension_migrator.rb +42 -41
  197. data/lib/trusty_cms/extension_path.rb +20 -19
  198. data/lib/trusty_cms/initializer.rb +5 -8
  199. data/lib/trusty_cms/pagination/controller.rb +7 -10
  200. data/lib/trusty_cms/pagination/link_renderer.rb +2 -2
  201. data/lib/trusty_cms/resource_responses.rb +3 -3
  202. data/lib/trusty_cms/setup.rb +130 -132
  203. data/lib/trusty_cms/taggable.rb +19 -22
  204. data/lib/trusty_cms/task_support.rb +9 -6
  205. data/package.json +10 -2
  206. data/public/dispatch.fcgi +1 -1
  207. data/public/dispatch.rb +2 -2
  208. data/script/extension +1 -1
  209. data/script/rails +2 -2
  210. data/spec/dummy/package.json +1 -1
  211. data/spec/dummy/yarn.lock +3 -3
  212. data/trusty_cms.gemspec +25 -25
  213. data/vendor/extensions/clipped-extension/lib/clipped_admin_ui.rb +1 -1
  214. data/yarn.lock +1992 -4
  215. metadata +54 -43
  216. data/app/assets/javascripts/rad_social/captcha.js +0 -42
  217. data/app/assets/stylesheets/admin/partials/_deprecated.scss +0 -65
  218. data/app/assets/stylesheets/admin/partials/_jquery-ui-structure.scss +0 -258
  219. data/app/assets/stylesheets/admin/partials/_jquery-ui-theme.scss +0 -410
  220. data/app/assets/stylesheets/admin/partials/_jquery-ui.scss +0 -650
  221. data/app/views/admin/assets/refresh.html.haml +0 -14
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: df7407acd1c4fbec623b0db122f04a560cacaa2d6997fc8c16bc95a76994bbef
4
- data.tar.gz: c8d47d1c903e107608fe0da4d94f2254c678cbb2ad5195cb836bf619c4fb29da
3
+ metadata.gz: '06485f3b9ed1c9ca511e064801b64e301c62a152a1da3ad7902215ab146f6c0d'
4
+ data.tar.gz: f2c25843032b941ffb0f1b7cb8920b07298ab131f626b2bd4cab6aee580a61e4
5
5
  SHA512:
6
- metadata.gz: 479e73974a02270bb4d666bb19dce9b354757551dbf6a2846a7fffaad8a482124bb85d81c1997ef22ff35772ceb093c90bfa75ba1ffbee7d12ae058345de60cc
7
- data.tar.gz: b1e40b2f698f9e414fc83c39e54ad3eeb9c18ca0f5902c430946169ec7b6e632e7c56944598e7451944e2df103e2fb36f122ca74f54ac4c3f84d3dd36f16987b
6
+ metadata.gz: f3660bb986c773d9e81821660898e04af9c985297acfd8bc2a57c4623f931b9636dc4f628176e370a46d3676608f9778b476ff9a21e1d775587c2739755f6873
7
+ data.tar.gz: 23246702302f14f37569aa164467d76f771df08a562a1f7c2dc773a85308ab2abcfd81e7343f68bf4f4cab92c2678544fda3139161eacd23856beb6298e7cd29
data/Gemfile CHANGED
@@ -14,10 +14,10 @@ gemspec
14
14
  group :development, :test do
15
15
  gem 'acts_as_list'
16
16
  gem 'database_cleaner'
17
- gem 'factory_bot_rails', '5.0.2'
18
- gem 'launchy', '~> 2.5.0'
17
+ gem 'factory_bot_rails', '5.2.0'
18
+ gem 'launchy', '~> 2.5.0'
19
19
  gem 'mysql2'
20
- gem 'poltergeist', '~> 1.18.1'
20
+ gem 'poltergeist', '~> 1.18.1'
21
21
  gem 'pry-byebug'
22
22
  gem 'rails-observers'
23
23
  gem 'rspec-rails'
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (4.0.2)
4
+ trusty-cms (4.1.4)
5
5
  RedCloth (= 4.3.2)
6
6
  acts_as_list (>= 0.9.5, < 1.1.0)
7
7
  acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -16,7 +16,7 @@ PATH
16
16
  mini_racer
17
17
  mysql2
18
18
  paperclip (> 5.2)
19
- rack (~> 2.0.1)
19
+ rack (>= 2.0.1, < 2.3.0)
20
20
  rack-cache (~> 1.7)
21
21
  radius (~> 0.7)
22
22
  rails
@@ -25,7 +25,7 @@ PATH
25
25
  roadie-rails
26
26
  sassc-rails
27
27
  stringex (>= 2.7.1, < 2.9.0)
28
- tzinfo (~> 1.2.3)
28
+ tzinfo (>= 1.2.3, < 2.1.0)
29
29
  uglifier (>= 3.2, < 5.0)
30
30
  uuidtools (~> 2.1.5)
31
31
  will_paginate (~> 3.0)
@@ -34,61 +34,61 @@ GEM
34
34
  remote: https://rubygems.org/
35
35
  specs:
36
36
  RedCloth (4.3.2)
37
- actioncable (6.0.2.2)
38
- actionpack (= 6.0.2.2)
37
+ actioncable (6.0.3.1)
38
+ actionpack (= 6.0.3.1)
39
39
  nio4r (~> 2.0)
40
40
  websocket-driver (>= 0.6.1)
41
- actionmailbox (6.0.2.2)
42
- actionpack (= 6.0.2.2)
43
- activejob (= 6.0.2.2)
44
- activerecord (= 6.0.2.2)
45
- activestorage (= 6.0.2.2)
46
- activesupport (= 6.0.2.2)
41
+ actionmailbox (6.0.3.1)
42
+ actionpack (= 6.0.3.1)
43
+ activejob (= 6.0.3.1)
44
+ activerecord (= 6.0.3.1)
45
+ activestorage (= 6.0.3.1)
46
+ activesupport (= 6.0.3.1)
47
47
  mail (>= 2.7.1)
48
- actionmailer (6.0.2.2)
49
- actionpack (= 6.0.2.2)
50
- actionview (= 6.0.2.2)
51
- activejob (= 6.0.2.2)
48
+ actionmailer (6.0.3.1)
49
+ actionpack (= 6.0.3.1)
50
+ actionview (= 6.0.3.1)
51
+ activejob (= 6.0.3.1)
52
52
  mail (~> 2.5, >= 2.5.4)
53
53
  rails-dom-testing (~> 2.0)
54
- actionpack (6.0.2.2)
55
- actionview (= 6.0.2.2)
56
- activesupport (= 6.0.2.2)
54
+ actionpack (6.0.3.1)
55
+ actionview (= 6.0.3.1)
56
+ activesupport (= 6.0.3.1)
57
57
  rack (~> 2.0, >= 2.0.8)
58
58
  rack-test (>= 0.6.3)
59
59
  rails-dom-testing (~> 2.0)
60
60
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
61
- actiontext (6.0.2.2)
62
- actionpack (= 6.0.2.2)
63
- activerecord (= 6.0.2.2)
64
- activestorage (= 6.0.2.2)
65
- activesupport (= 6.0.2.2)
61
+ actiontext (6.0.3.1)
62
+ actionpack (= 6.0.3.1)
63
+ activerecord (= 6.0.3.1)
64
+ activestorage (= 6.0.3.1)
65
+ activesupport (= 6.0.3.1)
66
66
  nokogiri (>= 1.8.5)
67
- actionview (6.0.2.2)
68
- activesupport (= 6.0.2.2)
67
+ actionview (6.0.3.1)
68
+ activesupport (= 6.0.3.1)
69
69
  builder (~> 3.1)
70
70
  erubi (~> 1.4)
71
71
  rails-dom-testing (~> 2.0)
72
72
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
73
- activejob (6.0.2.2)
74
- activesupport (= 6.0.2.2)
73
+ activejob (6.0.3.1)
74
+ activesupport (= 6.0.3.1)
75
75
  globalid (>= 0.3.6)
76
- activemodel (6.0.2.2)
77
- activesupport (= 6.0.2.2)
78
- activerecord (6.0.2.2)
79
- activemodel (= 6.0.2.2)
80
- activesupport (= 6.0.2.2)
81
- activestorage (6.0.2.2)
82
- actionpack (= 6.0.2.2)
83
- activejob (= 6.0.2.2)
84
- activerecord (= 6.0.2.2)
76
+ activemodel (6.0.3.1)
77
+ activesupport (= 6.0.3.1)
78
+ activerecord (6.0.3.1)
79
+ activemodel (= 6.0.3.1)
80
+ activesupport (= 6.0.3.1)
81
+ activestorage (6.0.3.1)
82
+ actionpack (= 6.0.3.1)
83
+ activejob (= 6.0.3.1)
84
+ activerecord (= 6.0.3.1)
85
85
  marcel (~> 0.3.1)
86
- activesupport (6.0.2.2)
86
+ activesupport (6.0.3.1)
87
87
  concurrent-ruby (~> 1.0, >= 1.0.2)
88
88
  i18n (>= 0.7, < 2)
89
89
  minitest (~> 5.1)
90
90
  tzinfo (~> 1.1)
91
- zeitwerk (~> 2.2)
91
+ zeitwerk (~> 2.2, >= 2.2.2)
92
92
  acts_as_list (1.0.1)
93
93
  activerecord (>= 4.2)
94
94
  acts_as_tree (2.8.0)
@@ -97,8 +97,8 @@ GEM
97
97
  public_suffix (>= 2.0.2, < 5.0)
98
98
  bcrypt (3.1.13)
99
99
  builder (3.2.4)
100
- byebug (11.1.1)
101
- capybara (3.31.0)
100
+ byebug (11.1.3)
101
+ capybara (3.32.2)
102
102
  addressable
103
103
  mini_mime (>= 0.1.3)
104
104
  nokogiri (~> 1.8)
@@ -113,15 +113,15 @@ GEM
113
113
  cliver (0.3.2)
114
114
  cocaine (0.6.0)
115
115
  terrapin (= 0.6.0)
116
- coderay (1.1.2)
116
+ coderay (1.1.3)
117
117
  concurrent-ruby (1.1.6)
118
118
  crass (1.0.6)
119
119
  css_parser (1.7.1)
120
120
  addressable
121
- database_cleaner (1.8.3)
121
+ database_cleaner (1.8.5)
122
122
  delocalize (1.2.0)
123
123
  rails (>= 2)
124
- devise (4.7.1)
124
+ devise (4.7.2)
125
125
  bcrypt (~> 3.0)
126
126
  orm_adapter (~> 0.1)
127
127
  railties (>= 4.1.0)
@@ -132,12 +132,12 @@ GEM
132
132
  erubi (1.9.0)
133
133
  erubis (2.7.0)
134
134
  execjs (2.7.0)
135
- factory_bot (5.0.2)
135
+ factory_bot (5.2.0)
136
136
  activesupport (>= 4.2.0)
137
- factory_bot_rails (5.0.2)
138
- factory_bot (~> 5.0.2)
137
+ factory_bot_rails (5.2.0)
138
+ factory_bot (~> 5.2.0)
139
139
  railties (>= 4.2.0)
140
- ffi (1.12.2)
140
+ ffi (1.13.1)
141
141
  globalid (0.4.2)
142
142
  activesupport (>= 4.2.0)
143
143
  haml (5.1.2)
@@ -155,10 +155,10 @@ GEM
155
155
  haml (>= 4.0, < 6)
156
156
  nokogiri (>= 1.6.0)
157
157
  ruby_parser (~> 3.5)
158
- httparty (0.18.0)
158
+ httparty (0.18.1)
159
159
  mime-types (~> 3.0)
160
160
  multi_xml (>= 0.5.2)
161
- i18n (1.8.2)
161
+ i18n (1.8.3)
162
162
  concurrent-ruby (~> 1.0)
163
163
  json (2.3.0)
164
164
  kraken-io (0.1.3)
@@ -169,7 +169,7 @@ GEM
169
169
  launchy (2.5.0)
170
170
  addressable (~> 2.7)
171
171
  libv8 (7.3.492.27.1)
172
- loofah (2.4.0)
172
+ loofah (2.5.0)
173
173
  crass (~> 1.0.2)
174
174
  nokogiri (>= 1.5.9)
175
175
  mail (2.7.1)
@@ -179,13 +179,13 @@ GEM
179
179
  method_source (1.0.0)
180
180
  mime-types (3.3.1)
181
181
  mime-types-data (~> 3.2015)
182
- mime-types-data (3.2019.1009)
183
- mimemagic (0.3.4)
182
+ mime-types-data (3.2020.0512)
183
+ mimemagic (0.3.5)
184
184
  mini_mime (1.0.2)
185
185
  mini_portile2 (2.4.0)
186
- mini_racer (0.2.9)
187
- libv8 (>= 6.9.411)
188
- minitest (5.14.0)
186
+ mini_racer (0.2.14)
187
+ libv8 (> 7.3)
188
+ minitest (5.14.1)
189
189
  multi_xml (0.6.0)
190
190
  multipart-post (2.1.1)
191
191
  mysql2 (0.5.3)
@@ -203,33 +203,33 @@ GEM
203
203
  capybara (>= 2.1, < 4)
204
204
  cliver (~> 0.3.1)
205
205
  websocket-driver (>= 0.2.0)
206
- pry (0.13.0)
206
+ pry (0.13.1)
207
207
  coderay (~> 1.1)
208
208
  method_source (~> 1.0)
209
209
  pry-byebug (3.9.0)
210
210
  byebug (~> 11.0)
211
211
  pry (~> 0.13.0)
212
- public_suffix (4.0.3)
213
- rack (2.0.9)
214
- rack-cache (1.11.0)
212
+ public_suffix (4.0.5)
213
+ rack (2.2.3)
214
+ rack-cache (1.12.0)
215
215
  rack (>= 0.4)
216
216
  rack-test (1.1.0)
217
217
  rack (>= 1.0, < 3)
218
218
  radius (0.7.5)
219
- rails (6.0.2.2)
220
- actioncable (= 6.0.2.2)
221
- actionmailbox (= 6.0.2.2)
222
- actionmailer (= 6.0.2.2)
223
- actionpack (= 6.0.2.2)
224
- actiontext (= 6.0.2.2)
225
- actionview (= 6.0.2.2)
226
- activejob (= 6.0.2.2)
227
- activemodel (= 6.0.2.2)
228
- activerecord (= 6.0.2.2)
229
- activestorage (= 6.0.2.2)
230
- activesupport (= 6.0.2.2)
219
+ rails (6.0.3.1)
220
+ actioncable (= 6.0.3.1)
221
+ actionmailbox (= 6.0.3.1)
222
+ actionmailer (= 6.0.3.1)
223
+ actionpack (= 6.0.3.1)
224
+ actiontext (= 6.0.3.1)
225
+ actionview (= 6.0.3.1)
226
+ activejob (= 6.0.3.1)
227
+ activemodel (= 6.0.3.1)
228
+ activerecord (= 6.0.3.1)
229
+ activestorage (= 6.0.3.1)
230
+ activesupport (= 6.0.3.1)
231
231
  bundler (>= 1.3.0)
232
- railties (= 6.0.2.2)
232
+ railties (= 6.0.3.1)
233
233
  sprockets-rails (>= 2.0.0)
234
234
  rails-dom-testing (2.0.3)
235
235
  activesupport (>= 4.2.0)
@@ -238,16 +238,16 @@ GEM
238
238
  loofah (~> 2.3)
239
239
  rails-observers (0.1.5)
240
240
  activemodel (>= 4.0)
241
- railties (6.0.2.2)
242
- actionpack (= 6.0.2.2)
243
- activesupport (= 6.0.2.2)
241
+ railties (6.0.3.1)
242
+ actionpack (= 6.0.3.1)
243
+ activesupport (= 6.0.3.1)
244
244
  method_source
245
245
  rake (>= 0.8.7)
246
246
  thor (>= 0.20.3, < 2.0)
247
247
  rake (12.3.3)
248
248
  rdoc (6.2.1)
249
- regexp_parser (1.7.0)
250
- responders (3.0.0)
249
+ regexp_parser (1.7.1)
250
+ responders (3.0.1)
251
251
  actionpack (>= 5.0)
252
252
  railties (>= 5.0)
253
253
  roadie (4.0.0)
@@ -256,15 +256,15 @@ GEM
256
256
  roadie-rails (2.1.1)
257
257
  railties (>= 5.1, < 6.1)
258
258
  roadie (>= 3.1, < 5.0)
259
- rspec-core (3.9.1)
260
- rspec-support (~> 3.9.1)
261
- rspec-expectations (3.9.1)
259
+ rspec-core (3.9.2)
260
+ rspec-support (~> 3.9.3)
261
+ rspec-expectations (3.9.2)
262
262
  diff-lcs (>= 1.2.0, < 2.0)
263
263
  rspec-support (~> 3.9.0)
264
264
  rspec-mocks (3.9.1)
265
265
  diff-lcs (>= 1.2.0, < 2.0)
266
266
  rspec-support (~> 3.9.0)
267
- rspec-rails (4.0.0)
267
+ rspec-rails (4.0.1)
268
268
  actionpack (>= 4.2)
269
269
  activesupport (>= 4.2)
270
270
  railties (>= 4.2)
@@ -272,10 +272,10 @@ GEM
272
272
  rspec-expectations (~> 3.9)
273
273
  rspec-mocks (~> 3.9)
274
274
  rspec-support (~> 3.9)
275
- rspec-support (3.9.2)
275
+ rspec-support (3.9.3)
276
276
  ruby_parser (3.14.2)
277
277
  sexp_processor (~> 4.9)
278
- sassc (2.2.1)
278
+ sassc (2.4.0)
279
279
  ffi (~> 1.9)
280
280
  sassc-rails (2.1.2)
281
281
  railties (>= 4.0.0)
@@ -283,12 +283,12 @@ GEM
283
283
  sprockets (> 3.0)
284
284
  sprockets-rails
285
285
  tilt
286
- sexp_processor (4.14.1)
286
+ sexp_processor (4.15.0)
287
287
  simplecov (0.18.5)
288
288
  docile (~> 1.1)
289
289
  simplecov-html (~> 0.11)
290
290
  simplecov-html (0.12.2)
291
- sprockets (4.0.0)
291
+ sprockets (4.0.2)
292
292
  concurrent-ruby (~> 1.0)
293
293
  rack (> 1, < 3)
294
294
  sprockets-rails (3.2.1)
@@ -304,16 +304,16 @@ GEM
304
304
  tilt (2.0.10)
305
305
  trustygems (0.2.1)
306
306
  rake
307
- tzinfo (1.2.6)
307
+ tzinfo (1.2.7)
308
308
  thread_safe (~> 0.1)
309
309
  uglifier (4.2.0)
310
310
  execjs (>= 0.3.0, < 3)
311
311
  uuidtools (2.1.5)
312
312
  warden (1.2.8)
313
313
  rack (>= 2.0.6)
314
- websocket-driver (0.7.1)
314
+ websocket-driver (0.7.2)
315
315
  websocket-extensions (>= 0.1.0)
316
- websocket-extensions (0.1.4)
316
+ websocket-extensions (0.1.5)
317
317
  will_paginate (3.3.0)
318
318
  xpath (3.2.0)
319
319
  nokogiri (~> 1.8)
@@ -325,7 +325,7 @@ PLATFORMS
325
325
  DEPENDENCIES
326
326
  acts_as_list
327
327
  database_cleaner
328
- factory_bot_rails (= 5.0.2)
328
+ factory_bot_rails (= 5.2.0)
329
329
  launchy (~> 2.5.0)
330
330
  mysql2
331
331
  poltergeist (~> 1.18.1)
data/Rakefile CHANGED
@@ -10,19 +10,19 @@ require 'pry'
10
10
  require 'byebug'
11
11
  require 'trustygems'
12
12
 
13
- #!/usr/bin/env rake
13
+ # !/usr/bin/env rake
14
14
  begin
15
15
  require 'bundler/setup'
16
16
  rescue LoadError
17
17
  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
18
18
  end
19
- APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
19
+ APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
20
20
  load 'rails/tasks/engine.rake'
21
21
  Bundler::GemHelper.install_tasks
22
- Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
22
+ Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each { |f| load f }
23
23
  require 'rspec/core'
24
24
  require 'rspec/core/rake_task'
25
- desc "Run all specs in spec directory (excluding plugin specs)"
26
- RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
27
- task :default => :spec
28
- #TrustyCms::Application.load_tasks
25
+ desc 'Run all specs in spec directory (excluding plugin specs)'
26
+ RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
27
+ task default: :spec
28
+ # TrustyCms::Application.load_tasks
@@ -34,3 +34,6 @@
34
34
  //= require 'admin/tags'
35
35
  //= require 'admin/treetable'
36
36
  //= require 'admin/sortable'
37
+ //= require 'tablesaw/dist/tablesaw.jquery.js'
38
+ //= require 'tablesaw/dist/tablesaw-init.js'
39
+ //= require '@fortawesome/fontawesome-free/js/all.js'
@@ -15,9 +15,9 @@
15
15
 
16
16
  $(link).toggleClass('less more');
17
17
  if (link.innerHTML.match(/less/i)) {
18
- link.innerHTML = 'More';
18
+ link.innerHTML = 'More <i class="fas fa-angle-down"></i>';
19
19
  } else if (link.innerHTML.match(/more/i)) {
20
- link.innerHTML = 'Less';
20
+ link.innerHTML = 'Less <i class="fas fa-angle-up"></i>';
21
21
  }
22
22
  }
23
23
 
@@ -33,8 +33,7 @@
33
33
  }
34
34
 
35
35
  TabControl.addTab = function(tabText) {
36
- var relative_url_root = "<%= ActionController::Base.relative_url_root %>";
37
- $('div#tab_control .tabs').append("<a id='tab_" + tabText + "' href='#' class='tab'><span>" + tabText + "</span><img src='" + relative_url_root + "<%= asset_path('admin/tab_close.png') %>' class='close' alt='Remove part' title='Remove part' /></a>");
36
+ $('div#tab_control .tabs').append("<a id='tab_" + tabText + "' href='#' class='tab'><span>" + tabText + "</span><i class='fas fa-times-circle close' title='Remove part'></i></a>");
38
37
  var $page_part_index = $('#page_part_index_field');
39
38
  $page_part_index.val(parseInt($page_part_index.val()) + 1);
40
39
  }
@@ -16,6 +16,9 @@ function RadAjaxForm(form) {
16
16
  type: "POST",
17
17
  url: form.find('input[name=submit_url]').attr('value'),
18
18
  data: form.serialize(),
19
+ beforeSend: function ( xhr ) {
20
+ xhr.setRequestHeader("X-CSRF-Token", $('meta[name=csrf-token]').attr('content'));
21
+ },
19
22
  success: function(data, status, xhr) {
20
23
  form.find(".loader").removeClass('ajax-loader');
21
24
  form.find(".loader-small").removeClass('ajax-loader-small');