alchemy_cms 4.0.5 → 4.1.0.beta

Sign up to get free protection for your applications and to get access to all the features.
Files changed (340) hide show
  1. checksums.yaml +4 -4
  2. data/.codeclimate.yml +1 -0
  3. data/.gitignore +1 -0
  4. data/.localeapp/config.rb +8 -0
  5. data/.rubocop.yml +26 -13
  6. data/.travis.yml +8 -11
  7. data/CHANGELOG.md +5 -20
  8. data/Gemfile +10 -7
  9. data/README.md +16 -14
  10. data/Rakefile +1 -1
  11. data/alchemy_cms.gemspec +6 -7
  12. data/app/assets/images/alchemy/alchemy-logo.png +0 -0
  13. data/app/assets/images/alchemy/alchemy-logo.svg +1 -70
  14. data/app/assets/images/alchemy/favicon.ico +0 -0
  15. data/app/assets/images/alchemy/icon.svg +1 -14
  16. data/app/assets/javascripts/alchemy/admin.js +0 -7
  17. data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +2 -2
  18. data/app/assets/javascripts/alchemy/alchemy.buttons.js.coffee +1 -1
  19. data/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee +1 -1
  20. data/app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee +1 -0
  21. data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +19 -6
  22. data/app/assets/javascripts/alchemy/alchemy.dirty.js.coffee +2 -7
  23. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +36 -26
  24. data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +6 -15
  25. data/app/assets/javascripts/alchemy/alchemy.file_progress.js.coffee +1 -1
  26. data/app/assets/javascripts/alchemy/alchemy.growler.js.coffee +8 -11
  27. data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +4 -1
  28. data/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee +1 -1
  29. data/app/assets/javascripts/alchemy/alchemy.initializer.js.coffee +5 -14
  30. data/app/assets/javascripts/alchemy/alchemy.preview.js.coffee +54 -75
  31. data/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee +4 -13
  32. data/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee +1 -0
  33. data/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee +12 -6
  34. data/app/assets/javascripts/alchemy/alchemy.translations.js.coffee +0 -158
  35. data/app/assets/stylesheets/alchemy/_defaults.scss +0 -2
  36. data/app/assets/stylesheets/alchemy/_extends.scss +13 -18
  37. data/app/assets/stylesheets/alchemy/_mixins.scss +72 -46
  38. data/app/assets/stylesheets/alchemy/_variables.scss +128 -59
  39. data/app/assets/stylesheets/alchemy/admin.scss +7 -1
  40. data/app/assets/stylesheets/alchemy/archive.scss +23 -27
  41. data/app/assets/stylesheets/alchemy/base.scss +5 -355
  42. data/app/assets/stylesheets/alchemy/buttons.scss +23 -60
  43. data/app/assets/stylesheets/alchemy/clipboard.scss +26 -0
  44. data/app/assets/stylesheets/alchemy/dashboard.scss +7 -40
  45. data/app/assets/stylesheets/alchemy/dialogs.scss +23 -36
  46. data/app/assets/stylesheets/alchemy/elements.scss +80 -156
  47. data/app/assets/stylesheets/alchemy/errors.scss +2 -2
  48. data/app/assets/stylesheets/alchemy/flash.scss +19 -10
  49. data/app/assets/stylesheets/alchemy/fonts.scss +13 -0
  50. data/app/assets/stylesheets/alchemy/forms.scss +6 -1
  51. data/app/assets/stylesheets/alchemy/frame.scss +24 -65
  52. data/app/assets/stylesheets/alchemy/hints.scss +2 -2
  53. data/app/assets/stylesheets/alchemy/icons.scss +3 -337
  54. data/app/assets/stylesheets/alchemy/image_library.scss +9 -10
  55. data/app/assets/stylesheets/alchemy/jquery-ui.scss +21 -839
  56. data/app/assets/stylesheets/alchemy/jquery.datetimepicker.scss +32 -57
  57. data/app/assets/stylesheets/alchemy/lists.scss +4 -8
  58. data/app/assets/stylesheets/alchemy/menubar.scss +26 -29
  59. data/app/assets/stylesheets/alchemy/navigation.scss +23 -25
  60. data/app/assets/stylesheets/alchemy/notices.scss +25 -25
  61. data/app/assets/stylesheets/alchemy/pagination.scss +12 -7
  62. data/app/assets/stylesheets/alchemy/preview_window.scss +20 -0
  63. data/app/assets/stylesheets/alchemy/resource_info.scss +1 -1
  64. data/app/assets/stylesheets/alchemy/search.scss +19 -15
  65. data/app/assets/stylesheets/alchemy/selects.scss +63 -32
  66. data/app/assets/stylesheets/alchemy/sitemap.scss +70 -148
  67. data/app/assets/stylesheets/alchemy/tables.scss +16 -59
  68. data/app/assets/stylesheets/alchemy/toolbar.scss +9 -36
  69. data/app/assets/stylesheets/alchemy/trash.scss +8 -0
  70. data/app/assets/stylesheets/alchemy/upload.scss +5 -6
  71. data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss +1 -0
  72. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +78 -43
  73. data/app/controllers/alchemy/admin/attachments_controller.rb +6 -6
  74. data/app/controllers/alchemy/admin/base_controller.rb +9 -9
  75. data/app/controllers/alchemy/admin/contents_controller.rb +0 -17
  76. data/app/controllers/alchemy/admin/elements_controller.rb +1 -4
  77. data/app/controllers/alchemy/admin/essence_files_controller.rb +1 -3
  78. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +1 -3
  79. data/app/controllers/alchemy/admin/languages_controller.rb +1 -1
  80. data/app/controllers/alchemy/admin/pictures_controller.rb +5 -5
  81. data/app/controllers/alchemy/admin/resources_controller.rb +10 -10
  82. data/app/controllers/alchemy/admin/tags_controller.rb +7 -7
  83. data/app/controllers/alchemy/api/contents_controller.rb +6 -1
  84. data/app/controllers/alchemy/api/elements_controller.rb +5 -1
  85. data/app/controllers/alchemy/api/pages_controller.rb +6 -1
  86. data/app/controllers/alchemy/base_controller.rb +5 -3
  87. data/app/controllers/alchemy/pages_controller.rb +1 -1
  88. data/app/helpers/alchemy/admin/base_helper.rb +14 -15
  89. data/app/helpers/alchemy/admin/contents_helper.rb +1 -2
  90. data/app/helpers/alchemy/admin/elements_helper.rb +7 -6
  91. data/app/helpers/alchemy/admin/tags_helper.rb +3 -4
  92. data/app/helpers/alchemy/base_helper.rb +35 -5
  93. data/app/helpers/alchemy/elements_helper.rb +2 -2
  94. data/app/helpers/alchemy/pages_helper.rb +4 -2
  95. data/app/models/alchemy/attachment.rb +14 -23
  96. data/app/models/alchemy/base_record.rb +13 -0
  97. data/app/models/alchemy/cell.rb +1 -1
  98. data/app/models/alchemy/content.rb +1 -2
  99. data/app/models/alchemy/content/factory.rb +1 -1
  100. data/app/models/alchemy/element.rb +10 -12
  101. data/app/models/alchemy/essence_boolean.rb +1 -1
  102. data/app/models/alchemy/essence_date.rb +2 -2
  103. data/app/models/alchemy/essence_file.rb +1 -1
  104. data/app/models/alchemy/essence_html.rb +1 -1
  105. data/app/models/alchemy/essence_link.rb +1 -1
  106. data/app/models/alchemy/essence_picture.rb +1 -1
  107. data/app/models/alchemy/essence_richtext.rb +1 -1
  108. data/app/models/alchemy/essence_select.rb +1 -1
  109. data/app/models/alchemy/essence_text.rb +1 -1
  110. data/app/models/alchemy/folded_page.rb +1 -1
  111. data/app/models/alchemy/language.rb +21 -5
  112. data/app/models/alchemy/page.rb +17 -5
  113. data/app/models/alchemy/page/page_elements.rb +14 -2
  114. data/app/models/alchemy/page/page_naming.rb +17 -4
  115. data/app/models/alchemy/picture.rb +4 -7
  116. data/app/models/alchemy/site.rb +3 -3
  117. data/app/models/alchemy/tag.rb +3 -3
  118. data/app/models/concerns/alchemy/content_touching.rb +23 -0
  119. data/app/serializers/alchemy/element_serializer.rb +2 -0
  120. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -1
  121. data/app/views/alchemy/admin/attachments/_attachment.html.erb +11 -21
  122. data/app/views/alchemy/admin/attachments/_files_list.html.erb +26 -29
  123. data/app/views/alchemy/admin/attachments/_filter_bar.html.erb +2 -3
  124. data/app/views/alchemy/admin/attachments/_overlay_file_list.html.erb +3 -4
  125. data/app/views/alchemy/admin/attachments/_replace_button.html.erb +2 -3
  126. data/app/views/alchemy/admin/attachments/_tag_list.html.erb +3 -3
  127. data/app/views/alchemy/admin/attachments/destroy.js.erb +1 -1
  128. data/app/views/alchemy/admin/attachments/edit.html.erb +2 -2
  129. data/app/views/alchemy/admin/attachments/index.html.erb +3 -2
  130. data/app/views/alchemy/admin/attachments/show.html.erb +7 -8
  131. data/app/views/alchemy/admin/clipboard/clear.js.erb +1 -1
  132. data/app/views/alchemy/admin/clipboard/index.html.erb +23 -7
  133. data/app/views/alchemy/admin/clipboard/insert.js.erb +1 -1
  134. data/app/views/alchemy/admin/clipboard/remove.js.erb +2 -2
  135. data/app/views/alchemy/admin/contents/create.js.erb +1 -1
  136. data/app/views/alchemy/admin/dashboard/_locked_pages.html.erb +9 -6
  137. data/app/views/alchemy/admin/dashboard/_recent_pages.html.erb +6 -4
  138. data/app/views/alchemy/admin/dashboard/_sites.html.erb +4 -2
  139. data/app/views/alchemy/admin/dashboard/_users.html.erb +6 -4
  140. data/app/views/alchemy/admin/dashboard/index.html.erb +3 -3
  141. data/app/views/alchemy/admin/dashboard/info.html.erb +6 -7
  142. data/app/views/alchemy/admin/elements/_add_picture.html.erb +1 -1
  143. data/app/views/alchemy/admin/elements/_element.html.erb +1 -1
  144. data/app/views/alchemy/admin/elements/_element_header.html.erb +14 -14
  145. data/app/views/alchemy/admin/elements/_element_toolbar.html.erb +3 -3
  146. data/app/views/alchemy/admin/elements/_new_element_form.html.erb +2 -3
  147. data/app/views/alchemy/admin/elements/index.html.erb +2 -4
  148. data/app/views/alchemy/admin/elements/new.html.erb +1 -2
  149. data/app/views/alchemy/admin/elements/publish.js.erb +5 -5
  150. data/app/views/alchemy/admin/languages/_language.html.erb +4 -9
  151. data/app/views/alchemy/admin/languages/_table.html.erb +1 -1
  152. data/app/views/alchemy/admin/languages/index.html.erb +1 -1
  153. data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb +5 -5
  154. data/app/views/alchemy/admin/layoutpages/index.html.erb +5 -4
  155. data/app/views/alchemy/admin/leave.html.erb +1 -1
  156. data/app/views/alchemy/admin/legacy_page_urls/_legacy_page_url.html.erb +1 -1
  157. data/app/views/alchemy/admin/legacy_page_urls/_new.html.erb +1 -1
  158. data/app/views/alchemy/admin/pages/_form.html.erb +1 -1
  159. data/app/views/alchemy/admin/pages/_locked_page.html.erb +1 -1
  160. data/app/views/alchemy/admin/pages/_page.html.erb +31 -23
  161. data/app/views/alchemy/admin/pages/_page_for_links.html.erb +5 -5
  162. data/app/views/alchemy/admin/pages/_page_infos.html.erb +3 -3
  163. data/app/views/alchemy/admin/pages/_publication_fields.html.erb +1 -1
  164. data/app/views/alchemy/admin/pages/edit.html.erb +22 -21
  165. data/app/views/alchemy/admin/pages/index.html.erb +5 -21
  166. data/app/views/alchemy/admin/pages/info.html.erb +5 -5
  167. data/app/views/alchemy/admin/pages/sort.html.erb +1 -1
  168. data/app/views/alchemy/admin/pages/unlock.js.erb +2 -4
  169. data/app/views/alchemy/admin/partials/_flash.html.erb +1 -1
  170. data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb +6 -2
  171. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -2
  172. data/app/views/alchemy/admin/partials/_search_form.html.erb +3 -3
  173. data/app/views/alchemy/admin/pictures/_archive.html.erb +19 -17
  174. data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb +1 -1
  175. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +13 -13
  176. data/app/views/alchemy/admin/pictures/_filter_bar.html.erb +2 -3
  177. data/app/views/alchemy/admin/pictures/_form.html.erb +3 -3
  178. data/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb +2 -3
  179. data/app/views/alchemy/admin/pictures/_picture.html.erb +7 -7
  180. data/app/views/alchemy/admin/pictures/_tag_list.html.erb +3 -3
  181. data/app/views/alchemy/admin/pictures/edit_multiple.html.erb +6 -7
  182. data/app/views/alchemy/admin/pictures/index.html.erb +12 -12
  183. data/app/views/alchemy/admin/pictures/index.js.erb +0 -1
  184. data/app/views/alchemy/admin/pictures/show.html.erb +9 -9
  185. data/app/views/alchemy/admin/resources/_filter_bar.html.erb +2 -3
  186. data/app/views/alchemy/admin/resources/_form.html.erb +10 -2
  187. data/app/views/alchemy/admin/resources/_resource.html.erb +9 -14
  188. data/app/views/alchemy/admin/resources/_table.html.erb +1 -1
  189. data/app/views/alchemy/admin/resources/_tag_list.html.erb +4 -4
  190. data/app/views/alchemy/admin/resources/index.html.erb +2 -3
  191. data/app/views/alchemy/admin/sites/index.html.erb +1 -1
  192. data/app/views/alchemy/admin/tags/_tag.html.erb +7 -11
  193. data/app/views/alchemy/admin/tags/index.html.erb +4 -4
  194. data/app/views/alchemy/admin/trash/index.html.erb +2 -3
  195. data/app/views/alchemy/admin/uploader/_button.html.erb +1 -2
  196. data/app/views/alchemy/base/500.html.erb +1 -1
  197. data/app/views/alchemy/base/permission_denied.js.erb +1 -1
  198. data/app/views/alchemy/base/redirect.js.erb +1 -2
  199. data/app/views/alchemy/elements/_editor_not_found.html.erb +2 -3
  200. data/app/views/alchemy/essences/_essence_date_editor.html.erb +1 -1
  201. data/app/views/alchemy/essences/_essence_file_editor.html.erb +7 -11
  202. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +9 -7
  203. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +1 -1
  204. data/app/views/alchemy/pages/_meta_data.html.erb +1 -1
  205. data/app/views/kaminari/alchemy/_first_page.html.erb +7 -3
  206. data/app/views/kaminari/alchemy/_gap.html.erb +1 -1
  207. data/app/views/kaminari/alchemy/_last_page.html.erb +7 -3
  208. data/app/views/kaminari/alchemy/_next_page.html.erb +4 -2
  209. data/app/views/kaminari/alchemy/_page.html.erb +1 -1
  210. data/app/views/kaminari/alchemy/_prev_page.html.erb +4 -2
  211. data/app/views/layouts/alchemy/admin.html.erb +8 -6
  212. data/bin/rails +2 -2
  213. data/bin/rspec +1 -1
  214. data/config/alchemy/config.yml +0 -2
  215. data/config/alchemy/modules.yml +5 -5
  216. data/config/initializers/simple_form.rb +45 -8
  217. data/config/locales/alchemy.en.yml +66 -179
  218. data/config/routes.rb +1 -1
  219. data/db/migrate/20180226123013_alchemy_four_point_zero.rb +392 -0
  220. data/db/migrate/20180227224537_migrate_tags_to_gutentag.rb +41 -0
  221. data/lib/alchemy/config.rb +0 -2
  222. data/lib/alchemy/engine.rb +5 -9
  223. data/lib/alchemy/essence.rb +6 -6
  224. data/lib/alchemy/filetypes.rb +13 -1
  225. data/lib/alchemy/forms/builder.rb +5 -3
  226. data/lib/alchemy/i18n.rb +8 -6
  227. data/lib/alchemy/modules.rb +1 -1
  228. data/lib/alchemy/name_conversions.rb +0 -2
  229. data/lib/alchemy/page_layout.rb +3 -2
  230. data/lib/alchemy/paths.rb +5 -5
  231. data/lib/alchemy/resource.rb +9 -9
  232. data/lib/alchemy/resources_helper.rb +11 -15
  233. data/lib/alchemy/routing_constraints.rb +2 -2
  234. data/lib/alchemy/shell.rb +0 -1
  235. data/lib/alchemy/taggable.rb +40 -0
  236. data/lib/alchemy/tasks/tidy.rb +1 -9
  237. data/lib/alchemy/test_support/factories/content_factory.rb +10 -0
  238. data/lib/alchemy/test_support/factories/element_factory.rb +5 -0
  239. data/lib/alchemy/test_support/shared_contexts.rb +1 -1
  240. data/lib/alchemy/tinymce.rb +2 -2
  241. data/lib/alchemy/upgrader/four_point_one.rb +42 -0
  242. data/lib/alchemy/upgrader/tasks/harden_acts_as_taggable_on_migrations.rb +27 -0
  243. data/lib/alchemy/version.rb +1 -1
  244. data/lib/alchemy_cms.rb +2 -3
  245. data/lib/rails/generators/alchemy/elements/elements_generator.rb +2 -2
  246. data/lib/rails/generators/alchemy/essence/essence_generator.rb +1 -1
  247. data/lib/rails/generators/alchemy/install/install_generator.rb +4 -8
  248. data/lib/rails/generators/alchemy/module/module_generator.rb +1 -1
  249. data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb +2 -2
  250. data/lib/rails/generators/alchemy/site_layouts/site_layouts_generator.rb +2 -2
  251. data/lib/rails/generators/alchemy/views/views_generator.rb +1 -1
  252. data/lib/tasks/alchemy/db.rake +2 -1
  253. data/lib/tasks/alchemy/tidy.rake +0 -6
  254. data/lib/tasks/alchemy/upgrade.rake +11 -144
  255. data/vendor/assets/fonts/fa-regular-400.eot +0 -0
  256. data/vendor/assets/fonts/fa-regular-400.svg +363 -0
  257. data/vendor/assets/fonts/fa-regular-400.ttf +0 -0
  258. data/vendor/assets/fonts/fa-regular-400.woff +0 -0
  259. data/vendor/assets/fonts/fa-regular-400.woff2 +0 -0
  260. data/vendor/assets/fonts/fa-solid-900.eot +0 -0
  261. data/vendor/assets/fonts/fa-solid-900.svg +1413 -0
  262. data/vendor/assets/fonts/fa-solid-900.ttf +0 -0
  263. data/vendor/assets/fonts/fa-solid-900.woff +0 -0
  264. data/vendor/assets/fonts/fa-solid-900.woff2 +0 -0
  265. data/vendor/assets/javascripts/tinymce/license.txt +6 -6
  266. data/vendor/assets/javascripts/tinymce/tinymce.min.js +2 -15
  267. data/vendor/assets/stylesheets/fontawesome/_animated.scss +20 -0
  268. data/vendor/assets/stylesheets/fontawesome/_bordered-pulled.scss +20 -0
  269. data/vendor/assets/stylesheets/fontawesome/_core.scss +16 -0
  270. data/vendor/assets/stylesheets/fontawesome/_fixed-width.scss +6 -0
  271. data/vendor/assets/stylesheets/fontawesome/_icons.scss +792 -0
  272. data/vendor/assets/stylesheets/fontawesome/_larger.scss +23 -0
  273. data/vendor/assets/stylesheets/fontawesome/_list.scss +18 -0
  274. data/vendor/assets/stylesheets/fontawesome/_mixins.scss +57 -0
  275. data/vendor/assets/stylesheets/fontawesome/_rotated-flipped.scss +23 -0
  276. data/vendor/assets/stylesheets/fontawesome/_screen-reader.scss +5 -0
  277. data/vendor/assets/stylesheets/fontawesome/_stacked.scss +31 -0
  278. data/vendor/assets/stylesheets/fontawesome/_variables.scss +805 -0
  279. data/vendor/assets/stylesheets/fontawesome/fa-regular.scss +22 -0
  280. data/vendor/assets/stylesheets/fontawesome/fa-solid.scss +23 -0
  281. data/vendor/assets/stylesheets/fontawesome/fontawesome.scss +16 -0
  282. metadata +77 -112
  283. data/app/assets/fonts/alchemy/icons.eot +0 -0
  284. data/app/assets/fonts/alchemy/icons.svg +0 -33
  285. data/app/assets/fonts/alchemy/icons.ttf +0 -0
  286. data/app/assets/fonts/alchemy/icons.woff +0 -0
  287. data/app/assets/images/alchemy/icons.png +0 -0
  288. data/app/assets/images/alchemy/ui-icons_666666_256x240.png +0 -0
  289. data/app/assets/images/sassy-ie-overlay.png +0 -0
  290. data/app/assets/javascripts/alchemy/alchemy.jquery_loader.js +0 -42
  291. data/app/assets/stylesheets/alchemy/icon-font.scss +0 -75
  292. data/app/assets/stylesheets/alchemy/modules.scss +0 -27
  293. data/app/models/alchemy.rb +0 -7
  294. data/app/views/alchemy/admin/contents/destroy.js.erb +0 -4
  295. data/app/views/alchemy/admin/pictures/flush.js.erb +0 -2
  296. data/config/locales/alchemy.de.yml +0 -932
  297. data/config/locales/alchemy.es.yml +0 -960
  298. data/config/locales/alchemy.fr.yml +0 -938
  299. data/config/locales/alchemy.it.yml +0 -938
  300. data/config/locales/alchemy.nl.yml +0 -918
  301. data/config/locales/alchemy.ru.yml +0 -830
  302. data/config/locales/simple_form.de.yml +0 -26
  303. data/config/locales/simple_form.en.yml +0 -25
  304. data/config/locales/simple_form.es.yml +0 -6
  305. data/config/locales/simple_form.fr.yml +0 -26
  306. data/config/locales/simple_form.it.yml +0 -25
  307. data/config/locales/simple_form.nl.yml +0 -25
  308. data/config/locales/simple_form.ru.yml +0 -25
  309. data/db/migrate/20130827094554_alchemy_two_point_six.rb +0 -378
  310. data/db/migrate/20130828121054_remove_do_not_index_from_alchemy_essence_texts.rb +0 -5
  311. data/db/migrate/20130828121120_remove_do_not_index_from_alchemy_essence_richtexts.rb +0 -5
  312. data/db/migrate/20130918201742_add_published_at_to_alchemy_pages.rb +0 -5
  313. data/db/migrate/20150608204610_add_parent_element_id_to_alchemy_elements.rb +0 -6
  314. data/db/migrate/20150729151825_add_link_text_to_alchemy_essence_files.rb +0 -5
  315. data/db/migrate/20150906195818_add_locale_to_alchemy_languages.rb +0 -7
  316. data/db/migrate/20160108174834_add_timebased_publishing_columns_to_pages.rb +0 -32
  317. data/db/migrate/20160422195310_add_image_file_format_to_alchemy_pictures.rb +0 -9
  318. data/db/migrate/20160617224938_change_alchemy_pages_locked_to_locked_at.rb +0 -22
  319. data/db/migrate/20160912223112_add_index_to_alchemy_pages_rgt.rb +0 -9
  320. data/db/migrate/20160927205604_add_foreign_key_indices_and_null_constraints.rb +0 -20
  321. data/db/migrate/20160928080104_add_foreign_keys.rb +0 -27
  322. data/lib/alchemy/touching.rb +0 -42
  323. data/lib/alchemy/upgrader/tasks/available_contents_upgrader.rb +0 -161
  324. data/lib/alchemy/upgrader/tasks/install_asset_manifests.rb +0 -15
  325. data/lib/alchemy/upgrader/tasks/install_dragonfly_config.rb +0 -14
  326. data/lib/alchemy/upgrader/tasks/nestable_elements_migration.rb +0 -71
  327. data/lib/alchemy/upgrader/tasks/three_point_two_task.rb +0 -31
  328. data/lib/alchemy/upgrader/three_point_five.rb +0 -32
  329. data/lib/alchemy/upgrader/three_point_four.rb +0 -52
  330. data/lib/alchemy/upgrader/three_point_one.rb +0 -54
  331. data/lib/alchemy/upgrader/three_point_three.rb +0 -50
  332. data/lib/alchemy/upgrader/three_point_two.rb +0 -40
  333. data/lib/alchemy/upgrader/three_point_zero.rb +0 -92
  334. data/vendor/assets/javascripts/jquery_plugins/jquery.floatThead.min.js +0 -3
  335. data/vendor/assets/javascripts/tinymce/langs/de.js +0 -219
  336. data/vendor/assets/javascripts/tinymce/langs/es.js +0 -219
  337. data/vendor/assets/javascripts/tinymce/langs/fr.js +0 -219
  338. data/vendor/assets/javascripts/tinymce/langs/it.js +0 -219
  339. data/vendor/assets/javascripts/tinymce/langs/nl.js +0 -219
  340. data/vendor/assets/javascripts/tinymce/langs/ru.js +0 -219
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 35a5066f5fee296b67dd64a9d8ddd912a83a4197c4a0c101e9c4ede1973f1af2
4
- data.tar.gz: 36bebc442b75517a7f39e15fb6bc7a80ec3f03c1a126a220dfef6dbc4c55e39c
3
+ metadata.gz: '084ab3053975356290606cfd0c9d6e6097f6a46878a8f94ff1b24bfa6b2c16d1'
4
+ data.tar.gz: 99bc5df70b19f79ec32274dab59005e51793b59e976e76e8555237748707174c
5
5
  SHA512:
