comfortable_mexican_sofa 1.9.3 → 1.10.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (219) hide show
  1. data/.travis.yml +2 -6
  2. data/README.md +2 -2
  3. data/Rakefile +23 -2
  4. data/app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee +7 -1
  5. data/app/assets/stylesheets/comfortable_mexican_sofa/application.css.sass +1 -1
  6. data/app/assets/stylesheets/comfortable_mexican_sofa/base.css.sass +7 -4
  7. data/app/controllers/{cms_admin → admin/cms}/base_controller.rb +6 -6
  8. data/app/controllers/{cms_admin → admin/cms}/categories_controller.rb +1 -1
  9. data/app/controllers/{cms_admin → admin/cms}/files_controller.rb +4 -4
  10. data/app/controllers/{cms_admin → admin/cms}/layouts_controller.rb +3 -3
  11. data/app/controllers/{cms_admin → admin/cms}/pages_controller.rb +3 -3
  12. data/app/controllers/{cms_admin → admin/cms}/revisions_controller.rb +8 -8
  13. data/app/controllers/{cms_admin → admin/cms}/sites_controller.rb +7 -7
  14. data/app/controllers/{cms_admin → admin/cms}/snippets_controller.rb +2 -2
  15. data/app/controllers/cms/base_controller.rb +30 -0
  16. data/app/controllers/{cms_content_controller.rb → cms/content_controller.rb} +2 -22
  17. data/app/models/cms/file.rb +1 -3
  18. data/app/models/cms/layout.rb +1 -1
  19. data/app/models/cms/snippet.rb +1 -3
  20. data/app/views/{cms_admin → admin/cms}/categories/_categories.html.haml +0 -0
  21. data/app/views/{cms_admin → admin/cms}/categories/_edit.html.haml +1 -1
  22. data/app/views/{cms_admin → admin/cms}/categories/_form.html.haml +0 -0
  23. data/app/views/{cms_admin → admin/cms}/categories/_index.html.haml +3 -3
  24. data/app/views/{cms_admin → admin/cms}/categories/_show.html.haml +2 -2
  25. data/app/views/{cms_admin → admin/cms}/categories/create.js.erb +0 -0
  26. data/app/views/{cms_admin → admin/cms}/categories/destroy.js.erb +0 -0
  27. data/app/views/{cms_admin → admin/cms}/categories/edit.js.erb +0 -0
  28. data/app/views/{cms_admin → admin/cms}/categories/update.js.erb +0 -0
  29. data/app/views/{cms_admin → admin/cms}/files/_file.html.haml +1 -1
  30. data/app/views/{cms_admin → admin/cms}/files/_form.html.haml +3 -3
  31. data/app/views/{cms_admin → admin/cms}/files/_index.html.haml +2 -2
  32. data/app/views/{cms_admin → admin/cms}/files/_page_form.html.haml +1 -1
  33. data/app/views/{cms_admin → admin/cms}/files/destroy.js.coffee +0 -0
  34. data/app/views/{cms_admin → admin/cms}/files/edit.html.haml +0 -0
  35. data/app/views/{cms_admin → admin/cms}/files/index.html.haml +8 -8
  36. data/app/views/{cms_admin → admin/cms}/files/new.html.haml +0 -0
  37. data/app/views/{cms_admin → admin/cms}/layouts/_form.html.haml +3 -3
  38. data/app/views/{cms_admin → admin/cms}/layouts/_index_branch.html.haml +4 -4
  39. data/app/views/{cms_admin → admin/cms}/layouts/edit.html.haml +2 -2
  40. data/app/views/admin/cms/layouts/index.html.haml +13 -0
  41. data/app/views/{cms_admin → admin/cms}/layouts/new.html.haml +0 -0
  42. data/app/views/{cms_admin → admin/cms}/pages/_form.html.haml +10 -10
  43. data/app/views/{cms_admin → admin/cms}/pages/_form_blocks.html.haml +1 -1
  44. data/app/views/{cms_admin → admin/cms}/pages/_index_branch.html.haml +6 -6
  45. data/app/views/{cms_admin → admin/cms}/pages/edit.html.haml +2 -2
  46. data/app/views/{cms_admin → admin/cms}/pages/form_blocks.js.erb +0 -0
  47. data/app/views/admin/cms/pages/index.html.haml +15 -0
  48. data/app/views/{cms_admin → admin/cms}/pages/new.html.haml +0 -0
  49. data/app/views/{cms_admin → admin/cms}/pages/toggle_branch.js.erb +0 -0
  50. data/app/views/{cms_admin → admin/cms}/partials/_body_before.html.haml +1 -1
  51. data/app/views/{cms_admin → admin/cms}/partials/_file_form_after.html.haml +1 -1
  52. data/app/views/{cms_admin → admin/cms}/partials/_file_form_before.html.haml +1 -1
  53. data/app/views/{cms_admin → admin/cms}/partials/_files_after.html.haml +1 -1
  54. data/app/views/{cms_admin → admin/cms}/partials/_files_before.html.haml +1 -1
  55. data/app/views/{cms_admin → admin/cms}/partials/_html_footer.html.haml +1 -1
  56. data/app/views/{cms_admin → admin/cms}/partials/_html_head.html.haml +1 -1
  57. data/app/views/{cms_admin → admin/cms}/partials/_layout_form_after.html.haml +1 -1
  58. data/app/views/{cms_admin → admin/cms}/partials/_layout_form_before.html.haml +1 -1
  59. data/app/views/{cms_admin → admin/cms}/partials/_layouts_after.html.haml +1 -1
  60. data/app/views/{cms_admin → admin/cms}/partials/_layouts_before.html.haml +1 -1
  61. data/app/views/{cms_admin → admin/cms}/partials/_navigation_after.html.haml +1 -1
  62. data/app/views/{cms_admin → admin/cms}/partials/_navigation_before.html.haml +1 -1
  63. data/app/views/admin/cms/partials/_navigation_inner.html.haml +3 -0
  64. data/app/views/{cms_admin → admin/cms}/partials/_page_form_after.html.haml +1 -1
  65. data/app/views/{cms_admin → admin/cms}/partials/_page_form_before.html.haml +1 -1
  66. data/app/views/{cms_admin → admin/cms}/partials/_page_form_inner.html.haml +1 -1
  67. data/app/views/{cms_admin → admin/cms}/partials/_pages_after.html.haml +1 -1
  68. data/app/views/{cms_admin → admin/cms}/partials/_pages_before.html.haml +1 -1
  69. data/app/views/{cms_admin → admin/cms}/partials/_right_column_after.html.haml +1 -1
  70. data/app/views/{cms_admin → admin/cms}/partials/_right_column_before.html.haml +1 -1
  71. data/app/views/{cms_admin → admin/cms}/partials/_site_form_after.html.haml +1 -1
  72. data/app/views/{cms_admin → admin/cms}/partials/_site_form_before.html.haml +1 -1
  73. data/app/views/{cms_admin → admin/cms}/partials/_sites_after.html.haml +1 -1
  74. data/app/views/{cms_admin → admin/cms}/partials/_sites_before.html.haml +1 -1
  75. data/app/views/{cms_admin → admin/cms}/partials/_snippet_form_after.html.haml +1 -1
  76. data/app/views/{cms_admin → admin/cms}/partials/_snippet_form_before.html.haml +1 -1
  77. data/app/views/{cms_admin → admin/cms}/partials/_snippets_after.html.haml +1 -1
  78. data/app/views/{cms_admin → admin/cms}/partials/_snippets_before.html.haml +1 -1
  79. data/app/views/{cms_admin → admin/cms}/revisions/show.html.haml +6 -4
  80. data/app/views/{cms_admin → admin/cms}/sites/_form.html.haml +2 -2
  81. data/app/views/admin/cms/sites/_mirrors.html.haml +18 -0
  82. data/app/views/{cms_admin → admin/cms}/sites/edit.html.haml +0 -0
  83. data/app/views/{cms_admin → admin/cms}/sites/index.html.haml +7 -7
  84. data/app/views/{cms_admin → admin/cms}/sites/new.html.haml +0 -0
  85. data/app/views/{cms_admin → admin/cms}/snippets/_form.html.haml +4 -4
  86. data/app/views/{cms_admin → admin/cms}/snippets/edit.html.haml +2 -2
  87. data/app/views/{cms_admin → admin/cms}/snippets/index.html.haml +9 -9
  88. data/app/views/{cms_admin → admin/cms}/snippets/new.html.haml +0 -0
  89. data/app/views/{cms_content → cms/content}/render_sitemap.xml.builder +1 -1
  90. data/app/views/kaminari/_first_page.html.haml +2 -0
  91. data/app/views/kaminari/_gap.html.haml +2 -0
  92. data/app/views/kaminari/_last_page.html.haml +2 -0
  93. data/app/views/kaminari/_next_page.html.haml +2 -0
  94. data/app/views/kaminari/_page.html.haml +2 -0
  95. data/app/views/kaminari/_paginator.html.haml +12 -0
  96. data/app/views/kaminari/_prev_page.html.haml +2 -0
  97. data/app/views/layouts/admin/cms.html.haml +4 -0
  98. data/app/views/layouts/admin/cms/_body.html.haml +17 -0
  99. data/app/views/layouts/{cms_admin → admin/cms}/_center.html.haml +0 -0
  100. data/app/views/layouts/{cms_admin → admin/cms}/_footer.html.haml +0 -0
  101. data/app/views/layouts/{cms_admin → admin/cms}/_footer_js.html.haml +2 -2
  102. data/app/views/layouts/{cms_admin → admin/cms}/_head.html.haml +1 -1
  103. data/app/views/layouts/admin/cms/_left.html.haml +16 -0
  104. data/app/views/layouts/admin/cms/_right.html.haml +5 -0
  105. data/comfortable_mexican_sofa.gemspec +12 -10
  106. data/config/database.yml +1 -1
  107. data/config/locales/de.yml +137 -136
  108. data/config/locales/en.yml +136 -135
  109. data/config/locales/es.yml +129 -128
  110. data/config/locales/fr.yml +129 -128
  111. data/config/locales/ja.yml +129 -128
  112. data/config/locales/pl.yml +129 -128
  113. data/config/locales/pt-BR.yml +129 -128
  114. data/config/locales/ru.yml +137 -136
  115. data/config/locales/sv.yml +129 -128
  116. data/config/locales/zh-CN.yml +138 -137
  117. data/lib/comfortable_mexican_sofa/engine.rb +2 -1
  118. data/lib/comfortable_mexican_sofa/fixture.rb +7 -0
  119. data/lib/comfortable_mexican_sofa/fixture/layout.rb +1 -1
  120. data/lib/comfortable_mexican_sofa/fixture/page.rb +2 -2
  121. data/lib/comfortable_mexican_sofa/fixture/snippet.rb +1 -1
  122. data/lib/comfortable_mexican_sofa/form_builder.rb +1 -1
  123. data/lib/comfortable_mexican_sofa/routing.rb +32 -30
  124. data/lib/comfortable_mexican_sofa/version.rb +1 -1
  125. data/lib/generators/comfy/cms/README +1 -1
  126. data/lib/generators/comfy/cms/cms_generator.rb +6 -6
  127. data/lib/generators/comfy/scaffold/scaffold_generator.rb +69 -0
  128. data/lib/generators/comfy/scaffold/templates/controller.rb +62 -0
  129. data/lib/generators/comfy/scaffold/templates/migration.rb +12 -0
  130. data/lib/generators/comfy/scaffold/templates/model.rb +21 -0
  131. data/lib/generators/comfy/scaffold/templates/tests/controller.rb +102 -0
  132. data/lib/generators/comfy/scaffold/templates/tests/fixture.yml +4 -0
  133. data/lib/generators/comfy/scaffold/templates/tests/model.rb +27 -0
  134. data/lib/generators/comfy/scaffold/templates/views/_form.haml +6 -0
  135. data/lib/generators/comfy/scaffold/templates/views/edit.haml +5 -0
  136. data/lib/generators/comfy/scaffold/templates/views/index.haml +23 -0
  137. data/lib/generators/comfy/scaffold/templates/views/new.haml +5 -0
  138. data/lib/generators/comfy/scaffold/templates/views/show.haml +4 -0
  139. data/test/controllers/{cms_admin → admin/cms}/base_controller_test.rb +3 -3
  140. data/test/controllers/{cms_admin → admin/cms}/categories_controller_test.rb +2 -2
  141. data/test/controllers/{cms_admin → admin/cms}/files_controller_test.rb +4 -4
  142. data/test/controllers/{cms_admin → admin/cms}/layouts_controller_test.rb +5 -5
  143. data/test/controllers/{cms_admin → admin/cms}/pages_controller_test.rb +9 -9
  144. data/test/controllers/{cms_admin → admin/cms}/revisions_controller_test.rb +9 -9
  145. data/test/controllers/{cms_admin → admin/cms}/sites_controller_test.rb +5 -5
  146. data/test/controllers/{cms_admin → admin/cms}/snippets_controller_test.rb +5 -5
  147. data/test/controllers/{cms_content_controller_test.rb → cms/content_controller_test.rb} +8 -9
  148. data/test/fixtures/generators/cms/routes.rb +8 -0
  149. data/test/fixtures/generators/scaffold/controller.rb +62 -0
  150. data/test/fixtures/generators/scaffold/migration.rb +10 -0
  151. data/test/fixtures/generators/scaffold/model.rb +21 -0
  152. data/test/fixtures/generators/scaffold/routes.rb +7 -0
  153. data/test/fixtures/generators/scaffold/tests/controller.rb +98 -0
  154. data/test/fixtures/generators/scaffold/tests/fixture +2 -0
  155. data/test/fixtures/generators/scaffold/tests/model.rb +25 -0
  156. data/test/fixtures/generators/scaffold/views/_form.haml +4 -0
  157. data/test/fixtures/generators/scaffold/views/edit.haml +5 -0
  158. data/test/fixtures/generators/scaffold/views/index.haml +19 -0
  159. data/test/fixtures/generators/scaffold/views/new.haml +5 -0
  160. data/test/fixtures/generators/scaffold/views/show.haml +4 -0
  161. data/test/gemfiles/Gemfile.rails.4.0 +2 -0
  162. data/test/generators/cms_generator_test.rb +23 -0
  163. data/test/generators/scaffold_generator_test.rb +31 -0
  164. data/test/integration/authentication_test.rb +6 -6
  165. data/test/integration/fixtures_test.rb +1 -1
  166. data/test/integration/mirrors_test.rb +12 -12
  167. data/test/integration/sites_test.rb +8 -8
  168. data/test/integration/view_hooks_test.rb +7 -7
  169. data/test/{models → lib}/configuration_test.rb +0 -0
  170. data/test/{models → lib}/fixtures/categories_test.rb +0 -0
  171. data/test/{models → lib}/fixtures/files_test.rb +0 -0
  172. data/test/{models → lib}/fixtures/layouts_test.rb +0 -0
  173. data/test/{models → lib}/fixtures/pages_test.rb +0 -0
  174. data/test/{models → lib}/fixtures/snippets_test.rb +0 -0
  175. data/test/{models → lib}/fixtures_test.rb +0 -0
  176. data/test/{models → lib}/mirrors_test.rb +0 -0
  177. data/test/{models → lib}/revisions_test.rb +0 -0
  178. data/test/{models → lib}/tag_test.rb +0 -0
  179. data/test/{models → lib}/tags/asset_test.rb +0 -0
  180. data/test/{models → lib}/tags/collection_test.rb +0 -0
  181. data/test/{models → lib}/tags/field_datetime_test.rb +0 -0
  182. data/test/{models → lib}/tags/field_integer_test.rb +0 -0
  183. data/test/{models → lib}/tags/field_rich_text_test.rb +0 -0
  184. data/test/{models → lib}/tags/field_string_test.rb +0 -0
  185. data/test/{models → lib}/tags/field_text_test.rb +0 -0
  186. data/test/{models → lib}/tags/file_test.rb +0 -0
  187. data/test/{models → lib}/tags/helper_test.rb +0 -0
  188. data/test/{models → lib}/tags/page_datetime_test.rb +0 -0
  189. data/test/{models → lib}/tags/page_file_test.rb +0 -0
  190. data/test/{models → lib}/tags/page_files_test.rb +0 -0
  191. data/test/{models → lib}/tags/page_integer_test.rb +0 -0
  192. data/test/{models → lib}/tags/page_markdown_test.rb +0 -0
  193. data/test/{models → lib}/tags/page_rich_text_test.rb +0 -0
  194. data/test/{models → lib}/tags/page_string_test.rb +0 -0
  195. data/test/{models → lib}/tags/page_text_test.rb +0 -0
  196. data/test/{models → lib}/tags/partial_test.rb +0 -0
  197. data/test/{models → lib}/tags/snippet_test.rb +0 -0
  198. data/test/{models → lib}/tags/template_test.rb +0 -0
  199. data/test/{models → lib}/view_methods_test.rb +0 -0
  200. data/test/models/{cms/block_test.rb → block_test.rb} +1 -1
  201. data/test/models/{cms/categorization_test.rb → categorization_test.rb} +1 -1
  202. data/test/models/{cms/category_test.rb → category_test.rb} +1 -1
  203. data/test/models/{cms/file_test.rb → file_test.rb} +2 -2
  204. data/test/models/{cms/layout_test.rb → layout_test.rb} +4 -4
  205. data/test/models/{cms/page_test.rb → page_test.rb} +1 -1
  206. data/test/models/{cms/site_test.rb → site_test.rb} +1 -1
  207. data/test/models/{cms/snippet_test.rb → snippet_test.rb} +1 -1
  208. data/test/test_helper.rb +30 -1
  209. metadata +204 -139
  210. data/app/assets/javascripts/comfortable_mexican_sofa/lib/codemirror.js +0 -10
  211. data/app/assets/stylesheets/comfortable_mexican_sofa/lib/codemirror.css +0 -240
  212. data/app/views/cms_admin/layouts/index.html.haml +0 -13
  213. data/app/views/cms_admin/pages/index.html.haml +0 -15
  214. data/app/views/cms_admin/partials/_navigation_inner.html.haml +0 -3
  215. data/app/views/cms_admin/sites/_mirrors.html.haml +0 -18
  216. data/app/views/layouts/cms_admin.html.haml +0 -4
  217. data/app/views/layouts/cms_admin/_body.html.haml +0 -17
  218. data/app/views/layouts/cms_admin/_left.html.haml +0 -16
  219. data/app/views/layouts/cms_admin/_right.html.haml +0 -5
