comfortable_mexican_sofa 1.6.15 → 1.6.16

data/VERSION

@@ -1 +1 @@
-1.6.15
+1.6.16

data/comfortable_mexican_sofa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.15"
+  s.version = "1.6.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]

data/config/locales/en.yml

@@ -13,6 +13,7 @@ en:
       cms/layout: Layout
       cms/page: Page
       cms/snippet: Snippet
+      cms/file: File
     attributes:
       cms/site:
         identifier: Identifier

data/config/locales/es.yml

@@ -6,19 +6,23 @@ es:
     slug: Identificador
     parent_id: Padre
     content: Contenido
+    identifier: Identifier
   activerecord:
     models:
       cms/site: Sitio
       cms/layout: Plantilla
       cms/page: Página
       cms/snippet: Fragmento
+      cms/file: File
     attributes:
       cms/site:
+        identifier: Identifier
         hostname: Dirección
         path: Ruta
         locale: Lengua
         is_mirrored: Espejo
       cms/layout:
+        identifier: Identifier
         label: Nombre de Plantilla
         app_layout: Plantilla Base
         parent_id: Plantilla Padre
@@ -30,6 +34,11 @@ es:
         slug: Ruta
         target_page_id: Redirigir a
         is_published: Publicada
+      cms/file:
+        file: File
+        description: Description
+      cms/snippet:
+        identifier: Identifier
 
   # -- Controllers ----------------------------------------------------------
   cms:

data/config/locales/ja.yml

@@ -6,19 +6,23 @@ ja:
     slug: スラッグ
     parent_id: 親
     content: コンテンツ
+    identifier: Identifier
   activerecord:
     models:
       cms/site: サイト
       cms/layout: レイアウト
       cms/page: ページ
       cms/snippet: スニペット
+      cms/file: File
     attributes:
       cms/site:
+        identifier: Identifier
         hostname: ホスト名
         path: パス
         locale: 言語
         is_mirrored: ミラーリング済み
       cms/layout:
+        identifier: Identifier
         label: レイアウト名
         app_layout: アプリケーションレイアウト
         parent_id: 親レイアウト
@@ -30,6 +34,11 @@ ja:
         slug: スラッグ
         target_page_id: ページにリダイレクト
         is_published: パブリッシュ済み
+      cms/file:
+        file: File
+        description: Description
+      cms/snippet:
+        identifier: Identifier
         
   # -- Controllers ----------------------------------------------------------
   cms:
@@ -222,4 +231,4 @@ ja:
         insert: 画像を挿入
       link:
         create: リンクを作成
-      
+      

data/config/locales/pt-BR.yml

@@ -13,6 +13,7 @@ pt-BR:
       cms/layout: Leiaute
       cms/page: Página
       cms/snippet: Fragmento
+      cms/file: File
     attributes:
       cms/site:
         identifier: Identificador

data/config/locales/zh-CN.yml

@@ -16,25 +16,30 @@ zh-CN:
       cms/file: 文件
     attributes:
       cms/site:
+        identifier: 标识符
         hostname: 主机名
         path: 路径
         locale: 语言
         is_mirrored: 镜像
       cms/layout:
+        identifier: 标识符
         label: 布局名称
         app_layout: 应用布局
         parent_id: 上级布局
         css: 样式
         js: Javascript
       cms/page:
+        label: 布局名称
         layout_id: 布局
+        slug: Slug
         target_page_id: 跳转至
         is_published: 发布
       cms/file:
         file: 文件
         description: 描述
+      cms/snippet:
+        identifier: 标识符
         
-
   # -- Controllers ----------------------------------------------------------
   cms:
     base:
@@ -225,5 +230,4 @@ zh-CN:
       image:
         insert: 插入图片
       link:
-        create: 创建链接
-
+        create: 创建链接

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -66,7 +66,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
       'datetime'
     when ComfortableMexicanSofa::Tag::PageText, ComfortableMexicanSofa::Tag::FieldText
       'code'
-    when ComfortableMexicanSofa::Tag::PageRichText
+    when ComfortableMexicanSofa::Tag::PageRichText, ComfortableMexicanSofa::Tag::FieldRichText
       'rich_text'
     end
     
@@ -102,6 +102,10 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
     default_tag_field(tag, index, :method => :text_area_tag)
   end
   
+  def field_rich_text(tag, index)
+    default_tag_field(tag, index, :method => :text_area_tag)
+  end
+  
   def page_date_time(tag, index)
     default_tag_field(tag, index)
   end

data/test/functional/cms_admin/pages_controller_test.rb

@@ -78,7 +78,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
   
-  def test_get_new_with_rich_page_text
+  def test_get_new_with_field_rich_text
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:rich_text}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
@@ -146,7 +146,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='snippet']"
   end
 
-  def test_get_new_with_rich_page_text
+  def test_get_new_with_page_rich_text
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:rich_text}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.15
+  version: 1.6.16
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-03-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70278706716960 !ruby/object:Gem::Requirement
+  requirement: &70113298842700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70278706716960
+  version_requirements: *70113298842700
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70278706693880 !ruby/object:Gem::Requirement
+  requirement: &70113298842040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70278706693880
+  version_requirements: *70113298842040
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70278706687500 !ruby/object:Gem::Requirement
+  requirement: &70113298841120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70278706687500
+  version_requirements: *70113298841120
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -369,7 +369,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4356669167521672038
+      hash: 1361783085271841730
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: