jekyll-open-sdg-plugins 2.3.0.pre.beta1 → 2.3.0.pre.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19b31bd6706a47dcbf2c07f210aa589639fc8ce67410e3843bb537a200980770
-  data.tar.gz: 0da1202bfcbb679a36d5e4f2d7438246872743ec6d33e13e7caf6a22ef3476ec
+  metadata.gz: 4944fa0ac86eba4e83bf4f3968446d4750af37f341e4f286dfe115faae4119da
+  data.tar.gz: 064bdf7b8c764545426078ea071dadc7ee6a0312a90c67f463e66140fd95f37a
 SHA512:
-  metadata.gz: ad5b6e143538c031cc803114b93af911c496b471f7ac1310003d5230debb5c79a6b359f15f856700fe534f13f6a310ecbbb57095b612cdc2e62047c9f3ade3b6
-  data.tar.gz: 656cfd31efc7b480fdba2b798531a308efca2e5bf03853f7b9f4431cc53045408dd81119f90889ec05eecc625b05d57426391a8c75d95b282597fea8b34c2f0b
+  metadata.gz: ec3a89e0a127bf08518ac704c4824b35c0b9a02eaa31c44f7bfa65b00362efd6a3a6ce5a87b3ea8578b5ba56c004ca7f323248e42aacf3d8e09a992e739aca7a
+  data.tar.gz: 5e5bf4015c3ba53b6d395dd5c3bfd0381813cec35b1a7c2c5d16141ce23e4df79441ac90a8a5d0466fbeb587d7fead29b500406623788b80384001c0812224de

data/lib/jekyll-open-sdg-plugins/create_indicators.rb

@@ -13,6 +13,10 @@ module JekyllOpenSdgPlugins
       form_settings_config = site.config['indicator_config_form']
       form_settings_meta = site.config['indicator_metadata_form']
       form_settings_data = site.config['indicator_data_form']
+      config_builder_layout = 'config-builder'
+      #if site.config['use_new_config_forms']
+      #  config_builder_layout = 'config-builder-2'
+      #end
 
       translations = site.data['translations']
       # If site.create_indicators is set, create indicators per the metadata.
@@ -110,7 +114,7 @@ module JekyllOpenSdgPlugins
                   dir = File.join(dir_base, 'config')
                   title = opensdg_translate_key('indicator.edit_configuration', translations, language)
                   config_type = 'indicator'
-                  site.collections['pages'].docs << IndicatorConfigPage.new(site, site.source, dir, inid, language, meta, title, config_type, form_settings_config)
+                  site.collections['pages'].docs << IndicatorConfigPage.new(site, site.source, dir, inid, language, meta, title, config_type, form_settings_config, config_builder_layout)
                 end
 
                 if do_indicator_meta_forms
@@ -121,7 +125,7 @@ module JekyllOpenSdgPlugins
                   dir = File.join(dir_base, 'metadata')
                   title = opensdg_translate_key('indicator.edit_metadata', translations, language)
                   config_type = 'metadata'
-                  site.collections['pages'].docs << IndicatorConfigPage.new(site, site.source, dir, inid, language, metadata_to_use, title, config_type, form_settings_meta)
+                  site.collections['pages'].docs << IndicatorConfigPage.new(site, site.source, dir, inid, language, metadata_to_use, title, config_type, form_settings_meta, config_builder_layout)
                 end
 
                 if do_indicator_data_forms
@@ -155,7 +159,7 @@ module JekyllOpenSdgPlugins
 
   # A Page subclass used in the `CreateIndicators` class for the indicator config forms.
   class IndicatorConfigPage < Jekyll::Page
-    def initialize(site, base, dir, inid, language, meta, title, config_type, form_settings)
+    def initialize(site, base, dir, inid, language, meta, title, config_type, form_settings, layout)
       @site = site
       @base = base
       @dir  = dir
@@ -166,7 +170,7 @@ module JekyllOpenSdgPlugins
       self.data['language'] = language
       self.data['indicator_number'] = inid
       self.data['config_type'] = config_type
