ecm_cms 0.0.1.pre → 0.0.2.pre

data/app/models/ecm/cms/navigation_item.rb

@@ -57,6 +57,10 @@ class Ecm::Cms::NavigationItem < ActiveRecord::Base
     end
   end
 
+  def to_s
+    "#{ecm_cms_navigation}: #{name}"
+  end
+
   def update_navigation_from_parent!
     self.update_navigation_from_parent
     self.save!

data/lib/ecm/cms/active_admin/ecm_cms_navigation_items.rb

@@ -33,7 +33,7 @@ ActiveAdmin.register Ecm::Cms::NavigationItem do
     column :url
     column :ecm_cms_page do |ni|
       if ni.ecm_cms_page.blank?
-        link_to(I18n.t('active_admin.new'), new_admin_ecm_cms_page_path({:ecm_cms_page => ni.params_for_new_page}))
+        link_to(I18n.t('active_admin.create_model', :model => Ecm::Cms::Page.model_name.human), new_admin_ecm_cms_page_path({:ecm_cms_page => ni.params_for_new_page}))
       else
         link_to(ni.ecm_cms_page.title, [:admin, ni.ecm_cms_page])
       end

data/lib/ecm/cms/active_admin/ecm_cms_navigations.rb

@@ -6,7 +6,7 @@ ActiveAdmin.register Ecm::Cms::Navigation do
   filter :name
 
   # Menu
-  menu :parent => Proc.new { I18n.t('ecm.cms.active_admin.menu') }.call  
+  menu :parent => Proc.new { I18n.t('ecm.cms.active_admin.menu') }.call
 
   form do |f|
     f.inputs do
@@ -20,7 +20,7 @@ ActiveAdmin.register Ecm::Cms::Navigation do
   index do
     selectable_column
     column :name
-    column :locale    
+    column :locale
     default_actions
   end
 
@@ -32,7 +32,7 @@ ActiveAdmin.register Ecm::Cms::Navigation do
         column :url
         column :ecm_cms_page do |ni|
           if ni.ecm_cms_page.blank?
-            link_to(I18n.t('active_admin.new'), new_admin_ecm_cms_page_path({:ecm_cms_page => ni.params_for_new_page}))
+            link_to(I18n.t('active_admin.create_model', :model => Ecm::Cms::Page.model_name.human), new_admin_ecm_cms_page_path({:ecm_cms_page => ni.params_for_new_page}))
           else
             link_to(ni.ecm_cms_page.title, [:admin, ni.ecm_cms_page])
           end
@@ -41,7 +41,7 @@ ActiveAdmin.register Ecm::Cms::Navigation do
         column :updated_at
 
         column do |ni|
-          link_to(I18n.t('active_admin.view'), [:admin, ni], :class => "member_link view_link") + 
+          link_to(I18n.t('active_admin.view'), [:admin, ni], :class => "member_link view_link") +
           link_to(I18n.t('active_admin.edit'), [:edit, :admin, ni], :class => "member_link edit_link")
         end
       end

data/lib/ecm/cms/active_admin/ecm_cms_pages.rb

@@ -23,7 +23,7 @@ ActiveAdmin.register Ecm::Cms::Page do
 
     I18n.available_locales.each do |locale|
       Ecm::Cms::Navigation.where(:locale => locale).all.each do |navigation|
-        f.inputs do
+        f.inputs navigation.to_s do
           f.input :ecm_cms_navigation_items,
                   :as => :check_boxes,
                   :collection => navigation.ecm_cms_navigation_items.joins(:ecm_cms_navigation).where(:ecm_cms_navigations => { :locale => locale }),
@@ -42,7 +42,13 @@ ActiveAdmin.register Ecm::Cms::Page do
     column :title
     column :home_page?
     column :layout
-    column :ecm_cms_navigation_items
+    column(:ecm_cms_navigation_items) do |page|
+      output = ""
+      page.ecm_cms_navigation_items.each do |navigation_item|
+        output << link_to(navigation_item, [:admin, navigation_item])
+      end
+      output.html_safe
+    end
     column :created_at
     column :updated_at
     default_actions

data/lib/ecm/cms/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Cms
-    VERSION = "0.0.1.pre"
+    VERSION = "0.0.2.pre"
   end  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ecm_cms
 version: !ruby/object:Gem::Version 
-  hash: 961915968
+  hash: 961915980
   prerelease: 6
   segments: 
   - 0
   - 0
-  - 1
+  - 2
   - pre
-  version: 0.0.1.pre
+  version: 0.0.2.pre
 platform: ruby
 authors: 
 - Roberto Vasquez Angel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-25 00:00:00 Z
+date: 2012-11-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails