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
@@ -7,18 +7,24 @@ table {
7
7
  }
8
8
 
9
9
  .list td, .list th {
10
- padding: $default-padding 2*$default-padding;
10
+ padding: 2*$default-padding;
11
11
  vertical-align: top;
12
12
  line-height: 18px;
13
13
  border-right: 1px solid $medium-gray;
14
+ transition: background-color 250ms;
15
+
16
+ &:last-child {
17
+ border-right: 0 none;
18
+ }
14
19
 
15
20
  &.wrap-text {
16
21
  white-space: normal !important;
17
22
  }
18
- }
19
23
 
20
- .list td:first-child, .list th:first-child {
21
- border-left: 1px solid $medium-gray
24
+ &.icon {
25
+ width: 16px;
26
+ text-align: center;
27
+ }
22
28
  }
23
29
 
24
30
  .list th {
@@ -29,29 +35,12 @@ table {
29
35
  }
30
36
  }
31
37
 
32
- .floatThead-container {
33
- background: $light-gray;
34
- overflow: visible !important; // the javascript author thought that, but ....
35
-
36
- &:after {
37
- position: absolute;
38
- bottom: -4px;
39
- left: 0;
40
- width: 100%;
41
- height: 4px;
42
- background: linear-gradient($light-gray, rgba($light-gray, .0));
43
- content: '';
44
- }
45
- }
46
-
47
38
  th {
48
39
  white-space: nowrap;
49
40
  text-align: left;
50
41
  vertical-align: top;
51
- background: $light-gray;
52
42
  border-bottom: 1px solid $medium-gray;
53
- font-weight: normal;
54
- text-transform: uppercase;
43
+ font-weight: bold;
55
44
 
56
45
  i {
57
46
  font-style: normal;
@@ -77,19 +66,16 @@ th {
77
66
  }
78
67
  }
79
68
 
80
- tr.odd td {
81
- background-color: #eaf3f9;
69
+ tr.even td {
70
+ background-color: $table-row-even-background-color;
82
71
  }
83
72
 
84
- tr.even td {
85
- background-color: white;
73
+ tr.odd td {
74
+ background-color: $table-row-odd-background-color;
86
75
  }
87
76
 
88
77
  .list tr .tools {
89
78
  width: 40px;
90
- background: $light-gray;
91
- border-top: 0 none;
92
- border-right: 0 none;
93
79
  white-space: nowrap;
94
80
  @extend .disable-user-select;
95
81
 
@@ -104,48 +90,19 @@ td.heading {
104
90
  text-decoration: underline;
105
91
  }
106
92
 
107
- .list td.icon, .list th.icon {
108
- background-color: $light-gray;
109
- background-image: none;
110
- border-left: 0 none;
111
- padding: 0;
112
- border-right: 1px solid $medium-gray;
113
- text-align: center;
114
- display: table-cell; // reset the .icon display: inline-block
115
- }
116
-
117
93
  .list .tools .icon, .list td.icon .icon {
118
- display: inline-block;
119
- vertical-align: middle;
120
- width: 16px;
121
- height: 16px;
122
94
  @extend .disable-user-select;
123
- background-repeat: no-repeat;
124
95
  margin: 0 $default-margin;
125
- text-indent: -100px;
126
- }
127
-
128
- .list td.icon .icon {
129
- margin: $default-margin 2*$default-margin 0;
130
96
  }
131
97
 
132
98
  .list tr:hover td {
133
- background-color: $light_yellow;
99
+ background-color: $table-row-hover-color;
134
100
  }
135
101
 
136
102
  td, th {
137
103
 
138
104
  &.center, &.boolean {
139
105
  text-align: center;
140
-
141
- .icon.false {
142
- @extend .false;
143
- }
144
-
145
- .icon.true {
146
- @extend .icon;
147
- @extend .true;
148
- }
149
106
  }
150
107
 
151
108
  &.right {
@@ -20,24 +20,6 @@
20
20
  margin: 3px $default-margin 0 0;
21
21
  padding: 0;
22
22
  }
23
-
24
- .button {
25
- width: 25px;
26
- height: 21px;
27
- text-decoration: none;
28
- float: right;
29
- border-width: 0;
30
- border-style: none;
31
- font-size: 0;
32
- padding: 0;
33
- background-repeat: no-repeat;
34
- background-position: 0 0;
35
-
36
- &:active {
37
- text-decoration: none;
38
- background-position: 0 -21px;
39
- }
40
- }
41
23
  }
42
24
 
43
25
  .toolbar_buttons {
@@ -62,6 +44,15 @@
62
44
  }
63
45
  }
64
46
  }
47
+
48
+ .icon_button {
49
+ line-height: 26px;
50
+
51
+ .icon {
52
+ font-size: 1.25em;
53
+ text-shadow: 0 0 1px rgba(#fff, 0.75);
54
+ }
55
+ }
65
56
  }
66
57
 
67
58
  .toolbar_spacer {
@@ -79,24 +70,6 @@
79
70
  #overlay_toolbar {
80
71
  @extend %gradiated-toolbar;
81
72
  border-bottom: $default-border;
82
-
83
- .button {
84
- width: 25px;
85
- height: 21px;
86
- text-decoration: none;
87
- float: right;
88
- border-width: 0;
89
- border-style: none;
90
- font-size: 0;
91
- padding: 0;
92
- background-repeat: no-repeat;
93
- background-position: 0 0;
94
-
95
- &:active {
96
- text-decoration: none;
97
- background-position: 0 -21px;
98
- }
99
- }
100
73
  }
101
74
 
102
75
  .button_group {
@@ -0,0 +1,8 @@
1
+ #trash_items {
2
+ height: 310px;
3
+ overflow-x: hidden;
4
+ overflow-y: auto;
5
+ margin-bottom: 1em;
6
+
7
+ .ajax-folder { display: none }
8
+ }
@@ -80,7 +80,7 @@
80
80
  background-color: $medium-gray;
81
81
  position: relative;
82
82
  margin-top: 8px;
83
- @extend %rounded-border;
83
+ border-radius: $default-border-radius;
84
84
  }
85
85
 
86
86
  .progress-name,
@@ -93,12 +93,12 @@
93
93
  }