-      self.data['layout'] = 'config-builder'
+      self.data['layout'] = layout
       self.data['meta'] = meta
       self.data['title'] = title + ': ' + inid.gsub('-', '.')
       self.data['config_filename'] = inid + '.yml'

data/lib/jekyll-open-sdg-plugins/create_pages.rb

@@ -89,11 +89,15 @@ module JekyllOpenSdgPlugins
         # Hardcode the site configuration page if it's not already there.
         form_settings = site.config['site_config_form']
         config_page = pages.find { |page| page['layout'] == 'config-builder' }
+        config_builder_layout = 'config-builder'
+        if site.config['use_new_config_forms']
+          config_builder_layout = 'config-builder-2'
+        end
         if config_page == nil
           if form_settings && form_settings['enabled']
             pages.push({
               'folder' => '/config',
-              'layout' => 'config-builder',
+              'layout' => config_builder_layout,
               'title' => 'Open SDG site configuration',
               'config_type' => 'site',
               'config_filename' => 'site_config.yml',
@@ -101,7 +105,7 @@ module JekyllOpenSdgPlugins
           end
         end
         # Make sure the form settings are set.
-        config_page = pages.find { |page| page['layout'] == 'config-builder' }
+        config_page = pages.find { |page| page['layout'] == config_builder_layout }
         if config_page != nil && form_settings && form_settings['enabled']
           config_page['form_settings'] = form_settings
         end

data/lib/jekyll-open-sdg-plugins/routes.rb

@@ -26,7 +26,7 @@ module JekyllOpenSdgPlugins
           route = route + '/'
         end
 
-        unless doc.data['layout'] == 'config-builder' or doc.data['layout'] == 'data-editor'
+        unless doc.data['layout'] == 'config-builder' or doc.data['layout'] == 'data-editor' or doc.data['layout'] == 'config-builder-2'
           routes['pages'].append(route)
         end
       end
@@ -40,7 +40,7 @@ module JekyllOpenSdgPlugins
           route = route + '/'
         end
 
-        if doc.data['layout'] == 'config-builder' or doc.data['layout'] == 'data-editor'
+        if doc.data['layout'] == 'config-builder' or doc.data['layout'] == 'data-editor' or doc.data['layout'] == 'config-builder-2'
           routes['config'].append(route)
         end
       end

data/lib/jekyll-open-sdg-plugins/schema-site-config.json

@@ -1521,6 +1521,18 @@
                 }
             ]
         },
+        "use_new_config_forms": {
+            "title": "Use new config forms",
+            "type": "boolean",
+            "description": "This setting can be set to `true` to try the new site configuration forms. This is experimental and will eventually be the default.",
+            "format": "checkbox",
+            "links": [
+                {
+                    "rel": "More information on the use_new_config_forms setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/configuration/#use_new_config_forms"
+                }
+            ]
+        },
         "validate_indicator_config": {
             "title": "Validate indicator config",
             "type": "boolean",

data/lib/jekyll-open-sdg-plugins/search_index.rb

@@ -36,7 +36,7 @@ module JekyllOpenSdgPlugins
       site.collections.keys.each do |collection|
         site.collections[collection].docs.each do |doc|
           # Do not index configuration forms.
-          if doc.data.has_key?('layout') && doc.data['layout'] == 'config-builder'
+          if doc.data.has_key?('layout') && (doc.data['layout'] == 'config-builder' or doc.data['layout'] == 'config-builder-2')
             next
           end
           # We segregate the search items by language.

data/lib/jekyll-open-sdg-plugins/version.rb

@@ -1,3 +1,3 @@
 module JekyllOpenSdgPlugins
-  VERSION = "2.3.0-beta1".freeze
+  VERSION = "2.3.0-beta3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-open-sdg-plugins
 version: !ruby/object:Gem::Version
-  version: 2.3.0.pre.beta1
+  version: 2.3.0.pre.beta3
 platform: ruby
 authors:
 - Brock Fanning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-17 00:00:00.000000000 Z
+date: 2024-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll