comfortable_mexican_sofa 1.11.2 → 1.12.0

data/app/views/admin/cms/files/_index.html.haml

@@ -1,14 +0,0 @@
-- type ||= nil
-- files_scope = (type == 'image') ? @site.files.images : @site.files
-
-.box.file-uploader
-  = 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 => 'admin/cms/files/file', :object => file
-      
-  %iframe#file-upload-frame{:name => 'file-upload-frame', :src => ''}

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

@@ -1,32 +0,0 @@
-.page-header
-  = link_to t('.new_link'), new_admin_cms_site_file_path(@site), :class => 'btn pull-right'
-  %h2= t('.title')
-  
-= render 'admin/cms/partials/files_before'
-
-= render :partial => 'admin/cms/categories/index', :object => 'Cms::File'
-
-%table.table.table-hover.table-bordered
-  %tbody.sortable
-    - @files.each do |file|
-      %tr{:id => dom_id(file)}
-        %td
-          - if file.is_image?
-            - icon_style = "background: url('#{file.file.url(:cms_thumb)}') no-repeat center"
-          .icon{:style => icon_style}
-            - if !params[:category].present? && @site.files.count > 1
-              .dragger
-                %span ⇅
-        %td.main
-          .item-title
-            = 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_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 'admin/cms/partials/files_after'

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

@@ -1,23 +0,0 @@
-- layout      ||= index_branch
-- has_siblings  = layout.siblings.select{|l| l.site_id == @site.id}.size > 0
-
-%li{:id => dom_id(layout)}
-  .item
-    .icon
-      - if !params[:category].present? && has_siblings
-        .dragger
-          %span ⇅
-          
-    .btn-group
-      = 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_admin_cms_site_layout_path(@site, layout)
-      .item-meta
-        = layout.identifier
-
-  - if layout.children.present?
-    %ul= render :partial => 'index_branch', :collection => layout.children

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

@@ -1,9 +0,0 @@
-.page-header
-  = link_to t('.revision', :count => @layout.revisions.count), admin_cms_site_layout_revisions_path(@site, @layout), :class => 'btn pull-right'
-  %h2= t('.title')
-
-- content_for :right_column do
-  = 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

@@ -1,13 +0,0 @@
-.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/admin/cms/pages/_form.html.haml

@@ -1,39 +0,0 @@
-- content_for :right_column do
-  #form-save.box
-    %label.checkbox.inline
-      %input{:type => 'checkbox'}
-      = ::Cms::Page.human_attribute_name(:is_published)
-    %button.btn.btn-small.btn-primary.pull-right
-  = render :partial => 'admin/cms/files/index'
-
-= render 'admin/cms/partials/page_form_before', :object => form
-
-= form.text_field :label, :data => {:slugify => @page.new_record?}
-
-- unless @site.pages.count == 0 || @site.pages.root == @page
-  = form.text_field :slug, :data => {:slug => true}
-  - 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_admin_cms_site_page_path(@site, @page.id.to_i)
-  
-- 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?
-  = form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options
-
-= render 'admin/cms/partials/page_form_inner', :object => form
-
-= render :partial => 'admin/cms/categories/form', :object => form
-
-= render :partial => 'form_blocks'
-
-= form.check_box :is_published, :label => t('.is_published')
-
-= render 'admin/cms/partials/page_form_after', :object => form
-
-.form-actions
-  = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn'
-  = form.submit t(@page.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

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

@@ -1,9 +0,0 @@
-.page-header
-  = link_to t('.revision', :count => @page.revisions.count), admin_cms_site_page_revisions_path(@site, @page), :class => 'btn pull-right'
-  %h2= t('.title')
-
-- content_for :right_column do
-  = 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

@@ -1,15 +0,0 @@
-.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/admin/cms/revisions/show.html.haml

@@ -1,29 +0,0 @@
-.page-header
-  %h2
-    = t('.title')
-    = @record.class.to_s.demodulize
-  %h4
-    = @record.is_a?(::Cms::Page) ? "#{t('.full_path')}: #{@record.full_path}" : "#{t('.slug')}: #{@record.identifier}"
-
-- content_for :right_column do
-  .box.revisions
-    - @record.revisions.each do |revision|
-      = active_link_to l(revision.created_at), :id => revision.id
-      
-%table.table
-  %tr
-    %th
-    %th= t('.current')
-    %th= l(@revision.created_at)
-
-  - @current_content.each do |label, content|
-    %tr
-      %th= ::Cms::Layout.human_attribute_name(label)
-      %td
-        %pre= content
-      %td
-        %pre= @versioned_content[label]
-  
-= comfy_form_for @revision, :url => {:action => :revert} do |form|
-  .form-actions
-    = form.submit t('.update'), :class => 'btn btn-primary'

data/app/views/admin/cms/sites/_form.html.haml

@@ -1,14 +0,0 @@
-= render 'admin/cms/partials/site_form_before', :object => form
-
-= form.text_field :label, :data => {:slugify => @site.new_record?}
-= form.text_field :identifier, :data => {:slug => true}
-= form.text_field :hostname
-= form.text_field :path
-= form.select :locale, ComfortableMexicanSofa.config.locales.to_a.collect{|l| [l[1], l[0]]}
-= form.check_box :is_mirrored, :label => t('.is_mirrored')
-
-= render 'admin/cms/partials/site_form_after', :object => form
-
-.form-actions
-  = form.submit t(@site.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
-

data/app/views/admin/cms/sites/_mirrors.html.haml

@@ -1,18 +0,0 @@
-- return unless @site.is_mirrored?
-
-- object ||= nil
-  
-- options = case object
-  - when ::Cms::Layout
-    - object.mirrors.collect{|m| [m.site.label, edit_admin_cms_site_layout_path(m.site, m)]}
-  - when ::Cms::Page
-    - object.mirrors.collect{|m| [m.site.label, edit_admin_cms_site_page_path(m.site, m)]}
-  - when ::Cms::Snippet
-    - object.mirrors.collect{|m| [m.site.label, edit_admin_cms_site_snippet_path(m.site, m)]}
-  - else
-    - (::Cms::Site.mirrored - [@site]).collect{|s| [s.label, url_for(params.merge(:site_id => s))]}
-
-- options = [[@site.label, request.fullpath]] + options
-
-#mirrors.box
-  = select_tag :mirror, options_for_select(options)

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

@@ -1,28 +0,0 @@
-.page-header
-  = link_to t('.new_link'), new_admin_cms_site_path, :class => 'btn pull-right'
-  %h2= t('.title')
-
-= render 'admin/cms/partials/sites_before'
-
-%table.table.table-hover.table-bordered
-  - @sites.each do |site|
-    %tr
-      %td
-        .icon
-      %td.main
-        .item-title
-          = link_to site.label, admin_cms_site_pages_path(site)
-        .item-meta
-          .identifier
-            = site.identifier
-            = "(#{site.locale})"
-          .host
-            - host = "http://#{site.hostname}/#{site.path}"
-            = link_to host, host, :target => '_blank'
-      %td
-        .btn-group
-          = link_to t('.select'),  admin_cms_site_pages_path(site), :class => 'btn btn-small'
-          = link_to t('.edit'), edit_admin_cms_site_path(site), :class => 'btn btn-small'
-          = link_to t('.delete'), admin_cms_site_path(site), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
-          
-= render 'admin/cms/partials/sites_after'

data/app/views/admin/cms/snippets/_form.html.haml

@@ -1,15 +0,0 @@
-- content_for :right_column do
-  = render :partial => 'admin/cms/files/index'
-
-= render 'admin/cms/partials/snippet_form_before', :object => form
-
-= form.text_field :label, :data => {:slugify => @snippet.new_record?}
-= form.text_field :identifier, :data => {:slug => true}
-= form.text_area :content, :data => {'cms-cm-mode' => 'text/html'}
-
-= render :partial => 'admin/cms/categories/form', :object => form
-
-= render 'admin/cms/partials/snippet_form_after', :object => form
-
-.form-actions
-  = form.submit t(@snippet.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

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

@@ -1,32 +0,0 @@
-.page-header
-  = link_to t('.new_link'), new_admin_cms_site_snippet_path(@site), :class => 'btn pull-right'
-  %h2= t('.title')
-
-- content_for :right_column do
-  = render :partial => 'admin/cms/sites/mirrors'
-
-= render 'admin/cms/partials/snippets_before'
-
-= render :partial => 'admin/cms/categories/index', :object => 'Cms::Snippet'
-
-%table.table.table-hover.table-bordered
-  %tbody.sortable
-    - @snippets.each do |snippet|
-      %tr{:id => dom_id(snippet)}
-        %td
-          .icon
-            - if !params[:category].present? && @site.snippets.count > 1
-              .dragger
-                %span ⇅
-        %td.main
-          .item-title
-            = link_to snippet.label, edit_admin_cms_site_snippet_path(@site, snippet)
-            = render :partial => 'admin/cms/categories/categories', :object => snippet
-          .item-meta
-            = snippet.identifier
-        %td
-          .btn-group
-            = link_to t('.edit'), edit_admin_cms_site_snippet_path(@site, snippet), :class => 'btn btn-small'
-            = 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'
-            
-= render 'admin/cms/partials/snippets_after'

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

@@ -1,4 +0,0 @@
-!!!
-%html{:lang => I18n.locale}
-  = render :partial => 'layouts/admin/cms/head'
-  = render :partial => 'layouts/admin/cms/body'

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

@@ -1,17 +0,0 @@
-%body#comfy{:class => "c-#{params[:controller].slugify} a-#{params[:action].slugify}"}
-
-  = render 'admin/cms/partials/body_before'
-
-  .body-wrapper
-    .left-column
-      .left-column-content
-        = render :partial => 'layouts/admin/cms/left'
-    .right-column
-      .right-column-content
-        = render :partial => 'layouts/admin/cms/right'
-    .center-column
-      = render :partial => 'layouts/admin/cms/center'
-      
-      = render :partial => 'layouts/admin/cms/footer'
-  
-  = render :partial => 'layouts/admin/cms/footer_js'

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

@@ -1,16 +0,0 @@
-= render '/admin/cms/partials/navigation_before'
-
-%ul.navigation
-  %li= active_link_to t('admin.cms.base.sites'), admin_cms_sites_path, :active => ['admin/cms/sites']
-  
-  - if @site && !@site.new_record?
-    %li= active_link_to t('admin.cms.base.layouts'), admin_cms_site_layouts_path(@site)
-    %li= active_link_to t('admin.cms.base.pages'), admin_cms_site_pages_path(@site)
-    %li= active_link_to t('admin.cms.base.snippets'), admin_cms_site_snippets_path(@site)
-    %li= active_link_to t('admin.cms.base.files'), admin_cms_site_files_path(@site)
-    
-  = cms_hook :navigation
-    
-  = render '/admin/cms/partials/navigation_inner'
-    
-= render '/admin/cms/partials/navigation_after'

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

@@ -1,5 +0,0 @@
-= render 'admin/cms/partials/right_column_before'
-
-= yield :right_column
-
-= render 'admin/cms/partials/right_column_after'

data/db/cms_fixtures/sample-site/layouts/default/nested/content.html

@@ -1,2 +0,0 @@
-<div class='left'> {{ cms:page:left }} </div>
-<div class='right'> {{ cms:page:right }} </div>

data/db/cms_fixtures/sample-site/pages/index/child/left.html

@@ -1 +0,0 @@
-Child Page Left Fixture Content

data/test/controllers/admin/cms/categories_controller_test.rb

@@ -1,70 +0,0 @@
-require_relative '../../../test_helper'
-
-class Admin::Cms::CategoriesControllerTest < ActionController::TestCase
-  
-  def test_get_edit
-    xhr :get, :edit, :site_id => cms_sites(:default), :id => cms_categories(:default)
-    assert_response :success
-    assert_template :edit
-    assert assigns(:category)
-  end
-  
-  def test_get_edit_failure
-    xhr :get, :edit, :site_id => cms_sites(:default), :id => 'invalid'
-    assert_response :success
-    assert response.body.blank?
-  end
-  
-  def test_creation
-    assert_difference 'Cms::Category.count' do
-      xhr :post, :create, :site_id => cms_sites(:default), :category => {
-        :label            => 'Test Label',
-        :categorized_type => 'Cms::Snippet'
-      }
-      assert_response :success
-      assert_template :create
-      assert assigns(:category)
-    end
-  end
-  
-  def test_creation_failure
-    assert_no_difference 'Cms::Category.count' do
-      xhr :post, :create, :site_id => cms_sites(:default), :category => { }
-      assert_response :success
-      assert response.body.blank?
-    end
-  end
-  
-  def test_update
-    category = cms_categories(:default)
-    xhr :put, :update, :site_id => cms_sites(:default), :id => category, :category => {
-      :label => 'Updated Label'
-    }
-    assert_response :success
-    assert_template :update
-    assert assigns(:category)
-    category.reload
-    assert_equal 'Updated Label', category.label
-  end
-  
-  def test_update_failure
-    category = cms_categories(:default)
-    xhr :put, :update, :site_id => cms_sites(:default), :id => category, :category => {
-      :label => ''
-    }
-    assert_response :success
-    assert response.body.blank?
-    category.reload
-    assert_not_equal '', category.label
-  end
-  
-  def test_destroy
-    assert_difference 'Cms::Category.count', -1 do
-      xhr :delete, :destroy, :site_id => cms_sites(:default), :id => cms_categories(:default)
-      assert assigns(:category)
-      assert_response :success
-      assert_template :destroy
-    end
-  end
-  
-end

data/test/controllers/admin/cms/revisions_controller_test.rb

@@ -1,138 +0,0 @@
-require_relative '../../../test_helper'
-
-class Admin::Cms::RevisionsControllerTest < ActionController::TestCase
-  
-  def test_get_index_for_layouts
-    get :index, :site_id => cms_sites(:default), :layout_id => cms_layouts(:default)
-    assert_response :redirect
-    assert_redirected_to :action => :show, :id => cms_revisions(:layout)
-  end
-  
-  def test_get_index_for_pages
-    get :index, :site_id => cms_sites(:default), :page_id => cms_pages(:default)
-    assert_response :redirect
-    assert_redirected_to :action => :show, :id => cms_revisions(:page)
-  end
-  
-  def test_get_index_for_snippets
-    get :index, :site_id => cms_sites(:default), :snippet_id => cms_snippets(:default)
-    assert_response :redirect
-    assert_redirected_to :action => :show, :id => cms_revisions(:snippet)
-  end
-  
-  def test_get_index_for_snippets_with_no_revisions
-    Cms::Revision.delete_all
-    get :index, :site_id => cms_sites(:default), :snippet_id => cms_snippets(:default)
-    assert_response :redirect
-    assert_redirected_to :action => :show, :id => 0
-  end
-  
-  def test_get_show_for_layout
-    get :show, :site_id => cms_sites(:default), :layout_id => cms_layouts(:default), :id => cms_revisions(:layout)
-    assert_response :success
-    assert assigns(:record)
-    assert assigns(:revision)
-    assert assigns(:record).is_a?(Cms::Layout)
-    assert_template :show
-  end
-  
-  def test_get_show_for_page
-    get :show, :site_id => cms_sites(:default), :page_id => cms_pages(:default), :id => cms_revisions(:page)
-    assert_response :success
-    assert assigns(:record)
-    assert assigns(:revision)
-    assert assigns(:record).is_a?(Cms::Page)
-    assert_template :show
-  end
-  
-  def test_get_show_for_snippet
-    get :show, :site_id => cms_sites(:default), :snippet_id => cms_snippets(:default), :id => cms_revisions(:snippet)
-    assert_response :success
-    assert assigns(:record)
-    assert assigns(:revision)
-    assert assigns(:record).is_a?(Cms::Snippet)
-    assert_template :show
-  end
-  
-  def test_get_show_for_bad_type
-    get :show, :site_id => cms_sites(:default), :snippet_id => 'invalid', :id => cms_revisions(:snippet)
-    assert_response :redirect
-    assert_redirected_to admin_cms_path
-    assert_equal 'Record Not Found', flash[:error]
-  end
-  
-  def test_get_show_for_layout_failure
-    site = cms_sites(:default)
-    get :show, :site_id => site, :layout_id => cms_layouts(:default), :id => 'invalid'
-    assert_response :redirect
-    assert assigns(:record)
-    assert_redirected_to edit_admin_cms_site_layout_path(site, assigns(:record))
-    assert_equal 'Revision Not Found', flash[:error]
-  end
-  
-  def test_get_show_for_page_failure
-    site = cms_sites(:default)
-    get :show, :site_id => site, :page_id => cms_pages(:default), :id => 'invalid'
-    assert_response :redirect
-    assert assigns(:record)
-    assert_redirected_to edit_admin_cms_site_page_path(site, assigns(:record))
-    assert_equal 'Revision Not Found', flash[:error]
-  end
-  
-  def test_get_show_for_snippet_failure
-    site = cms_sites(:default)
-    get :show, :site_id => site, :snippet_id => cms_snippets(:default), :id => 'invalid'
-    assert_response :redirect
-    assert assigns(:record)
-    assert_redirected_to edit_admin_cms_site_snippet_path(site, assigns(:record))
-    assert_equal 'Revision Not Found', flash[:error]
-  end
-  
-  def test_revert_for_layout
-    layout = cms_layouts(:default)
-    
-    assert_difference 'layout.revisions.count' do 
-      put :revert, :site_id => cms_sites(:default), :layout_id => layout, :id => cms_revisions(:layout)
-      assert_response :redirect
-      assert_redirected_to edit_admin_cms_site_layout_path(layout.site, layout)
-      assert_equal 'Content Reverted', flash[:success]
-      
-      layout.reload
-      assert_equal 'revision {{cms:page:default_page_text}}', layout.content
-      assert_equal 'revision css', layout.css
-      assert_equal 'revision js', layout.js
-    end
-  end
-  
-  def test_revert_for_page
-    page = cms_pages(:default)
-    
-    assert_difference 'page.revisions.count' do
-      put :revert, :site_id => cms_sites(:default), :page_id => page, :id => cms_revisions(:page)
-      assert_response :redirect
-      assert_redirected_to edit_admin_cms_site_page_path(page.site, page)
-      assert_equal 'Content Reverted', flash[:success]
-      
-      page.reload
-      assert_equal [
-        { :identifier => 'default_field_text', :content => 'revision field content'  },
-        { :identifier => 'default_page_text',  :content => 'revision page content'   }
-      ], page.blocks_attributes
-    end
-  end
-  
-  def test_revert_for_snippet
-    snippet = cms_snippets(:default)
-    
-    assert_difference 'snippet.revisions.count' do
-      put :revert, :site_id => cms_sites(:default), :snippet_id => snippet, :id => cms_revisions(:snippet)
-      assert_response :redirect
-      assert_redirected_to edit_admin_cms_site_snippet_path(snippet.site, snippet)
-      assert_equal 'Content Reverted', flash[:success]
-      
-      snippet.reload
-      assert_equal 'revision content', snippet.content
-    end
-  end
-  
-end