comfortable_mexican_sofa 1.2.8 → 1.3.0

data/config/locales/es.yml

@@ -0,0 +1,179 @@
+# encoding: utf-8
+es:
+  # -- Models ---------------------------------------------------------------
+  attributes:
+    label: Nombre
+    slug: Identificador
+    parent_id: Padre
+    content: Contenido
+  activerecord:
+    models:
+      cms/site: Sitio
+      cms/layout: Plantilla
+      cms/page: Página
+      cms/snippet: Fragmento
+    attributes:
+      cms/site:
+        hostname: Dirección
+        path: Ruta
+        locale: Lengua
+        is_mirrored: Espejo
+      cms/layout:
+        label: Nombre de Plantilla
+        app_layout: Plantilla Base
+        parent_id: Plantilla Padre
+        css: Hoja de Estilo
+        js: Javascript
+      cms/page:
+        label: Título
+        layout_id: Plantilla
+        slug: Ruta
+        target_page_id: Redirigir a
+        is_published: Publicada
+
+  # -- Controllers ----------------------------------------------------------
+  cms:
+    base:
+      site_not_found: Sitio no encontrado
+      fixtures_enabled: CMS Fixtures habilitadas. Todos los cambios realizados serán descartados.
+
+    sites:
+      created: Sitio creado
+      creation_failure: El sitio no ha podido ser creado
+      updated: Sitio actualizado
+      update_failure: El sitio no ha podido ser actualizado
+      deleted: Sitio eliminado
+      not_found: Sitio no encontrado
+
+    layouts:
+      created: Diseño Creado
+      creation_failure: El diseño NO ha podido ser Creado
+      updated: Diseño Actualizado"
+      update_failure: El diseño NO ha podido ser Actualizado
+      deleted: Diseñó Eliminado
+      not_found: Diseño no encontrado
+
+    pages:
+      created: Página creada
+      creation_failure: La página no ha podido ser creada
+      updated: Página actualizada
+      update_failure: La página no ha podido ser actualizada
+      deleted: Página eliminada
+      not_found: Página no encontrada
+      layout_not_found: No se ha encontrado una plantilla. Cree una primero.
+
+    snippets:
+      created: Fragmento creado
+      creation_failure: El fragmento no ha podido ser creado
+      updated: Fragmento actualizado
+      update_failure: El fragmento no ha podido ser actualizado
+      deleted: Fragmento eliminado
+      not_found: Fragmento no encontrado
+
+    revisions:
+      reverted: Contenido revertido
+      record_not_found: Registro no encontrado
+      not_found: Revisión no encontrada
+
+    uploads:
+
+    content:
+      site_not_found: Sitio no encontrado
+      layout_not_found: Diseño no encontrado
+      page_not_found: Página no encontrada
+
+  # -- Views ----------------------------------------------------------------
+  cms_admin:
+    base:
+      sites: Sitios
+      layouts: Diseños
+      pages: Páginas
+      snippets: Fragmentos
+
+    sites:
+      index:
+        title: Listado de Sitios
+        new_link: Crear nuevo Sitio
+        edit: Editar
+        delete: Eliminar
+        are_you_sure: ¿Está seguro de que desea eliminar este sitio?
+      new:
+        title: Creando Sitio
+      edit:
+        title: Editando Sitio
+      form:
+        create: Crear Sitio
+        update: Actualizar Sitio
+
+    layouts:
+      index:
+        title: Diseños
+        new_link: Crear Nuevo Diseño
+      index_branch:
+        add_child_layout: Añadir diseño hijo
+        edit: Editar
+        delete: Eliminar
+        are_you_sure: ¿Está seguro?
+      new:
+        title: Nuevo Diseño
+      edit:
+        title: Editando Diseño
+        revision: Revisión
+      form:
+        select_parent_layout: Seleccionar diseño padre
+        select_app_layout: Seleccionar diseño (App)
+        create: Crear Diseño
+        update: Actualizar Diseño
+
+    pages:
+      index:
+        title: Páginas
+        new_link: Crear Nueva Página
+      index_branch:
+        toggle: Cambiar
+        add_child_page: Añadir página hija
+        edit: Editar
+        delete: Eliminar
+        are_you_sure: ¿Está seguro?
+      new:
+        title: Nueva Página
+      edit:
+        title: Editando Página
+        revision: Revision
+      form:
+        select_target_page: No Redirigir
+        preview: Vista Previa
+        create: Crear Página
+        update: Actualizar Página
+      form_blocks:
+        no_tags: |-
+          La plantilla no tiene etiquetas de contenido definidas.<br/>
+          Edite el contenido para incluir alguna etiqueta de página o campo, por ejemplo: <code>{{cms:page:content}}</code>
+
+    snippets:
+      index:
+        title: Fragmentos
+        new_link: Crear nuevo Fragmento
+        edit: Editar
+        delete: Eliminar
+        are_you_sure: ¿Está seguro?
+      new:
+        title: Nuevo Fragmento
+      edit:
+        title: Editando Fragmento
+        revision: Revisión
+      form:
+        create: Crear Fragmento
+        update: Actualizar Fragmento
+
+    revisions:
+      show:
+        title: Revisiones de
+        revision: Revisión
+        full_path: Ruta completa
+        slug: Identificador
+        update: Actualizar a esta versión
+
+    uploads:
+      index:
+        button: Cargar Archivos

