comfortable_mexican_sofa 1.9.3 → 1.10.0

data/config/locales/zh-CN.yml

@@ -29,7 +29,7 @@ zh-CN:
         css: 样式
         js: Javascript
       cms/page:
-        label: 布局名称
+        label: 页面名称
         layout_id: 布局
         slug: Slug
         target_page_id: 跳转至
@@ -98,139 +98,140 @@ zh-CN:
       page_not_found: 页面不存在
 
   # -- Views ----------------------------------------------------------------
-  cms_admin:
-    base:
-      sites: 站点
-      layouts: 布局
-      pages: 页面
-      snippets: 片段
-      files: 文件
-
-    sites:
-      index:
-        title: 站点
-        new_link: 创建站点
-        select: 选择站点
-        edit: 编辑
-        delete: 删除
-        are_you_sure: 确定删除该站点吗？
-      new:
-        title: 新站点
-      edit:
-        title: 编辑站点
-      form:
-        create: 创建站点
-        update: 更新站点
-        is_mirrored: 镜像
-
-    layouts:
-      index:
-        title: 布局
-        new_link: 创建新布局
-      index_branch:
-        add_child_layout: 创建子布局
-        edit: 编辑
-        delete: 删除
-        are_you_sure: 确定删除该布局吗？
-      new:
-        title: 新布局
-      edit:
-        title: 编辑布局
-        revision: 修订版本
-      form:
-        select_parent_layout: 选择上级布局
-        select_app_layout: 选择应用布局
-        create: 创建布局
-        update: 更新布局
-
-    pages:
-      index:
-        title: 页面
-        new_link: 创建新页面
-      index_branch:
-        toggle: 切换
-        add_child_page: 创建子页面
-        edit: 编辑
-        delete: 删除
-        are_you_sure: 确定删除该页面吗？
-      new:
-        title: 新页面
-      edit:
-        title: 编辑页面
-        revision: 修订版本
-      form:
-        select_target_page: 没有跳转
-        preview: 预览
-        create: 创建页面
-        update: 更新页面
-        is_published: 发布
-      form_blocks:
-        no_tags: |-
-          布局中没有定义内容标签。<br/>
-          编辑内容使其包含一个页面或者field标签。例如： <code>{{cms:page:content}}</code>
-
-    snippets:
-      index:
-        title: 片段
-        new_link: 创建新片段
-        edit: 编辑
-        delete: 删除
-        are_you_sure: 确定删除该片段吗？
-      new:
-        title: 新片段
-      edit:
-        title: 编辑片段
-        revision: 修订版本
-      form:
-        create: 创建片段
-        update: 更新片段
-
-    revisions:
-      show:
-        title: 修订版本属于
-        revision: 修订版本
-        full_path: 全路径
-        slug: 嵌条
-        update: 更新到该修订版本
-        current: Current
-
-    files:
-      index:
-        title: 文件
-        new_link: 上传新文件
-        edit: 编辑
-        delete: 删除
-        are_you_sure: 确定删除该文件吗？
-        button: 上传文件
-      new:
-        title: 新文件
-      edit:
-        title: 编辑文件
-      form:
-        current_file: 当前文件
-        create: 上传文件
-        update: 更新文件
-      page_form:
-        are_you_sure: 确定删除该文件吗？
-      file:
-        are_you_sure: 确定删除该文件吗？
-
-    categories:
-      index:
-        label: 分类
-        edit: 编辑
-        done: 完成
-        all: 全部
-        add: 创建
-      show:
-        are_you_sure: 确定删除该分类吗？
-      edit:
-        save: 保存
-      form:
-        label: 分类
-
-    dialogs:
-      image:
-        insert: 插入图片
-      link:
-        create: 创建链接
+  admin:
+    cms:
+      base:
+        sites: 站点
+        layouts: 布局
+        pages: 页面
+        snippets: 片段
+        files: 文件
+
+      sites:
+        index:
+          title: 站点
+          new_link: 创建站点
+          select: 选择站点
+          edit: 编辑
+          delete: 删除
+          are_you_sure: 确定删除该站点吗？
+        new:
+          title: 新站点
+        edit:
+          title: 编辑站点
+        form:
+          create: 创建站点
+          update: 更新站点
+          is_mirrored: 镜像
+
+      layouts:
+        index:
+          title: 布局
+          new_link: 创建新布局
+        index_branch:
+          add_child_layout: 创建子布局
+          edit: 编辑
+          delete: 删除
+          are_you_sure: 确定删除该布局吗？
+        new:
+          title: 新布局
+        edit:
+          title: 编辑布局
+          revision: 修订版本
+        form:
+          select_parent_layout: 选择上级布局
+          select_app_layout: 选择应用布局
+          create: 创建布局
+          update: 更新布局
+
+      pages:
+        index:
+          title: 页面
+          new_link: 创建新页面
+        index_branch:
+          toggle: 切换
+          add_child_page: 创建子页面
+          edit: 编辑
+          delete: 删除
+          are_you_sure: 确定删除该页面吗？
+        new:
+          title: 新页面
+        edit:
+          title: 编辑页面
+          revision: 修订版本
+        form:
+          select_target_page: 没有跳转
+          preview: 预览
+          create: 创建页面
+          update: 更新页面
+          is_published: 发布
+        form_blocks:
+          no_tags: |-
+            布局中没有定义内容标签。<br/>
+            编辑内容使其包含一个页面或者field标签。例如： <code>{{cms:page:content}}</code>
+
+      snippets:
+        index:
+          title: 片段
+          new_link: 创建新片段
+          edit: 编辑
+          delete: 删除
+          are_you_sure: 确定删除该片段吗？
+        new:
+          title: 新片段
+        edit:
+          title: 编辑片段
+          revision: 修订版本
+        form:
+          create: 创建片段
+          update: 更新片段
+
+      revisions:
+        show:
+          title: 修订版本属于
+          revision: 修订版本
+          full_path: 全路径
+          slug: 嵌条
+          update: 更新到该修订版本
+          current: Current
+
+      files:
+        index:
+          title: 文件
+          new_link: 上传新文件
+          edit: 编辑
+          delete: 删除
+          are_you_sure: 确定删除该文件吗？
+          button: 上传文件
+        new:
+          title: 新文件
+        edit:
+          title: 编辑文件
+        form:
+          current_file: 当前文件
+          create: 上传文件
+          update: 更新文件
+        page_form:
+          are_you_sure: 确定删除该文件吗？
+        file:
+          are_you_sure: 确定删除该文件吗？
+
+      categories:
+        index:
+          label: 分类
+          edit: 编辑
+          done: 完成
+          all: 全部
+          add: 创建
+        show:
+          are_you_sure: 确定删除该分类吗？
+        edit:
+          save: 保存
+        form:
+          label: 分类
+
+      dialogs:
+        image:
+          insert: 插入图片
+        link:
+          create: 创建链接

data/lib/comfortable_mexican_sofa/engine.rb

@@ -10,10 +10,11 @@ require 'jquery-ui-rails'
 require 'haml-rails'
 require 'sass-rails'
 require 'coffee-rails'
+require 'codemirror-rails'
+require 'kaminari'
 
 module ComfortableMexicanSofa
   class Engine < ::Rails::Engine
     # ...
   end
 end
-

data/lib/comfortable_mexican_sofa/fixture.rb

@@ -40,6 +40,13 @@ module ComfortableMexicanSofa::Fixture
       end
     end
     
+    def read_as_haml(path)
+      content = ::File.open(path).read
+      Haml::Engine.new(content).render.rstrip
+    rescue # Bad haml, calls to helpers, who knows?
+      content
+    end
+    
     def import!
       ComfortableMexicanSofa::Fixture::Category::Importer.new(from, to, force_import).import!
       ComfortableMexicanSofa::Fixture::File::Importer.new(    from, to, force_import).import!

data/lib/comfortable_mexican_sofa/fixture/layout.rb

@@ -21,7 +21,7 @@ module ComfortableMexicanSofa::Fixture::Layout
         # setting content
         if File.exists?(content_path = File.join(path, 'content.html'))
           if fresh_fixture?(layout, content_path)
-            layout.content = File.open(content_path).read
+            layout.content = read_as_haml(content_path)
           end
         end
         if File.exists?(content_path = File.join(path, 'stylesheet.css'))

data/lib/comfortable_mexican_sofa/fixture/page.rb

@@ -37,12 +37,12 @@ module ComfortableMexicanSofa::Fixture::Page
         blocks_to_clear = page.blocks.collect(&:identifier)
         blocks_attributes = [ ]
         Dir.glob("#{path}/*.html").each do |block_path|
-          identifier = block_path.split('/').last.gsub(/\.html$/, '')
+          identifier = block_path.split('/').last.gsub(/\.html\z/, '')
           blocks_to_clear.delete(identifier)
           if fresh_fixture?(page, block_path)
             blocks_attributes << {
               :identifier => identifier,
-              :content    => File.open(block_path).read
+              :content    => read_as_haml(block_path)
             }
           end
         end

data/lib/comfortable_mexican_sofa/fixture/snippet.rb

@@ -20,7 +20,7 @@ module ComfortableMexicanSofa::Fixture::Snippet
         # setting content
         if File.exists?(content_path = File.join(path, 'content.html'))
           if fresh_fixture?(snippet, content_path)
-            snippet.content = File.open(content_path).read
+            snippet.content = read_as_haml(content_path)
           end
         end
         

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -18,7 +18,7 @@ class ComfortableMexicanSofa::FormBuilder < FormattedForm::FormBuilder
       end
       
       content << @template.send(method, name, input_params)
-      content << @template.render(:partial => 'cms_admin/files/page_form', :object => tag.block)
+      content << @template.render(:partial => 'admin/cms/files/page_form', :object => tag.block)
     else
       content << @template.send(method, "page[blocks_attributes][#{index}][content]", tag.content, options)
     end

data/lib/comfortable_mexican_sofa/routing.rb

@@ -1,36 +1,38 @@
 module ComfortableMexicanSofa::Routing
   
   def self.admin(options = {})
-    options[:path] ||= 'cms-admin'
+    options[:path] ||= 'admin'
     
     Rails.application.routes.draw do
-      namespace :cms_admin, :path => options[:path], :except => :show do
-        get '/', :to => 'base#jump'
-        resources :sites do
-          resources :pages do
-            get  :form_blocks,    :on => :member
-            get  :toggle_branch,  :on => :member
-            put :reorder,         :on => :collection
-            resources :revisions, :only => [:index, :show, :revert] do
-              patch :revert, :on => :member
+      scope :module => :admin do
+        namespace :cms, :as => :admin_cms, :path => options[:path], :except => :show do
+          get '/', :to => 'base#jump'
+          resources :sites do
+            resources :pages do
+              get  :form_blocks,    :on => :member
+              get  :toggle_branch,  :on => :member
+              put :reorder,         :on => :collection
+              resources :revisions, :only => [:index, :show, :revert] do
+                patch :revert, :on => :member
+              end
             end
-          end
-          resources :files do
-            post :reorder, :on => :collection
-          end
-          resources :layouts do
-            put :reorder, :on => :collection
-            resources :revisions, :only => [:index, :show, :revert] do
-              patch :revert, :on => :member
+            resources :files do
+              post :reorder, :on => :collection
             end
-          end
-          resources :snippets do
-            put :reorder, :on => :collection
-            resources :revisions, :only => [:index, :show, :revert] do
-              patch :revert, :on => :member
+            resources :layouts do
+              put :reorder, :on => :collection
+              resources :revisions, :only => [:index, :show, :revert] do
+                patch :revert, :on => :member
+              end
+            end
+            resources :snippets do
+              put :reorder, :on => :collection
+              resources :revisions, :only => [:index, :show, :revert] do
+                patch :revert, :on => :member
+              end
             end
+            resources :categories
           end
-          resources :categories
         end
       end
     end
@@ -39,18 +41,18 @@ module ComfortableMexicanSofa::Routing
   def self.content(options = {})
     
     Rails.application.routes.draw do
-      namespace :cms_content, :path => options[:path] do
-        get 'cms-css/:site_id/:identifier' => :render_css,  :as => 'css'
-        get 'cms-js/:site_id/:identifier'  => :render_js,   :as => 'js'
+      namespace :cms, :path => options[:path] do
+        get 'cms-css/:site_id/:identifier' => 'content#render_css', :as => 'render_css'
+        get 'cms-js/:site_id/:identifier'  => 'content#render_js',  :as => 'render_js'
         
         if options[:sitemap]
-          get '(:cms_path)/sitemap' => :render_sitemap,
-            :as           => 'sitemap',
+          get '(:cms_path)/sitemap' => 'content#render_sitemap',
+            :as           => 'render_sitemap',
             :constraints  => {:format => /xml/},
             :format       => :xml
         end
         
-        get '/' => :render_html, :as => 'html', :path => "(*cms_path)"
+        get '/' => 'content#render_html', :as => 'render_html', :path => "(*cms_path)"
       end
     end
   end

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.9.3"
+  VERSION = "1.10.0"
 end