6
- metadata.gz: 3e7de480331dd62d6a65cd477ad95d9e3648e693a6dcd7577ba6faa574204bd9a4fcb66c9b0c3c2599cbb74209f3ae18ff8866ab14c7e59b59fc2d6f3700ec3b
7
- data.tar.gz: dbe2c4290d20bb68218f6628165086d3747a5cb6153b891c6618ed4789fae15e1fca231a6b5e6fd78357d20db730e6fbd83b1e845a5099e98fb5a160b03b98f9
6
+ metadata.gz: 96ad91029980370ccad1db4f32c0baadded1216f05bbbf818aaa90c425512fb851aac9651b5365d9e0550050a61fae616cfcb45a3fd31f1c31110646a00b86b8
7
+ data.tar.gz: 8faae7e20c891abf20dc2b184fd3643a4fc26ec5f8be39085274a69db0ec79b15bfed9cc2784d71a79cfaca0f9f7ee34e8d79a386bab7c935fa1115e2e9d4e1f
@@ -32,3 +32,4 @@ exclude_paths:
32
32
  - "spec/"
33
33
  - "lib/alchemy/upgrader/"
34
34
  - "lib/rails/"
35
+ - "vendor/assets/"
data/.gitignore CHANGED
@@ -20,3 +20,4 @@ spec/dummy/public/assets
20
20
  .rbenv-version