data/config/routes.rb

@@ -1,40 +1,38 @@
 Rails.application.routes.draw do
   
   namespace :cms_admin, :path => ComfortableMexicanSofa.config.admin_route_prefix, :except => :show do
-    get '/' => redirect(
-      "/#{ComfortableMexicanSofa.config.admin_route_prefix}/#{ComfortableMexicanSofa.config.admin_route_redirect}"
-    )
-    resources :pages do
-      member do 
-        match :form_blocks
-        match :toggle_branch
+    get '/', :to => 'base#jump'
+    resources :sites do
+      resources :pages do
+        member do 
+          match :form_blocks
+          match :toggle_branch
+        end
+        collection do
+          match :reorder
+        end
+        resources :revisions, :only => [:index, :show, :revert] do
+          put :revert, :on => :member
+        end
       end
-      collection do
-        match :reorder
+      resources :uploads, :only => [:create, :destroy]
+      resources :layouts do
+        resources :revisions, :only => [:index, :show, :revert] do
+          put :revert, :on => :member
+        end
       end
-      resources :revisions, :only => [:index, :show, :revert] do
-        put :revert, :on => :member
-      end
-    end
-    resources :sites
-    resources :uploads, :only => [:create, :destroy]
-    resources :layouts do
-      resources :revisions, :only => [:index, :show, :revert] do
-        put :revert, :on => :member
-      end
-    end
-    resources :snippets do 
-      resources :revisions, :only => [:index, :show, :revert] do
-        put :revert, :on => :member
+      resources :snippets do 
+        resources :revisions, :only => [:index, :show, :revert] do
+          put :revert, :on => :member
+        end
       end
     end
   end unless ComfortableMexicanSofa.config.admin_route_prefix.blank?
   
   scope :controller => :cms_content do
-    prefix = ComfortableMexicanSofa.config.content_route_prefix
-    get "#{prefix}/cms-css/:id"  => :render_css,   :as => 'cms_css'
-    get "#{prefix}/cms-js/:id"   => :render_js,    :as => 'cms_js'
-    get "#{prefix}/"             => :render_html,  :as => 'cms_html',  :path => "#{prefix}/(*cms_path)"
+    get 'cms-css/:id' => :render_css,   :as => 'cms_css'
+    get 'cms-js/:id'  => :render_js,    :as => 'cms_js'
+    get '/'           => :render_html,  :as => 'cms_html',  :path => "(*cms_path)"
   end
   
 end

data/db/migrate/01_create_cms.rb

