comfortable_mexican_sofa 1.2.8 → 1.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (75) hide show
  1. data/Gemfile +1 -1
  2. data/README.md +1 -1
  3. data/VERSION +1 -1
  4. data/app/assets/javascripts/comfortable_mexican_sofa/application.js +3 -3
  5. data/app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js +1 -1
  6. data/app/assets/stylesheets/comfortable_mexican_sofa/structure.css +1 -1
  7. data/app/controllers/cms_admin/base_controller.rb +22 -25
  8. data/app/controllers/cms_admin/layouts_controller.rb +21 -21
  9. data/app/controllers/cms_admin/pages_controller.rb +29 -29
  10. data/app/controllers/cms_admin/revisions_controller.rb +6 -6
  11. data/app/controllers/cms_admin/sites_controller.rb +21 -20
  12. data/app/controllers/cms_admin/snippets_controller.rb +19 -20
  13. data/app/controllers/cms_admin/uploads_controller.rb +6 -6
  14. data/app/controllers/cms_content_controller.rb +30 -16
  15. data/app/models/cms/layout.rb +2 -9
  16. data/app/models/cms/site.rb +11 -6
  17. data/app/views/cms_admin/layouts/_form.html.erb +6 -6
  18. data/app/views/cms_admin/layouts/_index_branch.html.erb +10 -10
  19. data/app/views/cms_admin/layouts/edit.html.erb +6 -5
  20. data/app/views/cms_admin/layouts/index.html.erb +3 -3
  21. data/app/views/cms_admin/layouts/new.html.erb +3 -3
  22. data/app/views/cms_admin/pages/_form.html.erb +11 -11
  23. data/app/views/cms_admin/pages/_form_blocks.html.erb +3 -4
  24. data/app/views/cms_admin/pages/_index_branch.html.erb +15 -15
  25. data/app/views/cms_admin/pages/edit.html.erb +6 -5
  26. data/app/views/cms_admin/pages/index.html.erb +4 -4
  27. data/app/views/cms_admin/pages/new.html.erb +3 -3
  28. data/app/views/cms_admin/pages/toggle_branch.js.erb +3 -3
  29. data/app/views/cms_admin/revisions/show.html.erb +4 -4
  30. data/app/views/cms_admin/sites/_form.html.erb +5 -2
  31. data/app/views/cms_admin/sites/_mirrors.html.erb +6 -6
  32. data/app/views/cms_admin/sites/edit.html.erb +3 -3
  33. data/app/views/cms_admin/sites/index.html.erb +9 -9
  34. data/app/views/cms_admin/sites/new.html.erb +3 -3
  35. data/app/views/cms_admin/snippets/_form.html.erb +3 -3
  36. data/app/views/cms_admin/snippets/edit.html.erb +5 -5
  37. data/app/views/cms_admin/snippets/index.html.erb +9 -9
  38. data/app/views/cms_admin/snippets/new.html.erb +3 -3
  39. data/app/views/cms_admin/uploads/_file.html.erb +1 -1
  40. data/app/views/cms_admin/uploads/_index.html.erb +2 -2
  41. data/app/views/cms_admin/uploads/destroy.js.erb +1 -1
  42. data/app/views/layouts/cms_admin/_head.html.erb +2 -0
  43. data/app/views/layouts/cms_admin/_left.html.erb +6 -6
  44. data/comfortable_mexican_sofa.gemspec +10 -6
  45. data/config/boot.rb +3 -10
  46. data/config/initializers/comfortable_mexican_sofa.rb +14 -22
  47. data/config/locales/en.yml +179 -4
  48. data/config/locales/es.yml +179 -0
  49. data/config/routes.rb +25 -27
  50. data/db/migrate/01_create_cms.rb +8 -1
  51. data/db/migrate/upgrades/04_upgrade_to_1_3_0.rb +23 -0
  52. data/lib/comfortable_mexican_sofa/configuration.rb +15 -19
  53. data/lib/comfortable_mexican_sofa/fixtures.rb +12 -3
  54. data/lib/comfortable_mexican_sofa/form_builder.rb +7 -6
  55. data/lib/comfortable_mexican_sofa/is_mirrored.rb +9 -11
  56. data/lib/comfortable_mexican_sofa/tags/asset.rb +2 -2
  57. data/test/fixtures/cms/sites.yml +3 -1
  58. data/test/functional/cms_admin/base_controller_test.rb +18 -0
  59. data/test/functional/cms_admin/layouts_controller_test.rb +20 -19
  60. data/test/functional/cms_admin/pages_controller_test.rb +73 -71
  61. data/test/functional/cms_admin/revisions_controller_test.rb +23 -20
  62. data/test/functional/cms_admin/sites_controller_test.rb +8 -8
  63. data/test/functional/cms_admin/snippets_controller_test.rb +17 -16
  64. data/test/functional/cms_admin/uploads_controller_test.rb +3 -3
  65. data/test/integration/authentication_test.rb +4 -4
  66. data/test/integration/fixtures_test.rb +1 -1
  67. data/test/integration/mirrors_test.rb +15 -18
  68. data/test/integration/routing_extensions_test.rb +4 -19
  69. data/test/integration/sites_test.rb +67 -48
  70. data/test/test_helper.rb +26 -6
  71. data/test/unit/configuration_test.rb +5 -5
  72. data/test/unit/form_builder_test.rb +69 -0
  73. data/test/unit/mirrors_test.rb +2 -6
  74. data/test/unit/models/site_test.rb +30 -3
  75. metadata +55 -56
