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.
- data/.travis.yml +2 -6
- data/README.md +2 -2
- data/Rakefile +23 -2
- data/app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee +7 -1
- data/app/assets/stylesheets/comfortable_mexican_sofa/application.css.sass +1 -1
- data/app/assets/stylesheets/comfortable_mexican_sofa/base.css.sass +7 -4
- data/app/controllers/{cms_admin → admin/cms}/base_controller.rb +6 -6
- data/app/controllers/{cms_admin → admin/cms}/categories_controller.rb +1 -1
- data/app/controllers/{cms_admin → admin/cms}/files_controller.rb +4 -4
- data/app/controllers/{cms_admin → admin/cms}/layouts_controller.rb +3 -3
- data/app/controllers/{cms_admin → admin/cms}/pages_controller.rb +3 -3
- data/app/controllers/{cms_admin → admin/cms}/revisions_controller.rb +8 -8
- data/app/controllers/{cms_admin → admin/cms}/sites_controller.rb +7 -7
- data/app/controllers/{cms_admin → admin/cms}/snippets_controller.rb +2 -2
- data/app/controllers/cms/base_controller.rb +30 -0
- data/app/controllers/{cms_content_controller.rb → cms/content_controller.rb} +2 -22
- data/app/models/cms/file.rb +1 -3
- data/app/models/cms/layout.rb +1 -1
- data/app/models/cms/snippet.rb +1 -3
- data/app/views/{cms_admin → admin/cms}/categories/_categories.html.haml +0 -0
- data/app/views/{cms_admin → admin/cms}/categories/_edit.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/categories/_form.html.haml +0 -0
- data/app/views/{cms_admin → admin/cms}/categories/_index.html.haml +3 -3
- data/app/views/{cms_admin → admin/cms}/categories/_show.html.haml +2 -2
- data/app/views/{cms_admin → admin/cms}/categories/create.js.erb +0 -0
- data/app/views/{cms_admin → admin/cms}/categories/destroy.js.erb +0 -0
- data/app/views/{cms_admin → admin/cms}/categories/edit.js.erb +0 -0
- data/app/views/{cms_admin → admin/cms}/categories/update.js.erb +0 -0
- data/app/views/{cms_admin → admin/cms}/files/_file.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/files/_form.html.haml +3 -3
- data/app/views/{cms_admin → admin/cms}/files/_index.html.haml +2 -2
- data/app/views/{cms_admin → admin/cms}/files/_page_form.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/files/destroy.js.coffee +0 -0
- data/app/views/{cms_admin → admin/cms}/files/edit.html.haml +0 -0
- data/app/views/{cms_admin → admin/cms}/files/index.html.haml +8 -8
- data/app/views/{cms_admin → admin/cms}/files/new.html.haml +0 -0
- data/app/views/{cms_admin → admin/cms}/layouts/_form.html.haml +3 -3
- data/app/views/{cms_admin → admin/cms}/layouts/_index_branch.html.haml +4 -4
- data/app/views/{cms_admin → admin/cms}/layouts/edit.html.haml +2 -2
- data/app/views/admin/cms/layouts/index.html.haml +13 -0
- data/app/views/{cms_admin → admin/cms}/layouts/new.html.haml +0 -0
- data/app/views/{cms_admin → admin/cms}/pages/_form.html.haml +10 -10
- data/app/views/{cms_admin → admin/cms}/pages/_form_blocks.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/pages/_index_branch.html.haml +6 -6
- data/app/views/{cms_admin → admin/cms}/pages/edit.html.haml +2 -2
- data/app/views/{cms_admin → admin/cms}/pages/form_blocks.js.erb +0 -0
- data/app/views/admin/cms/pages/index.html.haml +15 -0
- data/app/views/{cms_admin → admin/cms}/pages/new.html.haml +0 -0
- data/app/views/{cms_admin → admin/cms}/pages/toggle_branch.js.erb +0 -0
- data/app/views/{cms_admin → admin/cms}/partials/_body_before.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_file_form_after.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_file_form_before.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_files_after.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_files_before.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_html_footer.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_html_head.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_layout_form_after.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_layout_form_before.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_layouts_after.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_layouts_before.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_navigation_after.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_navigation_before.html.haml +1 -1
- data/app/views/admin/cms/partials/_navigation_inner.html.haml +3 -0
- data/app/views/{cms_admin → admin/cms}/partials/_page_form_after.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_page_form_before.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_page_form_inner.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_pages_after.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_pages_before.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_right_column_after.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_right_column_before.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_site_form_after.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_site_form_before.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_sites_after.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_sites_before.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_snippet_form_after.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_snippet_form_before.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_snippets_after.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/partials/_snippets_before.html.haml +1 -1
- data/app/views/{cms_admin → admin/cms}/revisions/show.html.haml +6 -4
- data/app/views/{cms_admin → admin/cms}/sites/_form.html.haml +2 -2
- data/app/views/admin/cms/sites/_mirrors.html.haml +18 -0
- data/app/views/{cms_admin → admin/cms}/sites/edit.html.haml +0 -0
- data/app/views/{cms_admin → admin/cms}/sites/index.html.haml +7 -7
- data/app/views/{cms_admin → admin/cms}/sites/new.html.haml +0 -0
- data/app/views/{cms_admin → admin/cms}/snippets/_form.html.haml +4 -4
- data/app/views/{cms_admin → admin/cms}/snippets/edit.html.haml +2 -2
- data/app/views/{cms_admin → admin/cms}/snippets/index.html.haml +9 -9
- data/app/views/{cms_admin → admin/cms}/snippets/new.html.haml +0 -0
- data/app/views/{cms_content → cms/content}/render_sitemap.xml.builder +1 -1
- data/app/views/kaminari/_first_page.html.haml +2 -0
- data/app/views/kaminari/_gap.html.haml +2 -0
- data/app/views/kaminari/_last_page.html.haml +2 -0
- data/app/views/kaminari/_next_page.html.haml +2 -0
- data/app/views/kaminari/_page.html.haml +2 -0
- data/app/views/kaminari/_paginator.html.haml +12 -0
- data/app/views/kaminari/_prev_page.html.haml +2 -0
- data/app/views/layouts/admin/cms.html.haml +4 -0
- data/app/views/layouts/admin/cms/_body.html.haml +17 -0
- data/app/views/layouts/{cms_admin → admin/cms}/_center.html.haml +0 -0
- data/app/views/layouts/{cms_admin → admin/cms}/_footer.html.haml +0 -0
- data/app/views/layouts/{cms_admin → admin/cms}/_footer_js.html.haml +2 -2
- data/app/views/layouts/{cms_admin → admin/cms}/_head.html.haml +1 -1
- data/app/views/layouts/admin/cms/_left.html.haml +16 -0
- data/app/views/layouts/admin/cms/_right.html.haml +5 -0
- data/comfortable_mexican_sofa.gemspec +12 -10
- data/config/database.yml +1 -1
- data/config/locales/de.yml +137 -136
- data/config/locales/en.yml +136 -135
- data/config/locales/es.yml +129 -128
- data/config/locales/fr.yml +129 -128
- data/config/locales/ja.yml +129 -128
- data/config/locales/pl.yml +129 -128
- data/config/locales/pt-BR.yml +129 -128
- data/config/locales/ru.yml +137 -136
- data/config/locales/sv.yml +129 -128
- data/config/locales/zh-CN.yml +138 -137
- data/lib/comfortable_mexican_sofa/engine.rb +2 -1
- data/lib/comfortable_mexican_sofa/fixture.rb +7 -0
- data/lib/comfortable_mexican_sofa/fixture/layout.rb +1 -1
- data/lib/comfortable_mexican_sofa/fixture/page.rb +2 -2
- data/lib/comfortable_mexican_sofa/fixture/snippet.rb +1 -1
- data/lib/comfortable_mexican_sofa/form_builder.rb +1 -1
- data/lib/comfortable_mexican_sofa/routing.rb +32 -30
- data/lib/comfortable_mexican_sofa/version.rb +1 -1
- data/lib/generators/comfy/cms/README +1 -1
- data/lib/generators/comfy/cms/cms_generator.rb +6 -6
- data/lib/generators/comfy/scaffold/scaffold_generator.rb +69 -0
- data/lib/generators/comfy/scaffold/templates/controller.rb +62 -0
- data/lib/generators/comfy/scaffold/templates/migration.rb +12 -0
- data/lib/generators/comfy/scaffold/templates/model.rb +21 -0
- data/lib/generators/comfy/scaffold/templates/tests/controller.rb +102 -0
- data/lib/generators/comfy/scaffold/templates/tests/fixture.yml +4 -0
- data/lib/generators/comfy/scaffold/templates/tests/model.rb +27 -0
- data/lib/generators/comfy/scaffold/templates/views/_form.haml +6 -0
- data/lib/generators/comfy/scaffold/templates/views/edit.haml +5 -0
- data/lib/generators/comfy/scaffold/templates/views/index.haml +23 -0
- data/lib/generators/comfy/scaffold/templates/views/new.haml +5 -0
- data/lib/generators/comfy/scaffold/templates/views/show.haml +4 -0
- data/test/controllers/{cms_admin → admin/cms}/base_controller_test.rb +3 -3
- data/test/controllers/{cms_admin → admin/cms}/categories_controller_test.rb +2 -2
- data/test/controllers/{cms_admin → admin/cms}/files_controller_test.rb +4 -4
- data/test/controllers/{cms_admin → admin/cms}/layouts_controller_test.rb +5 -5
- data/test/controllers/{cms_admin → admin/cms}/pages_controller_test.rb +9 -9
- data/test/controllers/{cms_admin → admin/cms}/revisions_controller_test.rb +9 -9
- data/test/controllers/{cms_admin → admin/cms}/sites_controller_test.rb +5 -5
- data/test/controllers/{cms_admin → admin/cms}/snippets_controller_test.rb +5 -5
- data/test/controllers/{cms_content_controller_test.rb → cms/content_controller_test.rb} +8 -9
- data/test/fixtures/generators/cms/routes.rb +8 -0
- data/test/fixtures/generators/scaffold/controller.rb +62 -0
- data/test/fixtures/generators/scaffold/migration.rb +10 -0
- data/test/fixtures/generators/scaffold/model.rb +21 -0
- data/test/fixtures/generators/scaffold/routes.rb +7 -0
- data/test/fixtures/generators/scaffold/tests/controller.rb +98 -0
- data/test/fixtures/generators/scaffold/tests/fixture +2 -0
- data/test/fixtures/generators/scaffold/tests/model.rb +25 -0
- data/test/fixtures/generators/scaffold/views/_form.haml +4 -0
- data/test/fixtures/generators/scaffold/views/edit.haml +5 -0
- data/test/fixtures/generators/scaffold/views/index.haml +19 -0
- data/test/fixtures/generators/scaffold/views/new.haml +5 -0
- data/test/fixtures/generators/scaffold/views/show.haml +4 -0
- data/test/gemfiles/Gemfile.rails.4.0 +2 -0
- data/test/generators/cms_generator_test.rb +23 -0
- data/test/generators/scaffold_generator_test.rb +31 -0
- data/test/integration/authentication_test.rb +6 -6
- data/test/integration/fixtures_test.rb +1 -1
- data/test/integration/mirrors_test.rb +12 -12
- data/test/integration/sites_test.rb +8 -8
- data/test/integration/view_hooks_test.rb +7 -7
- data/test/{models → lib}/configuration_test.rb +0 -0
- data/test/{models → lib}/fixtures/categories_test.rb +0 -0
- data/test/{models → lib}/fixtures/files_test.rb +0 -0
- data/test/{models → lib}/fixtures/layouts_test.rb +0 -0
- data/test/{models → lib}/fixtures/pages_test.rb +0 -0
- data/test/{models → lib}/fixtures/snippets_test.rb +0 -0
- data/test/{models → lib}/fixtures_test.rb +0 -0
- data/test/{models → lib}/mirrors_test.rb +0 -0
- data/test/{models → lib}/revisions_test.rb +0 -0
- data/test/{models → lib}/tag_test.rb +0 -0
- data/test/{models → lib}/tags/asset_test.rb +0 -0
- data/test/{models → lib}/tags/collection_test.rb +0 -0
- data/test/{models → lib}/tags/field_datetime_test.rb +0 -0
- data/test/{models → lib}/tags/field_integer_test.rb +0 -0
- data/test/{models → lib}/tags/field_rich_text_test.rb +0 -0
- data/test/{models → lib}/tags/field_string_test.rb +0 -0
- data/test/{models → lib}/tags/field_text_test.rb +0 -0
- data/test/{models → lib}/tags/file_test.rb +0 -0
- data/test/{models → lib}/tags/helper_test.rb +0 -0
- data/test/{models → lib}/tags/page_datetime_test.rb +0 -0
- data/test/{models → lib}/tags/page_file_test.rb +0 -0
- data/test/{models → lib}/tags/page_files_test.rb +0 -0
- data/test/{models → lib}/tags/page_integer_test.rb +0 -0
- data/test/{models → lib}/tags/page_markdown_test.rb +0 -0
- data/test/{models → lib}/tags/page_rich_text_test.rb +0 -0
- data/test/{models → lib}/tags/page_string_test.rb +0 -0
- data/test/{models → lib}/tags/page_text_test.rb +0 -0
- data/test/{models → lib}/tags/partial_test.rb +0 -0
- data/test/{models → lib}/tags/snippet_test.rb +0 -0
- data/test/{models → lib}/tags/template_test.rb +0 -0
- data/test/{models → lib}/view_methods_test.rb +0 -0
- data/test/models/{cms/block_test.rb → block_test.rb} +1 -1
- data/test/models/{cms/categorization_test.rb → categorization_test.rb} +1 -1
- data/test/models/{cms/category_test.rb → category_test.rb} +1 -1
- data/test/models/{cms/file_test.rb → file_test.rb} +2 -2
- data/test/models/{cms/layout_test.rb → layout_test.rb} +4 -4
- data/test/models/{cms/page_test.rb → page_test.rb} +1 -1
- data/test/models/{cms/site_test.rb → site_test.rb} +1 -1
- data/test/models/{cms/snippet_test.rb → snippet_test.rb} +1 -1
- data/test/test_helper.rb +30 -1
- metadata +204 -139
- data/app/assets/javascripts/comfortable_mexican_sofa/lib/codemirror.js +0 -10
- data/app/assets/stylesheets/comfortable_mexican_sofa/lib/codemirror.css +0 -240
- data/app/views/cms_admin/layouts/index.html.haml +0 -13
- data/app/views/cms_admin/pages/index.html.haml +0 -15
- data/app/views/cms_admin/partials/_navigation_inner.html.haml +0 -3
- data/app/views/cms_admin/sites/_mirrors.html.haml +0 -18
- data/app/views/layouts/cms_admin.html.haml +0 -4
- data/app/views/layouts/cms_admin/_body.html.haml +0 -17
- data/app/views/layouts/cms_admin/_left.html.haml +0 -16
- data/app/views/layouts/cms_admin/_right.html.haml +0 -5
@@ -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
|
23
|
-
|
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 '
|
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 '
|
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)
|
File without changes
|
@@ -1,8 +1,8 @@
|
|
1
1
|
.page-header
|
2
|
-
= link_to t('.new_link'),
|
2
|
+
= link_to t('.new_link'), new_admin_cms_site_path, :class => 'btn pull-right'
|
3
3
|
%h2= t('.title')
|
4
4
|
|
5
|
-
= render '
|
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,
|
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'),
|
25
|
-
= link_to t('.edit'),
|
26
|
-
= link_to t('.delete'),
|
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 '
|
28
|
+
= render 'admin/cms/partials/sites_after'
|
File without changes
|
@@ -1,15 +1,15 @@
|
|
1
1
|
- content_for :right_column do
|
2
|
-
= render :partial => '
|
2
|
+
= render :partial => 'admin/cms/files/index'
|
3
3
|
|
4
|
-
= render '
|
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 => '
|
10
|
+
= render :partial => 'admin/cms/categories/form', :object => form
|
11
11
|
|
12
|
-
= render '
|
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')),
|
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 '
|
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'),
|
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 => '
|
6
|
+
= render :partial => 'admin/cms/sites/mirrors'
|
7
7
|
|
8
|
-
= render '
|
8
|
+
= render 'admin/cms/partials/snippets_before'
|
9
9
|
|
10
|
-
= render :partial => '
|
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,
|
24
|
-
= render :partial => '/
|
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'),
|
30
|
-
= link_to t('.delete'),
|
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 '
|
32
|
+
= render 'admin/cms/partials/snippets_after'
|
File without changes
|
@@ -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
|
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,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,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'
|
File without changes
|
File without changes
|
@@ -1,4 +1,4 @@
|
|
1
|
-
= render '
|
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 = "#{
|
9
|
+
CMS.file_upload_path = "#{admin_cms_site_files_path(@site)}"
|
@@ -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'
|
@@ -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',
|
21
|
-
s.add_dependency 'formatted_form',
|
22
|
-
s.add_dependency 'active_link_to',
|
23
|
-
s.add_dependency 'paperclip',
|
24
|
-
s.add_dependency 'kramdown',
|
25
|
-
s.add_dependency 'jquery-rails',
|
26
|
-
s.add_dependency 'jquery-ui-rails',
|
27
|
-
s.add_dependency 'haml-rails',
|
28
|
-
s.add_dependency 'sass-rails',
|
29
|
-
s.add_dependency 'coffee-rails',
|
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
data/config/locales/de.yml
CHANGED
@@ -98,139 +98,140 @@ de:
|
|
98
98
|
page_not_found: Seite nicht gefunden
|
99
99
|
|
100
100
|
# -- Views ----------------------------------------------------------------
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
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
|