@@ -5,8 +5,12 @@ class CreateCms < ActiveRecord::Migration
     create_table :cms_sites do |t|
       t.string :label
       t.string :hostname
+      t.string :path
+      t.string :locale,       :null => false, :default => 'en'
+      t.boolean :is_mirrored, :null => false, :default => false
     end
     add_index :cms_sites, :hostname
+    add_index :cms_sites, :is_mirrored
     
     # -- Layouts ------------------------------------------------------------
     create_table :cms_layouts do |t|
@@ -18,7 +22,8 @@ class CreateCms < ActiveRecord::Migration
       t.text    :content
       t.text    :css
       t.text    :js
-      t.integer :position, :null => false, :default => 0
+      t.integer :position,  :null => false, :default => 0
+      t.boolean :is_shared, :null => false, :default => false
       t.timestamps
     end
     add_index :cms_layouts, [:parent_id, :position]
@@ -37,6 +42,7 @@ class CreateCms < ActiveRecord::Migration
       t.integer :position,        :null => false, :default => 0
       t.integer :children_count,  :null => false, :default => 0
       t.boolean :is_published,    :null => false, :default => true
+      t.boolean :is_shared,       :null => false, :default => false
       t.timestamps
     end
     add_index :cms_pages, [:site_id, :full_path]
@@ -57,6 +63,7 @@ class CreateCms < ActiveRecord::Migration
       t.string  :label
       t.string  :slug
       t.text    :content
+      t.boolean :is_shared, :null => false, :default => false
       t.timestamps
     end
     add_index :cms_snippets, [:site_id, :slug], :unique => true

data/db/migrate/upgrades/04_upgrade_to_1_3_0.rb

@@ -0,0 +1,23 @@
+class UpgradeTo130 < ActiveRecord::Migration
+  def self.up
+    add_column :cms_sites, :is_mirrored, :boolean, :null => false, :default => false
+    add_column :cms_sites, :path, :string
+    add_column :cms_sites, :locale, :string, :null_false, :default => 'en'
+    add_index :cms_sites, :is_mirrored
+    
+    add_column :cms_layouts,  :is_shared, :null => false, :default => false
+    add_column :cms_pages,    :is_shared, :null => false, :default => false
+    add_column :cms_snippets, :is_shared, :null => false, :default => false
+  end
+
+  def self.down
+    remove_index :cms_sites, :is_mirrored
+    remove_column :cms_sites, :path
+    remove_column :cms_sites, :is_mirrored
+    remove_column :cms_sites, :locale
+    
+    remove_column :cms_layouts,   :is_shared
+    remove_column :cms_pages,     :is_shared
+    remove_column :cms_snippets,  :is_shared
+  end
+end

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 class ComfortableMexicanSofa::Configuration
   
   # Don't like Comfortable Mexican Sofa? Set it to whatever you like. :(
@@ -10,26 +12,13 @@ class ComfortableMexicanSofa::Configuration
   # You can change 'cms-admin' to 'admin', for example.
   attr_accessor :admin_route_prefix
   
-  # Default url to content directly is http://yourhost/
-  # You can change '' to 'preview', for example.
-  attr_accessor :content_route_prefix
-  
-  # /cms-admin redirects to /cms-admin/pages but you can change it
-  # to something else
+  # When arriving at /cms-admin you may chose to redirect to arbirtary path,
+  # for example '/cms-admin/users'
   attr_accessor :admin_route_redirect
   
-  # Are you running multiple sites from single install? Default assumption is 'No'
-  attr_accessor :enable_multiple_sites
-  
-  # All resources across sites are kept in sync
-  attr_accessor :enable_mirror_sites
-  
   # Not allowing irb code to be run inside page content. False by default.
   attr_accessor :allow_irb
   
-  # Caching for css/js. For admin layout and ones for cms content. Enabled by default.
-  attr_accessor :enable_caching
-  
   # Upload settings
   attr_accessor :upload_file_options
   
