archangel 0.3.0 → 0.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (589) hide show
  1. checksums.yaml +4 -4
  2. data/.codeclimate.yml +5 -1
  3. data/.erb-lint.yml +23 -0
  4. data/.eslintrc.json +1 -1
  5. data/.nvmrc +1 -1
  6. data/.rubocop.yml +7 -1
  7. data/.rubocop_exclude.yml +0 -1
  8. data/.sass-lint.yml +8 -0
  9. data/.travis.yml +13 -5
  10. data/Gemfile +19 -13
  11. data/README.md +10 -6
  12. data/app/assets/javascripts/archangel/input/datetimepicker.js +31 -77
  13. data/app/assets/javascripts/archangel/input/meta_keywords.js +0 -12
  14. data/app/assets/javascripts/archangel/input/wysiwyg.js.erb +51 -36
  15. data/app/assets/javascripts/archangel/object/flash.js +11 -8
  16. data/app/assets/javascripts/archangel/object/routes/backend.js +10 -10
  17. data/app/controllers/archangel/application_controller.rb +23 -13
  18. data/app/controllers/archangel/auth/invitations_controller.rb +22 -0
  19. data/app/controllers/archangel/auth/registrations_controller.rb +7 -3
  20. data/app/controllers/archangel/auth_controller.rb +8 -3
  21. data/app/controllers/archangel/backend/assets_controller.rb +9 -11
  22. data/app/controllers/archangel/backend/collections_controller.rb +3 -3
  23. data/app/controllers/archangel/backend/dashboards_controller.rb +1 -1
  24. data/app/controllers/archangel/backend/designs_controller.rb +43 -0
  25. data/app/controllers/archangel/backend/entries_controller.rb +25 -40
  26. data/app/controllers/archangel/backend/pages_controller.rb +7 -5
  27. data/app/controllers/archangel/backend/profiles_controller.rb +3 -2
  28. data/app/controllers/archangel/backend/sites_controller.rb +8 -14
  29. data/app/controllers/archangel/backend/users_controller.rb +6 -11
  30. data/app/controllers/archangel/backend/widgets_controller.rb +3 -3
  31. data/app/controllers/archangel/backend_controller.rb +6 -4
  32. data/app/controllers/archangel/frontend/homepages_controller.rb +33 -0
  33. data/app/controllers/archangel/frontend/pages_controller.rb +32 -43
  34. data/app/controllers/archangel/frontend_controller.rb +25 -1
  35. data/app/controllers/concerns/archangel/controllers/authenticatable_concern.rb +19 -0
  36. data/app/controllers/concerns/archangel/controllers/authorizable_concern.rb +19 -0
  37. data/app/controllers/concerns/archangel/controllers/metatagable_concern.rb +45 -0
  38. data/app/controllers/concerns/archangel/controllers/paginatable_concern.rb +43 -0
  39. data/app/controllers/concerns/archangel/controllers/resourceful_concern.rb +63 -26
  40. data/app/controllers/concerns/archangel/controllers/skip_authorizable_concern.rb +19 -0
  41. data/app/controllers/concerns/archangel/controllers/themable_concern.rb +34 -0
  42. data/app/controllers/concerns/archangel/helpers/actionable_concern.rb +76 -0
  43. data/app/helpers/archangel/application_helper.rb +35 -1
  44. data/app/helpers/archangel/backend/metatags_helper.rb +52 -0
  45. data/app/models/archangel/asset.rb +1 -1
  46. data/app/models/archangel/collection.rb +4 -7
  47. data/app/models/archangel/{template.rb → design.rb} +5 -13
  48. data/app/models/archangel/entry.rb +8 -28
  49. data/app/models/archangel/field.rb +1 -1
  50. data/app/models/archangel/page.rb +12 -48
  51. data/app/models/archangel/site.rb +17 -11
  52. data/app/models/archangel/user.rb +14 -7
  53. data/app/models/archangel/widget.rb +4 -4
  54. data/app/models/concerns/archangel/models/entry_validatable_concern.rb +74 -0
  55. data/app/models/concerns/archangel/models/metatagable_concern.rb +22 -0
  56. data/app/models/concerns/archangel/models/publishable_concern.rb +57 -0
  57. data/app/{helpers/archangel/auth_helper.rb → policies/archangel/design_policy.rb} +2 -2
  58. data/app/policies/archangel/site_policy.rb +0 -9
  59. data/app/services/archangel/{template_render_service.rb → design_render_service.rb} +3 -3
  60. data/app/services/archangel/render_service.rb +1 -1
  61. data/app/themes/default/assets/javascripts/default/auth.js +10 -13
  62. data/app/themes/default/assets/javascripts/default/backend.js +16 -37
  63. data/app/themes/default/assets/javascripts/default/backend/archangel.js +25 -0
  64. data/app/themes/default/assets/javascripts/default/backend/entries/sorting.js +37 -0
  65. data/app/themes/default/assets/javascripts/default/backend/misc/metatags.js +16 -0
  66. data/app/themes/default/assets/javascripts/default/common/flash.js +4 -43
  67. data/app/themes/default/assets/javascripts/default/frontend.js +11 -13
  68. data/app/themes/default/assets/stylesheets/default/_theme.scss +13 -0
  69. data/app/themes/default/assets/stylesheets/default/_variables.scss +113 -0
  70. data/app/themes/default/assets/stylesheets/default/auth.css +15 -13
  71. data/app/themes/default/assets/stylesheets/default/auth/_flash.scss +9 -0
  72. data/app/themes/default/assets/stylesheets/default/auth/default.scss +7 -0
  73. data/app/themes/default/assets/stylesheets/default/backend.css +10 -9
  74. data/app/themes/default/assets/stylesheets/default/backend/_entries.scss +25 -0
  75. data/app/themes/default/assets/stylesheets/default/backend/_flash.scss +19 -0
  76. data/app/themes/default/assets/stylesheets/default/backend/_footer.scss +15 -0
  77. data/app/themes/default/assets/stylesheets/default/backend/_global.scss +22 -0
  78. data/app/themes/default/assets/stylesheets/default/backend/_sidebar.scss +60 -0
  79. data/app/themes/default/assets/stylesheets/default/backend/_tables.scss +18 -0
  80. data/app/themes/default/assets/stylesheets/default/backend/_top.scss +25 -0
  81. data/app/themes/default/assets/stylesheets/default/backend/default.scss +16 -0
  82. data/app/themes/default/assets/stylesheets/default/common/_borders.scss +7 -0
  83. data/app/themes/default/assets/stylesheets/default/common/_cards.scss +15 -0
  84. data/app/themes/default/assets/stylesheets/default/common/_forms.scss +5 -0
  85. data/app/themes/default/assets/stylesheets/default/common/_global.scss +8 -0
  86. data/app/themes/default/assets/stylesheets/default/common/_mixins.scss +38 -0
  87. data/app/themes/default/assets/stylesheets/default/common/_navbar.scss +90 -0
  88. data/app/themes/default/assets/stylesheets/default/frontend.css +15 -13
  89. data/app/themes/default/assets/stylesheets/default/frontend/default.scss +5 -0
  90. data/app/themes/default/views/layouts/auth.html.erb +10 -8
  91. data/app/themes/default/views/layouts/backend.html.erb +16 -9
  92. data/app/themes/default/views/layouts/backend/_footer.html.erb +10 -6
  93. data/app/themes/default/views/layouts/backend/_header.html.erb +28 -24
  94. data/app/themes/default/views/layouts/backend/_sidebar.html.erb +65 -45
  95. data/app/themes/default/views/layouts/frontend.html.erb +20 -0
  96. data/app/views/archangel/backend/assets/_asset.html.erb +14 -7
  97. data/app/views/archangel/backend/assets/_buttons.html.erb +7 -5
  98. data/app/views/archangel/backend/assets/_form.html.erb +1 -1
  99. data/app/views/archangel/backend/assets/edit.html.erb +8 -14
  100. data/app/views/archangel/backend/assets/index.html.erb +36 -44
  101. data/app/views/archangel/backend/assets/new.html.erb +8 -14
  102. data/app/views/archangel/backend/assets/show.html.erb +33 -39
  103. data/app/views/archangel/backend/collections/_buttons.html.erb +8 -6
  104. data/app/views/archangel/backend/collections/_collection.html.erb +5 -4
  105. data/app/views/archangel/backend/collections/_form.html.erb +1 -1
  106. data/app/views/archangel/backend/collections/edit.html.erb +8 -14
  107. data/app/views/archangel/backend/collections/index.html.erb +34 -42
  108. data/app/views/archangel/backend/collections/new.html.erb +8 -14
  109. data/app/views/archangel/backend/collections/show.html.erb +21 -27
  110. data/app/views/archangel/backend/dashboards/show.html.erb +7 -17
  111. data/app/views/archangel/backend/designs/_buttons.html.erb +20 -0
  112. data/app/views/archangel/backend/designs/_design.html.erb +11 -0
  113. data/app/views/archangel/backend/{templates → designs}/_form.html.erb +2 -2
  114. data/app/views/archangel/backend/designs/edit.html.erb +15 -0
  115. data/app/views/archangel/backend/designs/index.html.erb +43 -0
  116. data/app/views/archangel/backend/designs/new.html.erb +15 -0
  117. data/app/views/archangel/backend/designs/show.html.erb +23 -0
  118. data/app/views/archangel/backend/entries/_buttons.html.erb +8 -6
  119. data/app/views/archangel/backend/entries/_entry.html.erb +17 -9
  120. data/app/views/archangel/backend/entries/_form.html.erb +6 -11
  121. data/app/views/archangel/backend/entries/edit.html.erb +8 -14
  122. data/app/views/archangel/backend/entries/index.html.erb +39 -47
  123. data/app/views/archangel/backend/entries/new.html.erb +8 -14
  124. data/app/views/archangel/backend/entries/show.html.erb +14 -20
  125. data/app/views/archangel/backend/pages/_buttons.html.erb +7 -5
  126. data/app/views/archangel/backend/pages/_form.html.erb +4 -3
  127. data/app/views/archangel/backend/pages/_metatag_fields.html.erb +3 -3
  128. data/app/views/archangel/backend/pages/_page.html.erb +13 -8
  129. data/app/views/archangel/backend/pages/edit.html.erb +8 -14
  130. data/app/views/archangel/backend/pages/index.html.erb +35 -43
  131. data/app/views/archangel/backend/pages/new.html.erb +8 -14
  132. data/app/views/archangel/backend/pages/show.html.erb +15 -31
  133. data/app/views/archangel/backend/profiles/_buttons.html.erb +7 -2
  134. data/app/views/archangel/backend/profiles/_form.html.erb +4 -2
  135. data/app/views/archangel/backend/profiles/edit.html.erb +8 -14
  136. data/app/views/archangel/backend/profiles/show.html.erb +20 -26
  137. data/app/views/archangel/backend/sites/_buttons.html.erb +2 -2
  138. data/app/views/archangel/backend/sites/_form.html.erb +10 -2
  139. data/app/views/archangel/backend/sites/_metatag_fields.html.erb +3 -3
  140. data/app/views/archangel/backend/sites/edit.html.erb +8 -14
  141. data/app/views/archangel/backend/sites/show.html.erb +22 -28
  142. data/app/views/archangel/backend/users/_buttons.html.erb +7 -5
  143. data/app/views/archangel/backend/users/_form.html.erb +1 -1
  144. data/app/views/archangel/backend/users/_user.html.erb +10 -6
  145. data/app/views/archangel/backend/users/edit.html.erb +8 -14
  146. data/app/views/archangel/backend/users/index.html.erb +35 -43
  147. data/app/views/archangel/backend/users/new.html.erb +8 -14
  148. data/app/views/archangel/backend/users/show.html.erb +16 -27
  149. data/app/views/archangel/backend/widgets/_buttons.html.erb +7 -5
  150. data/app/views/archangel/backend/widgets/_form.html.erb +2 -2
  151. data/app/views/archangel/backend/widgets/_widget.html.erb +5 -4
  152. data/app/views/archangel/backend/widgets/edit.html.erb +8 -14
  153. data/app/views/archangel/backend/widgets/index.html.erb +34 -42
  154. data/app/views/archangel/backend/widgets/new.html.erb +8 -14
  155. data/app/views/archangel/backend/widgets/show.html.erb +20 -31
  156. data/app/views/archangel/frontend/pages/show.json.jbuilder +4 -3
  157. data/app/views/archangel/shared/_flash_messages.html.erb +5 -2
  158. data/app/views/devise/confirmations/new.html.erb +10 -8
  159. data/app/views/devise/invitations/edit.html.erb +17 -0
  160. data/app/views/devise/invitations/new.html.erb +15 -0
  161. data/app/views/devise/mailer/invitation_instructions.html.erb +11 -0
  162. data/app/views/devise/mailer/invitation_instructions.text.erb +11 -0
  163. data/app/views/devise/passwords/edit.html.erb +14 -18
  164. data/app/views/devise/passwords/new.html.erb +8 -8
  165. data/app/views/devise/registrations/edit.html.erb +18 -28
  166. data/app/views/devise/registrations/new.html.erb +19 -31
  167. data/app/views/devise/sessions/new.html.erb +11 -19
  168. data/app/views/devise/shared/_error_messages.html.erb +15 -0
  169. data/app/views/devise/shared/_links.html.erb +19 -35
  170. data/app/views/devise/unlocks/new.html.erb +9 -8
  171. data/archangel.gemspec +12 -14
  172. data/config/initializers/devise.rb +1 -1
  173. data/config/initializers/simple_form.rb +18 -6
  174. data/config/initializers/simple_form_bootstrap.rb +520 -88
  175. data/config/locales/active_record.en.yml +14 -10
  176. data/config/locales/en.yml +10 -43
  177. data/config/locales/simple_form.en.yml +8 -7
  178. data/config/routes.rb +27 -40
  179. data/db/migrate/20190408164034_rename_archangel_pages_path_to_permalink.rb +5 -0
  180. data/db/migrate/20190417194514_add_settings_to_archangel_sites.rb +5 -0
  181. data/db/migrate/20190418150532_rename_archangel_templates_to_archangel_designs.rb +5 -0
  182. data/db/migrate/20190418150533_rename_archangel_pages_template_id_to_design_id.rb +5 -0
  183. data/db/migrate/20190418150534_rename_archangel_widgets_template_id_to_design_id.rb +5 -0
  184. data/db/migrate/20190421165525_rename_archangel_entries_available_at_to_published_at.rb +5 -0
  185. data/db/seeds.rb +41 -46
  186. data/docs/Developers.md +9 -7
  187. data/docs/Extension/Controllers.md +1 -1
  188. data/docs/Extension/Uploaders.md +1 -1
  189. data/lib/archangel.rb +2 -11
  190. data/lib/archangel/commands/base_command.rb +4 -8
  191. data/lib/archangel/commands/extension_command.rb +14 -14
  192. data/lib/archangel/commands/templates/common/Gemfile +24 -0
  193. data/lib/archangel/commands/templates/{extension → common}/Rakefile +1 -1
  194. data/lib/archangel/commands/templates/{extension → common}/bin/rails.tt +0 -0
  195. data/lib/archangel/commands/templates/{extension → common}/lib/%extension_name%.rb.tt +0 -0
  196. data/lib/archangel/commands/templates/{extension → common}/lib/%extension_name%/engine.rb.tt +0 -0
  197. data/lib/archangel/commands/templates/{extension → common}/lib/%extension_name%/version.rb.tt +0 -0
  198. data/lib/archangel/commands/templates/common/spec/rails_helper.rb.tt +0 -4
  199. data/lib/archangel/commands/templates/extension/lib/generators/%extension_name%/install/install_generator.rb.tt +10 -10
  200. data/lib/archangel/commands/templates/theme/README.md +2 -2
  201. data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/config/locales/en.yml.tt +1 -1
  202. data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/views/layouts/frontend.html.erb +20 -0
  203. data/lib/archangel/commands/templates/theme/theme.gemspec.tt +3 -3
  204. data/lib/archangel/commands/theme_command.rb +30 -27
  205. data/lib/archangel/config.rb +1 -2
  206. data/lib/archangel/constants/theme.rb +1 -1
  207. data/lib/archangel/engine.rb +3 -1
  208. data/lib/archangel/i18n.rb +5 -1
  209. data/lib/archangel/liquid/drop.rb +3 -45
  210. data/lib/archangel/liquid/drops/page_drop.rb +4 -4
  211. data/lib/archangel/liquid/drops/site_drop.rb +1 -0
  212. data/lib/archangel/liquid/tags/asset_tag.rb +4 -5
  213. data/lib/archangel/liquid/tags/collection_tag.rb +3 -5
  214. data/lib/archangel/liquid/tags/collectionfor_tag.rb +3 -4
  215. data/lib/archangel/liquid/tags/gist_tag.rb +3 -3
  216. data/lib/archangel/liquid/tags/noembed_tag.rb +1 -1
  217. data/lib/archangel/liquid/tags/vimeo_tag.rb +15 -9
  218. data/lib/archangel/liquid/tags/widget_tag.rb +9 -12
  219. data/lib/archangel/liquid/tags/youtube_tag.rb +44 -30
  220. data/lib/archangel/testing_support/factories/{archangel_templates.rb → archangel_designs.rb} +4 -4
  221. data/lib/archangel/testing_support/factories/archangel_entries.rb +5 -5
  222. data/lib/archangel/testing_support/factories/archangel_pages.rb +3 -3
  223. data/lib/archangel/testing_support/factories/archangel_users.rb +6 -0
  224. data/lib/archangel/testing_support/factories/archangel_widgets.rb +3 -3
  225. data/lib/archangel/testing_support/helpers/authorization_helpers.rb +5 -29
  226. data/lib/archangel/testing_support/helpers/fill_in_auth_form_helpers.rb +34 -0
  227. data/lib/archangel/testing_support/helpers/fill_in_form_helpers.rb +21 -0
  228. data/lib/archangel/testing_support/support/capybara.rb +0 -3
  229. data/lib/archangel/testing_support/support/shoulda.rb +0 -1
  230. data/lib/archangel/version.rb +5 -1
  231. data/lib/generators/archangel/install/install_generator.rb +15 -33
  232. data/lib/generators/archangel/install/templates/config/archangel.yml +0 -5
  233. data/lib/templates/erb/scaffold/_form.html.erb +2 -2
  234. data/package.json +5 -12
  235. data/spec/features/auth/invitation_spec.rb +86 -0
  236. data/spec/features/auth/log_in/attempts_spec.rb +50 -0
  237. data/spec/features/auth/log_in/locked_spec.rb +29 -0
  238. data/spec/features/auth/log_in/log_in_spec.rb +51 -0
  239. data/spec/features/auth/log_in/unconfirmed_spec.rb +22 -0
  240. data/spec/features/auth/log_out_spec.rb +11 -4
  241. data/spec/features/auth/password_reset_spec.rb +28 -0
  242. data/spec/features/auth/registration_spec.rb +28 -16
  243. data/spec/features/backend/assets/create_spec.rb +68 -0
  244. data/spec/features/backend/assets/delete_spec.rb +32 -0
  245. data/spec/features/backend/assets/listing_spec.rb +83 -0
  246. data/spec/features/backend/assets/show_spec.rb +57 -0
  247. data/spec/features/backend/collections/create_spec.rb +97 -0
  248. data/spec/features/backend/collections/delete_spec.rb +32 -0
  249. data/spec/features/backend/collections/listing_spec.rb +93 -0
  250. data/spec/features/backend/collections/show_spec.rb +43 -0
  251. data/spec/features/backend/dashboard/show_spec.rb +17 -0
  252. data/spec/features/backend/designs/create_spec.rb +76 -0
  253. data/spec/features/backend/designs/delete_spec.rb +32 -0
  254. data/spec/features/backend/designs/listing_spec.rb +77 -0
  255. data/spec/features/backend/designs/show_spec.rb +48 -0
  256. data/spec/features/backend/entries/create_spec.rb +98 -0
  257. data/spec/features/backend/entries/delete_spec.rb +35 -0
  258. data/spec/features/backend/entries/listing_sorting_spec.rb +32 -0
  259. data/spec/features/backend/entries/listing_spec.rb +100 -0
  260. data/spec/features/backend/entries/show_spec.rb +62 -0
  261. data/spec/features/backend/pages/create_metatags_spec.rb +59 -0
  262. data/spec/features/backend/pages/create_spec.rb +143 -0
  263. data/spec/features/backend/pages/delete_spec.rb +32 -0
  264. data/spec/features/backend/pages/liquid_tags_spec.rb +159 -0
  265. data/spec/features/backend/pages/listing_spec.rb +75 -0
  266. data/spec/features/backend/pages/show_spec.rb +47 -0
  267. data/spec/features/backend/profile/delete_spec.rb +41 -0
  268. data/spec/features/backend/profile/show_spec.rb +46 -0
  269. data/spec/features/backend/profile/update_spec.rb +144 -0
  270. data/spec/features/backend/site/show_spec.rb +46 -0
  271. data/spec/features/backend/site/update_spec.rb +46 -0
  272. data/spec/features/backend/site/update_with_metatags_spec.rb +45 -0
  273. data/spec/features/backend/users/create_spec.rb +90 -0
  274. data/spec/features/backend/users/delete_spec.rb +32 -0
  275. data/spec/features/backend/users/listing_spec.rb +69 -0
  276. data/spec/features/backend/users/show_spec.rb +87 -0
  277. data/spec/features/backend/users/update_spec.rb +49 -0
  278. data/spec/features/backend/widgets/create_spec.rb +111 -0
  279. data/spec/features/backend/widgets/delete_spec.rb +42 -0
  280. data/spec/features/backend/widgets/listing_spec.rb +89 -0
  281. data/spec/features/backend/widgets/show_spec.rb +47 -0
  282. data/spec/features/frontend/liquid/filters/link_to_spec.rb +49 -0
  283. data/spec/features/frontend/liquid/tags/asset_spec.rb +81 -0
  284. data/spec/features/frontend/liquid/tags/collection_tag_spec.rb +94 -0
  285. data/spec/features/frontend/liquid/tags/collectionfor_tag_spec.rb +159 -0
  286. data/spec/features/frontend/liquid/tags/gist_spec.rb +57 -0
  287. data/spec/features/frontend/liquid/tags/noembed_tag_spec.rb +106 -0
  288. data/spec/features/frontend/liquid/tags/vimeo_spec.rb +79 -0
  289. data/spec/features/frontend/liquid/tags/widget_spec.rb +40 -0
  290. data/spec/features/frontend/liquid/tags/youtube_spec.rb +89 -0
  291. data/spec/features/frontend/liquid/variables/current_page_spec.rb +74 -0
  292. data/spec/features/frontend/liquid/variables/page_spec.rb +58 -0
  293. data/spec/features/frontend/liquid/variables/site_spec.rb +46 -0
  294. data/spec/features/frontend/liquid/variables/unknown_spec.rb +19 -0
  295. data/spec/features/frontend/metatags/default_spec.rb +46 -0
  296. data/spec/features/frontend/metatags/page_spec.rb +58 -0
  297. data/spec/features/frontend/metatags/site_spec.rb +42 -0
  298. data/spec/fixtures/schemas/backend/assets/wysiwyg_error.json +11 -0
  299. data/spec/fixtures/schemas/backend/assets/wysiwyg_url.json +11 -0
  300. data/spec/fixtures/schemas/frontend/errors/not_found.json +11 -0
  301. data/spec/fixtures/schemas/frontend/pages/show.json +25 -0
  302. data/spec/requests/backend/assets_spec.rb +81 -0
  303. data/spec/requests/backend/designs_spec.rb +115 -0
  304. data/spec/requests/backend/entries_spec.rb +32 -0
  305. data/spec/requests/backend/pages_spec.rb +113 -0
  306. data/spec/requests/backend/site_spec.rb +65 -0
  307. data/spec/requests/backend/widgets_spec.rb +109 -0
  308. data/spec/requests/frontend/html/homepage_spec.rb +70 -0
  309. data/spec/requests/frontend/html/nested_page_spec.rb +97 -0
  310. data/spec/requests/frontend/html/page_spec.rb +78 -0
  311. data/spec/requests/frontend/json/homepage_spec.rb +80 -0
  312. data/spec/requests/frontend/json/nested_page_spec.rb +111 -0
  313. data/spec/requests/frontend/json/page_spec.rb +92 -0
  314. data/spec/support/helpers/ajax_helpers.rb +27 -0
  315. data/spec/support/helpers/json_response.rb +18 -0
  316. data/{lib/archangel/testing_support → spec/support}/matchers/have_meta.rb +0 -0
  317. data/{lib/archangel/testing_support → spec/support}/matchers/have_title.rb +0 -0
  318. data/spec/support/matchers/match_response_schema.rb +12 -0
  319. data/spec/support/missing_translation.rb +13 -0
  320. data/spec/support/selenium.rb +26 -0
  321. data/spec/support/timecop.rb +15 -0
  322. data/spec/unit/helpers/archangel/application_helper_spec.rb +65 -0
  323. data/spec/unit/helpers/archangel/flash_helper_spec.rb +41 -0
  324. data/spec/{inputs → unit/inputs}/archangel/date_picker_input_spec.rb +0 -0
  325. data/spec/{inputs → unit/inputs}/archangel/date_time_picker_input_spec.rb +0 -0
  326. data/spec/{inputs → unit/inputs}/archangel/field_classification_input_spec.rb +0 -0
  327. data/spec/{inputs → unit/inputs}/archangel/language_input_spec.rb +0 -0
  328. data/spec/{inputs → unit/inputs}/archangel/meta_keywords_input_spec.rb +0 -0
  329. data/spec/{inputs → unit/inputs}/archangel/role_input_spec.rb +0 -0
  330. data/spec/{inputs → unit/inputs}/archangel/theme_input_spec.rb +0 -0
  331. data/spec/{inputs → unit/inputs}/archangel/time_picker_input_spec.rb +0 -0
  332. data/spec/{inputs → unit/inputs}/archangel/wysiwyg_input_spec.rb +0 -0
  333. data/spec/{jobs → unit/jobs}/archangel/application_job_spec.rb +0 -0
  334. data/spec/{lib → unit/lib}/archangel/commands/extension_command_spec.rb +11 -6
  335. data/spec/{lib → unit/lib}/archangel/commands/theme_command_spec.rb +11 -6
  336. data/spec/{lib → unit/lib}/tasks/archangel/version_task_spec.rb +0 -0
  337. data/spec/{mailers → unit/mailers}/archangel/application_mailer_spec.rb +0 -0
  338. data/spec/{models → unit/models}/archangel/asset_spec.rb +7 -15
  339. data/spec/{models → unit/models}/archangel/collection_spec.rb +3 -16
  340. data/spec/unit/models/archangel/design_spec.rb +22 -0
  341. data/spec/unit/models/archangel/entry_spec.rb +104 -0
  342. data/spec/{models → unit/models}/archangel/field_spec.rb +5 -7
  343. data/spec/{models → unit/models}/archangel/metatag_spec.rb +1 -5
  344. data/spec/{models → unit/models}/archangel/page_spec.rb +46 -44
  345. data/spec/{models → unit/models}/archangel/site_spec.rb +15 -8
  346. data/spec/{models → unit/models}/archangel/user_spec.rb +29 -39
  347. data/spec/{models → unit/models}/archangel/widget_spec.rb +5 -20
  348. data/spec/{policies → unit/policies}/archangel/asset_policy_spec.rb +0 -0
  349. data/spec/{policies → unit/policies}/archangel/collection_policy_spec.rb +0 -0
  350. data/spec/{policies/archangel/template_policy_spec.rb → unit/policies/archangel/design_policy_spec.rb} +2 -2
  351. data/spec/{policies → unit/policies}/archangel/entries_policy_spec.rb +0 -0
  352. data/spec/{policies → unit/policies}/archangel/page_policy_spec.rb +0 -0
  353. data/spec/{policies → unit/policies}/archangel/site_policy_spec.rb +2 -6
  354. data/spec/{policies → unit/policies}/archangel/user_policy_spec.rb +0 -0
  355. data/spec/{policies → unit/policies}/archangel/widget_policy_spec.rb +0 -0
  356. data/spec/unit/services/archangel/design_render_service_spec.rb +46 -0
  357. data/spec/unit/services/archangel/render_service_spec.rb +43 -0
  358. data/spec/{uploaders → unit/uploaders}/archangel/application_uploader_spec.rb +4 -2
  359. data/spec/{uploaders → unit/uploaders}/archangel/asset_uploader_spec.rb +5 -3
  360. data/vendor/assets/javascripts/flatpickr/flatpickr.js +2 -0
  361. data/vendor/assets/javascripts/jodit/jodit.js +9 -0
  362. data/vendor/assets/javascripts/select2/select2.js +5891 -0
  363. data/vendor/assets/javascripts/sortable/sortable.js +2 -2
  364. data/vendor/assets/stylesheets/flatpickr/flatpickr.css +13 -0
  365. data/vendor/assets/stylesheets/jodit/jodit.css +296 -0
  366. data/vendor/assets/stylesheets/select2/select2.css +480 -0
  367. metadata +227 -322
  368. data/.editorconfig +0 -19
  369. data/.hound.yml +0 -21
  370. data/.jshintignore +0 -5
  371. data/.jshintrc +0 -30
  372. data/.rubocop_todo.yml +0 -3
  373. data/.scss-lint.yml +0 -22
  374. data/app/assets/javascripts/archangel/object/translate/datetimepicker.js.erb +0 -41
  375. data/app/assets/javascripts/archangel/object/translate/sortable.js.erb +0 -10
  376. data/app/assets/javascripts/archangel/sortable.js +0 -72
  377. data/app/controllers/archangel/backend/templates_controller.rb +0 -43
  378. data/app/controllers/concerns/archangel/actionable_concern.rb +0 -161
  379. data/app/controllers/concerns/archangel/authenticatable_concern.rb +0 -14
  380. data/app/controllers/concerns/archangel/authorizable_concern.rb +0 -14
  381. data/app/controllers/concerns/archangel/controllers/backend/resourceful_concern.rb +0 -28
  382. data/app/controllers/concerns/archangel/paginatable_concern.rb +0 -36
  383. data/app/controllers/concerns/archangel/seoable_concern.rb +0 -40
  384. data/app/controllers/concerns/archangel/skip_authorizable_concern.rb +0 -14
  385. data/app/controllers/concerns/archangel/themable_concern.rb +0 -27
  386. data/app/helpers/archangel/backend/assets_helper.rb +0 -14
  387. data/app/helpers/archangel/backend/collections_helper.rb +0 -14
  388. data/app/helpers/archangel/backend/dashboards_helper.rb +0 -14
  389. data/app/helpers/archangel/backend/entries_helper.rb +0 -14
  390. data/app/helpers/archangel/backend/pages_helper.rb +0 -14
  391. data/app/helpers/archangel/backend/sites_helper.rb +0 -14
  392. data/app/helpers/archangel/backend/templates_helper.rb +0 -14
  393. data/app/helpers/archangel/backend/users_helper.rb +0 -14
  394. data/app/helpers/archangel/backend/widgets_helper.rb +0 -14
  395. data/app/helpers/archangel/backend_helper.rb +0 -9
  396. data/app/helpers/archangel/frontend/pages_helper.rb +0 -14
  397. data/app/helpers/archangel/frontend_helper.rb +0 -9
  398. data/app/policies/archangel/template_policy.rb +0 -9
  399. data/app/themes/default/assets/javascripts/default/backend/core.js +0 -76
  400. data/app/themes/default/assets/javascripts/default/backend/templates.js +0 -26
  401. data/app/themes/default/assets/javascripts/default/common/cards.js +0 -28
  402. data/app/themes/default/assets/stylesheets/default/auth/core.scss +0 -20
  403. data/app/themes/default/assets/stylesheets/default/backend/bootstrap/_tables.scss +0 -40
  404. data/app/themes/default/assets/stylesheets/default/backend/core.scss +0 -23
  405. data/app/themes/default/assets/stylesheets/default/common/_bootstrap.scss +0 -49
  406. data/app/themes/default/assets/stylesheets/default/common/_selectize.scss +0 -348
  407. data/app/themes/default/assets/stylesheets/default/common/_variables.scss +0 -82
  408. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_animate.scss +0 -27
  409. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_aside.scss +0 -67
  410. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_avatars.scss +0 -42
  411. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_badge.scss +0 -3
  412. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_breadcrumb-menu.scss +0 -36
  413. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_breadcrumb.scss +0 -4
  414. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_buttons.scss +0 -408
  415. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_callout.scss +0 -58
  416. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_card.scss +0 -199
  417. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_charts.scss +0 -9
  418. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_dropdown-menu-right.scss +0 -8
  419. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_dropdown.scss +0 -70
  420. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_footer.scss +0 -9
  421. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_forms.scss +0 -4
  422. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_grid.scss +0 -15
  423. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_input-group.scss +0 -5
  424. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_layout.scss +0 -390
  425. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_loading.scss +0 -128
  426. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_mixins.scss +0 -1
  427. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_mobile.scss +0 -0
  428. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_modal.scss +0 -12
  429. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_nav.scss +0 -39
  430. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_navbar.scss +0 -122
  431. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_others.scss +0 -4
  432. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_progress.scss +0 -15
  433. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_rtl.scss +0 -287
  434. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_sidebar.scss +0 -462
  435. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_switches.scss +0 -286
  436. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_tables.scss +0 -20
  437. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_temp.scss +0 -39
  438. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_typography.scss +0 -36
  439. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_utilities.scss +0 -3
  440. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_variables.scss +0 -208
  441. data/app/themes/default/assets/stylesheets/default/common/bootstrap/_widgets.scss +0 -251
  442. data/app/themes/default/assets/stylesheets/default/common/bootstrap/mixins/_all.scss +0 -117
  443. data/app/themes/default/assets/stylesheets/default/common/bootstrap/utilities/_background.scss +0 -20
  444. data/app/themes/default/assets/stylesheets/default/common/bootstrap/utilities/_borders.scss +0 -17
  445. data/app/themes/default/assets/stylesheets/default/common/bootstrap/utilities/_display.scss +0 -14
  446. data/app/themes/default/assets/stylesheets/default/frontend/core.scss +0 -20
  447. data/app/themes/default/views/layouts/frontend.liquid +0 -22
  448. data/app/views/archangel/backend/dashboards/_buttons.html.erb +0 -3
  449. data/app/views/archangel/backend/sites/_additional_colors.html.erb +0 -49
  450. data/app/views/archangel/backend/sites/_alerts.html.erb +0 -130
  451. data/app/views/archangel/backend/sites/_badge.html.erb +0 -99
  452. data/app/views/archangel/backend/sites/_button.html.erb +0 -243
  453. data/app/views/archangel/backend/sites/_buttons_group.html.erb +0 -230
  454. data/app/views/archangel/backend/sites/_cards.html.erb +0 -441
  455. data/app/views/archangel/backend/sites/_carousel.html.erb +0 -159
  456. data/app/views/archangel/backend/sites/_colors.html.erb +0 -41
  457. data/app/views/archangel/backend/sites/_display_headings.html.erb +0 -41
  458. data/app/views/archangel/backend/sites/_dl.html.erb +0 -38
  459. data/app/views/archangel/backend/sites/_dropdowns.html.erb +0 -475
  460. data/app/views/archangel/backend/sites/_forms.html.erb +0 -1176
  461. data/app/views/archangel/backend/sites/_grays.html.erb +0 -21
  462. data/app/views/archangel/backend/sites/_headings.html.erb +0 -21
  463. data/app/views/archangel/backend/sites/_inline_text.html.erb +0 -45
  464. data/app/views/archangel/backend/sites/_jumbotron.html.erb +0 -45
  465. data/app/views/archangel/backend/sites/_list_group.html.erb +0 -254
  466. data/app/views/archangel/backend/sites/_modals.html.erb +0 -41
  467. data/app/views/archangel/backend/sites/_navs.html.erb +0 -389
  468. data/app/views/archangel/backend/sites/_pagination.html.erb +0 -160
  469. data/app/views/archangel/backend/sites/_social_buttons.html.erb +0 -746
  470. data/app/views/archangel/backend/sites/_tables.html.erb +0 -372
  471. data/app/views/archangel/backend/sites/sample.html.erb +0 -38
  472. data/app/views/archangel/backend/templates/_buttons.html.erb +0 -18
  473. data/app/views/archangel/backend/templates/_template.html.erb +0 -10
  474. data/app/views/archangel/backend/templates/edit.html.erb +0 -21
  475. data/app/views/archangel/backend/templates/index.html.erb +0 -49
  476. data/app/views/archangel/backend/templates/new.html.erb +0 -21
  477. data/app/views/archangel/backend/templates/show.html.erb +0 -34
  478. data/config/initializers/liquid.rb +0 -4
  479. data/lib/archangel/commands/templates/common/.editorconfig +0 -19
  480. data/lib/archangel/commands/templates/common/.rubocop.yml +0 -32
  481. data/lib/archangel/commands/templates/extension/Gemfile +0 -27
  482. data/lib/archangel/commands/templates/extension/app/assets/javascripts/archangel/auth/%extension_name%.js.tt +0 -3
  483. data/lib/archangel/commands/templates/extension/app/assets/javascripts/archangel/backend/%extension_name%.js.tt +0 -3
  484. data/lib/archangel/commands/templates/extension/app/assets/javascripts/archangel/frontend/%extension_name%.js.tt +0 -3
  485. data/lib/archangel/commands/templates/extension/app/assets/stylesheets/archangel/auth/%extension_name%.css.tt +0 -5
  486. data/lib/archangel/commands/templates/extension/app/assets/stylesheets/archangel/backend/%extension_name%.css.tt +0 -5
  487. data/lib/archangel/commands/templates/extension/app/assets/stylesheets/archangel/frontend/%extension_name%.css.tt +0 -5
  488. data/lib/archangel/commands/templates/theme/Gemfile +0 -27
  489. data/lib/archangel/commands/templates/theme/Rakefile +0 -29
  490. data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/assets/javascripts/%theme_base_name%/auth.js +0 -2
  491. data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/assets/javascripts/%theme_base_name%/backend.js +0 -2
  492. data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/assets/stylesheets/%theme_base_name%/auth.css +0 -4
  493. data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/assets/stylesheets/%theme_base_name%/backend.css +0 -4
  494. data/lib/archangel/commands/templates/theme/app/themes/%theme_base_name%/views/layouts/frontend.liquid +0 -18
  495. data/lib/archangel/commands/templates/theme/bin/rails.tt +0 -11
  496. data/lib/archangel/commands/templates/theme/lib/%theme_name%.rb.tt +0 -9
  497. data/lib/archangel/commands/templates/theme/lib/%theme_name%/engine.rb.tt +0 -29
  498. data/lib/archangel/commands/templates/theme/lib/%theme_name%/version.rb.tt +0 -5
  499. data/lib/archangel/liquid/tags/csrf_meta_tags_tag.rb +0 -29
  500. data/lib/archangel/liquid/tags/locale_tag.rb +0 -28
  501. data/lib/archangel/liquid/tags/meta_tags_tag.rb +0 -31
  502. data/lib/archangel/liquid/tags/text_direction_tag.rb +0 -29
  503. data/lib/archangel/liquid/tags/theme_javascript_tag.rb +0 -31
  504. data/lib/archangel/liquid/tags/theme_stylesheet_tag.rb +0 -31
  505. data/lib/archangel/liquid_view.rb +0 -68
  506. data/lib/archangel/testing_support/context/view_controller_context.rb +0 -55
  507. data/lib/archangel/testing_support/helpers/controller_helpers.rb +0 -20
  508. data/lib/archangel/testing_support/helpers/form_helpers.rb +0 -18
  509. data/lib/archangel/testing_support/helpers/routing_helpers.rb +0 -22
  510. data/lib/archangel/testing_support/support/controller.rb +0 -11
  511. data/lib/archangel/testing_support/support/liquid_filters.rb +0 -23
  512. data/lib/archangel/testing_support/support/liquid_tags.rb +0 -23
  513. data/lib/archangel/testing_support/support/verify_partial_doubles.rb +0 -21
  514. data/spec/controllers/archangel/application_controller_spec.rb +0 -183
  515. data/spec/controllers/archangel/auth/registrations_controller_spec.rb +0 -10
  516. data/spec/controllers/archangel/auth_controller_spec.rb +0 -8
  517. data/spec/controllers/archangel/backend/assets_controller_spec.rb +0 -226
  518. data/spec/controllers/archangel/backend/collections_controller_spec.rb +0 -252
  519. data/spec/controllers/archangel/backend/dashboards_controller_spec.rb +0 -27
  520. data/spec/controllers/archangel/backend/entries_controller_spec.rb +0 -273
  521. data/spec/controllers/archangel/backend/pages_controller_spec.rb +0 -220
  522. data/spec/controllers/archangel/backend/profiles_controller_spec.rb +0 -115
  523. data/spec/controllers/archangel/backend/sites_controller_spec.rb +0 -121
  524. data/spec/controllers/archangel/backend/templates_controller_spec.rb +0 -190
  525. data/spec/controllers/archangel/backend/users_controller_spec.rb +0 -181
  526. data/spec/controllers/archangel/backend/widgets_controller_spec.rb +0 -190
  527. data/spec/controllers/archangel/backend_controller_spec.rb +0 -8
  528. data/spec/controllers/archangel/frontend/pages_controller_spec.rb +0 -51
  529. data/spec/controllers/archangel/frontend_controller_spec.rb +0 -8
  530. data/spec/controllers/concerns/archangel/controllers/backend/resourceful_concern_spec.rb +0 -90
  531. data/spec/features/auth/log_in_spec.rb +0 -126
  532. data/spec/features/backend/pages/duplicate_slugs_spec.rb +0 -41
  533. data/spec/features/frontend/liquid_drop_variables_spec.rb +0 -133
  534. data/spec/features/frontend/pages/homepage_redirect_spec.rb +0 -15
  535. data/spec/features/frontend/pages/metatags_spec.rb +0 -73
  536. data/spec/helpers/archangel/application_helper_spec.rb +0 -30
  537. data/spec/helpers/archangel/auth_helper_spec.rb +0 -8
  538. data/spec/helpers/archangel/backend/assets_helper_spec.rb +0 -10
  539. data/spec/helpers/archangel/backend/collections_helper_spec.rb +0 -10
  540. data/spec/helpers/archangel/backend/dashboards_helper_spec.rb +0 -10
  541. data/spec/helpers/archangel/backend/entries_helper_spec.rb +0 -10
  542. data/spec/helpers/archangel/backend/pages_helper_spec.rb +0 -10
  543. data/spec/helpers/archangel/backend/sites_helper_spec.rb +0 -10
  544. data/spec/helpers/archangel/backend/templates_helper_spec.rb +0 -10
  545. data/spec/helpers/archangel/backend/users_helper_spec.rb +0 -10
  546. data/spec/helpers/archangel/backend/widgets_helper_spec.rb +0 -10
  547. data/spec/helpers/archangel/backend_helper_spec.rb +0 -8
  548. data/spec/helpers/archangel/flash_helper_spec.rb +0 -47
  549. data/spec/helpers/archangel/frontend/pages_helper_spec.rb +0 -10
  550. data/spec/helpers/archangel/frontend_helper_spec.rb +0 -8
  551. data/spec/lib/archangel/liquid/drop_spec.rb +0 -10
  552. data/spec/lib/archangel/liquid/drops/page_drop_spec.rb +0 -69
  553. data/spec/lib/archangel/liquid/drops/site_drop_spec.rb +0 -63
  554. data/spec/lib/archangel/liquid/filters/link_to_filter_spec.rb +0 -59
  555. data/spec/lib/archangel/liquid/tags/application_tag_spec.rb +0 -12
  556. data/spec/lib/archangel/liquid/tags/asset_tag_spec.rb +0 -91
  557. data/spec/lib/archangel/liquid/tags/collection_tag_spec.rb +0 -104
  558. data/spec/lib/archangel/liquid/tags/collectionfor_tag_spec.rb +0 -163
  559. data/spec/lib/archangel/liquid/tags/csrf_meta_tags_tag_spec.rb +0 -33
  560. data/spec/lib/archangel/liquid/tags/gist_tag_spec.rb +0 -42
  561. data/spec/lib/archangel/liquid/tags/locale_tag_spec.rb +0 -22
  562. data/spec/lib/archangel/liquid/tags/meta_tags_tag_spec.rb +0 -24
  563. data/spec/lib/archangel/liquid/tags/noembed_tag_spec.rb +0 -76
  564. data/spec/lib/archangel/liquid/tags/text_direction_tag_spec.rb +0 -32
  565. data/spec/lib/archangel/liquid/tags/theme_javascript_tag_spec.rb +0 -26
  566. data/spec/lib/archangel/liquid/tags/theme_stylesheet_tag_spec.rb +0 -28
  567. data/spec/lib/archangel/liquid/tags/vimeo_tag_spec.rb +0 -39
  568. data/spec/lib/archangel/liquid/tags/widget_tag_spec.rb +0 -59
  569. data/spec/lib/archangel/liquid/tags/youtube_tag_spec.rb +0 -39
  570. data/spec/models/archangel/entry_spec.rb +0 -62
  571. data/spec/models/archangel/template_spec.rb +0 -45
  572. data/spec/policies/archangel/application_policy_spec.rb +0 -8
  573. data/spec/services/archangel/render_service_spec.rb +0 -37
  574. data/spec/services/archangel/template_render_service_spec.rb +0 -42
  575. data/spec/support/.keep +0 -0
  576. data/spec/uploaders/archangel/avatar_uploader_spec.rb +0 -50
  577. data/spec/uploaders/archangel/logo_uploader_spec.rb +0 -50
  578. data/vendor/assets/icons/trumbowyg/icons.svg +0 -1
  579. data/vendor/assets/javascripts/daterangepicker/daterangepicker.js +0 -1529
  580. data/vendor/assets/javascripts/trumbowyg/plugins/allowtagsfrompaste/trumbowyg.allowtagsfrompaste.js +0 -143
  581. data/vendor/assets/javascripts/trumbowyg/plugins/base64/trumbowyg.base64.js +0 -129
  582. data/vendor/assets/javascripts/trumbowyg/plugins/cleanpaste/trumbowyg.cleanpaste.js +0 -110
  583. data/vendor/assets/javascripts/trumbowyg/plugins/colors/trumbowyg.colors.js +0 -183
  584. data/vendor/assets/javascripts/trumbowyg/plugins/noembed/trumbowyg.noembed.js +0 -104
  585. data/vendor/assets/javascripts/trumbowyg/plugins/upload/trumbowyg.upload.js +0 -261
  586. data/vendor/assets/javascripts/trumbowyg/trumbowyg.js +0 -1765
  587. data/vendor/assets/stylesheets/daterangepicker/_daterangepicker.scss +0 -405
  588. data/vendor/assets/stylesheets/trumbowyg/_trumbowyg.scss +0 -831
  589. data/vendor/assets/stylesheets/trumbowyg/plugins/colors/_trumbowyg.colors.scss +0 -38
