comfortable_mexican_sofa 1.9.3 → 1.10.0

data/app/views/{cms_admin → admin/cms}/categories/_edit.html.haml

@@ -1,6 +1,6 @@
 - category ||= edit
 
-= form_for @category, :as => :category, :url => cms_admin_site_category_path(@site, category), :remote => true, :html => {:id => dom_id(category)} do |form|
+= form_for @category, :as => :category, :url => admin_cms_site_category_path(@site, category), :remote => true, :html => {:id => dom_id(category)} do |form|
   .input-append
     = form.text_field :label
     %button.btn.btn-mini= t('.save')

data/app/views/{cms_admin → admin/cms}/categories/_index.html.haml

@@ -11,13 +11,13 @@
     .category.all{:class => params[:category].blank?? 'active' : nil}
       = link_to t('.all'), :category => nil
     - @site.categories.of_type(type).each do |category|
-      = render :partial => 'cms_admin/categories/show', :object => category, :locals => { :read => true }
+      = render :partial => 'admin/cms/categories/show', :object => category, :locals => { :read => true }
   
   .categories.editable
     - @site.categories.of_type(type).each do |category|
-      = render :partial => 'cms_admin/categories/show', :object => category
+      = render :partial => 'admin/cms/categories/show', :object => category
     
-    = form_for :category, :url => cms_admin_site_categories_path(@site), :remote => true, :html => {:id => 'new_category'} do |form|
+    = form_for :category, :url => admin_cms_site_categories_path(@site), :remote => true, :html => {:id => 'new_category'} do |form|
       = form.hidden_field :categorized_type, :value => type
       .input-append
         = form.text_field :label, :placeholder => 'Add Category'

data/app/views/{cms_admin → admin/cms}/categories/_show.html.haml

@@ -8,6 +8,6 @@
     - categories = active ? categories.reject{|c| c == category.label} : categories << category.label
     = link_to category.label, "?#{{:category => categories}.to_param}"
   - else
-    = link_to category.label, edit_cms_admin_site_category_path(@site, category), :remote => true
-    = link_to cms_admin_site_category_path(@site, category), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'delete' do
+    = link_to category.label, edit_admin_cms_site_category_path(@site, category), :remote => true
+    = link_to admin_cms_site_category_path(@site, category), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'delete' do
       %i.icon-remove-circle

data/app/views/{cms_admin → admin/cms}/files/_file.html.haml

@@ -1,6 +1,6 @@
 .file{:class => "#{dom_id(file)} #{file.is_image?? 'image' : nil}"}
   .file-name
-    = link_to cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'delete' do
+    = link_to admin_cms_site_file_path(@site, file), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'delete' do
       %i.icon-remove-circle
     = link_to file.file_file_name, file.file.url, :target => '_blank', :class => 'filename'
   

data/app/views/{cms_admin → admin/cms}/files/_form.html.haml

@@ -1,4 +1,4 @@
-= render 'cms_admin/partials/file_form_before', :object => form
+= render 'admin/cms/partials/file_form_before', :object => form
 
 = form.text_field :label
 = form.file_field :file, :multiple => @file.new_record?
@@ -10,9 +10,9 @@
 
 = form.text_area :description
 
-= render :partial => 'cms_admin/categories/form', :object => form
+= render :partial => 'admin/cms/categories/form', :object => form
 
-= render 'cms_admin/partials/file_form_after', :object => form
+= render 'admin/cms/partials/file_form_after', :object => form
 
 .form-actions
   = form.submit t(@file.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

data/app/views/{cms_admin → admin/cms}/files/_index.html.haml

@@ -2,13 +2,13 @@
 - files_scope = (type == 'image') ? @site.files.images : @site.files
 
 .box.file-uploader
-  = form_for :file, :url => cms_admin_site_files_path(@site, :ajax => true), :html => {:multipart => true, :target => 'file-upload-frame'} do |form|
+  = form_for :file, :url => admin_cms_site_files_path(@site, :ajax => true), :html => {:multipart => true, :target => 'file-upload-frame'} do |form|
     %span.btn.btn-file
       = t('.button')
       = form.file_field :file, :multiple => true, :id => nil
   
   .uploaded-files
     - files_scope.order(:label).each do |file|
-      = render :partial => 'cms_admin/files/file', :object => file
+      = render :partial => 'admin/cms/files/file', :object => file
       
   %iframe#file-upload-frame{:name => 'file-upload-frame', :src => ''}

data/app/views/{cms_admin → admin/cms}/files/_page_form.html.haml

@@ -5,5 +5,5 @@
     - files.each do |file|
       .file{:class => dom_id(file)}
         = link_to file.file_file_name, file.file.url, :target => '_blank'
-        = link_to cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :confirm => t('.are_you_sure'), :class => 'delete' do
+        = link_to admin_cms_site_file_path(@site, file), :method => :delete, :remote => true, :confirm => t('.are_you_sure'), :class => 'delete' do
           %i.icon-remove-circle

data/app/views/{cms_admin → admin/cms}/files/index.html.haml

@@ -1,10 +1,10 @@
 .page-header
-  = link_to t('.new_link'), new_cms_admin_site_file_path(@site), :class => 'btn pull-right'
+  = link_to t('.new_link'), new_admin_cms_site_file_path(@site), :class => 'btn pull-right'
   %h2= t('.title')
   
-= render 'cms_admin/partials/files_before'
+= render 'admin/cms/partials/files_before'
 
-= render :partial => 'cms_admin/categories/index', :object => 'Cms::File'
+= render :partial => 'admin/cms/categories/index', :object => 'Cms::File'
 
 %table.table.table-hover.table-bordered
   %tbody.sortable
@@ -19,15 +19,15 @@
                 %span ⇅
         %td.main
           .item-title
-            = link_to file.label, edit_cms_admin_site_file_path(@site, file)
-            = render :partial => '/cms_admin/categories/categories', :object => file
+            = link_to file.label, edit_admin_cms_site_file_path(@site, file)
+            = render :partial => '/admin/cms/categories/categories', :object => file
           .item-meta
             = link_to file.file_file_name, file.file.url, :target => '_blank'
             
         %td
           .btn-group
-            = link_to t('.edit'), edit_cms_admin_site_file_path(@site, file), :class => 'btn btn-small'
-            = link_to t('.delete'), cms_admin_site_file_path(@site, file), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
+            = link_to t('.edit'), edit_admin_cms_site_file_path(@site, file), :class => 'btn btn-small'
+            = link_to t('.delete'), admin_cms_site_file_path(@site, file), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
 
 
-= render 'cms_admin/partials/files_after'
+= render 'admin/cms/partials/files_after'

data/app/views/{cms_admin → admin/cms}/layouts/_form.html.haml

@@ -1,7 +1,7 @@
 - content_for :right_column do
-  = render :partial => 'cms_admin/files/index'
+  = render :partial => 'admin/cms/files/index'
   
-= render 'cms_admin/partials/layout_form_before', :object => form
+= render 'admin/cms/partials/layout_form_before', :object => form
 
 = form.text_field :label, :data => {:slugify => @layout.new_record?}
 = form.text_field :identifier, :data => {:slug => true}
@@ -15,7 +15,7 @@
 = form.text_area :css, :data => {:cm_mode => 'css'}
 = form.text_area :js, :data => {:cm_mode => 'javascript'}
 
-= render 'cms_admin/partials/layout_form_after', :object => form
+= render 'admin/cms/partials/layout_form_after', :object => form
 
 .form-actions
   = form.submit t(@layout.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

data/app/views/{cms_admin → admin/cms}/layouts/_index_branch.html.haml

@@ -9,13 +9,13 @@
           %span ⇅
           
     .btn-group
-      = link_to t('.add_child_layout'), new_cms_admin_site_layout_path(@site, :parent_id => layout.id), :class => 'btn btn-small'
-      = link_to t('.edit'), edit_cms_admin_site_layout_path(@site, layout), :class => 'btn btn-small'
-      = link_to t('.delete'), cms_admin_site_layout_path(@site, layout), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
+      = link_to t('.add_child_layout'), new_admin_cms_site_layout_path(@site, :parent_id => layout.id), :class => 'btn btn-small'
+      = link_to t('.edit'), edit_admin_cms_site_layout_path(@site, layout), :class => 'btn btn-small'
+      = link_to t('.delete'), admin_cms_site_layout_path(@site, layout), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
     
     .item-content
       .item-title
-        = link_to layout.label, edit_cms_admin_site_layout_path(@site, layout)
+        = link_to layout.label, edit_admin_cms_site_layout_path(@site, layout)
       .item-meta
         = layout.identifier
 

data/app/views/{cms_admin → admin/cms}/layouts/edit.html.haml

@@ -1,9 +1,9 @@
 .page-header
-  = link_to pluralize(@layout.revisions.count, t('.revision')), cms_admin_site_layout_revisions_path(@site, @layout), :class => 'btn pull-right'
+  = link_to pluralize(@layout.revisions.count, t('.revision')), admin_cms_site_layout_revisions_path(@site, @layout), :class => 'btn pull-right'
   %h2= t('.title')
 
 - content_for :right_column do
-  = render 'cms_admin/sites/mirrors', :object => @layout
+  = render 'admin/cms/sites/mirrors', :object => @layout
 
 = comfy_form_for @layout, :as => :layout, :url => {:action => :update} do |form|
   = render form

data/app/views/admin/cms/layouts/index.html.haml

@@ -0,0 +1,13 @@
+.page-header
+  = link_to t('.new_link'), new_admin_cms_site_layout_path(@site), :class => 'btn pull-right'
+  %h2= t('.title')
+
+- content_for :right_column do
+  = render :partial => 'admin/cms/sites/mirrors'
+
+= render 'admin/cms/partials/layouts_before'
+
+%ul.list.sortable
+  = render :partial => 'index_branch', :collection => @layouts
+
+= render 'admin/cms/partials/layouts_after'

data/app/views/{cms_admin → admin/cms}/pages/_form.html.haml

@@ -2,11 +2,11 @@
   #form-save.box
     %label.checkbox.inline
       %input{:type => 'checkbox'}
-      = Cms::Page.human_attribute_name(:is_published)
+      = ::Cms::Page.human_attribute_name(:is_published)
     %button.btn.btn-small.btn-primary.pull-right
-  = render :partial => 'cms_admin/files/index'
+  = render :partial => 'admin/cms/files/index'
 
-= render 'cms_admin/partials/page_form_before', :object => form
+= render 'admin/cms/partials/page_form_before', :object => form
 
 = form.text_field :label, :data => {:slugify => @page.new_record?}
 
@@ -15,24 +15,24 @@
   - unless @page.new_record?
     = form.text_field :full_path, :id => 'full-path', :disabled => true
 
-- if (options = Cms::Layout.options_for_select(@site)).present?
-  = form.select :layout_id, options, {}, 'data-url' => form_blocks_cms_admin_site_page_path(@site, @page.id.to_i)
+- if (options = ::Cms::Layout.options_for_select(@site)).present?
+  = form.select :layout_id, options, {}, 'data-url' => form_blocks_admin_cms_site_page_path(@site, @page.id.to_i)
   
-- if (options = Cms::Page.options_for_select(@site, @page)).present?
+- if (options = ::Cms::Page.options_for_select(@site, @page)).present?
   = form.select :parent_id, options
 
-- if (options = Cms::Page.options_for_select(@site, @page, nil, 0, false)).present?
+- if (options = ::Cms::Page.options_for_select(@site, @page, nil, 0, false)).present?
   = form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options
 
-= render 'cms_admin/partials/page_form_inner', :object => form
+= render 'admin/cms/partials/page_form_inner', :object => form
 
-= render :partial => 'cms_admin/categories/form', :object => form
+= render :partial => 'admin/cms/categories/form', :object => form
 
 = render :partial => 'form_blocks'
 
 = form.check_box :is_published, :label => t('.is_published')
 
-= render 'cms_admin/partials/page_form_after', :object => form
+= render 'admin/cms/partials/page_form_after', :object => form
 
 .form-actions
   = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn'

data/app/views/{cms_admin → admin/cms}/pages/_form_blocks.html.haml

@@ -7,7 +7,7 @@
 #form-blocks
   - if tags.empty?
     .no-tags
-      = link_to @page.layout.label, edit_cms_admin_site_layout_path(@site, @page.layout)
+      = link_to @page.layout.label, edit_cms_site_layout_path(@site, @page.layout)
       = t('.no_tags').html_safe
   
   - else

data/app/views/{cms_admin → admin/cms}/pages/_index_branch.html.haml

@@ -10,7 +10,7 @@
   .item
     .toggle{:class => branch_open ? 'open' : nil}
       - if !category_view && has_children && !page.root?
-        = link_to toggle_branch_cms_admin_site_page_path(@site, page), :remote => true do
+        = link_to toggle_branch_cms_site_page_path(@site, page), :remote => true do
           %span= t('.toggle')
         
     .icon{:class => page.is_published?? 'published' : 'draft'}
@@ -19,14 +19,14 @@
           %span ⇅
           
     .btn-group
-      = link_to t('.add_child_page'), new_cms_admin_site_page_path(@site, :parent_id => page.id), :class => 'btn btn-small'
-      = link_to t('.edit'), edit_cms_admin_site_page_path(@site, page), :class => 'btn btn-small'
-      = link_to t('.delete'), cms_admin_site_page_path(@site, page), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
+      = link_to t('.add_child_page'), new_admin_cms_site_page_path(@site, :parent_id => page.id), :class => 'btn btn-small'
+      = link_to t('.edit'), edit_admin_cms_site_page_path(@site, page), :class => 'btn btn-small'
+      = link_to t('.delete'), admin_cms_site_page_path(@site, page), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
       
     .item-content
       .item-title
-        = link_to page.label, edit_cms_admin_site_page_path(@site, page), :class => 'item-label'
-        = render :partial => '/cms_admin/categories/categories', :object => page
+        = link_to page.label, edit_admin_cms_site_page_path(@site, page), :class => 'item-label'
+        = render :partial => '/admin/cms/categories/categories', :object => page
       .item-meta
         = link_to page.url, page.url, :target => '_blank'
         

data/app/views/{cms_admin → admin/cms}/pages/edit.html.haml

@@ -1,9 +1,9 @@
 .page-header
-  = link_to pluralize(@page.revisions.count, t('.revision')), cms_admin_site_page_revisions_path(@site, @page), :class => 'btn pull-right'
+  = link_to pluralize(@page.revisions.count, t('.revision')), admin_cms_site_page_revisions_path(@site, @page), :class => 'btn pull-right'
   %h2= t('.title')
 
 - content_for :right_column do
-  = render 'cms_admin/sites/mirrors', :object => @page
+  = render 'admin/cms/sites/mirrors', :object => @page
 
 = comfy_form_for @page, :as => :page, :url => {:action => :update}, :html => {:multipart => true} do |form|
   = render form

data/app/views/admin/cms/pages/index.html.haml

@@ -0,0 +1,15 @@
+.page-header
+  = link_to t('.new_link'), new_admin_cms_site_page_path(@site), :class => 'btn pull-right'
+  %h2= t('.title')
+
+- content_for :right_column do
+  = render :partial => 'admin/cms/sites/mirrors'
+
+= render 'admin/cms/partials/pages_before'
+
+= render :partial => 'admin/cms/categories/index', :object => 'Cms::Page'
+
+%ul.list.sortable
+  = render :partial => 'index_branch', :collection => @pages
+
+= render 'admin/cms/partials/pages_after'

data/app/views/{cms_admin → admin/cms}/partials/_body_before.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/body_before
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_file_form_after.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/file_form_after
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_file_form_before.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/file_form_before
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_files_after.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/snippets_after
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_files_before.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/snippets_before
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_html_footer.html.haml

@@ -1,2 +1,2 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
-  / /cms_admin/partials/html_footer
+  / views/admin/cms/partials/html_footer

data/app/views/{cms_admin → admin/cms}/partials/_html_head.html.haml

@@ -1,2 +1,2 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
-  / /cms_admin/partials/html_head
+  / views/admin/cms/partials/html_head

data/app/views/{cms_admin → admin/cms}/partials/_layout_form_after.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/layout_form_after
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_layout_form_before.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/layout_form_before
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_layouts_after.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/layouts_after
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_layouts_before.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/layouts_before
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_navigation_after.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/navigation_after
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_navigation_before.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/navigation_before
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/admin/cms/partials/_navigation_inner.html.haml

@@ -0,0 +1,3 @@
+- if ComfortableMexicanSofa.config.reveal_cms_partials
+  .cms-partial
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_page_form_after.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/page_form_after
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_page_form_before.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/page_form_before
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')

data/app/views/{cms_admin → admin/cms}/partials/_page_form_inner.html.haml

@@ -1,3 +1,3 @@
 - if ComfortableMexicanSofa.config.reveal_cms_partials
   .cms-partial
-    cms_admin/partials/page_form_inner
+    = __FILE__.split('/').last(5).join('/').gsub(/\.html\.haml\z/, '')