21
21
  .ruby-gemset
22
22
  .ruby-version
23
+ .env
@@ -0,0 +1,8 @@
1
+ require 'dotenv/load'
2
+
3
+ Localeapp.configure do |config|
4
+ config.api_key = ENV['LOCALEAPP_API_KEY']
5
+ config.translation_data_directory = 'config/locales'
6
+ config.synchronization_data_file = '.localeapp/log.yml'
7
+ config.daemon_pid_file = '.localeapp/localeapp.pid'
8
+ end
@@ -4,10 +4,12 @@ AllCops:
4
4
  Exclude:
5
5
  - 'bin/rspec'
6
6
  - 'vendor/**/*'
7
- - 'spec/dummy/**/*'
7
+ - 'spec/dummy/db/**/*'
8
+ - 'spec/dummy/config/**/*'
8
9
  - 'alchemy_cms.gemspec'
10
+ - 'Rakefile'
9
11
 
10
- TargetRubyVersion: 2.1
12
+ TargetRubyVersion: 2.2
11
13
 
12
14
  # Really, rubocop?
13
15
  Bundler/OrderedGems:
@@ -25,10 +27,6 @@ Style/EmptyLiteral:
25
27
  Style/ClassVars:
26
28
  Enabled: false
27
29
 
28
- # We need these names for backwards compatability
29
- Style/PredicateName:
30
- Enabled: false
31
-
32
30
  # This has been used for customization
33
31
  Style/MutableConstant:
34
32
  Enabled: false
@@ -49,6 +47,10 @@ Style/WordArray:
49
47
  Style/ConditionalAssignment:
50
48
  Enabled: false
51
49
 
50
+ Style/MixinUsage:
51
+ Exclude:
52
+ - spec/**/*
53
+
52
54
  Performance/Count:
53
55
  Enabled: false
54
56
 
@@ -103,7 +105,7 @@ Layout/SpaceInsideParens:
103
105
  Enabled: false
104
106
  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
105
107
 
106
- Lint/EndAlignment:
108
+ Layout/EndAlignment:
107
109
  Enabled: false
108
110
 
109
111
  Lint/HandleExceptions:
@@ -117,9 +119,6 @@ Lint/ShadowedException:
117
119
  Style/CollectionMethods:
118
120
  Enabled: false
119
121
 
120
- Style/AccessorMethodName:
121
- Enabled: false
122
-
123
122
  Style/Alias:
124
123
  Enabled: false
125
124
  StyleGuide: http://relaxed.ruby.style/#stylealias
@@ -217,9 +216,6 @@ Style/StringLiterals:
217
216
  Enabled: false
218
217
  StyleGuide: http://relaxed.ruby.style/#stylestringliterals
219
218
 
220
- Style/VariableNumber:
221
- Enabled: false
222
-
223
219
  Style/WhileUntilModifier:
224
220
  Enabled: false
225
221
  StyleGuide: http://relaxed.ruby.style/#stylewhileuntilmodifier
@@ -280,3 +276,20 @@ Metrics/ParameterLists:
280
276
 
281
277
  Metrics/PerceivedComplexity:
282
278
  Enabled: false
279
+
280
+ Naming/AccessorMethodName:
281
+ Enabled: false
282
+
283
+ Naming/HeredocDelimiterNaming:
284
+ Enabled: false
285
+
286
+ # This cop is great but has no config option to support the style `@_method_name` we are using.
287
+ Naming/MemoizedInstanceVariableName:
288
+ Enabled: false
289
+
290
+ # We need these names for backwards compatability
291
+ Naming/PredicateName:
292
+ Enabled: false
293
+
294
+ Naming/VariableNumber:
295
+ Enabled: false
@@ -1,24 +1,21 @@
1
1
  language: ruby
2
2
  dist: trusty
3
3
  sudo: false
4
+ addons:
5
+ apt:
6
+ packages:
7
+ - chromium-chromedriver
4
8
  cache:
5
9
  bundler: true
6
- directories:
7
- - "travis_phantomjs"
8
10
  rvm:
9
- - 2.2.7
10
11
  - 2.3.5
11
12
  - 2.4.2
13
+ - 2.5.0
12
14
  before_install:
13
- - "phantomjs --version"
14
- - "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"
15
- - "phantomjs --version"
16
- - "if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
17
- - "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi"
18
- - "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
19
- - "phantomjs --version"
20
15
  - gem install bundler
21
- before_script: bundle exec rake alchemy:spec:prepare
16
+ before_script:
17
+ - bundle exec rake alchemy:spec:prepare
18
+ - export PATH=$PATH:/usr/lib/chromium-browser/
22
19
  script: bundle exec rspec
23
20
  after_success: bundle exec codeclimate-test-reporter
24
21
  env:
@@ -1,26 +1,11 @@
1
1
  # Change Log
2
2
 
3
- ## 4.0.5 (unreleased)
3
+ ## 4.1.0 (unreleased)
4
4
 