@@ -1,41 +1,25 @@
1
- <ul class="list-inline text-center">
2
- <%- if controller_name != "sessions" %>
3
- <li class="list-inline-item">
4
- <%= link_to("Log in", new_session_path(resource_name), class: "nav-link") %>
5
- </li>
6
- <% end -%>
1
+ <%- if controller_name != 'sessions' %>
2
+ <%= link_to "Log in", new_session_path(resource_name) %><br />
3
+ <% end %>
7
4
 
8
- <%- if Archangel.config.allow_registration && devise_mapping.registerable? && controller_name != "registrations" %>
9
- <li class="list-inline-item">
10
- <%= link_to("Sign up", new_registration_path(resource_name), class: "nav-link") %>
11
- </li>
12
- <% end -%>
5
+ <%- if current_site.allow_registration? && devise_mapping.registerable? && controller_name != 'registrations' %>
6
+ <%= link_to "Sign up", new_registration_path(resource_name) %><br />
7
+ <% end %>
13
8
 
14
- <%- if devise_mapping.recoverable? && controller_name != "passwords" && controller_name != "registrations" %>
15
- <li class="list-inline-item">
16
- <%= link_to("Forgot your password?", new_password_path(resource_name), class: "nav-link") %>
17
- </li>
18
- <% end -%>
9
+ <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
10
+ <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
11
+ <% end %>
19
12
 
20
- <%- if devise_mapping.confirmable? && controller_name != "confirmations" %>
21
- <li class="list-inline-item">
22
- <%= link_to("Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "nav-link") %>
23
- </li>
24
- <% end -%>
13
+ <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
14
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
15
+ <% end %>
25
16
 
26
- <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != "unlocks" %>
27
- <li class="list-inline-item">
28
- <%= link_to("Didn't receive unlock instructions?", new_unlock_path(resource_name), class: "nav-link") %>
29
- </li>
30
- <% end -%>
31
- </ul>
17
+ <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
18
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
19
+ <% end %>
32
20
 
33
21
  <%- if devise_mapping.omniauthable? %>
34
- <ul class="nav justify-content-center">
35
- <%- resource_class.omniauth_providers.each do |provider| %>
36
- <li class="list-inline-item">
37
- <%= link_to("Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), class: "nav-link") %>
38
- </li>
39
- <% end -%>
40
- </ul>
41
- <% end -%>
22
+ <%- resource_class.omniauth_providers.each do |provider| %>
23
+ <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
24
+ <% end %>
25
+ <% end %>
@@ -1,17 +1,18 @@
1
1
  <h2>Resend unlock instructions</h2>
2
2
 
3
- <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
4
- <%= devise_error_messages! %>
3
+ <%= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
4
+ <%= f.error_notification %>
5
+ <%= f.full_error :unlock_token %>
5
6
 
6
7
  <div class="form-inputs">
7
- <div class="form-group string required email">
8
- <%= f.label :email, class: "control-label string email required" %>
9
- <%= f.email_field :email, autofocus: true, class: "form-control string email required" %>
10
- </div>
8
+ <%= f.input :email,
9
+ required: true,
10
+ autofocus: true,
11
+ input_html: { autocomplete: "email" } %>
11
12
  </div>
12
13
 
13
- <div class="form-actions text-right">
14
- <%= f.submit "Resend unlock instructions", class: "btn btn-default" %>
14
+ <div class="form-actions">
15
+ <%= f.button :submit, "Resend unlock instructions", class: "btn btn-primary" %>
15
16
  </div>
16
17
  <% end %>
17
18
 
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
25
25
  s.files = `git ls-files -z`.split("\x0")
26
26
  s.executables = ["archangel"]
27
27
 
28
- s.required_ruby_version = ">= 2.2.10"
28
+ s.required_ruby_version = ">= 2.4"
29
29
 
30
30
  s.add_dependency "jquery-rails", "~> 4.1", ">= 4.1.0"
31
31
  s.add_dependency "rails", "~> 5.1", ">= 5.1.4"
@@ -33,28 +33,26 @@ Gem::Specification.new do |s|
33
33
 
34
34
  s.add_dependency "activerecord-typedstore", "~> 1.2"
35
35
  s.add_dependency "acts_as_list", "~> 0.9"
36
- s.add_dependency "acts_as_tree", "~> 2.8"
36
+ s.add_dependency "acts_as_tree", "~> 2.9"
37
37
  s.add_dependency "anyway_config", "~> 1.4"
38
- s.add_dependency "bootstrap", "~> 4.1"
39
- s.add_dependency "carrierwave", "~> 1.2"
38
+ s.add_dependency "bootstrap", "~> 4.3"
39
+ s.add_dependency "carrierwave", "~> 1.3"
40
40
  s.add_dependency "cocoon", "~> 1.2"
41
41
  s.add_dependency "date_validator", "~> 0.9"
42
- s.add_dependency "devise", "~> 4.5"
43
- s.add_dependency "devise_invitable", "~> 1.7"
42
+ s.add_dependency "devise", "~> 4.6"
43
+ s.add_dependency "devise_invitable", "~> 2.0"
44
44
  s.add_dependency "file_validators", "~> 2.3"
45
- s.add_dependency "font-awesome-rails", "~> 4.7"
45
+ s.add_dependency "font-awesome-sass", "~> 5.9"
46
46
  s.add_dependency "highline", "~> 2.0"
47
- s.add_dependency "jbuilder", "~> 2.7"
47
+ s.add_dependency "jbuilder", "~> 2.9"
48
48
  s.add_dependency "kaminari", "~> 1.1"
49
49
  s.add_dependency "liquid", "~> 4.0"
50
- s.add_dependency "meta-tags", "~> 2.10"
50
+ s.add_dependency "meta-tags", "~> 2.11"
51
51
  s.add_dependency "mini_magick", "~> 4.9"
52
- s.add_dependency "momentjs-rails", "~> 2.20"
53
52
  s.add_dependency "paranoia", "~> 2.4"
54
- s.add_dependency "popper_js", "~> 1.14"
55
53
  s.add_dependency "pundit", "~> 2.0"
56
- s.add_dependency "responders", "~> 2.4"
57
- s.add_dependency "selectize-rails", "~> 0.12"
58
- s.add_dependency "simple_form", "~> 4.0"
54
+ s.add_dependency "responders", "~> 3.0"
55
+ s.add_dependency "sass-rails", "~> 5.0"
56
+ s.add_dependency "simple_form", "~> 4.1"
59
57
  s.add_dependency "validates", "~> 1.0"
60
58
  end
@@ -146,7 +146,7 @@ Devise.setup do |config|
146
146
 
147
147
  # Flag that force a record to be valid before being actually invited
148
148
  # Default: false
149
- # config.validate_on_invite = true
149
+ config.validate_on_invite = true
150
150
 
151
151
  # Resend invitation if user with invited status is invited again
152
152
  # Default: true
@@ -1,5 +1,12 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ # Uncomment this and change the path if necessary to include your own
4
+ # components.
5
+ # See https://github.com/plataformatec/simple_form#custom-components to know
6
+ # more about custom components.
7
+ # Dir[Rails.root.join("lib/components/**/*.rb")].each { |f| require f }
8
+ #
9
+ # Use this setup block to configure all options available in SimpleForm.
3
10
  SimpleForm.setup do |config|
4
11
  # Wrappers are used by the form builder to generate a
5
12
  # complete input. You can remove any component from the
@@ -8,7 +15,8 @@ SimpleForm.setup do |config|
8
15
  # whole input.
9
16
  config.wrappers :default, class: :input,
10
17
  hint_class: :field_with_hint,
11
- error_class: :field_with_errors do |b|
18
+ error_class: :field_with_errors,
19
+ valid_class: :field_without_errors do |b|
12
20
  ## Extensions enabled by default
13
21
  # Any of these extensions can be disabled for a
14
22
  # given input by passing: `f.input EXTENSION_NAME => false`.
@@ -46,6 +54,9 @@ SimpleForm.setup do |config|
46
54
  b.optional :readonly
47
55
 
48
56
  ## Inputs
57
+ # b.use :input, class: "input",
58
+ # error_class: "is-invalid",
59
+ # valid_class: "is-valid"
49
60
  b.use :label_input
50
61
  b.use :hint, wrap_with: { tag: :span, class: :hint }
51
62
  b.use :error, wrap_with: { tag: :span, class: :error }
@@ -80,9 +91,6 @@ SimpleForm.setup do |config|
80
91
  # CSS class to add for error notification helper.
81
92
  config.error_notification_class = "error_notification"
82
93
 
83
- # ID to add for error notification helper.
84
- # config.error_notification_id = nil
85
-
86
94
  # Series of attempts to detect a default label method for collection.
87
95
  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
88
96
 
@@ -131,7 +139,7 @@ SimpleForm.setup do |config|
131
139
  config.browser_validations = false
132
140
 
133
141
  # Collection of methods to detect if a file type was given.
134
- # config.file_methods = [ :mounted_as, :file?, :public_filename ]
142
+ # config.file_methods = [ :mounted_as, :file?, :public_filename, :attached? ]
135
143
 
136
144
  # Custom mappings for input types. This should be a hash containing a regexp
137
145
  # to match as key, and the input type that will be used when the field name
@@ -173,5 +181,9 @@ SimpleForm.setup do |config|
173
181
  # config.include_default_input_wrapper_class = true
174
182
 
175
183
  # Defines which i18n scope will be used in Simple Form.
176
- # config.i18n_scope = 'simple_form'
184
+ # config.i18n_scope = "simple_form"
185
+
186
+ # Defines validation classes to the input_field. By default it's nil.
187
+ # config.input_field_valid_class = "is-valid"
188
+ # config.input_field_error_class = "is-invalid"
177
189
  end
@@ -1,12 +1,46 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  SimpleForm.setup do |config|
4
+ # Default class for buttons
5
+ config.button_class = "btn"
6
+
7
+ # Define the default class of the input wrapper of the boolean input.
8
+ config.boolean_label_class = "form-check-label"
9
+
10
+ # How the label text should be generated altogether with the required text.
11
+ config.label_text = lambda do |label, required, _explicit_label|
12
+ "#{label} #{required}"
13
+ end
14
+
15
+ # Define the way to render check boxes / radio buttons with labels.
16
+ config.boolean_style = :inline
17
+
18
+ # You can wrap each item in a collection of radio/check boxes with a tag
19
+ config.item_wrapper_tag = :div
20
+
21
+ # Defines if the default input wrapper class should be included in radio
22
+ # collection wrappers.
23
+ config.include_default_input_wrapper_class = false
24
+
25
+ # CSS class to add for error notification helper.
4
26
  config.error_notification_class = "alert alert-danger"
5
- config.button_class = "btn btn-primary"
6
27
 
28
+ # Method used to tidy up errors. Specify any Rails Array method.
29
+ # :first lists the first message for each field.
30
+ # :to_sentence to list all errors for each field.
31
+ config.error_method = :to_sentence
32
+
33
+ # add validation classes to `input_field`
34
+ config.input_field_error_class = "is-invalid"
35
+ config.input_field_valid_class = "is-valid"
36
+
37
+ # vertical forms
38
+ #
39
+ # vertical default_wrapper
7
40
  config.wrappers :vertical_form, tag: "div",
8
41
  class: "form-group",
9
- error_class: "has-error" do |b|
42
+ error_class: "form-group-invalid",
43
+ valid_class: "form-group-valid" do |b|
10
44
  b.use :html5
11
45
  b.use :placeholder
12
46
  b.optional :maxlength
@@ -14,57 +48,145 @@ SimpleForm.setup do |config|
14
48
  b.optional :pattern
15
49
  b.optional :min_max
16
50
  b.optional :readonly
17
- b.use :label, class: "control-label"
51
+ b.use :label, class: "form-control-label"
52
+ b.use :input, class: "form-control",
53
+ error_class: "is-invalid",
54
+ valid_class: "is-valid"
55
+ b.use :full_error, wrap_with: { tag: "div", class: "invalid-feedback" }
56
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
57
+ end
18
58
 
19
- b.use :input, class: "form-control"
20
- b.use :error, wrap_with: { tag: "span", class: "help-block" }
21
- b.use :hint, wrap_with: { tag: "p", class: "help-block" }
59
+ # vertical input for boolean
60
+ config.wrappers :vertical_boolean, tag: "fieldset",
61
+ class: "form-group",
62
+ error_class: "form-group-invalid",
63
+ valid_class: "form-group-valid" do |b|
64
+ b.use :html5
65
+ b.optional :readonly
66
+ b.wrapper :form_check_wrapper, tag: "div",
67
+ class: "form-check" do |bb|
68
+ bb.use :input, class: "form-check-input",
69
+ error_class: "is-invalid",
70
+ valid_class: "is-valid"
71
+ bb.use :label, class: "form-check-label"
72
+ bb.use :full_error, wrap_with: { tag: "div", class: "invalid-feedback" }
73
+ bb.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
74
+ end
22
75
  end
23
76
 
24
- config.wrappers :vertical_file_input, tag: "div",
77
+ # vertical input for radio buttons and check boxes
78
+ config.wrappers :vertical_collection, item_wrapper_class: "form-check",
79
+ tag: "fieldset",
25
80
  class: "form-group",
26
- error_class: "has-error" do |b|
81
+ error_class: "form-group-invalid",
82
+ valid_class: "form-group-valid" do |b|
83
+ b.use :html5
84
+ b.optional :readonly
85
+ b.wrapper :legend_tag, tag: "legend", class: "col-form-label pt-0" do |ba|
86
+ ba.use :label_text
87
+ end
88
+ b.use :input, class: "form-check-input",
89
+ error_class: "is-invalid",
90
+ valid_class: "is-valid"
91
+ b.use :full_error, wrap_with: {
92
+ tag: "div",
93
+ class: "invalid-feedback d-block"
94
+ }
95
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
96
+ end
97
+
98
+ # vertical input for inline radio buttons and check boxes
99
+ config.wrappers :vertical_collection_inline,
100
+ item_wrapper_class: "form-check form-check-inline",
101
+ tag: "fieldset",
102
+ class: "form-group",
103
+ error_class: "form-group-invalid",
104
+ valid_class: "form-group-valid" do |b|
105
+ b.use :html5
106
+ b.optional :readonly
107
+ b.wrapper :legend_tag, tag: "legend", class: "col-form-label pt-0" do |ba|
108
+ ba.use :label_text
109
+ end
110
+ b.use :input, class: "form-check-input",
111
+ error_class: "is-invalid",
112
+ valid_class: "is-valid"
113
+ b.use :full_error, wrap_with: {
114
+ tag: "div",
115
+ class: "invalid-feedback d-block"
116
+ }
117
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
118
+ end
119
+
120
+ # vertical file input
121
+ config.wrappers :vertical_file, tag: "div",
122
+ class: "form-group",
123
+ error_class: "form-group-invalid",
124
+ valid_class: "form-group-valid" do |b|
27
125
  b.use :html5
28
126
  b.use :placeholder
29
127
  b.optional :maxlength
30
128
  b.optional :minlength
31
129
  b.optional :readonly
32
- b.use :label, class: "control-label"
33
-
34
- b.use :input
35
- b.use :error, wrap_with: { tag: "span", class: "help-block" }
36
- b.use :hint, wrap_with: { tag: "p", class: "help-block" }
130
+ b.use :label
131
+ b.use :input, class: "form-control-file",
132
+ error_class: "is-invalid",
133
+ valid_class: "is-valid"
134
+ b.use :full_error, wrap_with: {
135
+ tag: "div",
136
+ class: "invalid-feedback d-block"
137
+ }
138
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
37
139
  end
38
140
 
39
- config.wrappers :vertical_boolean, tag: "div",
40
- class: "form-group",
41
- error_class: "has-error" do |b|
141
+ # vertical multi select
142
+ config.wrappers :vertical_multi_select, tag: "div",
143
+ class: "form-group",
144
+ error_class: "form-group-invalid",
145
+ valid_class: "form-group-valid" do |b|
42
146
  b.use :html5
43
147
  b.optional :readonly
44
-
45
- b.wrapper tag: "div", class: "checkbox" do |ba|
46
- ba.use :label_input
148
+ b.use :label, class: "form-control-label"
149
+ b.wrapper tag: "div",
150
+ class: "d-flex flex-row justify-content-between
151
+ align-items-center" do |ba|
152
+ ba.use :input, class: "form-control mx-1",
153
+ error_class: "is-invalid",
154
+ valid_class: "is-valid"
47
155
  end
48
-
49
- b.use :error, wrap_with: { tag: "span", class: "help-block" }
50
- b.use :hint, wrap_with: { tag: "p", class: "help-block" }
156
+ b.use :full_error, wrap_with: {
157
+ tag: "div",
158
+ class: "invalid-feedback d-block"
159
+ }
160
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
51
161
  end
52
162
 
53
- config.wrappers :vertical_radio_and_checkboxes,
54
- tag: "div",
55
- class: "form-group",
56
- error_class: "has-error" do |b|
163
+ # vertical range input
164
+ config.wrappers :vertical_range, tag: "div",
165
+ class: "form-group",
166
+ error_class: "form-group-invalid",
167
+ valid_class: "form-group-valid" do |b|
57
168
  b.use :html5
169
+ b.use :placeholder
58
170
  b.optional :readonly
59
- b.use :label, class: "control-label"
60
- b.use :input
61
- b.use :error, wrap_with: { tag: "span", class: "help-block" }
62
- b.use :hint, wrap_with: { tag: "p", class: "help-block" }
171
+ b.optional :step
172
+ b.use :label
173
+ b.use :input, class: "form-control-range",
174
+ error_class: "is-invalid",
175
+ valid_class: "is-valid"
176
+ b.use :full_error, wrap_with: {
177
+ tag: "div",
178
+ class: "invalid-feedback d-block"
179
+ }
180
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
63
181
  end
64
182
 
183
+ # horizontal forms
184
+ #
185
+ # horizontal default_wrapper
65
186
  config.wrappers :horizontal_form, tag: "div",
66
- class: "form-group",
67
- error_class: "has-error" do |b|
187
+ class: "form-group row",
188
+ error_class: "form-group-invalid",
189
+ valid_class: "form-group-valid" do |b|
68
190
  b.use :html5
69
191
  b.use :placeholder
70
192
  b.optional :maxlength
@@ -72,105 +194,415 @@ SimpleForm.setup do |config|
72
194
  b.optional :pattern
73
195
  b.optional :min_max
74
196
  b.optional :readonly
75
- b.use :label, class: "col-sm-3 control-label"
197
+ b.use :label, class: "col-sm-3 col-form-label"
198
+ b.wrapper :grid_wrapper, tag: "div", class: "col-sm-9" do |ba|
199
+ ba.use :input, class: "form-control",
200
+ error_class: "is-invalid",
201
+ valid_class: "is-valid"
202
+ ba.use :full_error, wrap_with: { tag: "div", class: "invalid-feedback" }
203
+ ba.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
204
+ end
205
+ end
76
206
 
77
- b.wrapper tag: "div", class: "col-sm-9" do |ba|
78
- ba.use :input, class: "form-control"
79
- ba.use :error, wrap_with: { tag: "span", class: "help-block" }
80
- ba.use :hint, wrap_with: { tag: "p", class: "help-block" }
207
+ # horizontal input for boolean
208
+ config.wrappers :horizontal_boolean, tag: "div",
209
+ class: "form-group row",
210
+ error_class: "form-group-invalid",
211
+ valid_class: "form-group-valid" do |b|
212
+ b.use :html5
213
+ b.optional :readonly
214
+ b.wrapper tag: "label", class: "col-sm-3" do |ba|
215
+ ba.use :label_text
216
+ end
217
+ b.wrapper :grid_wrapper, tag: "div", class: "col-sm-9" do |wr|
218
+ wr.wrapper :form_check_wrapper, tag: "div", class: "form-check" do |bb|
219
+ bb.use :input, class: "form-check-input",
220
+ error_class: "is-invalid",
221
+ valid_class: "is-valid"
222
+ bb.use :label, class: "form-check-label"
223
+ bb.use :full_error, wrap_with: {
224
+ tag: "div",
225
+ class: "invalid-feedback d-block"
226
+ }
227
+ bb.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
228
+ end
81
229
  end
82
230
  end
83
231
 
84
- config.wrappers :horizontal_file_input, tag: "div",
85
- class: "form-group",
86
- error_class: "has-error" do |b|
232
+ # horizontal input for radio buttons and check boxes
233
+ config.wrappers :horizontal_collection, item_wrapper_class: "form-check",
234
+ tag: "div",
235
+ class: "form-group row",
236
+ error_class: "form-group-invalid",
237
+ valid_class: "form-group-valid" do |b|
238
+ b.use :html5
239
+ b.optional :readonly
240
+ b.use :label, class: "col-sm-3 form-control-label"
241
+ b.wrapper :grid_wrapper, tag: "div", class: "col-sm-9" do |ba|
242
+ ba.use :input, class: "form-check-input",
243
+ error_class: "is-invalid",
244
+ valid_class: "is-valid"
245
+ ba.use :full_error, wrap_with: {
246
+ tag: "div",
247
+ class: "invalid-feedback d-block"
248
+ }
249
+ ba.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
250
+ end
251
+ end
252
+
253
+ # horizontal input for inline radio buttons and check boxes
254
+ config.wrappers :horizontal_collection_inline,
255
+ item_wrapper_class: "form-check form-check-inline",
256
+ tag: "div",
257
+ class: "form-group row",
258
+ error_class: "form-group-invalid",
259
+ valid_class: "form-group-valid" do |b|
260
+ b.use :html5
261
+ b.optional :readonly
262
+ b.use :label, class: "col-sm-3 form-control-label"
263
+ b.wrapper :grid_wrapper, tag: "div", class: "col-sm-9" do |ba|
264
+ ba.use :input, class: "form-check-input",
265
+ error_class: "is-invalid",
266
+ valid_class: "is-valid"
267
+ ba.use :full_error, wrap_with: {
268
+ tag: "div",
269
+ class: "invalid-feedback d-block"
270
+ }
271
+ ba.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
272
+ end
273
+ end
274
+
275
+ # horizontal file input
276
+ config.wrappers :horizontal_file, tag: "div",
277
+ class: "form-group row",
278
+ error_class: "form-group-invalid",
279
+ valid_class: "form-group-valid" do |b|
87
280
  b.use :html5
88
281
  b.use :placeholder
89
282
  b.optional :maxlength
90
283
  b.optional :minlength
91
284
  b.optional :readonly
285
+ b.use :label, class: "col-sm-3 form-control-label"
286
+ b.wrapper :grid_wrapper, tag: "div", class: "col-sm-9" do |ba|
287
+ ba.use :input, error_class: "is-invalid", valid_class: "is-valid"
288
+ ba.use :full_error, wrap_with: {
289
+ tag: "div",
290
+ class: "invalid-feedback d-block"
291
+ }
292
+ ba.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
293
+ end
294
+ end
295
+
296
+ # horizontal multi select
297
+ config.wrappers :horizontal_multi_select,
298
+ tag: "div",
299
+ class: "form-group row",
300
+ error_class: "form-group-invalid",
301
+ valid_class: "form-group-valid" do |b|
302
+ b.use :html5
303
+ b.optional :readonly
92
304
  b.use :label, class: "col-sm-3 control-label"
305
+ b.wrapper :grid_wrapper, tag: "div", class: "col-sm-9" do |ba|
306
+ ba.wrapper tag: "div",
307
+ class: "d-flex flex-row justify-content-between
308
+ align-items-center" do |bb|
309
+ bb.use :input, class: "form-control mx-1",
310
+ error_class: "is-invalid",
311
+ valid_class: "is-valid"
312
+ end
313
+ ba.use :full_error, wrap_with: {
314
+ tag: "div",
315
+ class: "invalid-feedback d-block"
316
+ }
317
+ ba.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
318
+ end
319
+ end
93
320
 
94
- b.wrapper tag: "div", class: "col-sm-9" do |ba|
95
- ba.use :input
96
- ba.use :error, wrap_with: { tag: "span", class: "help-block" }
97
- ba.use :hint, wrap_with: { tag: "p", class: "help-block" }
321
+ # horizontal range input
322
+ config.wrappers :horizontal_range, tag: "div",
323
+ class: "form-group row",
324
+ error_class: "form-group-invalid",
325
+ valid_class: "form-group-valid" do |b|
326
+ b.use :html5
327
+ b.use :placeholder
328
+ b.optional :readonly
329
+ b.optional :step
330
+ b.use :label, class: "col-sm-3 form-control-label"
331
+ b.wrapper :grid_wrapper, tag: "div", class: "col-sm-9" do |ba|
332
+ ba.use :input, class: "form-control-range",
333
+ error_class: "is-invalid",
334
+ valid_class: "is-valid"
335
+ ba.use :full_error, wrap_with: {
336
+ tag: "div",
337
+ class: "invalid-feedback d-block"
338
+ }
339
+ ba.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
98
340
  end
99
341
  end
100
342
 
101
- config.wrappers :horizontal_boolean, tag: "div",
102
- class: "form-group",
103
- error_class: "has-error" do |b|
343
+ # inline forms
344
+ #
345
+ # inline default_wrapper
346
+ config.wrappers :inline_form, tag: "span",
347
+ error_class: "form-group-invalid",
348
+ valid_class: "form-group-valid" do |b|
104
349
  b.use :html5
350
+ b.use :placeholder
351
+ b.optional :maxlength
352
+ b.optional :minlength
353
+ b.optional :pattern
354
+ b.optional :min_max
105
355
  b.optional :readonly
356
+ b.use :label, class: "sr-only"
106
357
 
107
- b.wrapper tag: "div", class: "col-sm-offset-3 col-sm-9" do |wr|
108
- wr.wrapper tag: "div", class: "checkbox" do |ba|
109
- ba.use :label_input
110
- end
358
+ b.use :input, class: "form-control",
359
+ error_class: "is-invalid",
360
+ valid_class: "is-valid"
361
+ b.use :error, wrap_with: { tag: "div", class: "invalid-feedback" }
362
+ b.optional :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
363
+ end
111
364
 
112
- wr.use :error, wrap_with: { tag: "span", class: "help-block" }
113
- wr.use :hint, wrap_with: { tag: "p", class: "help-block" }
365
+ # inline input for boolean
366
+ config.wrappers :inline_boolean,
367
+ tag: "span",
368
+ class: "form-check flex-wrap justify-content-start mr-sm-2",
369
+ error_class: "form-group-invalid",
370
+ valid_class: "form-group-valid" do |b|
371
+ b.use :html5
372
+ b.optional :readonly
373
+ b.use :input, class: "form-check-input",
374
+ error_class: "is-invalid",
375
+ valid_class: "is-valid"
376
+ b.use :label, class: "form-check-label"
377
+ b.use :error, wrap_with: { tag: "div", class: "invalid-feedback" }
378
+ b.optional :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
379
+ end
380
+
381
+ # bootstrap custom forms
382
+ #
383
+ # custom input for boolean
384
+ config.wrappers :custom_boolean, tag: "fieldset",
385
+ class: "form-group",
386
+ error_class: "form-group-invalid",
387
+ valid_class: "form-group-valid" do |b|
388
+ b.use :html5
389
+ b.optional :readonly
390
+ b.wrapper :form_check_wrapper,
391
+ tag: "div",
392
+ class: "custom-control custom-checkbox" do |bb|
393
+ bb.use :input, class: "custom-control-input",
394
+ error_class: "is-invalid",
395
+ valid_class: "is-valid"
396
+ bb.use :label, class: "custom-control-label"
397
+ bb.use :full_error, wrap_with: { tag: "div", class: "invalid-feedback" }
398
+ bb.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
114
399
  end
115
400
  end
116
401
 
117
- config.wrappers :horizontal_radio_and_checkboxes,
118
- tag: "div",
119
- class: "form-group",
120
- error_class: "has-error" do |b|
402
+ config.wrappers :custom_boolean_switch, tag: "fieldset",
403
+ class: "form-group",
404
+ error_class: "form-group-invalid",
405
+ valid_class: "form-group-valid" do |b|
121
406
  b.use :html5
122
407
  b.optional :readonly
408
+ b.wrapper :form_check_wrapper,
409
+ tag: "div",
410
+ class: "custom-control custom-checkbox-switch" do |bb|
411
+ bb.use :input, class: "custom-control-input",
412
+ error_class: "is-invalid",
413
+ valid_class: "is-valid"
414
+ bb.use :label, class: "custom-control-label"
415
+ bb.use :full_error, wrap_with: { tag: "div", class: "invalid-feedback" }
416
+ bb.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
417
+ end
418
+ end
123
419
 
124
- b.use :label, class: "col-sm-3 control-label"
420
+ # custom input for radio buttons and check boxes
421
+ config.wrappers :custom_collection, item_wrapper_class: "custom-control",
422
+ tag: "fieldset",
423
+ class: "form-group",
424
+ error_class: "form-group-invalid",
425
+ valid_class: "form-group-valid" do |b|
426
+ b.use :html5
427
+ b.optional :readonly
428
+ b.wrapper :legend_tag, tag: "legend", class: "col-form-label pt-0" do |ba|
429
+ ba.use :label_text
430
+ end
431
+ b.use :input, class: "custom-control-input",
432
+ error_class: "is-invalid",
433
+ valid_class: "is-valid"
434
+ b.use :full_error, wrap_with: {
435
+ tag: "div",
436
+ class: "invalid-feedback d-block"
437
+ }
438
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
439
+ end
125
440
 
126
- b.wrapper tag: "div", class: "col-sm-9" do |ba|
127
- ba.use :input
128
- ba.use :error, wrap_with: { tag: "span", class: "help-block" }
129
- ba.use :hint, wrap_with: { tag: "p", class: "help-block" }
441
+ # custom input for inline radio buttons and check boxes
442
+ config.wrappers :custom_collection_inline,
443
+ item_wrapper_class: "custom-control custom-control-inline",
444
+ tag: "fieldset",
445
+ class: "form-group",
446
+ error_class: "form-group-invalid",
447
+ valid_class: "form-group-valid" do |b|
448
+ b.use :html5
449
+ b.optional :readonly
450
+ b.wrapper :legend_tag, tag: "legend", class: "col-form-label pt-0" do |ba|
451
+ ba.use :label_text
130
452
  end
453
+ b.use :input, class: "custom-control-input",
454
+ error_class: "is-invalid",
455
+ valid_class: "is-valid"
456
+ b.use :full_error, wrap_with: {
457
+ tag: "div",
458
+ class: "invalid-feedback d-block"
459
+ }
460
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
131
461
  end
132
462
 
133
- config.wrappers :inline_form, tag: "div",
463
+ # custom file input
464
+ config.wrappers :custom_file, tag: "div",
134
465
  class: "form-group",
135
- error_class: "has-error" do |b|
466
+ error_class: "form-group-invalid",
467
+ valid_class: "form-group-valid" do |b|
136
468
  b.use :html5
137
469
  b.use :placeholder
138
470
  b.optional :maxlength
139
471
  b.optional :minlength
140
- b.optional :pattern
141
- b.optional :min_max
142
472
  b.optional :readonly
143
- b.use :label, class: "sr-only"
473
+ b.use :label, class: "form-control-label"
474
+ b.wrapper :custom_file_wrapper, tag: "div", class: "custom-file" do |ba|
475
+ ba.use :input, class: "custom-file-input",
476
+ error_class: "is-invalid",
477
+ valid_class: "is-valid"
478
+ ba.use :label, class: "custom-file-label"
479
+ ba.use :full_error, wrap_with: { tag: "div", class: "invalid-feedback" }
480
+ end
481
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
482
+ end
144
483
 
145
- b.use :input, class: "form-control"
146
- b.use :error, wrap_with: { tag: "span", class: "help-block" }
147
- b.use :hint, wrap_with: { tag: "p", class: "help-block" }
484
+ # custom multi select
485
+ config.wrappers :custom_multi_select, tag: "div",
486
+ class: "form-group",
487
+ error_class: "form-group-invalid",
488
+ valid_class: "form-group-valid" do |b|
489
+ b.use :html5
490
+ b.optional :readonly
491
+ b.use :label, class: "form-control-label"
492
+ b.wrapper tag: "div",
493
+ class: "d-flex flex-row justify-content-between
494
+ align-items-center" do |ba|
495
+ ba.use :input, class: "custom-select mx-1",
496
+ error_class: "is-invalid",
497
+ valid_class: "is-valid"
498
+ end
499
+ b.use :full_error, wrap_with: {
500
+ tag: "div",
501
+ class: "invalid-feedback d-block"
502
+ }
503
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
148
504
  end
149
505
 
150
- config.wrappers :multi_select, tag: "div",
506
+ # custom range input
507
+ config.wrappers :custom_range, tag: "div",
151
508
  class: "form-group",
152
- error_class: "has-error" do |b|
509
+ error_class: "form-group-invalid",
510
+ valid_class: "form-group-valid" do |b|
153
511
  b.use :html5
512
+ b.use :placeholder
154
513
  b.optional :readonly
155
- b.use :label, class: "control-label"
156
- b.wrapper tag: "div", class: "form-inline" do |ba|
157
- ba.use :input, class: "form-control"
158
- ba.use :error, wrap_with: { tag: "span", class: "help-block" }
159
- ba.use :hint, wrap_with: { tag: "p", class: "help-block" }
160
- end
514
+ b.optional :step
515
+ b.use :label, class: "form-control-label"
516
+ b.use :input, class: "custom-range",
517
+ error_class: "is-invalid",
518
+ valid_class: "is-valid"
519
+ b.use :full_error, wrap_with: {
520
+ tag: "div",
521
+ class: "invalid-feedback d-block"
522
+ }
523
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
524
+ end
525
+
526
+ # Input Group - custom component
527
+ # see example app and config at https://github.com/rafaelfranca/simple_form-bootstrap
528
+ # config.wrappers :input_group, tag: "div",
529
+ # class: "form-group",
530
+ # error_class: "form-group-invalid",
531
+ # valid_class: "form-group-valid" do |b|
532
+ # b.use :html5
533
+ # b.use :placeholder
534
+ # b.optional :maxlength
535
+ # b.optional :minlength
536
+ # b.optional :pattern
537
+ # b.optional :min_max
538
+ # b.optional :readonly
539
+ # b.use :label, class: "form-control-label"
540
+ # b.wrapper :input_group_tag, tag: "div", class: "input-group" do |ba|
541
+ # ba.optional :prepend
542
+ # ba.use :input, class: "form-control",
543
+ # error_class: "is-invalid",
544
+ # valid_class: "is-valid"
545
+ # ba.optional :append
546
+ # end
547
+ # b.use :full_error, wrap_with: {
548
+ # tag: "div",
549
+ # class: "invalid-feedback d-block"
550
+ # }
551
+ # b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
552
+ # end
553
+
554
+ # Floating Labels form
555
+ #
556
+ # floating labels default_wrapper
557
+ config.wrappers :floating_labels_form, tag: "div",
558
+ class: "form-label-group",
559
+ error_class: "form-group-invalid",
560
+ valid_class: "form-group-valid" do |b|
561
+ b.use :html5
562
+ b.use :placeholder
563
+ b.optional :maxlength
564
+ b.optional :minlength
565
+ b.optional :pattern
566
+ b.optional :min_max
567
+ b.optional :readonly
568
+ b.use :input, class: "form-control",
569
+ error_class: "is-invalid",
570
+ valid_class: "is-valid"
571
+ b.use :label, class: "form-control-label"
572
+ b.use :full_error, wrap_with: { tag: "div", class: "invalid-feedback" }
573
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
161
574
  end
162
- # Wrappers for forms and inputs using the Bootstrap toolkit.
163
- # Check the Bootstrap docs (http://getbootstrap.com)
164
- # to learn about the different styles for forms and inputs,
165
- # buttons and other elements.
575
+
576
+ # custom multi select
577
+ config.wrappers :floating_labels_select,
578
+ tag: "div",
579
+ class: "form-label-group",
580
+ error_class: "form-group-invalid",
581
+ valid_class: "form-group-valid" do |b|
582
+ b.use :html5
583
+ b.optional :readonly
584
+ b.use :input, class: "custom-select custom-select-lg",
585
+ error_class: "is-invalid",
586
+ valid_class: "is-valid"
587
+ b.use :label, class: "form-control-label"
588
+ b.use :full_error, wrap_with: { tag: "div", class: "invalid-feedback" }
589
+ b.use :hint, wrap_with: { tag: "small", class: "form-text text-muted" }
590
+ end
591
+
592
+ # The default wrapper to be used by the FormBuilder.
166
593
  config.default_wrapper = :vertical_form
594
+
595
+ # Custom wrappers for input types. This should be a hash containing an input
596
+ # type as key and the wrapper that will be used for all inputs with specified
597
+ # type.
167
598
  config.wrapper_mappings = {
168
- check_boxes: :vertical_radio_and_checkboxes,
169
- radio_buttons: :vertical_radio_and_checkboxes,
170
- file: :vertical_file_input,
171
599
  boolean: :vertical_boolean,
172
- datetime: :multi_select,
173
- date: :multi_select,
174
- time: :multi_select
600
+ check_boxes: :vertical_collection,
601
+ date: :vertical_multi_select,
602
+ datetime: :vertical_multi_select,
603
+ file: :vertical_file,
604
+ radio_buttons: :vertical_collection,
605
+ range: :vertical_range,
606
+ time: :vertical_multi_select
175
607
  }
176
608
  end