@@ -1,3 +1,3 @@
1
1
  - if ComfortableMexicanSofa.config.reveal_cms_partials
2
2
  .cms-partial
3
- cms_admin/partials/pages_after
3
+ = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')
@@ -1,3 +1,3 @@
1
1
  - if ComfortableMexicanSofa.config.reveal_cms_partials
2
2
  .cms-partial
3
- cms_admin/partials/pages_before
3
+ = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')
@@ -1,3 +1,3 @@
1
1
  - if ComfortableMexicanSofa.config.reveal_cms_partials
2
2
  .cms-partial
3
- cms_admin/partials/right_column_after
3
+ = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')
@@ -1,3 +1,3 @@
1
1
  - if ComfortableMexicanSofa.config.reveal_cms_partials
2
2
  .cms-partial
3
- cms_admin/partials/right_column_before
3
+ = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')
@@ -1,3 +1,3 @@
1
1
  - if ComfortableMexicanSofa.config.reveal_cms_partials
2
2
  .cms-partial
3
- cms_admin/partials/site_form_after
3
+ = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')
@@ -1,3 +1,3 @@
1
1
  - if ComfortableMexicanSofa.config.reveal_cms_partials
2
2
  .cms-partial
3
- cms_admin/partials/site_form_before
3
+ = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')
@@ -1,3 +1,3 @@
1
1
  - if ComfortableMexicanSofa.config.reveal_cms_partials
2
2
  .cms-partial
3
- cms_admin/partials/sites_after
3
+ = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')
@@ -1,3 +1,3 @@
1
1
  - if ComfortableMexicanSofa.config.reveal_cms_partials
2
2
  .cms-partial
3
- cms_admin/partials/sites_before
3
+ = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')
@@ -1,3 +1,3 @@
1
1
  - if ComfortableMexicanSofa.config.reveal_cms_partials
2
2
  .cms-partial
3
- cms_admin/partials/snippet_form_after
3
+ = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')
@@ -1,3 +1,3 @@
1
1
  - if ComfortableMexicanSofa.config.reveal_cms_partials
2
2
  .cms-partial
3
- cms_admin/partials/snippet_form_before
3
+ = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')
@@ -1,3 +1,3 @@
1
1
  - if ComfortableMexicanSofa.config.reveal_cms_partials
2
2
  .cms-partial
3
- cms_admin/partials/sites_after
3
+ = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')
@@ -1,3 +1,3 @@
1
1
  - if ComfortableMexicanSofa.config.reveal_cms_partials
2
2
  .cms-partial
3
- cms_admin/partials/snippets_before
3
+ = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')
@@ -3,7 +3,7 @@
3
3
  = t('.title')
4
4
  = @record.class.to_s.demodulize
