alchemy_cms 2.1.rc6 → 2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (57) hide show
  1. data/app/assets/images/alchemy/lupe.cur +0 -0
  2. data/app/assets/javascripts/alchemy/alchemy.buttons.js +1 -1
  3. data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +1 -0
  4. data/app/assets/stylesheets/alchemy/alchemy.css +11 -0
  5. data/app/assets/stylesheets/alchemy/base.css.scss +447 -2446
  6. data/app/assets/stylesheets/alchemy/buttons.css.scss +354 -0
  7. data/app/assets/stylesheets/alchemy/dashboard.css.scss +76 -0
  8. data/app/assets/stylesheets/alchemy/flags.css.scss +1 -1
  9. data/app/assets/stylesheets/alchemy/flash.css.scss +54 -0
  10. data/app/assets/stylesheets/alchemy/frame.css.scss +287 -0
  11. data/app/assets/stylesheets/alchemy/icons.css.scss +300 -0
  12. data/app/assets/stylesheets/alchemy/jquery-ui.alchemy.css.scss +3 -2
  13. data/app/assets/stylesheets/alchemy/jquery.sb.css.scss +1 -1
  14. data/app/assets/stylesheets/alchemy/login.css.scss +53 -0
  15. data/app/assets/stylesheets/alchemy/menubar.css.scss +26 -11
  16. data/app/assets/stylesheets/alchemy/modules.css.scss +31 -0
  17. data/app/assets/stylesheets/alchemy/pagination.css.scss +56 -0
  18. data/app/assets/stylesheets/alchemy/sitemap.css.scss +285 -0
  19. data/app/assets/stylesheets/alchemy/tables.css.scss +150 -0
  20. data/app/assets/stylesheets/alchemy/upload.css.scss +92 -0
  21. data/app/controllers/alchemy/admin/dashboard_controller.rb +1 -1
  22. data/app/controllers/alchemy/admin/pages_controller.rb +1 -1
  23. data/app/controllers/alchemy/admin/resources_controller.rb +35 -2
  24. data/app/controllers/alchemy/user_sessions_controller.rb +3 -0
  25. data/app/helpers/alchemy/admin/attachments_helper.rb +1 -1
  26. data/app/helpers/alchemy/admin/base_helper.rb +69 -20
  27. data/app/helpers/alchemy/pages_helper.rb +0 -55
  28. data/app/views/alchemy/admin/attachments/_attachment.html.erb +1 -1
  29. data/app/views/alchemy/admin/clipboard/index.html.erb +4 -1
  30. data/app/views/alchemy/admin/dashboard/index.html.erb +16 -11
  31. data/app/views/alchemy/admin/elements/_new_element_form.html.erb +4 -1
  32. data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb +1 -20
  33. data/app/views/alchemy/admin/layoutpages/index.html.erb +1 -1
  34. data/app/views/alchemy/admin/pages/index.html.erb +3 -3
  35. data/app/views/alchemy/admin/partials/_search_form.html.erb +7 -1
  36. data/app/views/alchemy/admin/resources/_form.html.erb +1 -1
  37. data/app/views/alchemy/admin/resources/_resource.html.erb +8 -5
  38. data/app/views/alchemy/admin/resources/_table.html.erb +1 -1
  39. data/app/views/alchemy/admin/resources/index.html.erb +4 -3
  40. data/app/views/alchemy/admin/trash/index.html.erb +3 -2
  41. data/app/views/alchemy/user_sessions/login.html.erb +2 -1
  42. data/app/views/layouts/alchemy/admin.html.erb +3 -4
  43. data/app/views/layouts/alchemy/login.html.erb +9 -8
  44. data/config/authorization_rules.rb +0 -1
  45. data/config/locales/alchemy.de.yml +1 -0
  46. data/config/locales/alchemy.en.yml +1 -0
  47. data/lib/alchemy/seeder.rb +1 -1
  48. data/lib/alchemy/version.rb +1 -1
  49. data/spec/integration/admin/pages_controller_spec.rb +45 -57
  50. data/spec/integration/admin/resources_spec.rb +19 -0
  51. data/spec/models/content_spec.rb +6 -5
  52. data/spec/support/alchemy/controller_hacks.rb +41 -0
  53. data/spec/support/alchemy/specs_helpers.rb +32 -0
  54. data/vendor/assets/javascripts/tiny_mce/plugins/autoresize/editor_plugin.js +137 -1
  55. metadata +55 -37
  56. data/app/views/alchemy/admin/languages/_language.html.erb +0 -36
  57. data/spec/support/controller_hacks.rb +0 -37
data/app/views/alchemy/admin/languages/_language.html.erb DELETED
@@ -1,36 +0,0 @@
1
- <tr class="<%= cycle('even', 'odd') %>">
2
- <td class="name"><%= language.name -%></td>
3
- <td class="code"><%= language.code %></td>
4
- <td class="name"><%= language.frontpage_name %></td>
5
- <td class="name"><%= language.page_layout %></td>
6
- <td class="center"><%= render_icon language.public? %></td>
7
- <td class="center"><%= render_icon language.default? %></td>
8
- <td class="tools">
9
- <%- permitted_to?(:edit, :alchemy_admin_languages) do -%>
10
- <%= link_to_overlay_window(
11
- '',
12
- alchemy.edit_admin_language_path(language),
13
- {
14
- :title => t('edit_language'),
15
- :size => '420x280',
16
- :overflow => true
17
- },
18
- {
19
- :class => "icon edit",
20
- :title => t('edit_language')
21
- }
22
- ) -%>
23
- <%- end -%>
24
- <%- unless language.default? -%>
25
- <%- permitted_to?(:destroy, :alchemy_admin_languages) do -%>
26
- <%= link_to_confirmation_window(
27
- '',
28
- t("confirm_to_delete_language"),
29
- alchemy.admin_language_path(language),
30
- :title => t('delete_language'),
31
- :class => "icon destroy"
32
- ) -%>
33
- <%- end -%>
34
- <%- end -%>
35
- </td>
36
- </tr>
data/spec/support/controller_hacks.rb DELETED
@@ -1,37 +0,0 @@
1
- # Based on spree commerce controller hacks.
2
- # https://github.com/spree/spree/blob/master/core/spec/support/controller_hacks.rb
3
- # Thanks!
4
-
5
- module Alchemy
6
- module ControllerHacks
7
- def get(action, parameters = nil, session = nil, flash = nil)
8
- process_alchemy_action(action, parameters, session, flash, "GET")
9
- end
10
-
11
- # Executes a request simulating POST HTTP method and set/volley the response
12
- def post(action, parameters = nil, session = nil, flash = nil)
13
- process_alchemy_action(action, parameters, session, flash, "POST")
14
- end
15
-
16
- # Executes a request simulating PUT HTTP method and set/volley the response
17
- def put(action, parameters = nil, session = nil, flash = nil)
18
- process_alchemy_action(action, parameters, session, flash, "PUT")
19
- end
20
-
21
- # Executes a request simulating DELETE HTTP method and set/volley the response
22
- def delete(action, parameters = nil, session = nil, flash = nil)
23
- process_alchemy_action(action, parameters, session, flash, "DELETE")
24
- end
25
-
26
- private
27
-
28
- def process_alchemy_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
29
- parameters ||= {}
30
- process(action, parameters.merge!(:use_route => :alchemy), session, flash, method)
31
- end
32
- end
33
- end
34
-
35
- RSpec.configure do |c|
36
- c.include Alchemy::ControllerHacks, :type => :controller
37
- end