@@ -1,5 +1,5 @@
1
- <h1> New Page </h1>
1
+ <h1><%= t('.title') %></h1>
2
2
 
3
- <%= cms_form_for @cms_page, :url => {:action => :create} do |form| %>
3
+ <%= cms_form_for @page, :as => :page, :url => {:action => :create} do |form| %>
4
4
  <%= render :partial => 'form', :object => form %>
5
- <% end %>
5
+ <% end %>
@@ -1,9 +1,9 @@
1
- var li = $('li#cms_page_<%=@cms_page.id%>');
1
+ var li = $('li#cms_page_<%=@page.id%>');
2
2
  li.find('.item .toggle').first().toggleClass('open');
3
3
 
4
- <% if session[:cms_page_tree].member?(@cms_page.id.to_s) %>
4
+ <% if session[:cms_page_tree].member?(@page.id.to_s) %>
5
5
  if(!li.find('ul')[0]) {
6
- li.append('<ul><%= escape_javascript(render :partial => "index_branch", :collection => @cms_page.children) %></ul>');
6
+ li.append('<ul><%= escape_javascript(render :partial => "index_branch", :collection => @page.children) %></ul>');
7
7
  $.CMS.enable_sortable_list();
8
8
  }
9
9
  <% else %>
@@ -1,8 +1,8 @@
1
- <h1> Revisions for <%= @record.class.to_s.demodulize %></h1>
2
- <h2> <%= @record.is_a?(Cms::Page) ? "Full Path: #{@record.full_path}" : "Slug: #{@record.slug}" %> </h2>
1
+ <h1> <%= t('.title') %> <%= @record.class.to_s.demodulize %></h1>
2
+ <h2> <%= @record.is_a?(Cms::Page) ? "#{t('.full_path')}: #{@record.full_path}" : "#{t('.slug')}: #{@record.slug}" %> </h2>
3
3
 
4
4
  <% content_for :right_column do %>
5
- <h2><%= pluralize(@record.revisions.count, 'Revision') %></h2>
5
+ <h2><%= pluralize(@record.revisions.count, t('.revision')) %></h2>
6
6
  <div class='revisions box'>
7
7
  <% @record.revisions.each do |revision| %>
8
8
  <%= active_link_to revision.created_at, :id => revision.id %>
@@ -32,5 +32,5 @@
32
32
  <% end %>
33
33
  <% end %>
34
34
 
35
- <%= form.submit 'Update to this Revision' %>
35
+ <%= form.submit t('.update') %>
36
36
  <% end %>
@@ -1,6 +1,9 @@
1
1
  <%= form.text_field :label %>
2
2
  <%= form.text_field :hostname %>
3
+ <%= form.text_field :path %>
4
+ <%= form.select :locale, ComfortableMexicanSofa.config.locales.to_a.collect{|l| [l[1], l[0]]} %>
5
+ <%= form.check_box :is_mirrored %>
3
6
 
4
7
  <%= form.simple_field nil, nil, :class => 'submit_element' do %>
