etabliocms_pages 0.0.1 → 0.0.2

data/app/controllers/etabliocms_pages/admin/pages_controller.rb

@@ -3,15 +3,17 @@ module EtabliocmsPages
     class PagesController < EtabliocmsCore::Admin::BaseController
 
       def new
-        @page = Page.new
+        @page = EtabliocmsPages::Page.new
+        @page.build_contents_for_available_locales
       end
 
       def create
-        @page = Page.new(params[:page])
+        @page = Page.new(params[:etabliocms_pages_page])
         if @page.save
           flash[:notice] = t('page.created')
           redirect_to :action => 'index'
         else
+          @page.build_contents_for_available_locales
           render :action => 'new'
         end
       end
@@ -22,7 +24,7 @@ module EtabliocmsPages
 
       def update
         @page = Page.find(params[:id])
-        if @page.update_attributes(params[:page])
+        if @page.update_attributes(params[:etabliocms_pages_page])
           flash[:notice] = t('page.updated')
           redirect_to :action => 'index'
         else

data/app/models/etabliocms_pages/content.rb

@@ -0,0 +1,14 @@
+module EtabliocmsPages
+  class Content < ActiveRecord::Base
+
+    validates :title, :presence => true
+    validates :locale, :presence => true
+
+    belongs_to :page, :inverse_of => :contents
+
+    serialize :areas, Hash
+
+    has_slug :to_param => "path"
+
+  end
+end

data/app/models/etabliocms_pages/page.rb

@@ -1,26 +1,48 @@
 module EtabliocmsPages
   class Page < ActiveRecord::Base
 
+    delegate :title, :areas, :slug, :to => :content, :allow_nil => true
+    def content
+      contents.where(:locale => I18n.locale).first
+    end
+
     acts_as_nested_set
     attr_accessor :child_of
     after_save :update_position
 
-    validates :title, :presence => true
-    validates :locale, :presence => true
+    has_many :contents, :class_name => "EtabliocmsPages::Content", :inverse_of => :page, :order => "locale asc", :dependent => :destroy
+    accepts_nested_attributes_for :contents, :reject_if => proc { |attributes| attributes['title'].blank? }
 
-    has_slug :to_param => "path"
+    validate :at_least_one_content_has_title
 
     def path
-      self_and_ancestors.map(&:slug).join("/")
+      self_and_ancestors.map{|p| p.slug }.join("/")
+    end
+
+    def to_param
+      path
+    end
+
+    def titles
+      contents.map(&:title).join(" / ")
+    end
+
+    def locales
+      contents.map(&:locale).join(", ")
     end
 
     def other_pages_for_select
       pages = EtabliocmsPages::Page.order("lft ASC")
       pages = pages.where("id != ?", id) unless new_record?
-      pages.map { |d| [d.title, d.id] }
+      pages.map { |d| [d.titles, d.id] }
+    end
+
+    def build_contents_for_available_locales
+      I18n.available_locales.each do |available_locale|
+        contents.build(:locale => available_locale) unless contents.detect { |c| c.locale == available_locale.to_s }
+      end
     end
 
-    scope :for_locale, lambda { |locale| where(:locale => locale) }
     scope :visible, where(:visible => true)
 
     private
@@ -38,6 +60,12 @@ module EtabliocmsPages
       self.child_of = nil
     end
 
+    def at_least_one_content_has_title
+      if contents.select { |c| c.title.present? }.blank?
+        errors[:base] << I18n.t('activerecord.errors.messages.at_least_one_content_has_title')
+      end
+    end
+
   end
 
 end

data/app/views/etabliocms_pages/admin/pages/_content_fields.html.erb

@@ -0,0 +1,30 @@
+<% content = f.object %>
+<div class="fields" id="tabs-<%= content.object_id %>">
+
+  <%= render "layouts/errors", :target => content %>
+
+  <%= f.hidden_field :locale, :value => content.locale %>
+
+  <p>
+    <%= f.label :title %>
+    <%= f.text_field :title, :class => 'text-field' %>
+  </p>
+
+  <% EtabliocmsPages.areas.each do |area| %>
+      <p>
+        <%= label_tag "#{content.object_id}_#{area}", t("helpers.label.etabliocms_pages_page.contents.#{area}") %>
+        <%= f.textile_text_area "areas[#{area}]",
+                                :id => "#{content.object_id}_#{area}",
+                                :value => content.areas[area].to_s, :width => 460, :height => 200 %>
+      </p>
+  <% end %>
+
+  <% if !@page.new_record? && respond_to?(:page_path) %>
+      <p>
+        <% I18n.locale = content.locale %>
+        <strong>Náhled: </strong>
+        <%= link_to @page.title, page_path(@page), :"data-popup" => "true" %>
+      </p>
+  <% end %>
+
+</div>