94
94
 
95
95
  .progress-bar-status {
96
- font-size: 10px;
96
+ font-size: $small-font-size;
97
97
  }
98
98
 
99
99
  .progress-bar-container {
100
100
  background-color: #f9f9f9;
101
- @extend %rounded-border;
101
+ border-radius: $default-border-radius;
102
102
  height: 16px;
103
103
  overflow: hidden;
104
104
  width: 100%;
@@ -129,11 +129,10 @@
129
129
  }
130
130
 
131
131
  .progress-cancel {
132
- @extend .icon-cross;
133
- width: 16px;
134
- height: 16px;
135
132
  position: absolute;
136
133
  top: 8px;
137
134
  right: 4px;
135
+ width: 16px;
136
+ height: 16px;
138
137
  }
139
138
  }
@@ -6,6 +6,7 @@
6
6
  html {
7
7
  box-shadow: inset 0px 1px 1px $medium-gray;
8
8
  border-radius: $default-border-radius;
9
+ font-size: $base-font-size;
9
10
  }
10
11
 
11
12
  body {
@@ -253,7 +253,7 @@ div.mce-tinymce-inline {
253
253
 
254
254
  .mce-panel {
255
255
  border: 0 solid $default-border-color;
256
- background-color: $medium-gray;
256
+ background-color: $light-gray;
257
257
  }
258
258
 
259
259
  .mce-toolbar-grp {
@@ -354,20 +354,16 @@ div.mce-fullscreen {
354
354
 
355
355
  #mce-modal-block {
356
356
  opacity: 0;
357
- filter: alpha(opacity=0);
358
- zoom: 1;
359
357
  position: fixed;
360
358
  left: 0;
361
359
  top: 0;
362
360
  width: 100%;
363
361
  height: 100%;
364
- background-color: rgb(229, 229, 229);
362
+ background-color: $dialog-overlay-color;
365
363
  }
366
364
 
367
365
  #mce-modal-block.mce-in {
368
- opacity: 0.4;
369
- filter: alpha(opacity=40);
370
- zoom: 1;
366
+ opacity: $dialog-overlay-opacity;
371
367
  }
372
368
 
373
369
  .mce-window-move {
@@ -375,9 +371,8 @@ div.mce-fullscreen {
375
371
  }
376
372
 
377
373
  .mce-window {
378
- border-radius: $default-border-radius;
379
- border: $default-border;
380
- background-color: $light-gray;
374
+ @include border-top-radius($default-border-radius);
375
+ border: 0 none;
381
376
  color: $text-color;
382
377
  position: fixed;
383
378
  top: 0;
@@ -385,15 +380,28 @@ div.mce-fullscreen {
385
380
  opacity: 0;
386
381
  -webkit-transition: opacity 150ms ease-in;
387
382
  transition: opacity 150ms ease-in;
383
+ box-shadow: $dialog-box-shadow;
388
384
 
389
385
  &.mce-in {
390
386
  opacity: 1;
391
387
  }
388
+
389
+ &.mce-panel {
390
+ background-color: transparent;
391
+ }
392
+
393
+ .mce-container-body.mce-abs-layout {
394
+ overflow: visible;
395
+ }
396
+ }
397
+
398
+ .mce-window-body {
399
+ background-color: $dialog-background-color;
392
400
  }
393
401
 
394
402
  .mce-window-head {
395
403
  padding: 8px 12px;
396
- background-color: $light-blue;
404
+ background-color: $dialog-header-color;
397
405
  position: relative;
398
406
  @include border-top-radius($default-border-radius);
399
407
 
@@ -402,6 +410,8 @@ div.mce-fullscreen {
402
410
  font-weight: bold;
403
411
  text-rendering: optimizelegibility;
404
412
  padding-right: 10px;
413
+ color: $dialog-header-text-color;
414
+ @include antialiased-font-smoothing;
405
415
  }
406
416
 
407
417
  .mce-dragh {
@@ -420,7 +430,7 @@ div.mce-fullscreen {
420
430
  font-size: 14px;
421
431
  font-weight: bold;
422
432
  line-height: 14px;
423
- color: $text-color;
433
+ color: $white;
424
434
  cursor: pointer;
425
435
  height: 18px;
426
436
  overflow: hidden;
@@ -428,9 +438,12 @@ div.mce-fullscreen {
428
438
  box-shadow: none;
429
439
 
430
440
  &:hover {
431
- color: #000;
432
441
  background: transparent;
433
442
  }
443
+
444
+ .mce-ico {
445
+ color: inherit;
446
+ }
434
447
  }
435
448
  }
436
449
 
@@ -440,15 +453,32 @@ div.mce-fullscreen {
440
453
 
441
454
  .mce-foot {
442
455
  display: block;
443
- background-color: transparent;
456
+ background-color: $dialog-background-color;
444
457
  border-top: 0 none;
445
- @include border-bottom-radius($default-border-radius);
446
458
 
447
459
  .mce-btn {
448
460
  border-radius: $default-border-radius;
461
+ border: 0 none;
462
+
463
+ &:hover, &:focus, &:active {
464
+ width: auto !important;
465
+ background: $button-hover-bg-color !important;
466
+ border-color: $button-hover-border-color;
467
+ }
449
468
 
450
469
  button {
451
- padding: 0.5em 1.5em;
470
+ padding: 0.3em 1.5em;
471
+ width: auto !important;
472
+ height: auto !important;
473
+ border: 1px solid $button-border-color;
474
+ background-color: $button-bg-color;
475
+ }
476
+
477
+ .mce-txt {
478
+ vertical-align: middle;
479
+ color: $button-text-color;
480
+ font-weight: bold;
481
+ @include antialiased-font-smoothing;
452
482
  }
453
483
  }
454
484
  }
@@ -504,14 +534,14 @@ body .mce-abs-layout-item {
504
534
 
505
535
  .mce-tooltip-inner {
506
536
  font-size: 11px;
507
- background-color: $dark-gray;
508
- color: #fff;
537
+ background-color: $tooltip-background-color;
538
+ color: $white;
509
539
  max-width: 200px;
510
540
  padding: $default-padding 2*$default-padding;
511
541
  text-align: center;
512
542
  white-space: normal;
513
543
  box-shadow: 0 0 4px $default-border-color;
514
- @extend %rounded-border;
544
+ border-radius: $default-border-radius;
515
545
  }
516
546
 
517
547
  .mce-tooltip-arrow {
@@ -519,7 +549,7 @@ body .mce-abs-layout-item {
519
549
  width: 0;
520
550
  height: 0;
521
551
  line-height: 0;
522
- border: 5px solid $dark-gray;
552
+ border: 5px solid $tooltip-background-color;
523
553
  }
524
554
 
525
555
  .mce-tooltip-arrow-n {
@@ -620,20 +650,19 @@ body .mce-abs-layout-item {
620
650
  }
621
651
 
622
652
  .mce-btn {
623
- border: 1px solid #b1b1b1;
624
- border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25) rgba(0,0,0,0.25);
653
+ border: 1px solid $default-border-color;
625
654
  position: relative;
626
- text-shadow: 0 1px 1px rgba(255,255,255,0.75);
655
+ text-shadow: $button-text-shadow;
627
656
  display: inline-block;
628
657
  *display: inline;
629
658
  *zoom: 1;
630
- box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
631
- background: linear-gradient($button-gradient-first-color, $button-gradient-second-color);
659
+ box-shadow: $button-box-shadow;
660
+ background-color: $light-gray;
632
661
 
633
662
  &:focus,
634
663
  &:hover {
635
- color: #333;
636
- background: linear-gradient(darken($button-gradient-first-color, 5%), darken($button-gradient-second-color, 5%));
664
+ color: $text-color;
665
+ background-color: darken($medium-gray, 3%);
637
666
 
638
667
  button {
639
668
  background: inherit;
@@ -646,7 +675,7 @@ body .mce-abs-layout-item {
646
675
  line-height: 20px;
647
676
  *line-height: 16px;
648
677
  cursor: pointer;
649
- color: #333;
678
+ color: $text-color;
650
679
  text-align: center;
651
680
  overflow: visible;
652
681
  -webkit-appearance: none;
@@ -827,8 +856,7 @@ i.mce-i-checkbox {
827
856
 
828
857
  .mce-checkbox.mce-focus i.mce-i-checkbox,
829
858
  .mce-checkbox:focus i.mce-i-checkbox {
830
- border: 1px solid rgba(82,168,236,0.8);
831
- box-shadow: inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);
859
+ @include default-focus-style;
832
860
  }
833
861
 
834
862
  .mce-checkbox.mce-disabled .mce-label,
@@ -1497,27 +1525,32 @@ i.mce-i-resize {
1497
1525
  }
1498
1526
 
1499
1527
  .mce-textbox {
1500
- background: #fff;
1501
- border: 1px solid #c5c5c5;
1528
+ &:not(.mce-multiline) {
1529
+ box-sizing: border-box;
1530
+ width: auto !important;
1531
+ height: $form-field-height !important;
1532
+ padding: $form-field-padding;
1533
+ }
1534
+
1535
+ background: $form-field-background-color;
1536
+ border-width: $form-field-border-width;
1537
+ border-style: $form-field-border-style;
1538
+ border-color: $form-field-border-color;
1502
1539
  border-radius: $default-border-radius;
1503
- box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
1540
+ box-shadow: $form-field-box-shadow;
1504
1541
  display: inline-block;
1505
- -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
1506
1542
  transition: border linear 0.2s, box-shadow linear 0.2s;
1507
- height: 28px;
1508
1543
  resize: none;
1509
- padding: 0 4px;
1510
1544
  white-space: pre-wrap;
1511
- *white-space: pre;
1512
- color: #333;
1545
+ color: $form-field-text-color;
1546
+ cursor: text;
1547
+ font-size: $form-field-font-size;
1548
+ line-height: $form-field-line-height;
1513
1549
  }
1514
1550
 
1515
1551
  .mce-textbox.mce-focus,
1516
1552
  .mce-textbox:focus {
1517
- border-color: rgba(82,168,236,0.8);
1518
- -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);
1519
- -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);
1520
- box-shadow: inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);
1553
+ @include default-focus-style;
1521
1554
  }
1522
1555
 
1523
1556
  .mce-placeholder .mce-textbox {
@@ -1526,10 +1559,12 @@ i.mce-i-resize {
1526
1559
 
1527
1560
  .mce-textbox.mce-multiline {
1528
1561
  padding: 4px;
1562
+ height: inherit;
1529
1563
  }
1530
1564
 
1531
1565
  .mce-textbox.mce-disabled {
1532
- color: #adadad;
1566
+ background: $form-field-disabled-bg-color;
1567
+ color: $form-field-disabled-text-color;
1533
1568
  }
1534
1569
 
1535
1570
  .mce-rtl .mce-textbox {