alchemy_cms 2.1.5 → 2.1.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (55) hide show
  1. data/.travis.yml +1 -0
  2. data/app/assets/javascripts/alchemy/alchemy.base.js +1 -1
  3. data/app/assets/javascripts/alchemy/alchemy.buttons.js +5 -5
  4. data/app/assets/javascripts/alchemy/alchemy.dragndrop.js +1 -1
  5. data/app/assets/javascripts/alchemy/alchemy.element_editor_selector.js +2 -2
  6. data/app/assets/javascripts/alchemy/alchemy.windows.js +1 -1
  7. data/app/assets/stylesheets/alchemy/base.css.scss +22 -13
  8. data/app/assets/stylesheets/alchemy/buttons.css.scss +14 -14
  9. data/app/assets/stylesheets/alchemy/elements.css.scss +79 -46
  10. data/app/controllers/alchemy/admin/elements_controller.rb +1 -1
  11. data/app/helpers/alchemy/admin/base_helper.rb +4 -3
  12. data/app/helpers/alchemy/admin/elements_helper.rb +2 -2
  13. data/app/helpers/alchemy/admin/essences_helper.rb +7 -14
  14. data/app/models/alchemy/element.rb +13 -10
  15. data/app/models/alchemy/message.rb +2 -2
  16. data/app/models/alchemy/page.rb +1 -1
  17. data/app/views/alchemy/admin/clipboard/index.html.erb +4 -3
  18. data/app/views/alchemy/admin/clipboard/insert.js.erb +2 -2
  19. data/app/views/alchemy/admin/contents/create.js.erb +48 -13
  20. data/app/views/alchemy/admin/contents/new.html.erb +1 -1
  21. data/app/views/alchemy/admin/elements/_element.html.erb +1 -1
  22. data/app/views/alchemy/admin/elements/_elements_select.html.erb +1 -1
  23. data/app/views/alchemy/admin/elements/create.js.erb +9 -5
  24. data/app/views/alchemy/admin/elements/fold.js.erb +9 -7
  25. data/app/views/alchemy/admin/elements/trash.js.erb +13 -11
  26. data/app/views/alchemy/admin/elements/update.js.erb +10 -7
  27. data/app/views/alchemy/admin/essence_files/edit.html.erb +1 -1
  28. data/app/views/alchemy/admin/essence_pictures/edit.html.erb +3 -3
  29. data/app/views/alchemy/admin/pages/_contactform_links.html.erb +1 -1
  30. data/app/views/alchemy/admin/pages/_create_language_form.html.erb +1 -1
  31. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  32. data/app/views/alchemy/admin/pages/_file_link.html.erb +2 -2
  33. data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
  34. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +1 -1
  35. data/app/views/alchemy/admin/partials/_language_tree_select.html.erb +1 -1
  36. data/app/views/alchemy/admin/partials/_upload_form.html.erb +2 -2
  37. data/app/views/alchemy/admin/resources/destroy.js.erb +1 -1
  38. data/app/views/alchemy/admin/users/_table.html.erb +3 -3
  39. data/app/views/alchemy/elements/_contactform_editor.html.erb +1 -4
  40. data/app/views/alchemy/essences/_essence_date_editor.html.erb +2 -3
  41. data/app/views/alchemy/essences/_essence_date_view.html.erb +4 -6
  42. data/app/views/alchemy/essences/_essence_text_editor.html.erb +2 -2
  43. data/app/views/layouts/alchemy/admin.html.erb +1 -1
  44. data/config/alchemy/elements.yml +2 -0
  45. data/config/locales/alchemy.de.yml +8 -3
  46. data/config/locales/alchemy.en.yml +4 -3
  47. data/lib/alchemy/capistrano.rb +6 -6
  48. data/lib/alchemy/essence.rb +9 -4
  49. data/lib/alchemy/version.rb +1 -1
  50. data/spec/helpers/admin/elements_helper_spec.rb +1 -1
  51. data/spec/integration/security_spec.rb +2 -2
  52. data/spec/models/page_spec.rb +28 -1
  53. data/spec/support/alchemy/specs_helpers.rb +1 -1
  54. metadata +33 -34
  55. data/app/views/alchemy/admin/elements/destroy.js.erb +0 -6
data/app/views/alchemy/admin/elements/destroy.js.erb DELETED
@@ -1,6 +0,0 @@
1
- (function($) {
2
- $('.element_editor[data-element-id="<%= @element.id -%>"]').remove();
3
- Alchemy.growl('<%= t("element_deleted_successful") -%>');
4
- $('#element_area').sortable('refresh');
5
- Alchemy.PreviewWindow.refresh();
6
- })(jQuery);