5
5
  %h4
6
- = @record.is_a?(Cms::Page) ? "#{t('.full_path')}: #{@record.full_path}" : "#{t('.slug')}: #{@record.identifier}"
6
+ = @record.is_a?(::Cms::Page) ? "#{t('.full_path')}: #{@record.full_path}" : "#{t('.slug')}: #{@record.identifier}"
7
7
 
8
8
  - content_for :right_column do
9
9
  .box.revisions
@@ -18,9 +18,11 @@
18
18
 
19
19
  - @current_content.each do |label, content|
20
20
  %tr
21
- %th= Cms::Layout.human_attribute_name(label)
22
- %td.main= content
23
- %td.main= @versioned_content[label]
21
+ %th= ::Cms::Layout.human_attribute_name(label)
22
+ %td
23
+ %pre= content
24
+ %td
25
+ %pre= @versioned_content[label]
24
26
 
25
27
  = comfy_form_for @revision, :url => {:action => :revert} do |form|
26
28
  .form-actions
@@ -1,4 +1,4 @@
1
- = render 'cms_admin/partials/site_form_before', :object => form
1
+ = render 'admin/cms/partials/site_form_before', :object => form
2
2
 
3
3
  = form.text_field :label, :data => {:slugify => @site.new_record?}
4
4
  = form.text_field :identifier, :data => {:slug => true}
@@ -7,7 +7,7 @@
7
7
  = form.select :locale, ComfortableMexicanSofa.config.locales.to_a.collect{|l| [l[1], l[0]]}
8
8
  = form.check_box :is_mirrored, :label => t('.is_mirrored')
9
9
 
10
- = render 'cms_admin/partials/site_form_after', :object => form
10
+ = render 'admin/cms/partials/site_form_after', :object => form
11
11
 
12
12
  .form-actions
13
13
  = form.submit t(@site.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
@@ -0,0 +1,18 @@
1
+ - return unless @site.is_mirrored?
2
+
3
+ - object ||= nil
4
+
5
+ - options = case object
6
+ - when ::Cms::Layout
7
+ - object.mirrors.collect{|m| [m.site.label, edit_admin_cms_site_layout_path(m.site, m)]}
8
+ - when ::Cms::Page
9
+ - object.mirrors.collect{|m| [m.site.label, edit_admin_cms_site_page_path(m.site, m)]}
10
+ - when ::Cms::Snippet
11
+ - object.mirrors.collect{|m| [m.site.label, edit_admin_cms_site_snippet_path(m.site, m)]}
12
+ - else
13
+ - (::Cms::Site.mirrored - [@site]).collect{|s| [s.label, url_for(params.merge(:site_id => s))]}
14
+
15
+ - options = [[@site.label, request.fullpath]] + options
16
+
17
+ #mirrors.box
18
+ = select_tag :mirror, options_for_select(options)
@@ -1,8 +1,8 @@
1
1
  .page-header
2
- = link_to t('.new_link'), new_cms_admin_site_path, :class => 'btn pull-right'
2
+ = link_to t('.new_link'), new_admin_cms_site_path, :class => 'btn pull-right'
3
3
  %h2= t('.title')
4
4
 
5
- = render 'cms_admin/partials/sites_before'
5
+ = render 'admin/cms/partials/sites_before'
6
6
 
7
7
  %table.table.table-hover.table-bordered
8
8
  - @sites.each do |site|
@@ -11,7 +11,7 @@
11
11
  .icon
12
12
  %td.main
13
13
  .item-title
14
- = link_to site.label, cms_admin_site_pages_path(site)
14
+ = link_to site.label, admin_cms_site_pages_path(site)
15
15
  .item-meta
16
16
  .identifier
17
17
  = site.identifier
@@ -21,8 +21,8 @@
21
21
  = link_to host, host, :target => '_blank'
22
22
  %td
23
23
  .btn-group
24
- = link_to t('.select'), cms_admin_site_pages_path(site), :class => 'btn btn-small'
25
- = link_to t('.edit'), edit_cms_admin_site_path(site), :class => 'btn btn-small'
26
- = link_to t('.delete'), cms_admin_site_path(site), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
24
+ = link_to t('.select'), admin_cms_site_pages_path(site), :class => 'btn btn-small'
25
+ = link_to t('.edit'), edit_admin_cms_site_path(site), :class => 'btn btn-small'
26
+ = link_to t('.delete'), admin_cms_site_path(site), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
27
27
 
28
- = render 'cms_admin/partials/sites_after'
28
+ = render 'admin/cms/partials/sites_after'
@@ -1,15 +1,15 @@
1
1
  - content_for :right_column do
2
- = render :partial => 'cms_admin/files/index'
2
+ = render :partial => 'admin/cms/files/index'
3
3
 
4
- = render 'cms_admin/partials/snippet_form_before', :object => form
4
+ = render 'admin/cms/partials/snippet_form_before', :object => form
5
5
 
6
6
  = form.text_field :label, :data => {:slugify => @snippet.new_record?}
7
7
  = form.text_field :identifier, :data => {:slug => true}
8
8
  = form.text_area :content, :data => {:cm_mode => 'text/html'}
9
9
 
10
- = render :partial => 'cms_admin/categories/form', :object => form
10
+ = render :partial => 'admin/cms/categories/form', :object => form
11
11
 
12
- = render 'cms_admin/partials/snippet_form_after', :object => form
12
+ = render 'admin/cms/partials/snippet_form_after', :object => form
13
13
 
14
14
  .form-actions
15
15
  = form.submit t(@snippet.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
@@ -1,9 +1,9 @@
1
1
  .page-header
2
- = link_to pluralize(@snippet.revisions.count, t('.revision')), cms_admin_site_snippet_revisions_path(@site, @snippet), :class => 'btn pull-right'
2
+ = link_to pluralize(@snippet.revisions.count, t('.revision')), admin_cms_site_snippet_revisions_path(@site, @snippet), :class => 'btn pull-right'
3
3
  %h2= t('.title')
4
4
 
5
5
  - content_for :right_column do
6
- = render 'cms_admin/sites/mirrors', :object => @snippet
6
+ = render 'admin/cms/sites/mirrors', :object => @snippet
7
7
 
8
8
  = comfy_form_for @snippet, :as => :snippet, :url => {:action => :update} do |form|
9
9
  = render form
@@ -1,13 +1,13 @@
1
1
  .page-header
2
- = link_to t('.new_link'), new_cms_admin_site_snippet_path(@site), :class => 'btn pull-right'
2
+ = link_to t('.new_link'), new_admin_cms_site_snippet_path(@site), :class => 'btn pull-right'
3
3
  %h2= t('.title')
4
4
 
5
5
  - content_for :right_column do
6
- = render :partial => 'cms_admin/sites/mirrors'
6
+ = render :partial => 'admin/cms/sites/mirrors'
7
7
 
8
- = render 'cms_admin/partials/snippets_before'
8
+ = render 'admin/cms/partials/snippets_before'
9
9
 
10
- = render :partial => 'cms_admin/categories/index', :object => 'Cms::Snippet'
10
+ = render :partial => 'admin/cms/categories/index', :object => 'Cms::Snippet'
11
11
 
12
12
  %table.table.table-hover.table-bordered
13
13
  %tbody.sortable
@@ -20,13 +20,13 @@
20
20
  %span ⇅
21
21
  %td.main
22
22
  .item-title
23
- = link_to snippet.label, edit_cms_admin_site_snippet_path(@site, snippet)
24
- = render :partial => '/cms_admin/categories/categories', :object => snippet
23
+ = link_to snippet.label, edit_admin_cms_site_snippet_path(@site, snippet)
24
+ = render :partial => 'admin/cms/categories/categories', :object => snippet
25
25
  .item-meta
26
26
  = snippet.identifier
27
27
  %td
28
28
  .btn-group
29
- = link_to t('.edit'), edit_cms_admin_site_snippet_path(@site, snippet), :class => 'btn btn-small'
30
- = link_to t('.delete'), cms_admin_site_snippet_path(@site, snippet), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
29
+ = link_to t('.edit'), edit_admin_cms_site_snippet_path(@site, snippet), :class => 'btn btn-small'
30
+ = link_to t('.delete'), admin_cms_site_snippet_path(@site, snippet), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
31
31
 
32
- = render 'cms_admin/partials/snippets_after'
32
+ = render 'admin/cms/partials/snippets_after'
@@ -3,7 +3,7 @@ xml.instruct! :xml, :version => '1.0', :encoding => 'UTF-8'
3
3
  xml.urlset :xmlns => 'http://www.sitemaps.org/schemas/sitemap/0.9' do
4
4
  @cms_site.pages.published.each do |page|
5
5
  xml.url do
6
- xml.loc "http://#{@cms_site.hostname}#{"/" + @cms_site.path unless @cms_site.path.blank? }#{page.full_path}"
6
+ xml.loc page.url
7
7
  # just take some guesses the closer to the root means higher priority
8
8
  # start subtracting 0.1 for every additional child page, max out at 0.1
9
9
  # "/" splits to 0, "/child_page" splits to 2, hence weird max -1
@@ -0,0 +1,2 @@
1
+ %li
2
+ = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote
@@ -0,0 +1,2 @@
1
+ %li.disabled
2
+ = link_to raw(t 'views.pagination.truncate'), '#'
@@ -0,0 +1,2 @@
1
+ %li
2
+ = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote}
@@ -0,0 +1,2 @@
1
+ %li
2
+ = link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote
@@ -0,0 +1,2 @@
1
+ %li{class: "#{'active' if page.current?}"}
2
+ = link_to page, page.current? ? '#' : url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}
@@ -0,0 +1,12 @@
1
+ = paginator.render do
2
+ .pagination
3
+ %ul
4
+ = first_page_tag unless current_page.first?
5
+ = prev_page_tag unless current_page.first?
6
+ - each_page do |page|
7
+ - if page.left_outer? || page.right_outer? || page.inside_window?
8
+ = page_tag page
9
+ - elsif !page.was_truncated?
10
+ = gap_tag
11
+ = next_page_tag unless current_page.last?
12
+ = last_page_tag unless current_page.last?
@@ -0,0 +1,2 @@
1
+ %li
2
+ = link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote
@@ -0,0 +1,4 @@
1
+ !!!
2
+ %html{:lang => I18n.locale}
3
+ = render :partial => 'layouts/admin/cms/head'
4
+ = render :partial => 'layouts/admin/cms/body'
@@ -0,0 +1,17 @@
1
+ %body#comfy{:class => "c-#{params[:controller].slugify} a-#{params[:action].slugify}"}
2
+
3
+ = render 'admin/cms/partials/body_before'
4
+
5
+ .body-wrapper
6
+ .left-column
7
+ .left-column-content
8
+ = render :partial => 'layouts/admin/cms/left'
9
+ .right-column
10
+ .right-column-content
11
+ = render :partial => 'layouts/admin/cms/right'
12
+ .center-column
13
+ = render :partial => 'layouts/admin/cms/center'
14
+
15
+ = render :partial => 'layouts/admin/cms/footer'
16
+
17
+ = render :partial => 'layouts/admin/cms/footer_js'
@@ -1,4 +1,4 @@
1
- = render 'cms_admin/partials/html_footer'
1
+ = render 'admin/cms/partials/html_footer'
2
2
 