5
- - Do not cache sitemap in Turbolinks [#1463](https://github.com/AlchemyCMS/alchemy_cms/pull/1463) ([tvdeyen](https://github.com/tvdeyen))
6
- - Skip folded deeper levels when rendering page tree [#1324](https://github.com/AlchemyCMS/alchemy_cms/pull/1324) ([pascalj](https://github.com/pascalj))
7
-
8
- ## 4.0.4 (2018-09-05)
9
-
10
- - Allow Kaminari 1.x [#1467](https://github.com/AlchemyCMS/alchemy_cms/pull/1467) ([tvdeyen](https://github.com/tvdeyen))
11
-
12
- ## 4.0.3 (2018-05-14)
13
-
14
- - Add must_revalidate to cache-control header [#1340](https://github.com/AlchemyCMS/alchemy_cms/pull/1340) ([afdev82](https://github.com/afdev82))
15
-
16
- ## 4.0.2 (2018-05-08)
17
-
18
- - Fix draggable trash item feature [#1429](https://github.com/AlchemyCMS/alchemy_cms/pull/1429) ([tvdeyen](https://github.com/tvdeyen))
19
- - Allow CanCanCan 2.x [#1418](https://github.com/AlchemyCMS/alchemy_cms/pull/1418) ([tvdeyen](https://github.com/tvdeyen))
20
-
21
- ## 4.0.1 (2018-04-23)
22
-
23
- - Add more classes to YAML.safe_load [#1414](https://github.com/AlchemyCMS/alchemy_cms/pull/1414) ([tvdeyen](https://github.com/tvdeyen))
5
+ * Replaces PNG icons with FontAwesome icon font [#1342](https://github.com/AlchemyCMS/alchemy_cms/pull/1342) by [tvdeyen](https://github.com/tvdeyen)
6
+ * Remove pleaseWait overlay from links with GET requests [#1343](https://github.com/AlchemyCMS/alchemy_cms/pull/1343) by [tvdeyen](https://github.com/tvdeyen)
7
+ * Removed fixed table headers from admin resource tables [#1339](https://github.com/AlchemyCMS/alchemy_cms/pull/1339) by [tvdeyen](https://github.com/tvdeyen)
8
+ * Removed Bourbon Sass library [#1339](https://github.com/AlchemyCMS/alchemy_cms/pull/1339) by [tvdeyen](https://github.com/tvdeyen)
24
9
 
25
10
  ## 4.0.0 (2017-11-06)
26
11
 
data/Gemfile CHANGED
@@ -2,17 +2,17 @@ source 'https://rubygems.org'
2
2
 
3
3
  gemspec
4
4
 
5
+ gem 'rails', '~> 5.2.0'
6
+
5
7
  # Profiling
6
8
  gem 'rack-mini-profiler', group: :development, require: false
7
9
 
8
10
  gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
9
- gem 'mysql2', '~> 0.3.18' if ENV['DB'] == 'mysql'
10
- gem 'pg' if ENV['DB'] == 'postgresql'
11
+ gem 'mysql2', '~> 0.5.1' if ENV['DB'] == 'mysql'
12
+ gem 'pg', '~> 1.0' if ENV['DB'] == 'postgresql'
11
13
  gem 'sassc-rails'
12
14
 
13
15
  group :development, :test do
14
- gem 'jasmine-rails', github: 'searls/jasmine-rails'
15
- gem 'jasmine-jquery-rails', github: 'travisjeffery/jasmine-jquery-rails'
16
16
  gem 'simplecov', require: false
17
17
  if ENV['TRAVIS']
18
18
  gem 'codeclimate-test-reporter', '~> 1.0', require: false
@@ -28,11 +28,14 @@ group :development, :test do
28
28
  gem 'spring-commands-rspec'
29
29
  gem 'rubocop', require: false
30
30
  gem 'listen'
31
+ gem 'localeapp', '~> 3.0', require: false
32
+ gem 'dotenv', '~> 2.2'
31
33
  end
32
- gem 'capybara', '~> 2.4'
34
+ gem 'capybara', '~> 3.0'
35
+ gem 'capybara-screenshot', '~> 1.0'
33
36
  gem 'database_cleaner', '~> 1.3'
34
37
  gem 'factory_bot_rails', '~> 4.5'
35
- gem 'poltergeist', '~> 1.10'
38
+ gem 'selenium-webdriver', '~> 3.8'
36
39
  gem 'rspec-activemodel-mocks', '~> 1.0'
37
40
  gem 'rspec-rails', '~> 3.0'
38
41
  gem 'shoulda-matchers', '~> 3.1'
@@ -41,6 +44,6 @@ end
41
44
 
42
45
  # We need this if we want to start the dummy app in production, ie on Teatro.io
43
46
  group :production do
44
- gem 'uglifier', '>= 1.0.3'
47
+ gem 'uglifier', '>= 2.7.2'
45
48
  gem 'therubyracer'
46
49
  end
data/README.md CHANGED
@@ -1,8 +1,11 @@
1
1
  [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
2
- [![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=4.0-stable)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
3
- [![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy_cms.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
4
- [![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
5
- [![Slack Status](http://slack.alchemy-cms.com/badge.svg)](http://slack.alchemy-cms.com)
2
+ [![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=master)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
3
+ [![Maintainability](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/maintainability)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/maintainability)
4
+ [![Test Coverage](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/test_coverage)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/test_coverage)
5
+ [![Slack Status](http://slackin.alchemy-cms.com/badge.svg)](http://slackin.alchemy-cms.com)
6
+
7
+ **CAUTION: This master branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (4.0-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/4.0-stable).**
8
+
6
9
 
7
10
  ## About
8
11
 
@@ -61,16 +64,10 @@ For a Ruby 1.8.7 compatible version use the [`2.3-stable` branch](https://github
61
64
  Put this into your `Gemfile`:
62
65
 
63
66
  ```ruby
64
- gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '4.0-stable'
65
- ```
66
-
67
- If you want to use Russian translation and have better i18n support, you should put:
68
-
69
- ```ruby
70
- gem 'russian', '~> 0.6.0'
67
+ gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'master'
71
68
  ```
72
69
 
73
- or gem with similar functionality into your Gemfile.
70
+ **NOTE:** You normally want to use a stable branch, like `4.0-stable`.
74
71
 
75
72
  #### 2. Update your bundle:
76
73
 
@@ -88,9 +85,11 @@ the Devise based user model that Alchemy provides and was extracted [into its ow
88
85
  If you don't have your own user class, you can use the Alchemy user model. Just add the following gem into your `Gemfile`:
89
86
 
90
87
  ```ruby
91
- gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '4.0-stable'
88
+ gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: 'master'
92
89
  ```
93
90
 
91
+ **NOTE:** You normally want to use a stable branch, like `4.0-stable`.
92
+
94
93
  Then run:
95
94
 
96
95
  ```shell
@@ -163,7 +162,7 @@ For example, these settings:
163
162
  ```ruby
164
163
  # config/initializers/alchemy.rb
165
164
 
166
- Alchemy.admin_path = '/backend'
165
+ Alchemy.admin_path = 'backend'
167
166
  Alchemy.admin_constraints = {subdomain: 'hidden'}
168
167
  ```
169
168
 
@@ -183,6 +182,9 @@ Please follow the guidelines about picture caching on the Dragonfly homepage for
183
182
 
184
183
  http://markevans.github.io/dragonfly/cache
185
184
 
185
+ ### Localization
186
+
187
+ Alchemy ships with one default English translation for the admin interface. If you want to use the admin interface in other languages please have a look at the [`alchemy_i18n` project](https://github.com/AlchemyCMS/alchemy_cms).
186
188
 
187
189
  ## Upgrading
188
190
 
data/Rakefile CHANGED
@@ -23,7 +23,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
23
23
  rdoc.rdoc_files.include('app/**/*.rb')
24
24
  end
25
25
 
26
- APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
26
+ APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
27
27
  load 'rails/tasks/engine.rake'
28
28
 
29
29
  require 'rspec/core'
@@ -1,5 +1,5 @@
1
1
  # coding: utf-8
2
- lib = File.expand_path('../lib', __FILE__)
2
+ lib = File.expand_path('lib', __dir__)
3
3
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
  require 'alchemy/version'
5
5
 
@@ -20,17 +20,16 @@ Gem::Specification.new do |gem|
20
20
 
21
21
  gem.add_runtime_dependency 'active_model_serializers', ['~> 0.9.0']
22
22
  gem.add_runtime_dependency 'acts_as_list', ['~> 0.3']
23
- gem.add_runtime_dependency 'acts-as-taggable-on', ['~> 5.0']
24
23
  gem.add_runtime_dependency 'awesome_nested_set', ['~> 3.1']
25
- gem.add_runtime_dependency 'bourbon', ['~> 4.2']
26
- gem.add_runtime_dependency 'cancancan', ['>= 1.9', '< 3.0']
24
+ gem.add_runtime_dependency 'cancancan', ['~> 2.1']
27
25
  gem.add_runtime_dependency 'coffee-rails', ['~> 4.0']
28
26
  gem.add_runtime_dependency 'dragonfly', ['~> 1.0', '>= 1.0.7']
29
27
  gem.add_runtime_dependency 'dragonfly_svg', ['~> 0.0.4']
28
+ gem.add_runtime_dependency 'gutentag', ['~> 2.2', '>= 2.2.1']
30
29
  gem.add_runtime_dependency 'handlebars_assets', ['~> 0.23']
31
- gem.add_runtime_dependency 'jquery-rails', ['~> 4.0']
30
+ gem.add_runtime_dependency 'jquery-rails', ['~> 4.0', '>= 4.0.4']
32
31
  gem.add_runtime_dependency 'jquery-ui-rails', ['~> 5.0.0']
33
- gem.add_runtime_dependency 'kaminari', ['>= 0.15', '< 2.0']
32
+ gem.add_runtime_dependency 'kaminari', ['~> 1.1']
34
33
  gem.add_runtime_dependency 'originator', ['~> 3.1']
35
34
  gem.add_runtime_dependency 'non-stupid-digest-assets', ['~> 1.0.8']
36
35
  gem.add_runtime_dependency 'rails', ['~> 5.0', '< 6.0']
@@ -38,7 +37,7 @@ Gem::Specification.new do |gem|
38
37
  gem.add_runtime_dependency 'request_store', ['~> 1.2']
39
38
  gem.add_runtime_dependency 'responders', ['~> 2.0']
40
39
  gem.add_runtime_dependency 'select2-rails', ['>= 3.5.9.1', '< 4.0']
41
- gem.add_runtime_dependency 'simple_form', ['~> 3.0']
40
+ gem.add_runtime_dependency 'simple_form', ['~> 4.0']
42
41
  gem.add_runtime_dependency 'turbolinks', ['>= 2.5']
43
42
 
44
43
  gem.post_install_message = <<-MSG
@@ -1,70 +1 @@
1
- <?xml version="1.0" encoding="utf-8"?>
2
- <!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
3
- <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
4
- <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
5
- width="240.5px" height="70.575px" viewBox="0 0 240.5 70.575" enable-background="new 0 0 240.5 70.575" xml:space="preserve">
6
- <g>
7
- <path fill="#33393F" d="M10.283,20.956h9.441l10.115,36.975h-8.26l-1.686-6.406H9.552l-1.685,6.406H0L10.283,20.956z M10.733,46.13
8
- h7.979c-1.405-6.406-3.203-14.048-3.933-18.038C13.992,32.082,12.194,39.724,10.733,46.13z"/>
9
- <path fill="#33393F" d="M40.796,57.931h-7.586V17.528l7.586-1.123V57.931z"/>
10
- <path fill="#33393F" d="M65.07,56.021c-1.068,0.449-3.878,2.585-8.26,2.585c-7.53,0-11.688-4.72-11.688-14.667
11
- c0-10.452,4.327-15.509,12.194-15.509c3.147,0,5.732,0.786,6.743,1.18l-0.899,5.563c-0.73-0.281-2.753-0.899-4.776-0.899
12
- c-3.709,0-5.451,2.866-5.451,9.384c0,6.631,1.911,9.047,5.226,9.047c2.304,0,4.383-1.236,5.17-1.517L65.07,56.021z"/>
13
- <path fill="#33393F" d="M67.992,17.528l7.586-1.123v16.352h0.112c0.787-0.731,3.372-4.327,7.98-4.327
14
- c5.282,0,7.361,3.259,7.361,10.058v19.443h-7.586V40.343c0-4.159-0.674-5.339-2.978-5.339c-2.304,0-4.215,2.361-4.889,3.147v19.78
15
- h-7.586V17.528z"/>
16
- <path fill="#33393F" d="M116.936,55.852c-0.843,0.561-4.327,2.754-9.89,2.754c-6.519,0-11.8-4.215-11.8-14.33
17
- c0-10.733,5.225-15.846,11.632-15.846c6.406,0,10.901,3.99,10.901,13.43c0,2.023-0.281,3.652-0.337,3.934h-14.666
18
- c0.056,5.001,2.529,7.08,5.732,7.08c3.034,0,5.563-1.348,6.911-1.967L116.936,55.852z M102.775,41.073h7.698
19
- c0-5.732-1.573-7.249-3.653-7.249C104.854,33.824,102.831,35.622,102.775,41.073z"/>
20
- <path fill="#33393F" d="M122.273,29.048h6.687l0.337,3.878c0.844-1.012,2.979-4.495,7.25-4.495c3.259,0,5.282,1.124,6.125,4.439
21
- c0.955-1.293,3.315-4.439,7.361-4.439c4.889,0,6.968,2.754,6.968,10.002v19.499h-7.53V39.05c0-2.529-0.394-4.046-2.361-4.046
22
- c-1.967,0-3.484,2.248-3.877,3.147v19.78h-7.25V39.05c0-2.529-0.393-4.046-2.36-4.046c-1.967,0-3.428,2.192-3.878,3.147v19.78
23
- h-7.474V29.048z"/>
24
- <path fill="#33393F" d="M184.367,29.048l-9.496,30.513c-2.361,7.587-6.8,9.722-9.16,11.014c-0.787-1.011-2.641-3.596-3.372-4.608
25
- c0.843-0.731,4.889-2.81,6.069-7.418l-9.103-29.501h7.923c0.843,3.428,3.878,16.071,4.72,20.792
26
- c0.9-4.833,3.878-17.364,4.776-20.792H184.367z"/>
27
- </g>
28
- <g>
29
- <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#C7E4F5" points="196.981,19.066 186.023,22.016 177.996,13.958
30
- 180.937,2.95 191.893,0 199.911,8.058 "/>
31
- <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#33393F" points="201.487,31.458 195.325,33.114 190.819,28.588
32
- 192.476,22.407 198.627,20.752 203.132,25.277 "/>
33
- <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#88AD59" points="214.803,22.347 206.133,24.685 199.781,18.303
34
- 202.098,9.593 210.778,7.255 217.13,13.637 "/>
35
- </g>
36
- <g>
37
- <path fill="#33393F" stroke="#33393F" d="M195.908,43.146c-0.337,0-0.755-0.264-1.253-0.792c-0.498-0.527-0.997-0.791-1.494-0.791
38
- c-1.802,0-3.641,1.663-5.517,4.99c-1.656,2.945-2.484,5.246-2.484,6.902c0,1.846,0.777,2.769,2.33,2.769
39
- c1.538,0,3.062-0.506,4.572-1.517c1.391-0.937,2.586-2.175,3.583-3.714c0.087-0.162,0.205-0.242,0.352-0.242
40
- c0.175,0,0.344,0.118,0.506,0.352c0.161,0.234,0.219,0.425,0.175,0.571c-0.118,0.469-0.938,1.45-2.462,2.946
41
- c-1.392,1.362-2.242,2.125-2.55,2.285c-1.451,0.792-2.36,1.188-2.726,1.188c-0.043,0-0.234,0.018-0.571,0.055
42
- c-0.337,0.036-0.52,0.055-0.55,0.055c-1.524,0-2.674-0.55-3.45-1.648c-0.645-0.909-0.967-2.045-0.967-3.407
43
- c0-2.154,0.967-4.777,2.902-7.869c2.227-3.561,4.586-5.348,7.077-5.363c0.425,0,1.048,0.183,1.869,0.549
44
- c1.069,0.469,1.627,1.041,1.671,1.715c0.028,0.293-0.085,0.527-0.341,0.704C196.322,43.058,196.098,43.146,195.908,43.146z"/>
45
- <path fill="#33393F" stroke="#33393F" d="M224.306,56.796c-1.261,0-2.294-0.915-3.1-2.748c-0.63-1.421-0.946-2.717-0.946-3.89
46
- c0,0.278,0-0.432,0-2.132c0.029-1.113,0.015-1.977-0.043-2.593c-0.074-0.85-0.22-1.275-0.438-1.275
47
- c-0.044,0-0.416,0.557-1.117,1.67c-2.38,3.723-3.665,5.715-3.854,5.98c-1.986,2.755-3.541,4.131-4.665,4.131
48
- c-1.124,0-1.737-1.223-1.839-3.67c-0.029-0.674,0.036-2.807,0.198-6.397c0.029-0.806-0.036-1.208-0.198-1.208
49
- c-0.469,0-1.7,1.81-3.692,5.429c-2.037,3.679-3.121,6.191-3.253,7.54c-0.044,0.542-0.381,0.813-1.011,0.813
50
- c-0.293,0-0.557-0.469-0.791-1.407c-0.162-0.718-0.242-1.253-0.242-1.604c0-2.682,0.066-4.99,0.198-6.924
51
- c0.117-1.787,0.342-3.304,0.676-4.55c0.35-1.348,0.75-2.023,1.2-2.023c0.32,0,0.615,0.118,0.884,0.352
52
- c0.269,0.234,0.375,0.461,0.316,0.681c-0.864,3.122-1.311,6.33-1.34,9.628c1.579-2.843,2.675-4.74,3.29-5.692
53
- c1.783-2.741,3.179-4.111,4.188-4.111c1.213,0,1.79,1.443,1.732,4.33c-0.012,0.308-0.048,1.003-0.108,2.088
54
- c-0.06,0.997-0.089,1.787-0.089,2.373c0,1.129,0.109,1.986,0.328,2.572c0.527-0.162,1.441-1.114,2.743-2.858
55
- c1.067-1.466,1.974-2.828,2.72-4.088c1.931-3.342,3.335-5.012,4.213-5.012c0.878,0,1.434,0.843,1.668,2.528
56
- c0.073,1.041,0.182,2.638,0.329,4.792c0.264,3.912,0.951,5.884,2.066,5.913c0.425,0.015,0.803-0.202,1.132-0.649
57
- c0.33-0.447,0.597-0.67,0.803-0.67c0.41,0,0.615,0.22,0.615,0.66c0,0.601-0.367,1.113-1.099,1.538
58
- C225.207,56.635,224.716,56.796,224.306,56.796z"/>
59
- <path fill="#33393F" stroke="#33393F" d="M239.23,42.421c-0.087,0-0.377-0.132-0.868-0.396c-0.491-0.264-0.86-0.403-1.109-0.417
60
- c-0.997-0.088-2.389,0.637-4.176,2.175c-1.846,1.583-2.769,2.939-2.769,4.067c0,0.601,1.069,0.901,3.209,0.901
61
- c4.131,0,6.198,1.15,6.198,3.45c0,1.627-0.914,3.085-2.742,4.374c-1.667,1.172-3.327,1.758-4.979,1.758
62
- c-0.732,0-1.412-0.227-2.04-0.681c-0.732-0.513-1.097-1.18-1.097-2c0-0.337,0.145-0.733,0.435-1.187
63
- c0.332-0.528,0.687-0.792,1.063-0.792c0.101,0,0.203,0.023,0.305,0.066c-0.053,0.513-0.137,0.909-0.255,1.188
64
- c-0.065,0.161-0.097,0.329-0.097,0.506c0,0.658,0.394,0.989,1.183,0.989c1.213,0,2.602-0.396,4.166-1.187
65
- c1.738-0.88,2.609-1.803,2.609-2.77c0-0.601-0.302-1.099-0.904-1.494c-0.5-0.322-1.051-0.498-1.652-0.527l-4.229-0.154
66
- c-0.705-0.029-1.388-0.176-2.049-0.44c-0.896-0.352-1.343-0.82-1.343-1.406c0-1.451,1.14-3.287,3.418-5.506
67
- c2.278-2.221,4.202-3.33,5.77-3.33c0.44,0,0.974,0.169,1.605,0.506c0.747,0.41,1.121,0.864,1.121,1.362
68
- C240,42.106,239.743,42.421,239.23,42.421z"/>
69
- </g>
70
- </svg>
1
+ <svg xmlns="http://www.w3.org/2000/svg" width="267" height="91" viewBox="0 0 267 91"><path d="M261.749 29.77h-9.812l-.72 2.738a193.53 193.53 0 0 0-.802 3.217c-.334-1.384-.604-2.5-.767-3.162l-.685-2.792H234.075c-1.102-.371-2.338-.564-3.705-.564-2.537 0-4.557.864-6.104 1.934-1.406-1.15-3.402-1.934-6.221-1.934-1.341 0-2.524.242-3.564.625l-.006-.061H201.334v4.17c-2.345-3.051-5.884-4.735-10.401-4.735-4.196 0-8.831 1.936-11.655 6.784-1.194-3.746-3.896-6.784-9.557-6.784-1.385 0-2.626.24-3.727.617v-12.19l-4.204.623-6.934 1.027-3.132.464v10.324a22.109 22.109 0 0 0-6.086-.864c-5.96 0-9.341 2.652-11.128 4.876-.108.133-.2.284-.303.422V17.633l-4.207.623-6.933 1.027-3.131.464v24.04l-5.118-18.709-.739-2.701H99.863l-.745 2.686L95.854 36.8 80.915 21.597a2.922 2.922 0 0 0-2.823-.776l-18.554 4.875a2.918 2.918 0 0 0-.634-.981L39.437 4.906a2.927 2.927 0 0 0-2.826-.777L9.797 11.173a2.92 2.92 0 0 0-2.073 2.054L.372 40.078a2.922 2.922 0 0 0 .735 2.818L20.6 62.705a2.921 2.921 0 0 0 2.822.774l9.259-2.43-3.051 11.1a2.921 2.921 0 0 0 .735 2.821l10.94 11.122a2.92 2.92 0 0 0 2.822.778l15.08-3.953a2.919 2.919 0 0 0 2.077-2.055l3.536-12.978.316.324a2.928 2.928 0 0 0 2.064.872c.254.001.508-.031.761-.098l20.839-5.48H103.275l.72-2.733.82-3.121h3.794l.822 3.122.718 2.732h24.059v-4.307c.07.092.133.194.207.282 1.729 2.119 5.001 4.643 10.76 4.643 2.735 0 4.945-.705 6.55-1.415v.797H180.119v-4.383c2.392 3.007 5.737 4.495 9.134 4.885-1.602 1.106-3.095 2.759-4.467 4.952-2.161 3.454-3.211 6.441-3.211 9.137 0 2.014.524 3.774 1.562 5.236 1.388 1.967 3.57 3.053 6.143 3.053.226 0 .384-.016.896-.073.142-.014.243-.025.312-.03 1.014-.043 2.078-.446 4.047-1.521.468-.248.973-.622 2.077-1.656.966 3.029 2.97 3.501 4.119 3.501 2.479 0 4.354-1.665 4.575-4.057.007-.045.041-.233.189-.649.774 1.335 2.059 2.415 4.188 2.415 2.658 0 4.791-2.088 6.555-4.378.065.155.132.312.203.47 1.794 4.082 4.646 4.694 6.185 4.694.76 0 1.52-.168 2.307-.503.228.213.463.419.726.605a6.818 6.818 0 0 0 3.993 1.302c2.273 0 4.515-.764 6.661-2.274 3.357-2.369 4.061-5.111 4.061-6.996 0-2.266-1.092-4.215-3.014-5.406a4.177 4.177 0 0 0 2.142-1.312c.918 1.27 1.794 2.475 2.303 3.129l1.917 2.468 2.74-1.503.268-.144c2.382-1.291 7.335-3.979 9.847-12.048l8.677-27.888 1.479-4.759h-4.984z" fill="none"/><path fill="#eca96e" d="M102.705 26.102h8.626l9.245 33.793h-7.549l-1.541-5.856h-9.448l-1.541 5.856h-7.189l9.397-33.793zm.411 23.008h7.291c-1.282-5.857-2.925-12.841-3.594-16.487-.719 3.647-2.362 10.63-3.697 16.487zm27.472 10.786h-6.931V22.969l6.931-1.026v37.953zm22.187-1.748c-.977.409-3.545 2.364-7.549 2.364-6.883 0-10.682-4.314-10.682-13.405 0-9.554 3.953-14.176 11.143-14.176 2.878 0 5.239.719 6.163 1.079l-.822 5.083c-.666-.256-2.517-.822-4.365-.822-3.388 0-4.981 2.62-4.981 8.579 0 6.061 1.747 8.267 4.775 8.267 2.108 0 4.008-1.128 4.726-1.386l1.592 4.417zm2.671-35.179l6.931-1.026v14.943h.105c.717-.667 3.079-3.954 7.291-3.954 4.826 0 6.728 2.979 6.728 9.193v17.771h-6.934V43.819c0-3.801-.616-4.879-2.721-4.879-2.107 0-3.853 2.157-4.47 2.876v18.079h-6.931V22.969zm44.73 35.026c-.771.514-3.956 2.518-9.038 2.518-5.957 0-10.785-3.852-10.785-13.097 0-9.811 4.775-14.484 10.63-14.484 5.854 0 9.963 3.646 9.963 12.273 0 1.851-.257 3.339-.309 3.597h-13.401c.05 4.571 2.311 6.469 5.235 6.469 2.773 0 5.086-1.231 6.319-1.795l1.386 4.519zm-12.941-13.509h7.034c0-5.237-1.437-6.624-3.338-6.624-1.798 0-3.646 1.643-3.696 6.624zm17.82-10.989h6.107l.31 3.543c.772-.925 2.722-4.109 6.624-4.109 2.98 0 4.828 1.027 5.598 4.057.874-1.181 3.03-4.057 6.728-4.057 4.468 0 6.37 2.517 6.37 9.141v17.823h-6.883V42.637c0-2.311-.358-3.697-2.158-3.697-1.797 0-3.183 2.054-3.543 2.876v18.079h-6.625V42.637c0-2.311-.358-3.697-2.157-3.697-1.796 0-3.131 2.003-3.542 2.876v18.079h-6.828V33.497zm56.744 0l-8.679 27.887c-2.156 6.934-6.213 8.886-8.37 10.067-.718-.926-2.414-3.287-3.081-4.213.771-.668 4.467-2.566 5.546-6.778l-8.318-26.963h7.239c.771 3.132 3.545 14.688 4.314 19.002.821-4.417 3.545-15.87 4.367-19.002h6.982z"/><g><path fill="#eca96e" d="M193.986 68.011c.319 0 .667.193 1.031.578.897.95 1.506 1.125 2.353.546.367-.254.548-.633.508-1.05-.054-.799-.66-1.456-1.799-1.957-.818-.364-1.438-.541-1.896-.541-2.436.013-4.74 1.736-6.854 5.116-1.807 2.889-2.722 5.389-2.722 7.435 0 1.336.326 2.474.969 3.379.796 1.128 1.983 1.701 3.526 1.701.029 0 .213-.016.555-.054.268-.028.427-.045.47-.046.306 0 .867-.139 2.703-1.14.226-.117.704-.468 2.439-2.166 1.932-1.896 2.285-2.549 2.366-2.884.084-.275.01-.583-.22-.921-.238-.344-.523-.518-.838-.518a.786.786 0 0 0-.708.429c-.872 1.35-1.932 2.444-3.146 3.266-1.295.868-2.615 1.308-3.923 1.308-.778 0-1.671-.234-1.671-2.074 0-1.427.742-3.47 2.211-6.08 1.621-2.872 3.183-4.327 4.646-4.327zm30.25 10.553c-.354 0-.695.247-1.103.798-.301.408-.535.409-.654.408-.259-.01-1.135-.388-1.441-4.977l-.305-4.414c-.25-1.795-.915-2.704-1.979-2.704-.68 0-1.78.545-4.245 4.804a46.07 46.07 0 0 1-2.457 3.695c-.936 1.256-1.511 1.87-1.856 2.171-.082-.436-.124-.979-.124-1.635 0-.533.027-1.253.081-2.143.055-.995.089-1.633.101-1.925.039-2.004-.251-3.293-.885-3.941a1.569 1.569 0 0 0-1.157-.483c-1.114 0-2.453 1.26-4.214 3.968-.44.683-1.144 1.88-2.093 3.565.149-2.311.529-4.59 1.141-6.795.071-.267.054-.669-.433-1.089-.33-.287-.703-.436-1.107-.436-.863 0-1.277 1.173-1.539 2.19-.313 1.16-.526 2.592-.635 4.245-.119 1.754-.181 3.891-.181 6.36 0 .357.075.868.233 1.577.203.807.5 1.631 1.17 1.631.813 0 1.32-.423 1.381-1.157.113-1.165 1.095-3.422 2.918-6.71 1.54-2.804 2.334-3.953 2.701-4.42 0 .089 0 .194-.005.32-.15 3.265-.211 5.245-.182 5.886.105 2.516.823 3.792 2.139 3.792 1.21 0 2.685-1.261 4.636-3.968.255-.355 2.324-3.588 3.537-5.488.234-.37.414-.648.545-.854.012.086.021.184.031.293.052.55.064 1.329.038 2.328v2.002c.01 1.115.313 2.354.903 3.685.812 1.851 1.907 2.786 3.252 2.786.459 0 .972-.164 1.575-.502.819-.475 1.234-1.083 1.234-1.804.001-.652-.392-1.059-1.021-1.059zm6.628-4.902c-2.19 0-2.468-.365-2.475-.365 0-.874.821-2.04 2.372-3.37 1.809-1.556 2.828-1.882 3.366-1.882.036 0 .073.003.123.006.072.004.298.046.826.328.721.386.872.415 1.009.415.727 0 1.163-.494 1.163-1.324 0-.631-.425-1.187-1.268-1.647-.651-.35-1.201-.517-1.684-.517-1.572 0-3.401 1.039-5.592 3.175-2.195 2.138-3.262 3.892-3.262 5.361 0 .738.509 1.313 1.518 1.711.65.258 1.33.402 2.023.432l3.86.141c.473.023.891.157 1.28.407.556.367.619.737.619.983 0 .86-1.161 1.629-2.133 2.122-1.358.688-2.57 1.035-3.598 1.035-.625 0-.625-.247-.625-.444 0-.104.017-.197.054-.283.126-.3.213-.694.266-1.218l.035-.339-.312-.132c-.656-.279-1.311.032-1.813.841-.316.495-.47.93-.47 1.33 0 .904.4 1.646 1.192 2.199a3.557 3.557 0 0 0 2.134.712c1.598 0 3.218-.569 4.811-1.693 1.794-1.263 2.701-2.733 2.701-4.371.002-2.398-2.057-3.613-6.12-3.613z"/></g><g fill-rule="evenodd" clip-rule="evenodd" fill="#eca96e"><path d="M47.632 51.588L23.382 57.956 5.754 40.043 12.401 15.762 36.65 9.393 54.254 27.305z"/><path d="M57.42 79.029L43.781 82.603 33.888 72.543 37.632 58.91 51.244 55.334 61.138 65.395z"/><path d="M86.963 59.079L67.775 64.128 53.829 49.94 59.066 30.726 78.277 25.679 92.223 39.865z"/></g></svg>
@@ -1,14 +1 @@
1
- <?xml version="1.0" encoding="utf-8"?>
2
- <!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
3
- <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
4
- <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
5
- width="28px" height="28px" viewBox="0 0 28 28" enable-background="new 0 0 28 28" xml:space="preserve">
6
- <g>
7
- <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#C7E4F5" points="13.584,15.795 5.744,17.906 0,12.141 2.104,4.265
8
- 9.943,2.154 15.68,7.919 "/>
9
- <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#33393F" points="16.807,24.662 12.399,25.846 9.175,22.608 10.36,18.186
10
- 14.761,17.001 17.984,20.239 "/>
11
- <polygon fill-rule="evenodd" clip-rule="evenodd" fill="#88AD59" points="26.335,18.143 20.131,19.815 15.587,15.249 17.245,9.018
12
- 23.455,7.345 28,11.911 "/>
13
- </g>
14
- </svg>
1
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="-4 -6 32 32" class="svg-inline--fa fa-lg fa-fw"><path fill="currentColor" d="M15.7 7.9L9.9 2.2 2.1 4.3 0 12.1l5.7 5.8 7.8-2.1 2.2-7.9zm-5.3 10.3l-1.2 4.4 3.2 3.2 4.4-1.2 1.2-4.4-3.2-3.2-4.4 1.2zM23.5 7.3L17.2 9l-1.7 6.2 4.5 4.6 6.2-1.7 1.7-6.2-4.4-4.6z"/></svg>
@@ -4,7 +4,6 @@
4
4
  //= require jquery_ujs
5
5
  //= require turbolinks
6
6
  //= require jquery-ui/draggable
7
- //= require jquery-ui/effect-drop
8
7
  //= require jquery-ui/effect-fade
9
8
  //= require jquery-ui/sortable
10
9
  //= require jquery-ui/tabs
@@ -14,12 +13,6 @@
14
13
  //= require keymaster
15
14
  //= require requestAnimationFrame
16
15
  //= require select2
17
- //= require select2_locale_de
18
- //= require select2_locale_es
19
- //= require select2_locale_fr
20
- //= require select2_locale_nl
21
- //= require select2_locale_ru
22
- //= require select2_locale_it
23
16
  //= require handlebars
24
17
  //= require alchemy/templates
25
18
  //= require alchemy/alchemy.base