admin.rb in enjoy_cms-0.2.0.beta

- old
+ new

@@ -1,11 +1,11 @@
 module Enjoy
   class << self
     def map_config(is_active = true)
       Proc.new {
         active is_active
-        label I18n.t('rs.map')
+        label I18n.t('enjoy.map')
         field :address, :string
         field :map_address, :string
         field :map_hint, :string
         field :coordinates, :string do
           read_only true
@@ -20,22 +20,14 @@
       }
     end
 
     def seo_config(is_active = true)
       Proc.new {
-        if respond_to?(:active)
-          active is_active
-          label "SEO"
-        else
-          visible false
+        navigation_label 'SEO'
+        field :seoable do
+          read_only true
         end
-        Enjoy.seo_fields(self)
-      }
-    end
-
-    def seo_fields(s)
-      s.instance_eval do
         field :h1, :string
         field :title, :string
         field :keywords, :text
         field :description, :text
         field :robots, :string
@@ -47,11 +39,11 @@
         end
 
         if block_given?
           yield
         end
-      end
+      }
     end
 
     def page_config(fields = {})
       Proc.new {
         Enjoy.apply_patches self
@@ -75,20 +67,20 @@
           field :name
           field :excerpt, :ck_editor
           field :content, :ck_editor
           Enjoy.apply_patches self
           group :menu do
-            label I18n.t('rs.menu')
+            label I18n.t('enjoy.menu')
             field :menus
             field :fullpath, :string do
-              help I18n.t('rs.with_final_slash')
+              help I18n.t('enjoy.with_final_slash')
             end
             field :regexp, :string do
-              help I18n.t('rs.page_url_regex')
+              help I18n.t('enjoy.page_url_regex')
             end
             field :redirect, :string do
-              help I18n.t('rs.final_in_menu')
+              help I18n.t('enjoy.final_in_menu')
             end
             field :text_slug
           end
           fields.each_pair do |name, type|
             if type.nil?
@@ -100,16 +92,21 @@
                 field name, type
               end
             end
           end
           group :seo do
-            active true
+            active false
             field :seo do
               active true
             end
           end
-          group :sitemap_data, &Enjoy.sitemap_data_config
+          group :sitemap_data do
+            active false
+            field :sitemap_data do
+              active true
+            end
+          end
         end
         Enjoy.only_patches self, [:show, :export]
         nested_set({
           max_depth: Enjoy.config.menu_max_depth,
           scopes: []
@@ -137,11 +134,11 @@
       }
     end
 
     def contact_message_config
       Proc.new {
-        # navigation_label I18n.t('rs.settings')
+        # navigation_label I18n.t('enjoy.settings')
         field :c_at do
           read_only true
         end
         field :name
         field :content, :text
@@ -216,12 +213,22 @@
                 field name, type
               end
             end
           end
           Enjoy.apply_patches self
-          group :seo, &Enjoy.seo_config
-          group :sitemap_data, &Enjoy.sitemap_data_config
+          group :seo do
+            active false
+            field :seo do
+              active true
+            end
+          end
+          group :sitemap_data do
+            active false
+            field :sitemap_data do
+              active true
+            end
+          end
         end
 
         Enjoy.only_patches self, [:show, :list, :export]
 
         if block_given?
@@ -230,17 +237,20 @@
       }
     end
 
     def sitemap_data_config(is_active = false)
       Proc.new {
-        active is_active
-        label I18n.t('rs.sitemap_data')
-        field :sitemap_show
+        navigation_label 'SEO'
+        label I18n.t('enjoy.sitemap_data')
+        field :sitemap_data_field do
+          read_only true
+        end
+        field :sitemap_show, :toggle
         field :sitemap_lastmod
         field :sitemap_changefreq, :enum do
           enum do
-            SitemapData::SITEMAP_CHANGEFREQ_ARRAY
+            Enjoy::SitemapData::SITEMAP_CHANGEFREQ_ARRAY
           end
         end
         field :sitemap_priority
 
         if block_given?
@@ -293,11 +303,11 @@
       end
     end
 
     def gallery_config
       Proc.new {
-        # navigation_label I18n.t('rs.gallery')
+        # navigation_label I18n.t('enjoy.gallery')
         field :enabled, :toggle
 
         field :name, :string
         field :slugs, :enum do
           enum_method do
@@ -322,10 +332,10 @@
       }
     end
 
     def image_config(without_gallery = false, fields = {})
       Proc.new {
-        # navigation_label I18n.t('rs.gallery')
+        # navigation_label I18n.t('enjoy.gallery')
         field :enabled, :toggle
         unless without_gallery
           field :gallery
         end
         field :name, :string