data/app/views/etabliocms_pages/admin/pages/_form.html.erb

@@ -1,48 +1,54 @@
 <%= render "layouts/errors", :target => @page %>
 
 <fieldset>
-  <legend><%= t('page.admin_legend') %></legend>
-
-  <p>
-    <%= f.label :title, :id => "page_title_label" %>
-    <%= f.text_field :title, :class => 'text-field' %>
-  </p>
+  <legend><%= t('page.admin_legend_basic') %></legend>
 
   <p>
     <%= f.label :child_of, :id => "page_child_of_label" %>
     <%= f.select :child_of, [[t('hierarchy.top_level'), nil]] + @page.other_pages_for_select,
-                 :selected => @page.parent ? [@page.parent.title, @page.parent_id] : nil %>
-  </p>
-
-  <p>
-    <%= f.label :locale, :id => "page_locale_label" %>
-    <%= f.select :locale, [[t('admin.locale.cs'), 'cs'], [t('admin.locale.en'), 'en']] %>
+                 :selected => @page.parent ? [@page.parent.titles, @page.parent_id] : nil %>
   </p>
 
-
   <p>
     <%= f.label :visible, :id => "page_visible_label" %>
     <%= f.boolean_yes_no_select :visible %>
   </p>
 
-  <p>
-    <%= f.textile_text_area :text, :width => 560, :height => 200 %>
-  </p>
-
   <p>
     <%= f.label :url, :id => "page_url_label" %>
     <%= f.text_field :url, :class => 'text-field' %>
   </p>
 
-  <% if !@page.new_record? && respond_to?(:page_path) %>
-      <p>
-        <strong>Náhled: </strong>
-        <%= link_to @page.title, page_url(@page, :locale => @page.locale), :"data-popup" => "true" %>
-      </p>
-  <% end %>
+</fieldset>
+
+<fieldset>
+  <legend><%= t('page.admin_legend_contents') %></legend>
+
+  <div id="contents">
+    <ul>
+      <%@page.contents.sort_by{|a| a.locale.to_s }.each do |content| %>
+          <li><a href="#tabs-<%= content.object_id %>"><%= t("admin.locales.#{content.locale}") %></a></li>
+      <% end %>
+    </ul>
+
+    <%= f.fields_for :contents do |builder| %>
+        <%= render "content_fields", :f => builder %>
+    <% end %>
+  </div>
 
+</fieldset>
+
+<fieldset>
+
+  <% I18n.locale = I18n.default_locale %>
   <p>
     <%= submit_tag t('admin.save'), :class => 'submit' %>
   </p>
 
 </fieldset>
+
+<script>
+    $(function() {
+        $("#contents").tabs();
+    });
+</script>

data/app/views/etabliocms_pages/admin/pages/edit.html.erb

@@ -2,6 +2,6 @@
 
 <h1><%= @page.title %></h1>
 
-<%= form_for :page,  :url => admin_page_path(@page.id), :html => {:method => :put, :id => "admin-form"} do |f| -%>
+<%= form_for @page, :url => admin_page_path(@page.id), :html => {:method => :put, :id => "admin-form"} do |f| -%>
   <%= render :partial => 'form', :locals => { :f => f } %>
 <% end  %>

data/app/views/etabliocms_pages/admin/pages/new.html.erb

@@ -2,6 +2,6 @@
 
 <h1><%= t('page.new') %></h1>
 
-<%= form_for :page,  :url => admin_pages_url, :html => {:method => :post, :id => "admin-form"} do |f| -%>
+<%= form_for @page,  :url => admin_pages_url, :html => {:method => :post, :id => "admin-form"} do |f| -%>
   <%= render :partial => 'form', :locals => { :f => f } %>
 <% end  %>

data/config/locales/pages.cs.yml

@@ -9,10 +9,26 @@ cs:
     moved: Stránka byla úspěšně přesunuta.
     not_moved: Stránka nebyla přesunuta.
     destroy_confirmation: Skutečně chcete smazat tuto stránku?
-    admin_legend: Základní údaje o stránce
+    admin_legend_basic: Základní údaje o stránce
+    admin_legend_contents: Obsah stránky
     edit: "Editace stránky %{title}"
     new: Nová stránka
+  helpers:
+    label:
+      etabliocms_pages_page:
+        child_of: Rodič
+        text: Text
+        visible: Viditelné
+        page_title: Meta title
+        page_description: Meta description
+        contents:
+          title: Nadpis
+          locale: Jazyk
+          text: Text
   activerecord:
+    errors:
+      messages:
+        at_least_one_content_has_title: Alespoň jedna jazyková mutace musí mít nadpis.
     attributes:
       "etabliocms_pages/page":
         title: Nadpis

data/db/migrate/20120301175455_create_contents.etabliocms_pages_engine.rb

@@ -0,0 +1,26 @@
+class CreateContents < ActiveRecord::Migration
+
+def change
+    create_table :contents do |t|
+      t.string :title, :null => false
+      t.string :slug, :null => false
+
+      t.text :areas
+      t.string :locale, :null => false
+      t.integer :page_id, :null => false
+      t.timestamps
+    end
+
+    EtabliocmsPages::Page.all.each do |page|
+      page.contents.create(:title => page.title,
+                           :slug => page.slug,
+                           :locale => page.locale,
+                           :areas => {:text => page.text})
+    end
+    remove_column :pages, :title
+    remove_column :pages, :slug
+    remove_column :pages, :locale
+    remove_column :pages, :text
+  end
+
+end

data/lib/etabliocms_pages.rb

@@ -1,6 +1,13 @@
 require "active_support/dependencies"
 
 module EtabliocmsPages
+
+  mattr_accessor :areas
+
+  def self.setup
+    yield self
+  end
+
 end
 
 require "etabliocms_pages/engine"

data/lib/etabliocms_pages/engine.rb

@@ -1,3 +1,5 @@
+require 'awesome_nested_set'
+
 module EtabliocmsPages
 
   class Engine < ::Rails::Engine
@@ -9,6 +11,12 @@ module EtabliocmsPages
       end
     end
 
+    initializer "etabliocms_pages.initialize" do |app|
+      EtabliocmsPages.setup do |config|
+        config.areas ||= [:text]
+      end
+    end
+
   end
 
 end

data/lib/etabliocms_pages/version.rb

@@ -1,3 +1,3 @@
 module EtabliocmsPages
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etabliocms_pages
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &14094540 !ruby/object:Gem::Requirement
+  requirement: &8748920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *14094540
+  version_requirements: *8748920
 - !ruby/object:Gem::Dependency
   name: etabliocms_core
-  requirement: &14094060 !ruby/object:Gem::Requirement
+  requirement: &8748500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14094060
+  version_requirements: *8748500
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &14093460 !ruby/object:Gem::Requirement
+  requirement: &8747940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *14093460
+  version_requirements: *8747940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &14092960 !ruby/object:Gem::Requirement
+  requirement: &8747440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14092960
+  version_requirements: *8747440
 description: Small CMS - module for pages
 email:
 - patrikjira@gmail.com
@@ -64,15 +64,18 @@ extra_rdoc_files: []
 files:
 - app/views/layouts/_sidebar_pages.html.erb
 - app/views/etabliocms_pages/admin/pages/_form.html.erb
+- app/views/etabliocms_pages/admin/pages/_content_fields.html.erb
 - app/views/etabliocms_pages/admin/pages/new.html.erb
 - app/views/etabliocms_pages/admin/pages/edit.html.erb
 - app/views/etabliocms_pages/admin/pages/index.html.erb
 - app/assets/images/admin/sidebar-pages.png
 - app/controllers/etabliocms_pages/admin/pages_controller.rb
+- app/models/etabliocms_pages/content.rb
 - app/models/etabliocms_pages/page.rb
 - config/routes.rb
 - config/locales/pages.cs.yml
-- db/migrate/20120223140555_create_pages.etabliocms_core_engine.rb
+- db/migrate/20120223140555_create_pages.etabliocms_pages_engine.rb
+- db/migrate/20120301175455_create_contents.etabliocms_pages_engine.rb
 - lib/etabliocms_pages/version.rb
 - lib/etabliocms_pages/engine.rb
 - lib/etabliocms_pages.rb