@@ -43,22 +32,29 @@ class ComfortableMexicanSofa::Configuration
   # Number of revisions kept. Default is 25. If you wish to disable: set this to 0.
   attr_accessor :revisions_limit
   
+  # Locale definitions. If you want to define your own locale merge
+  # {:locale => 'Locale Title'} with this.
+  attr_accessor :locales
+  
+  # Admin interface will respect the locale of the site being managed. However you can
+  # force it to English by setting this to `:en`
+  attr_accessor :admin_locale
+  
   # Configuration defaults
   def initialize
     @cms_title              = 'ComfortableMexicanSofa MicroCMS'
     @authentication         = 'ComfortableMexicanSofa::HttpAuth'
     @seed_data_path         = nil
     @admin_route_prefix     = 'cms-admin'
-    @admin_route_redirect   = 'pages'
-    @content_route_prefix   = ''
+    @admin_route_redirect   = ''
     @enable_multiple_sites  = false
-    @enable_mirror_sites    = false
     @allow_irb              = false
-    @enable_caching         = true
     @upload_file_options    = {}
     @enable_fixtures        = false
     @fixtures_path          = File.expand_path('db/cms_fixtures', Rails.root)
     @revisions_limit        = 25
+    @locales                = { :en => 'English', :es => 'Español' }
+    @admin_locale           = nil
   end
   
 end

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -51,7 +51,10 @@ module ComfortableMexicanSofa::Fixtures
       
       # saving
       layout.parent = parent
-      layout.save! if layout.changed?
+      if layout.changed?
+        layout.save!
+        Rails.logger.debug "[Fixtures] Saved Layout {#{layout.slug}}"
+      end
       layout_ids << layout.id
       
       # checking for nested fixtures
@@ -105,7 +108,10 @@ module ComfortableMexicanSofa::Fixtures
       
       # saving
       page.blocks_attributes = blocks_attributes if blocks_attributes.present?
-      page.save! if page.changed? || blocks_attributes.present?
+      if page.changed? || blocks_attributes.present?
+        page.save! 
+        Rails.logger.debug "[Fixtures] Saved Page {#{page.full_path}}"
+      end
       page_ids << page.id
       
       # checking for nested fixtures
@@ -146,7 +152,10 @@ module ComfortableMexicanSofa::Fixtures
       end
       
       # saving
-      snippet.save! if snippet.changed?
+      if snippet.changed?
+        snippet.save!
+        Rails.logger.debug "[Fixtures] Saved Snippet {#{snippet.slug}}"
+      end
       snippet_ids << snippet.id
     end
     

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -42,9 +42,10 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
     ).html_safe
   end
   
-  def label_for(field, options)
-    label = options.delete(:label) || field.to_s.titleize.capitalize_all
-    "<label for=\"#{object_name}_#{field}\">#{label}</label>".html_safe
+  def label_for(field, options={})
+    label = options.delete(:label) || object.class.human_attribute_name(field).titleize
+    for_value = options[:id] || "#{object_name}_#{field}"
+    %Q{<label for="#{for_value}">#{label}</label>}.html_safe
   end
   
   def submit(value, options = {}, &block)
@@ -68,14 +69,14 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
     options[:content_field_method] ||= :text_field_tag
     field = 
       options[:field] || 
-      @template.send(options[:content_field_method], 'cms_page[blocks_attributes][][content]', tag.content, :id => nil, :class => field_css_class)
+      @template.send(options[:content_field_method], 'page[blocks_attributes][][content]', tag.content, :id => nil, :class => field_css_class)
     
     %(
       <div class='form_element #{css_class}'>
         <div class='label'>#{label}</div>
         <div class='value'>
           #{field}
-          #{@template.hidden_field_tag('cms_page[blocks_attributes][][label]', tag.label, :id => nil)}
+          #{@template.hidden_field_tag('page[blocks_attributes][][label]', tag.label, :id => nil)}
         </div>
       </div>
     ).html_safe
@@ -117,4 +118,4 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
     default_tag_field(tag, :content_field_method => :text_area_tag)
   end
   
-end
+end