3
3
  - if content_for(:javascript)
4
4
  :javascript
@@ -6,4 +6,4 @@
6
6
 
7
7
  - if @site && !@site.new_record?
8
8
  :javascript
9
- CMS.file_upload_path = "#{cms_admin_site_files_path(@site)}"
9
+ CMS.file_upload_path = "#{admin_cms_site_files_path(@site)}"
@@ -10,4 +10,4 @@
10
10
 
11
11
  = yield :head
12
12
 
13
- = render 'cms_admin/partials/html_head'
13
+ = render 'admin/cms/partials/html_head'
@@ -0,0 +1,16 @@
1
+ = render '/admin/cms/partials/navigation_before'
2
+
3
+ %ul.navigation
4
+ %li= active_link_to t('admin.cms.base.sites'), admin_cms_sites_path, :active => ['admin/cms/sites']
5
+
6
+ - if @site && !@site.new_record?
7
+ %li= active_link_to t('admin.cms.base.layouts'), admin_cms_site_layouts_path(@site)
8
+ %li= active_link_to t('admin.cms.base.pages'), admin_cms_site_pages_path(@site)
9
+ %li= active_link_to t('admin.cms.base.snippets'), admin_cms_site_snippets_path(@site)
10
+ %li= active_link_to t('admin.cms.base.files'), admin_cms_site_files_path(@site)
11
+
12
+ = cms_hook :navigation
13
+
14
+ = render '/admin/cms/partials/navigation_inner'
15
+
16
+ = render '/admin/cms/partials/navigation_after'
@@ -0,0 +1,5 @@
1
+ = render 'admin/cms/partials/right_column_before'
2
+
3
+ = yield :right_column
4
+
5
+ = render 'admin/cms/partials/right_column_after'
@@ -17,14 +17,16 @@ Gem::Specification.new do |s|
17
17
  s.platform = Gem::Platform::RUBY
18
18
  s.require_paths = ['lib']
19
19
 
20
- s.add_dependency 'rails', '~> 4.0'
21
- s.add_dependency 'formatted_form', '>= 2.1.0'
22
- s.add_dependency 'active_link_to', '>= 1.0.0'
23
- s.add_dependency 'paperclip', '>= 3.4.0'
24
- s.add_dependency 'kramdown', '>= 1.0.0'
25
- s.add_dependency 'jquery-rails', '>= 3.0.0'
26
- s.add_dependency 'jquery-ui-rails', '>= 4.0.0'
27
- s.add_dependency 'haml-rails', '>= 0.3.0'
28
- s.add_dependency 'sass-rails', '>= 3.1.0'
29
- s.add_dependency 'coffee-rails', '>= 3.1.0'
20
+ s.add_dependency 'rails', '~> 4.0'
21
+ s.add_dependency 'formatted_form', '>= 2.1.0'
22
+ s.add_dependency 'active_link_to', '>= 1.0.0'
23
+ s.add_dependency 'paperclip', '>= 3.4.0'
24
+ s.add_dependency 'kramdown', '>= 1.0.0'
25
+ s.add_dependency 'jquery-rails', '>= 3.0.0'
26
+ s.add_dependency 'jquery-ui-rails', '>= 4.0.0'
27
+ s.add_dependency 'haml-rails', '>= 0.3.0'
28
+ s.add_dependency 'sass-rails', '>= 3.1.0'
29
+ s.add_dependency 'coffee-rails', '>= 3.1.0'
30
+ s.add_dependency 'codemirror-rails', '>= 3.0.0'
31
+ s.add_dependency 'kaminari', '>= 0.14.0'
30
32
  end
data/config/database.yml CHANGED
@@ -1,6 +1,6 @@
1
1
  development:
2
2
  adapter: sqlite3
3
- database: db/cms_development.sqlite3
3
+ database: db/development.sqlite3
4
4
  pool: 5
5
5
  timeout: 10000
6
6
 
@@ -98,139 +98,140 @@ de:
98
98
  page_not_found: Seite nicht gefunden
99
99
 
100
100
  # -- Views ----------------------------------------------------------------
101
- cms_admin:
102
- base:
103
- sites: Web-Sites
104
- layouts: Layouts
105
- pages: Seiten
106
- snippets: Schnipsel
107
- files: Datei
108
-
109
- sites:
110
- index:
111
- title: Web-Sites
112
- new_link: Erstelle neue Web-Site
113
- select: Wähle Web-Site
114
- edit: Bearbeiten
115
- delete: Löschen
116
- are_you_sure: Sind Sie sicher, dass Sie diese Web-Site löschen wollen?
117
- new:
118
- title: Neue Web-Site
119
- edit:
120
- title: Web-Site bearbeiten
121
- form:
122
- create: Erstelle Web-Site
123
- update: Web-Site speichern
124
- is_mirrored: Gespiegelt
125
-
126
- layouts:
127
- index:
128
- title: Layouts
129
- new_link: Erstelle neue Layout
130
- index_branch:
131
- add_child_layout: Erstelle untergeordnetes Layout
132
- edit: Bearbeiten
133
- delete: Löschen
134
- are_you_sure: Sind Sie sicher?
135
- new:
136
- title: Neues Layout
137
- edit:
138
- title: Layout bearbeiten
139
- revision: Revision
140
- form:
141
- select_parent_layout: Select Parent Layout
142
- select_app_layout: Select Application Layout
143
- create: Erstelle Layout
144
- update: Layout speichern
145
-
146
- pages:
147
- index:
148
- title: Seiten
149
- new_link: Erstelle neue Seite
150
- index_branch:
151
- toggle: Toggle
152
- add_child_page: Erstelle untergeordnete Seite
153
- edit: Bearbeiten
154
- delete: Löschen
155
- are_you_sure: Sind Sie sicher?
156
- new:
157
- title: Neue Seite
158
- edit:
159
- title: Seite bearbeiten
160
- revision: Revision
161
- form:
162
- select_target_page: Keine Weiterleitung
163
- preview: Vorschau
164
- create: Erstelle Seite
165
- update: Seite speichern
166
- is_published: Veröffentlicht
167
- form_blocks:
168
- no_tags: |-
169
- Layout has hat keine Inhalt-Tags definiert.<br/>
170
- Bearbeiten den Inhalt des Layout um ein Inhalt-Tag hinzuzufügen. Zum Beispiel: <code>{{cms:page:content}}</code>
171
-
172
- snippets:
173
- index:
174
- title: Schnipsels
175
- new_link: Erstelle neuen Schnipsel
176
- edit: Bearbeiten
177
- delete: Löschen
178
- are_you_sure: Sind Sie sicher?
179
- new:
180
- title: Neuer Schnipsel
181
- edit:
182
- title: Schnipsel bearbeiten
183
- revision: Revision
184
- form:
185
- create: Erstelle Schnipsel
186
- update: Schnipsel speichern
187
-
188
- revisions:
189
- show:
190
- title: Revisionen von
191
- revision: Revision
192
- full_path: Completer Pfad
193
- slug: Slug
194
- update: Zurücksetzen auf diese Revision
195
- current: Aktuell
196
-
197
- files:
198
- index:
199
- title: Datei
200
- new_link: Neue Datei hochladen
201
- edit: Bearbeiten
202
- delete: Löschen
203
- are_you_sure: Sind Sie sicher?
204
- button: Datei hochladen
205
- new:
206
- title: Neue Datei
207
- edit:
208
- title: Datei bearbeiten
209
- form:
210
- current_file: Aktuelle Datei
211
- create: Lade Datei hoch
212
- update: Datei speichern
213
- page_form:
214
- are_you_sure: Sind Sie sicher?
215
- file:
216
- are_you_sure: Sind Sie sicher?
217
-
218
- categories:
219
- index:
220
- label: Kategorien
221
- edit: Bearbeiten
222
- done: Erledigt
223
- all: Alle
224
- add: Hinzuzufügen
225
- show:
226
- are_you_sure: Sind Sie sicher?
227
- edit:
228
- save: Speichern
229
- form:
230
- label: Kategorien
231
-
232
- dialogs:
233
- image:
234
- insert: Bild einfügen
235
- link:
236
- create: Link erstellen
101
+ admin:
102
+ cms:
103
+ base:
104
+ sites: Web-Sites
105
+ layouts: Layouts
106
+ pages: Seiten
107
+ snippets: Schnipsel
108
+ files: Datei
109
+
110
+ sites:
111
+ index:
112
+ title: Web-Sites
113
+ new_link: Erstelle neue Web-Site
114
+ select: Wähle Web-Site
115
+ edit: Bearbeiten
116
+ delete: Löschen
117
+ are_you_sure: Sind Sie sicher, dass Sie diese Web-Site löschen wollen?
118
+ new:
119
+ title: Neue Web-Site
120
+ edit:
121
+ title: Web-Site bearbeiten
122
+ form:
123
+ create: Erstelle Web-Site
124
+ update: Web-Site speichern
125
+ is_mirrored: Gespiegelt
126
+
127
+ layouts:
128
+ index:
129
+ title: Layouts
130
+ new_link: Erstelle neue Layout
131
+ index_branch:
132
+ add_child_layout: Erstelle untergeordnetes Layout
133
+ edit: Bearbeiten
134
+ delete: Löschen
135
+ are_you_sure: Sind Sie sicher?
136
+ new:
137
+ title: Neues Layout
138
+ edit:
139
+ title: Layout bearbeiten
140
+ revision: Revision
141
+ form:
142
+ select_parent_layout: Select Parent Layout
143
+ select_app_layout: Select Application Layout
144
+ create: Erstelle Layout
145
+ update: Layout speichern
146
+
147
+ pages:
148
+ index:
149
+ title: Seiten
150
+ new_link: Erstelle neue Seite
151
+ index_branch:
152
+ toggle: Toggle
153
+ add_child_page: Erstelle untergeordnete Seite
154
+ edit: Bearbeiten
155
+ delete: Löschen
156
+ are_you_sure: Sind Sie sicher?
157
+ new:
158
+ title: Neue Seite
159
+ edit:
160
+ title: Seite bearbeiten
161
+ revision: Revision
162
+ form:
163
+ select_target_page: Keine Weiterleitung
164
+ preview: Vorschau
165
+ create: Erstelle Seite
166
+ update: Seite speichern
167
+ is_published: Veröffentlicht
168
+ form_blocks:
169
+ no_tags: |-
170
+ Layout has hat keine Inhalt-Tags definiert.<br/>
171
+ Bearbeiten den Inhalt des Layout um ein Inhalt-Tag hinzuzufügen. Zum Beispiel: <code>{{cms:page:content}}</code>
172
+
173
+ snippets:
174
+ index:
175
+ title: Schnipsels
176
+ new_link: Erstelle neuen Schnipsel
177
+ edit: Bearbeiten
178
+ delete: Löschen
179
+ are_you_sure: Sind Sie sicher?
180
+ new:
181
+ title: Neuer Schnipsel
182
+ edit:
183
+ title: Schnipsel bearbeiten
184
+ revision: Revision
185
+ form:
186
+ create: Erstelle Schnipsel
187
+ update: Schnipsel speichern
188
+
189
+ revisions:
190
+ show:
191
+ title: Revisionen von
192
+ revision: Revision
193
+ full_path: Completer Pfad
194
+ slug: Slug
195
+ update: Zurücksetzen auf diese Revision
196
+ current: Aktuell
197
+
198
+ files:
199
+ index:
200
+ title: Datei
201
+ new_link: Neue Datei hochladen
202
+ edit: Bearbeiten
203
+ delete: Löschen
204
+ are_you_sure: Sind Sie sicher?
205
+ button: Datei hochladen
206
+ new:
207
+ title: Neue Datei
208
+ edit:
209
+ title: Datei bearbeiten
210
+ form:
211
+ current_file: Aktuelle Datei
212
+ create: Lade Datei hoch
213
+ update: Datei speichern
214
+ page_form:
215
+ are_you_sure: Sind Sie sicher?
216
+ file:
217
+ are_you_sure: Sind Sie sicher?
218
+
219
+ categories:
220
+ index:
221
+ label: Kategorien
222
+ edit: Bearbeiten
223
+ done: Erledigt
224
+ all: Alle
225
+ add: Hinzuzufügen
226
+ show:
227
+ are_you_sure: Sind Sie sicher?
228
+ edit:
229
+ save: Speichern
230
+ form:
231
+ label: Kategorien
232
+
233
+ dialogs:
234
+ image:
235
+ insert: Bild einfügen
236
+ link:
237
+ create: Link erstellen