5
- <%= form.submit @cms_site.new_record?? 'Create Site' : 'Update Site', :disable_builder => true %>
6
- <% end %>
8
+ <%= form.submit t(@site.new_record?? '.create' : '.update'), :disable_builder => true %>
9
+ <% end %>
@@ -1,18 +1,18 @@
1
1
  <%
2
- return unless ComfortableMexicanSofa.config.enable_mirror_sites
3
2
  object ||= mirrors
3
+ return unless @site.is_mirrored?
4
4
 
5
5
  options = case object
6
6
  when Cms::Layout
7
- object.mirrors.collect{|m| [m.site.label, edit_cms_admin_layout_url(m, :host => m.site.hostname)]}
7
+ object.mirrors.collect{|m| [m.site.label, edit_cms_admin_site_layout_path(m.site, m)]}
8
8
  when Cms::Page
9
- object.mirrors.collect{|m| [m.site.label, edit_cms_admin_page_url(m, :host => m.site.hostname)]}
9
+ object.mirrors.collect{|m| [m.site.label, edit_cms_admin_site_page_path(m.site, m)]}
10
10
  when Cms::Snippet
11
- object.mirrors.collect{|m| [m.site.label, edit_cms_admin_snippet_url(m, :host => m.site.hostname)]}
11
+ object.mirrors.collect{|m| [m.site.label, edit_cms_admin_site_snippet_path(m.site, m)]}
12
12
  else
13
- (Cms::Site.all - [@cms_site]).collect{|s| [s.label, url_for(:host => s.hostname)]}
13
+ (Cms::Site.mirrored - [@site]).collect{|s| [s.label, url_for(params.merge(:site_id => s))]}
14
14
  end
15
- options = [[@cms_site.label, request.fullpath]] + options
15
+ options = [[@site.label, request.fullpath]] + options
16
16
  %>
17
17
 
18
18
  <div id='mirrors' class='box'>
@@ -1,5 +1,5 @@
1
- <h1> Editing Site </h1>
1
+ <h1><%= t('.title') %></h1>
2
2
 
3
- <%= cms_form_for @cms_site, :url => {:action => :update} do |form| %>
3
+ <%= cms_form_for @site, :as => :site, :url => {:action => :update} do |form| %>
4
4
  <%= render :partial => 'form', :object => form %>
5
- <% end %>
5
+ <% end %>
@@ -1,22 +1,22 @@
1
- <%= link_to span_tag('Create New Site'), new_cms_admin_site_path, :class => 'big button' %>
2
- <h1>Sites</h1>
1
+ <%= link_to span_tag(t('.new_link')), new_cms_admin_site_path, :class => 'big button' %>
2
+ <h1><%= t('.title') %></h1>
3
3
 
4
4
  <ul class='list'>
5
- <% @cms_sites.each do |cms_site| %>
6
- <li id='cms_site_<%= cms_site.id %>'>
5
+ <% @sites.each do |site| %>
6
+ <li id='cms_site_<%= site.id %>'>
7
7
  <div class='item'>
8
8
  <div class='icon'></div>
9
9
  <div class='action_links'>
10
- <%= link_to 'Edit', edit_cms_admin_site_path(cms_site) %>
11
- <%= link_to 'Delete', cms_admin_site_path(cms_site), :method => :delete, :confirm => 'Are you sure?' %>
10
+ <%= link_to t('.edit'), edit_cms_admin_site_path(site) %>
11
+ <%= link_to t('.delete'), cms_admin_site_path(site), :method => :delete, :confirm => t('.are_you_sure') %>
12
12
  </div>
13
13
  <div class='label'>
14
- <%= link_to cms_site.label, edit_cms_admin_site_path(cms_site) %>
14
+ <%= link_to site.label, cms_admin_site_pages_path(site) %>
15
15
  <div class='sublabel'>
16
- <%= link_to cms_site.hostname, "http://#{cms_site.hostname}/cms-admin" %>
16
+ <%= link_to "http://#{site.hostname}/#{site.path}", "http://#{site.hostname}/#{site.path}", :target => '_blank' %>
17
17
  </div>
18
18
  </div>
19
19
  </div>
20
20
  </li>
21
21
  <% end %>
22
- </ul>
22
+ </ul>
@@ -1,5 +1,5 @@
1
- <h1> New Site </h1>
1
+ <h1><%= t('.title') %></h1>
2
2
 
3
- <%= cms_form_for @cms_site, :url => {:action => :create} do |form| %>
3
+ <%= cms_form_for @site, :as => :site, :url => {:action => :create} do |form| %>
4
4
  <%= render :partial => 'form', :object => form %>
5
- <% end %>
5
+ <% end %>
@@ -2,10 +2,10 @@
2
2
  <%= render :partial => 'cms_admin/uploads/index' %>
3
3
  <% end %>
4
4
 
5
- <%= form.text_field :label, :id => (@cms_snippet.new_record?? 'slugify' : nil) %>
5
+ <%= form.text_field :label, :id => (@snippet.new_record?? 'slugify' : nil) %>
6
6
  <%= form.text_field :slug, :id => 'slug', :class => 'delimiter-underscore' %>
7
7
  <%= form.text_area :content, :class => 'code' %>
8
8
 
9
9
  <%= form.simple_field nil, nil, :class => 'submit_element' do %>
10
- <%= form.submit @cms_snippet.new_record?? 'Create Snippet' : 'Update Snippet', :disable_builder => true %>
11
- <% end %>
10
+ <%= form.submit t(@snippet.new_record?? '.create' : '.update'), :disable_builder => true %>
11
+ <% end %>
@@ -1,10 +1,10 @@
1
- <%= link_to span_tag(pluralize(@cms_snippet.revisions.count, 'revision')), cms_admin_snippet_revisions_path(@cms_snippet), :class => 'big button' %>
2
- <h1> Editing Snippet </h1>
1
+ <%= link_to span_tag(pluralize(@snippet.revisions.count, t('.revision'))), cms_admin_site_snippet_revisions_path(@site, @snippet), :class => 'big button' %>
2
+ <h1><%= t('.title')%></h1>
3
3
 
4
4
  <% content_for :right_column do %>
5
- <%= render :partial => 'cms_admin/sites/mirrors', :object => @cms_snippet %>
5
+ <%= render :partial => 'cms_admin/sites/mirrors', :object => @snippet %>
6
6
  <% end %>
7
7
 
8
- <%= cms_form_for @cms_snippet, :url => {:action => :update} do |form| %>
8
+ <%= cms_form_for @snippet, :as => :snippet, :url => {:action => :update} do |form| %>
9
9
  <%= render :partial => 'form', :object => form %>
10
- <% end %>
10
+ <% end %>
@@ -1,26 +1,26 @@
1
- <%= link_to span_tag('Create New Snippet'), new_cms_admin_snippet_path, :class => 'big button' %>
2
- <h1>Snippets</h1>
1
+ <%= link_to span_tag(t('.new_link')), new_cms_admin_site_snippet_path(@site), :class => 'big button' %>
2
+ <h1><%= t('.title')%></h1>
3
3
 
4
4
  <% content_for :right_column do %>
5
5
  <%= render :partial => 'cms_admin/sites/mirrors' %>
6
6
  <% end %>
7
7
 
8
8
  <ul class='list'>
9
- <% @cms_snippets.each do |cms_snippet| %>
10
- <li id='cms_snippet_<%= cms_snippet.id %>'>
9
+ <% @snippets.each do |snippet| %>
10
+ <li id='cms_snippet_<%= snippet.id %>'>
11
11
  <div class='item'>
12
12
  <div class='icon'></div>
13
13
  <div class='action_links'>
14
- <%= link_to 'Edit', edit_cms_admin_snippet_path(cms_snippet) %>
15
- <%= link_to 'Delete', cms_admin_snippet_path(cms_snippet), :method => :delete, :confirm => 'Are you sure?' %>
14
+ <%= link_to t('.edit'), edit_cms_admin_site_snippet_path(@site, snippet) %>
15
+ <%= link_to t('.delete'), cms_admin_site_snippet_path(@site, snippet), :method => :delete, :confirm => t('.are_you_sure') %>
16
16
  </div>
17
17
  <div class='label'>
18
- <%= link_to cms_snippet.label, edit_cms_admin_snippet_path(cms_snippet) %>
18
+ <%= link_to snippet.label, edit_cms_admin_site_snippet_path(@site, snippet) %>
19
19
  <div class='sublabel'>
20
- <%= link_to cms_snippet.slug, edit_cms_admin_snippet_path(cms_snippet) %>
20
+ <%= link_to snippet.slug, edit_cms_admin_site_snippet_path(@site, snippet) %>
21
21
  </div>
22
22
  </div>
23
23
  </div>
24
24
  </li>
25
25
  <% end %>
26
- </ul>
26
+ </ul>
@@ -1,5 +1,5 @@
1
- <h1> New Snippet </h1>
1
+ <h1><%= t('.title') %></h1>
2
2
 
3
- <%= cms_form_for @cms_snippet, :url => {:action => :create} do |form| %>
3
+ <%= cms_form_for @snippet, :as => :snippet, :url => {:action => :create} do |form| %>
4
4
  <%= render :partial => 'form', :object => form %>
5
- <% end %>
5
+ <% end %>
@@ -6,5 +6,5 @@
6
6
  end
7
7
  %>
8
8
  <%= link_to file_name, file.file.url, :target => '_blank', :class => 'filename' %>
9
- <%= link_to span_tag('x'), cms_admin_upload_path(file), :method => :delete, :remote => true, :class => 'delete' %>
9
+ <%= link_to span_tag('x'), cms_admin_site_upload_path(@site, file), :method => :delete, :remote => true, :class => 'delete' %>
10
10
  </div>
@@ -1,10 +1,10 @@
1
1
  <div id='file_uploads' class='box'>
2
2
  <div class='actions'>
3
- <a id='uploader_button' href='#' class='big button'>Upload Files</a>
3
+ <a id='uploader_button' href='#' class='big button'><%= t('.button') %></a>
4
4
  </div>
5
5
  <div id='uploaded_files'>
6
6
  <% Cms::Upload.order('file_file_name').all.each do |file| %>
7
7
  <%= render :partial => 'cms_admin/uploads/file', :object => file %>
8
8
  <% end %>
9
9
  </div>
10
- </div>
10
+ </div>
@@ -1,3 +1,3 @@
1
- $(".file#<%= dom_id(@cms_upload) %>").fadeOut('slow', function(){
1
+ $(".file#<%= dom_id(@upload) %>").fadeOut('slow', function(){
2
2
  $(this).remove()
3
3
  })
@@ -2,7 +2,9 @@
2
2
  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
3
3
  <title><%= ComfortableMexicanSofa.config.cms_title %></title>
4
4
  <%= csrf_meta_tag %>
5
+
5
6
  <meta name="cms-admin-path" content="<%= ComfortableMexicanSofa.config.admin_route_prefix %>" />
7
+ <meta name="cms-locale" content="<%= I18n.locale %>" />
6
8
 
7
9
  <% if ComfortableMexicanSofa.asset_pipeline_enabled? %>
8
10
 
@@ -1,9 +1,9 @@
1
1
  <ul class='nav'>
2
- <% if ComfortableMexicanSofa.config.enable_multiple_sites %>
3
- <li><%= active_link_to 'Sites', cms_admin_sites_path %></li>
2
+ <li><%= active_link_to t('cms_admin.base.sites'), cms_admin_sites_path, :active => {:when => :self_only} %></li>
3
+ <% if @site && params[:controller] != 'cms_admin/sites' %>
4
+ <li><%= active_link_to t('cms_admin.base.layouts'), cms_admin_site_layouts_path(@site) %></li>
5
+ <li><%= active_link_to t('cms_admin.base.pages'), cms_admin_site_pages_path(@site) %></li>
6
+ <li><%= active_link_to t('cms_admin.base.snippets'), cms_admin_site_snippets_path(@site) %></li>
4
7
  <% end %>
5
- <li><%= active_link_to 'Layouts', cms_admin_layouts_path %></li>
6
- <li><%= active_link_to 'Pages', cms_admin_pages_path %></li>
7
- <li><%= active_link_to 'Snippets', cms_admin_snippets_path %></li>
8
8
  <%= cms_hook :navigation %>
9
- </ul>
9
+ </ul>
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{comfortable_mexican_sofa}
8
- s.version = "1.2.8"
8
+ s.version = "1.3.0"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Oleg Khabarov", "The Working Group Inc"]
12
- s.date = %q{2011-06-13}
12
+ s.date = %q{2011-07-03}
13
13
  s.description = %q{}
14
14
  s.email = %q{oleg@theworkinggroup.ca}
15
15
  s.extra_rdoc_files = [
@@ -143,6 +143,7 @@ Gem::Specification.new do |s|
143
143
  "config/initializers/comfortable_mexican_sofa.rb",
144
144
  "config/initializers/paperclip.rb",
145
145
  "config/locales/en.yml",
146
+ "config/locales/es.yml",
146
147
  "config/routes.rb",
147
148
  "db/cms_fixtures/example.com/layouts/default/_default.yml",
148
149
  "db/cms_fixtures/example.com/layouts/default/content.html",
@@ -162,6 +163,7 @@ Gem::Specification.new do |s|
162
163
  "db/migrate/01_create_cms.rb",
163
164
  "db/migrate/upgrades/02_upgrade_to_1_1_0.rb",
164
165
  "db/migrate/upgrades/03_upgrade_to_1_2_0.rb",
166
+ "db/migrate/upgrades/04_upgrade_to_1_3_0.rb",
165
167
  "db/seeds.rb",
166
168
  "doc/page_editing.png",
167
169
  "doc/sofa.png",
@@ -214,6 +216,7 @@ Gem::Specification.new do |s|
214
216
  "test/fixtures/files/valid_image.jpg",
215
217
  "test/fixtures/views/_nav_hook.html.erb",
216
218
  "test/fixtures/views/_nav_hook_2.html.erb",
219
+ "test/functional/cms_admin/base_controller_test.rb",
217
220
  "test/functional/cms_admin/layouts_controller_test.rb",
218
221
  "test/functional/cms_admin/pages_controller_test.rb",
219
222
  "test/functional/cms_admin/revisions_controller_test.rb",
@@ -231,6 +234,7 @@ Gem::Specification.new do |s|
231
234
  "test/test_helper.rb",
232
235
  "test/unit/configuration_test.rb",
233
236
  "test/unit/fixtures_test.rb",
237
+ "test/unit/form_builder_test.rb",
234
238
  "test/unit/mirrors_test.rb",
235
239
  "test/unit/models/block_test.rb",
236
240
  "test/unit/models/layout_test.rb",
@@ -258,7 +262,7 @@ Gem::Specification.new do |s|
258
262
  ]
259
263
  s.homepage = %q{http://github.com/twg/comfortable-mexican-sofa}
260
264
  s.require_paths = ["lib"]
261
- s.rubygems_version = %q{1.7.2}
265
+ s.rubygems_version = %q{1.6.2}
262
266
  s.summary = %q{ComfortableMexicanSofa is a powerful micro CMS for Ruby on Rails 3 applications}
263
267
 
264
268
  if s.respond_to? :specification_version then
@@ -266,18 +270,18 @@ Gem::Specification.new do |s|
266
270
 
267
271
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
268
272
  s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
269
- s.add_runtime_dependency(%q<active_link_to>, [">= 0.0.7"])
273
+ s.add_runtime_dependency(%q<active_link_to>, [">= 0.0.0"])
270
274
  s.add_runtime_dependency(%q<paperclip>, [">= 2.3.11"])
271
275
  s.add_development_dependency(%q<sqlite3>, [">= 0"])
272
276
  else
273
277
  s.add_dependency(%q<rails>, [">= 3.0.0"])
274
- s.add_dependency(%q<active_link_to>, [">= 0.0.7"])
278
+ s.add_dependency(%q<active_link_to>, [">= 0.0.0"])
275
279
  s.add_dependency(%q<paperclip>, [">= 2.3.11"])
276
280
  s.add_dependency(%q<sqlite3>, [">= 0"])
277
281
  end
278
282
  else
279
283
  s.add_dependency(%q<rails>, [">= 3.0.0"])
280
- s.add_dependency(%q<active_link_to>, [">= 0.0.7"])
284
+ s.add_dependency(%q<active_link_to>, [">= 0.0.0"])
281
285
  s.add_dependency(%q<paperclip>, [">= 2.3.11"])
282
286
  s.add_dependency(%q<sqlite3>, [">= 0"])
283
287
  end
data/config/boot.rb CHANGED
@@ -1,13 +1,6 @@
1
1
  require 'rubygems'
2
2
 
3
3
  # Set up gems listed in the Gemfile.
4
- gemfile = File.expand_path('../../Gemfile', __FILE__)
5
- begin
6
- ENV['BUNDLE_GEMFILE'] = gemfile
7
- require 'bundler'
8
- Bundler.setup
9
- rescue Bundler::GemNotFound => e
10
- STDERR.puts e.message
11
- STDERR.puts "Try running `bundle install`."
12
- exit!
13
- end if File.exist?(gemfile)
4
+ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
5
+
6
+ require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
@@ -1,3 +1,5 @@
1
+ # encoding: utf-8
2
+
1
3
  ComfortableMexicanSofa.configure do |config|
2
4
  # Title of the admin area
3
5
  # config.cms_title = 'ComfortableMexicanSofa MicroCMS'
@@ -11,32 +13,14 @@ ComfortableMexicanSofa.configure do |config|
11
13
  # entirely set this to '' or nil
12
14
  # config.admin_route_prefix = 'cms-admin'
13
15
 
14
- # By default Cms content is served directly from the root. Change this setting
15
- # if you wish to restrict all content to a section of your site.
16
- # To have root page served from http://yourhost/content/ set config below to 'content'
17
- # config.content_route_prefix = ''
18
-
19
- # Path: /cms-admin redirects to /cms-admin/pages but you can change it
20
- # config.admin_route_redirect = 'pages'
21
-
22
- # If you enable this setting you'll be able to serve completely different set
23
- # of sites with their own layouts and pages.
24
- # config.enable_multiple_sites = true
25
-
26
- # In cases when you need sites with identical page tree structure, like different
27
- # language versions. This will automatically create/destroy resources across all sites and
28
- # will keep slugs/paths synced.
29
- # config.enable_mirror_sites = true
16
+ # When arriving at /cms-admin you may chose to redirect to arbirtary path,
17
+ # for example '/cms-admin/users'
18
+ # config.admin_route_redirect = ''
30
19
 
31
20
  # By default you cannot have irb code inside your layouts/pages/snippets.
32
21
  # Generally this is to prevent putting something like this:
33
22
  # <% User.delete_all %> but if you really want to allow it...
34
- # config.disable_irb = true
35
-
36
- # Asset caching for CSS and JS for admin layout. This setting also controls
37
- # page caching for CMS Layout CSS and Javascript. Enabled by default. When deploying
38
- # to an environment with read-only filesystem (like Heroku) turn this setting off.
39
- # config.enable_caching = true
23
+ # config.allow_irb = false
40
24
 
41
25
  # File uploads use Paperclip and can support filesystem or s3 uploads. Override
42
26
  # the upload method and appropriate settings based on Paperclip. For S3 see:
@@ -57,6 +41,14 @@ ComfortableMexicanSofa.configure do |config|
57
41
  # object you want to keep. Set it to 0 if you wish to turn this feature off.
58
42
  # config.revisions_limit = 25
59
43
 
44
+ # Locale definitions. If you want to define your own locale merge
45
+ # {:locale => 'Locale Title'} with this.
46
+ # config.locales = {:en => 'English', :es => 'Español'}
47
+
48
+ # Admin interface will respect the locale of the site being managed. However you can
49
+ # force it to English by setting this to `:en`
50
+ # cofig.admin_locale = nil
51
+
60
52
  end
61
53
 
62
54
  # Default credentials for ComfortableMexicanSofa::HttpAuth
@@ -1,5 +1,180 @@
1
- # Sample localization file for English. Add more files in this directory for other locales.
2
- # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
3
-
1
+ # encoding: utf-8
4
2
  en:
5
- hello: "Hello world"
3
+ # -- Models ---------------------------------------------------------------
4
+ attributes:
5
+ label: Label
6
+ slug: Slug
7
+ parent_id: Parent
8
+ content: Content
9
+ activerecord:
10
+ models:
11
+ cms/site: Site
12
+ cms/layout: Layout
13
+ cms/page: Page
14
+ cms/snippet: Snippet
15
+ attributes:
16
+ cms/site:
17
+ hostname: Hostname
18
+ path: Path
19
+ locale: Language
20
+ is_mirrored: Mirrored
21
+ cms/layout:
22
+ label: Layout Name
23
+ app_layout: App Layout
24
+ parent_id: Parent Layout
25
+ css: Stylesheet
26
+ js: Javascript
27
+ cms/page:
28
+ label: Label
29
+ layout_id: Layout
30
+ slug: Slug
31
+ target_page_id: Redirect to Page
32
+ is_published: Published
33
+
34
+ # -- Controllers ----------------------------------------------------------
35
+ cms:
36
+ base:
37
+ site_not_found: Site not found
38
+ fixtures_enabled: CMS Fixtures are enabled. All changes done here will be discarded.
39
+
40
+ sites:
41
+ created: Site created
42
+ creation_failure: Failed to create site
43
+ updated: Site updated
44
+ update_failure: Failed to update site
45
+ deleted: Site deleted
46
+ not_found: Site not found
47
+
48
+ layouts:
49
+ created: Layout created
50
+ creation_failure: Failed to create layout
51
+ updated: Layout updated
52
+ update_failure: Failed to update layout
53
+ deleted: Layout deleted
54
+ not_found: Layout not found
55
+
56
+ pages:
57
+ created: Page created
58
+ creation_failure: Failed to create page
59
+ updated: Page updated
60
+ update_failure: Failed to update page
61
+ deleted: Page deleted
62
+ not_found: Page not found
63
+ layout_not_found: No Layouts found. Please create one.
64
+
65
+ snippets:
66
+ created: Snippet created
67
+ creation_failure: Failed to create snippet
68
+ updated: Snippet updated
69
+ update_failure: Failed to update snippet
70
+ deleted: Snippet deleted
71
+ not_found: Snippet not found
72
+
73
+ revisions:
74
+ reverted: Content Reverted
75
+ record_not_found: Record Not Found
76
+ not_found: Revision Not Found
77
+
78
+ uploads:
79
+
80
+ content:
81
+ site_not_found: Site Not Found
82
+ layout_not_found: Layout Not Found
83
+ page_not_found: Page Not Found
84
+
85
+ # -- Views ----------------------------------------------------------------
86
+ cms_admin:
87
+ base:
88
+ sites: Sites
89
+ layouts: Layouts
90
+ pages: Pages
91
+ snippets: Snippets
92
+
93
+ sites:
94
+ index:
95
+ title: Sites
96
+ new_link: Create New Site
97
+ edit: Edit
98
+ delete: Delete
99
+ are_you_sure: Are you sure you want to delete this site?
100
+ new:
101
+ title: New Site
102
+ edit:
103
+ title: Editing Site
104
+ form:
105
+ create: Create Site
106
+ update: Update Site
107
+
108
+ layouts:
109
+ index:
110
+ title: Layouts
111
+ new_link: Create New Layout
112
+ index_branch:
113
+ add_child_layout: Add Child Layout
114
+ edit: Edit
115
+ delete: Delete
116
+ are_you_sure: Are you sure?
117
+ new:
118
+ title: New Layout
119
+ edit:
120
+ title: Editing Layout
121
+ revision: Revision
122
+ form:
123
+ select_parent_layout: Select Parent Layout
124
+ select_app_layout: Select Application Layout
125
+ create: Create Layout
126
+ update: Update Layout
127
+
128
+ pages:
129
+ index:
130
+ title: Pages
131
+ new_link: Create New Page
132
+ index_branch:
133
+ toggle: Toggle
134
+ add_child_page: Add Child Page
135
+ edit: Edit
136
+ delete: Delete
137
+ are_you_sure: Are you sure?
138
+ new:
139
+ title: New Page
140
+ edit:
141
+ title: Editing Page
142
+ revision: Revision
143
+ form:
144
+ select_target_page: No Redirect
145
+ preview: Preview
146
+ create: Create Page
147
+ update: Update Page
148
+ form_blocks:
149
+ no_tags: |-
150
+ Layout has no content tags defined.<br/>
151
+ Edit the content to include a page or field tag. For example: <code>{{cms:page:content}}</code>
152
+
153
+ snippets:
154
+ index:
155
+ title: Snippets
156
+ new_link: Create New Snippet
157
+ edit: Edit
158
+ delete: Delete
159
+ are_you_sure: Are you sure?
160
+ new:
161
+ title: New Snippet
162
+ edit:
163
+ title: Editing Snippet
164
+ revision: Revision
165
+ form:
166
+ create: Create Snippet
167
+ update: Update Snippet
168
+
169
+ revisions:
170
+ show:
171
+ title: Revisions for
172
+ revision: Revision
173
+ full_path: Full Path
174
+ slug: Slug
175
+ update: Update to this Revision
176
+
177
+ uploads:
178
+ index:
179
+ button: Upload Files
180
+