jekyll-open-sdg-plugins 1.3.1 → 1.4.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b8207e00fee9b06651b035048a46ebf9c3feaa83c34a389411b11d9b1f5c859
-  data.tar.gz: 6f36f1ce30f97de9228082af5aede9750b0155caace3c92dd44bd11f89107f1b
+  metadata.gz: 6ba22fd994d04edb16b31b864db8b6538e2a996cfbf98c16f0eaee128fa8117c
+  data.tar.gz: 70d64a4098ecc895aac3f8690617bf34c019b743cff279734cf81b71c015d5de
 SHA512:
-  metadata.gz: 5857e831f608586fa54ddde293d6a127c6907361c2f758837c8cba7f78802fca1da1df9d7a5ab8ba69774cb8f242b0297a905db8bea8f4ca7a479c909492575a
-  data.tar.gz: f5b4950adf873e5a1db34452430fc87b23ae5cf189748e17ea6a3e03a236a3292a6b7029b4a80267281017a7030e5e81085d2658d302bb07286c59af9e721b7f
+  metadata.gz: f9440c732b7ecb4ea1cbe223abd96288ffbbc647c4e4ab102009a3887643dfa6f0270c6171cbb7636e816385865ceebee7f840dfb09e454c0d38968779b9d720
+  data.tar.gz: 920503070bad04e792f6ec01815236a50edc5a5556f611da5640d867416eb0dd5bbcb52dfde684db521af5156f59490ce84ff64b234c2d6b0103b5b9ef038858

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

@@ -11,6 +11,7 @@ require_relative "jekyll-open-sdg-plugins/create_pages"
 require_relative "jekyll-open-sdg-plugins/sdg_variables"
 require_relative "jekyll-open-sdg-plugins/search_index"
 require_relative "jekyll-open-sdg-plugins/validate_indicator_config"
+require_relative "jekyll-open-sdg-plugins/metadata_schema_to_config"
 
 module JekyllOpenSdgPlugins
 end

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

@@ -7,17 +7,52 @@ module JekyllOpenSdgPlugins
     priority :normal
 
     def generate(site)
+      # Some references to clean up the code below.
+      language_config = site.config['languages']
+      indicator_config = site.config['create_indicators']
+      form_settings_config = site.config['indicator_config_form']
+      form_settings_meta = site.config['indicator_metadata_form']
+      form_settings_data = site.config['indicator_data_form']
+
+      # Special treatment of repository_link settings: prefix them
+      # with the repository_url_data site config if needed.
+      repo_url = site.config['repository_url_data']
+      if repo_url && repo_url != '' && repo_url.start_with?('http')
+        if form_settings_config != nil && form_settings_config && form_settings_config['enabled']
+          if form_settings_config['repository_link'] && form_settings_config['repository_link'] != ''
+            unless form_settings_config['repository_link'].start_with?('http')
+              form_settings_config['repository_link'] = repo_url + form_settings_config['repository_link']
+            end
+          end
+        end
+        if form_settings_meta != nil && form_settings_meta && form_settings_meta['enabled']
+          if form_settings_meta['repository_link'] && form_settings_meta['repository_link'] != ''
+            unless form_settings_meta['repository_link'].start_with?('http')
+              form_settings_meta['repository_link'] = repo_url + form_settings_meta['repository_link']
+            end
+          end
+        end
+        if form_settings_data != nil && form_settings_data && form_settings_data['enabled']
+          if form_settings_data['repository_link'] && form_settings_data['repository_link'] != ''
+            unless form_settings_data['repository_link'].start_with?('http')
+              form_settings_data['repository_link'] = repo_url + form_settings_data['repository_link']
+            end
+          end
+        end
+      end
+
+      translations = site.data['translations']
       # If site.create_indicators is set, create indicators per the metadata.
-      if site.config['languages'] and site.config['create_indicators'] and site.config['create_indicators'].key?('layout') and site.config['create_indicators']['layout'] != ''
+      if (language_config and indicator_config and indicator_config.key?('layout') and indicator_config['layout'] != '')
         # Decide what layout to use for the indicator pages.
-        layout = site.config['create_indicators']['layout']
+        layout = indicator_config['layout']
         # See if we need to "map" any language codes.
         languages_public = Hash.new
         if site.config['languages_public']
           languages_public = opensdg_languages_public(site)
         end
         # Loop through the languages.
-        site.config['languages'].each_with_index do |language, index|
+        language_config.each_with_index do |language, index|
           # Get the "public language" (for URLs) which may be different.
           language_public = language
           if languages_public[language]
@@ -35,7 +70,7 @@ module JekyllOpenSdgPlugins
           # Loop through the indicators (using metadata as a list).
           metadata.each do |inid, meta|
             permalink = inid
-            if meta.has_key?('permalink') and meta['permalink'] != ''
+            if (meta.has_key?('permalink') and meta['permalink'] != '')
               permalink = meta['permalink']
             end
             # Add the language subfolder for all except the default (first) language.
@@ -45,24 +80,53 @@ module JekyllOpenSdgPlugins
             site.collections['indicators'].docs << IndicatorPage.new(site, site.source, dir, inid, language, layout)
           end
         end
-        # Create the indicator configuration pages.
-        if site.config['create_config_forms'] && site.config['create_config_forms'].key?('layout') && site.config['create_config_forms']['layout'] != ''
+        # Create the indicator settings configuration/metadata/data pages.
+        do_indicator_config_forms = form_settings_config && form_settings_config['enabled']
+        do_indicator_meta_forms = form_settings_meta && form_settings_meta['enabled']
+        do_indicator_data_forms = form_settings_data && form_settings_data['enabled']
+        use_translated_metadata = form_settings_meta && form_settings_meta['translated']
+        if do_indicator_config_forms || do_indicator_meta_forms || do_indicator_data_forms
+
           metadata = {}
-          layout = site.config['create_config_forms']['layout']
           if opensdg_translated_builds(site)
             if site.data.has_key?('untranslated')
               metadata = site.data['untranslated']['meta']
             else
-              default_language = site.config['languages'][0]
+              default_language = language_config[0]
               metadata = site.data[default_language]['meta']
             end
           else
             metadata = site.data['meta']
           end
+
+          metadata_by_language = {}
+          language_config.each do |language|
+            if opensdg_translated_builds(site)
+              metadata_by_language[language] = site.data[language]['meta']
+            else
+              metadata_by_language[language] = site.data['meta']
+            end
+          end
+
+          # Because we have config forms for indicator config or meta/data, we
+          # take over the meta/data_edit_url and configuration_edit_url settings
+          # here with simple relative links.
+          if do_indicator_config_forms
+            site.config['configuration_edit_url'] = 'config'
+          end
+
+          if do_indicator_meta_forms
+            site.config['metadata_edit_url'] = 'metadata'
+          end
+
+          if do_indicator_data_forms
+            site.config['data_edit_url'] = 'data'
+          end
+
           # Loop through the indicators (using metadata as a list).
           if !metadata.empty?
             # Loop through the languages.
-            site.config['languages'].each_with_index do |language, index|
+            language_config.each_with_index do |language, index|
               # Get the "public language" (for URLs) which may be different.
               language_public = language
               if languages_public[language]
@@ -70,14 +134,37 @@ module JekyllOpenSdgPlugins
               end
               metadata.each do |inid, meta|
                 permalink = inid
-                if meta.has_key?('permalink') and meta['permalink'] != ''
+                if (meta.has_key?('permalink') and meta['permalink'] != '')
                   permalink = meta['permalink']
                 end
-                dir = File.join('config', permalink)
+                dir_base = File.join(permalink)
                 if index != 0
-                  dir = File.join(language_public, 'config', permalink)
+                  dir_base = File.join(language_public, permalink)
+                end
+
+                if do_indicator_config_forms
+                  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)
+                end
+
+                if do_indicator_meta_forms
+                  metadata_to_use = meta
+                  if use_translated_metadata
+                    metadata_to_use = metadata_by_language[language][inid]
+                  end
+                  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)
+                end
+
+                if do_indicator_data_forms
+                  dir = File.join(dir_base, 'data')
+                  title = opensdg_translate_key('indicator.edit_data', translations, language)
+                  site.collections['pages'].docs << IndicatorDataPage.new(site, site.source, dir, inid, language, title, form_settings_data)
                 end
-                site.collections['pages'].docs << IndicatorConfigPage.new(site, site.source, dir, inid, language, meta, layout)
               end
             end
           end
@@ -86,7 +173,7 @@ module JekyllOpenSdgPlugins
     end
   end
 
-  # A Page subclass used in the `CreateIndicators` class.
+  # A Page subclass used in the `CreateIndicators` class for the indicators.
   class IndicatorPage < Jekyll::Page
     def initialize(site, base, dir, inid, language, layout)
       @site = site
@@ -104,9 +191,9 @@ module JekyllOpenSdgPlugins
     end
   end
 
-  # A Page subclass used in the `CreateIndicators` class.
+  # 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, layout)
+    def initialize(site, base, dir, inid, language, meta, title, config_type, form_settings)
       @site = site
       @base = base
       @dir  = dir
@@ -115,12 +202,32 @@ module JekyllOpenSdgPlugins
       self.process(@name)
       self.data = {}
       self.data['language'] = language
-      self.data['indicator_number'] = inid.gsub('-', '.')
-      self.data['config_type'] = 'indicator'
-      self.data['layout'] = layout
+      self.data['indicator_number'] = inid
+      self.data['config_type'] = config_type
+      self.data['layout'] = 'config-builder'
       self.data['meta'] = meta
-      self.data['title'] = 'Open SDG indicator configuration: ' + self.data['indicator_number']
+      self.data['title'] = title + ': ' + inid.gsub('-', '.')
       self.data['config_filename'] = inid + '.yml'
+      self.data['form_settings'] = form_settings
+    end
+  end
+
+  # A Page subclass used in the `CreateIndicators` class for the indicator data forms.
+  class IndicatorDataPage < Jekyll::Page
+    def initialize(site, base, dir, inid, language, title, form_settings)
+      @site = site
+      @base = base
+      @dir  = dir
+      @name = 'index.html'
+
+      self.process(@name)
+      self.data = {}
+      self.data['language'] = language
+      self.data['indicator_number'] = inid
+      self.data['layout'] = 'data-editor'
+      self.data['title'] = title + ': ' + inid.gsub('-', '.')
+      self.data['config_filename'] = 'indicator_' + inid
+      self.data['form_settings'] = form_settings
     end
   end
 end

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

@@ -30,7 +30,7 @@ module JekyllOpenSdgPlugins
       # To use the default 4 pages, simply put:
       #
       # create_pages: true
-      if site.config['languages'] and site.config['create_pages']
+      if (site.config['languages'] and site.config['create_pages'])
 
         default_pages = [
           {
@@ -54,7 +54,7 @@ module JekyllOpenSdgPlugins
           }
         ]
         pages = default_pages
-        if site.config['create_pages'].is_a?(Hash) and site.config['create_pages'].key?('pages')
+        if (site.config['create_pages'].is_a?(Hash) and site.config['create_pages'].key?('pages'))
           # Backwards compatability to support the deprecated "pages" key.
           pages = site.config['create_pages']['pages']
         elsif site.config['create_pages'].is_a?(Array)
@@ -65,18 +65,33 @@ module JekyllOpenSdgPlugins
         pages = pages.clone
 
         # 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' }
         if config_page == nil
-          if site.config['create_config_forms'] && site.config['create_config_forms'].key?('layout') && site.config['create_config_forms']['layout'] != ''
+          if form_settings && form_settings['enabled']
             pages.push({
               'folder' => '/config',
-              'layout' => site.config['create_config_forms']['layout'],
+              'layout' => 'config-builder',
               'title' => 'Open SDG site configuration',
               'config_type' => 'site',
-              'config_filename' => 'site_config.yml'
+              'config_filename' => 'site_config.yml',
             })
           end
         end
+        # Make sure the form settings are set.
+        config_page = pages.find { |page| page['layout'] == 'config-builder' }
+        if config_page != nil && form_settings && form_settings['enabled']
+          # Special treatment of repository_link.
+          if form_settings['repository_link'] && form_settings['repository_link'] != ''
+            unless form_settings['repository_link'].start_with?('http')
+              repo_url = site.config['repository_url_site']
+              if repo_url && repo_url != '' && repo_url.start_with?('http')
+                form_settings['repository_link'] = repo_url + form_settings['repository_link']
+              end
+            end
+          end
+          config_page['form_settings'] = form_settings
+        end
 
         # See if we need to "map" any language codes.
         languages_public = Hash.new

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

@@ -25,7 +25,8 @@ module JekyllOpenSdgPlugins
         'disaggregation' => 'stats/disaggregation.json',
         'translations' => 'translations/translations.json',
         'zip' => 'zip/all_indicators.json',
-        'indicator_downloads' => 'downloads/indicator-downloads.json'
+        'indicator_downloads' => 'downloads/indicator-downloads.json',
+        'data_packages' => 'data-packages/all.json',
       }
     end
 
@@ -43,7 +44,7 @@ module JekyllOpenSdgPlugins
         rescue StandardError => e
           # For backwards compatibility, forego the exception in some cases.
           abort_build = true
-          if ['translations', 'indicator_downloads', 'disaggregation'].include? key
+          if ['translations', 'indicator_downloads', 'disaggregation', 'data_packages'].include? key
             abort_build = false
           elsif endpoint.include? '/untranslated/'
             abort_build = false

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

@@ -0,0 +1,72 @@
+require "jekyll"
+require_relative "helpers"
+
+module JekyllOpenSdgPlugins
+  class MetadataSchemaToConfig < Jekyll::Generator
+    safe true
+    priority :lowest
+
+    def generate(site)
+
+      # Convert the metadata schema from the internal format into JSONSchema so
+      # it can be used to create config forms.
+
+      language_config = site.config['languages']
+      form_settings = site.config['indicator_metadata_form']
+      t = site.data['translations']
+      lang = language_config[0]
+
+      if form_settings && form_settings['enabled']
+        scopes = ['national', 'global']
+        if form_settings && form_settings.has_key?('scopes')
+          if form_settings['scopes'].kind_of?(Array) && form_settings['scopes'].length() > 0
+            scopes = form_settings['scopes']
+          end
+        end
+        exclude_fields = []
+        if form_settings && form_settings.has_key?('exclude_fields')
+          if form_settings['exclude_fields'].kind_of?(Array) && form_settings['exclude_fields'].length() > 0
+            exclude_fields = form_settings['exclude_fields']
+          end
+        end
+        if form_settings && form_settings.has_key?('language') && form_settings['language'] != ''
+          lang = form_settings['language']
+        end
+
+        schema = {
+          "type" => "object",
+          "title" => opensdg_translate_key('indicator.edit_metadata', t, lang),
+          "properties" => {},
+        }
+
+        site.data['schema'].each do |field|
+          field_name = field['name']
+          field_scope = field['field']['scope']
+          next unless scopes.include?(field_scope)
+          next if exclude_fields.include?(field_name)
+
+          to_translate = field_name
+          if field['field'].has_key?('translation_key')
+            to_translate = field['field']['translation_key']
+          elsif t[lang].has_key?('metadata_fields') && t[lang]['metadata_fields'].has_key?(field_name)
+            to_translate = 'metadata_fields.' + field_name
+          elsif field['field'].has_key?('label')
+            to_translate = field['field']['label']
+          end
+          field_label = opensdg_translate_key(to_translate, t, lang)
+
+          schema['properties'][field_name] = {
+            "type" => "string",
+            "format" => "markdown",
+            "title" => field_label,
+            "description" => 'Scope: ' + field_scope + ', Field: ' + field_name,
+          }
+          schema['additionalProperties'] = true
+        end
+
+        # Regardless place the schema in site data so it can be used in Jekyll templates.
+        site.data['schema-indicator-metadata'] = schema
+      end
+    end
+  end
+end

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

@@ -443,6 +443,17 @@
                 }
             ]
         },
+        "indicator_available": {
+            "type": "string",
+            "title": "Indicator available",
+            "description": "An optional sub-title for the indicator, which displays below the indicator name. Intended for cases where the available data is slightly different than the indicator name.",
+            "links": [
+                {
+                    "rel": "More information on the indicator available setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/metadata-format/#recommended-special-fields"
+                }
+            ]
+        },
         "indicator_name": {
             "type": "string",
             "title": "Indicator name",

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

@@ -87,6 +87,25 @@
                 }
             ]
         },
+        "contrast_type": {
+            "type": "string",
+            "title": "Contrast type",
+            "description": "The type of high-contrast toggle to use.",
+            "enum": ["default", "single", "long"],
+            "options": {
+                "enum_titles": [
+                    "Default - two 'A' buttons side-by-side",
+                    "Single - one 'A' button which toggles on/off",
+                    "Long - text toggling between 'High contrast' and 'Default contrast'"
+                ]
+            },
+            "links": [
+                {
+                    "rel": "More information on the contrast type setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/configuration/#contrast_type"
+                }
+            ]
+        },
         "country": {
             "options": {"collapsed": true},
             "type": "object",
@@ -113,35 +132,6 @@
                 }
             ]
         },
-        "create_config_forms": {
-            "options": {"collapsed": true},
-            "type": "object",
-            "title": "Create configuration forms",
-            "description": "This setting can be used to automatically create the configuration form pages.",
-            "properties": {
-                "layout": {
-                    "type": "string",
-                    "title": "Layout",
-                    "enum": [
-                        "",
-                        "config-builder"
-                    ],
-                    "options": {
-                        "enum_titles": [
-                            "Do not automatically create config forms",
-                            "config-builder"
-                        ]
-                    },
-                    "description": "The layout to use for the configuration form pages."
-                }
-            },
-            "links": [
-                {
-                    "rel": "More information on the create config forms setting",
-                    "href": "https://open-sdg.readthedocs.io/en/latest/configuration/#create_config_forms"
-                }
-            ]
-        },
         "create_goals": {
             "options": {"collapsed": true},
             "type": "object",
@@ -615,6 +605,7 @@
             "type": "string",
             "format": "color",
             "title": "Graph color for headline",
+            "default": "#004466",
             "description": "This setting can be used to customize the color used in the chart 'headlines'.",
             "examples": [],
             "links": [
@@ -628,6 +619,7 @@
             "type": "string",
             "format": "color",
             "title": "Graph color for headline - high-contrast",
+            "default": "#55a6e5",
             "description": "This setting can be used to customize the color used in the chart 'headlines' in high-contrast mode.",
             "examples": [],
             "links": [
@@ -679,6 +671,18 @@
                 }
             ]
         },
+        "graph_title_from_series": {
+            "title": "Graph title from series",
+            "type": "boolean",
+            "description": "This setting can be set to `true` to use the selected series for the graph title, whenever possible.",
+            "format": "checkbox",
+            "links": [
+                {
+                    "rel": "More information on the graph title from series setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/configuration/#graph_title_from_series"
+                }
+            ]
+        },
         "header": {
             "options": {"collapsed": true},
             "type": "object",
@@ -739,6 +743,69 @@
             "description": "Configuration of the indicator configuration form.",
             "$ref": "#/definitions/config_form_options"
         },
+        "indicator_data_form": {
+            "options": {"collapsed": true},
+            "type": "object",
+            "title": "Indicator data form",
+            "description": "Configuration of the indicator data form.",
+            "properties": {
+                "enabled": {
+                    "type": "boolean",
+                    "title": "Enable this type of form",
+                    "description": "If enabled, the indicator data form will be available.",
+                    "format": "checkbox"
+                },
+                "repository_link": {
+                    "type": "string",
+                    "title": "Repository link",
+                    "description": "The URL pattern of the 'Go to repository' link on the configuration page."
+                }
+            }
+        },
+        "indicator_metadata_form": {
+            "options": {"collapsed": true},
+            "type": "object",
+            "title": "Indicator metadata form",
+            "description": "Configuration of the indicator metadata form.",
+            "allOf": [
+                { "$ref": "#/definitions/config_form_options" },
+                {
+                    "properties": {
+                        "language": {
+                            "type": "string",
+                            "title": "Language for editing",
+                            "description": "Choose the language you prefer when editing metadata. This is used to translate the labels of the metadata fields."
+                        },
+                        "scopes": {
+                            "options": {"collapsed": true},
+                            "type": "array",
+                            "title": "Metadata scopes",
+                            "description": "Specify the 'scopes' of metadata to include on the form. Eg: 'national' or 'global'.",
+                            "items": {
+                                "type": "string",
+                                "title": "Scope"
+                            }
+                        },
+                        "exclude_fields": {
+                            "options": {"collapsed": true},
+                            "type": "array",
+                            "title": "Exclude fields",
+                            "description": "Specify any fields you would like to exclude from the form.",
+                            "items": {
+                                "type": "string",
+                                "title": "Field"
+                            }
+                        },
+                        "translated": {
+                            "type": "boolean",
+                            "title": "Display translated contents in the form",
+                            "description": "This should only be enabled if you are using the 'subfolder' approach for your metadata.",
+                            "format": "checkbox"
+                        }
+                    }
+                }
+            ]
+        },
         "languages": {
             "options": {"collapsed": true},
             "type": "array",
@@ -787,6 +854,41 @@
                 }
             ]
         },
+        "logos": {
+            "options": {"collapsed": true},
+            "type": "array",
+            "title": "Logos",
+            "description": "This setting can be used to control the main logo (or logos).",
+            "items": {
+                "type": "object",
+                "title": "Logo",
+                "properties": {
+                    "language": {
+                        "type": "string",
+                        "title": "Language",
+                        "description": "The language on which this logo displays. Leave blank to show on all."
+                    },
+                    "src": {
+                        "type": "string",
+                        "minLength": 1,
+                        "title": "Image file",
+                        "description": "The image file (path or URL) for this logo"
+                    },
+                    "alt": {
+                        "type": "string",
+                        "minLength": 1,
+                        "title": "Alt text",
+                        "description": "The alt text for this logo"
+                    }
+                }
+            },
+            "links": [
+                {
+                    "rel": "More information on the logos setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/configuration/#logos"
+                }
+            ]
+        },
         "map_layers": {
             "options": {"collapsed": true},
             "type": "array",
@@ -1053,8 +1155,8 @@
         "remote_data_prefix": {
             "type": "string",
             "minLength": 1,
-            "title": "Remote data repository URL",
-            "description": "Specify the URL of your published data repository.",
+            "title": "Remote data prefix",
+            "description": "Specify the URL of the 'data service' that is generated from your data repository.",
             "links": [
                 {
                     "rel": "More information on the remote data prefix setting",
@@ -1087,6 +1189,28 @@
                 }
             ]
         },
+        "repository_url_data": {
+            "type": "string",
+            "title": "Repository URL - Data",
+            "description": "The URL of your data repository, eg: https://github.com/my-github-org/data",
+            "links": [
+                {
+                    "rel": "More information on the data repository URL setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/configuration/#repository_url_data"
+                }
+            ]
+        },
+        "repository_url_site": {
+            "type": "string",
+            "title": "Repository URL - Site",
+            "description": "The URL of your site repository, eg: https://github.com/my-github-org/site",
+            "links": [
+                {
+                    "rel": "More information on the site repository URL setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/configuration/#repository_url_site"
+                }
+            ]
+        },
         "search_index_boost": {
             "options": {"collapsed": true},
             "type": "array",
@@ -1273,6 +1397,12 @@
         "config_form_options": {
             "type": "object",
             "properties": {
+                "enabled": {
+                    "type": "boolean",
+                    "title": "Enable this type of form",
+                    "description": "If enabled, this type of configuration form will be available.",
+                    "format": "checkbox"
+                },
                 "dropdowns": {
                     "type": "array",
                     "title": "Dropdown lists",
@@ -1306,6 +1436,16 @@
                             }
                         }
                     }
+                },
+                "repository_link": {
+                    "type": "string",
+                    "title": "Repository link",
+                    "description": "The URL pattern of the 'Go to repository' link on the configuration page."
+                },
+                "translation_link": {
+                    "type": "string",
+                    "title": "Translation link",
+                    "description": "The URL pattern for all 'Go to translation' links on the configuration page."
                 }
             }
         }

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

@@ -15,7 +15,11 @@ module JekyllOpenSdgPlugins
     # Get a target number from an indicator number.
     def get_target_number(indicator_number)
       parts = indicator_number.split('.')
-      parts[0] + '.' + parts[1]
+      if parts.length() < 2
+        indicator_number
+      else
+        parts[0] + '.' + parts[1]
+      end
     end
 
     # Is this string numeric?
@@ -64,7 +68,7 @@ module JekyllOpenSdgPlugins
     # The Jekyll baseurl is user-configured, and can be inconsistent. This
     # ensure it is consistent in whether it starts/ends with a slash.
     def normalize_baseurl(baseurl)
-      if baseurl == ''
+      if baseurl == '' || baseurl.nil?
         baseurl = '/'
       end
       if !baseurl.start_with? '/'
@@ -272,7 +276,7 @@ module JekyllOpenSdgPlugins
             end
           end
 
-          is_standalone = meta.has_key?('standalone') and meta['standalone']
+          is_standalone = (meta.has_key?('standalone') and meta['standalone'])
 
           # Set the goal for this language, once only.
           if !is_standalone && already_added[language].index(goal_number) == nil
@@ -383,8 +387,36 @@ module JekyllOpenSdgPlugins
             doc.data['remote_data_prefix'] = normalize_baseurl(baseurl)
           end
           if opensdg_translated_builds(site)
+            doc.data['remote_data_prefix_untranslated'] = File.join(doc.data['remote_data_prefix'], 'untranslated')
             doc.data['remote_data_prefix'] = File.join(doc.data['remote_data_prefix'], language)
+          else
+            doc.data['remote_data_prefix_untranslated'] = doc.data['remote_data_prefix']
+          end
+
+          # Set the logo for this page.
+          logo = {}
+          match = false
+          if site.config.has_key?('logos') && site.config['logos'].length > 0
+            match = site.config['logos'].find{ |item| item['language'] == language }
+            unless match
+              match = site.config['logos'].find{ |item| item.fetch('language', '') == '' }
+            end
+          end
+          if match
+            src = match['src']
+            unless src.start_with?('http')
+              src = normalize_baseurl(baseurl) + src
+            end
+            logo['src'] = src
+            logo['alt'] = opensdg_translate_key(match['alt'], translations, language)
+          else
+            logo['src'] = normalize_baseurl(baseurl) + 'assets/img/SDG_logo.png'
+            alt_text = opensdg_translate_key('general.sdg', translations, language)
+            alt_text += ' - '
+            alt_text += opensdg_translate_key('header.tag_line', translations, language)
+            logo['alt'] = alt_text
           end
+          doc.data['logo'] = logo
 
           if collection == 'indicators'
             # For indicators we also set the current indicator/target/goal.

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

@@ -31,6 +31,15 @@ module JekyllOpenSdgPlugins
         hash_to_hash(site.data['site_config_prod'], site.config)
       end
 
+      # Look for environment variables for some settings.
+      env_settings = [
+        'REPOSITORY_URL_SITE',
+      ]
+      env_settings.each do |setting|
+          if ENV.has_key?(setting)
+            site.config[setting.downcase] = ENV[setting]
+          end
+      end
     end
 
     # Copy properties from a hash onto another hash.

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

@@ -8,6 +8,8 @@ module Jekyll
     # language of the current page and a date format given.
     def t_date(date, format_type)
 
+      original = date
+
       # Determine the language of the current page.
       config = @context.registers[:site].config
       translations = @context.registers[:site].data['translations']
@@ -57,7 +59,29 @@ module Jekyll
 
       # Support timestamps.
       if date.is_a? Integer
-        date = Time.at(date)
+        # Convert milliseconds to seconds if necessary.
+        if date > 9000000000
+          date = date / 1000
+        end
+        begin
+          date = Time.at(date).utc
+        rescue => err
+          return original
+        end
+      end
+
+      # Support other strings.
+      if date.is_a? String
+        begin
+          date = Time.parse(date).utc
+        rescue => err
+          return original
+        end
+      end
+
+      # Avoid nil errors.
+      unless date.is_a? Time
+        return original
       end
 
       # Convert the date into English.

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

@@ -1,3 +1,3 @@
 module JekyllOpenSdgPlugins
-  VERSION = "1.3.1".freeze
+  VERSION = "1.4.0-beta1".freeze
 end

data/tests/_config.yml

@@ -9,6 +9,7 @@ data_edit_url: http://prose.io/#open-sdg/open-sdg-data-starter/edit/develop/data
 metadata_edit_url: http://prose.io/#open-sdg/open-sdg-data-starter/edit/develop/meta/[id].md
 languages:
   - en
+  - es
 
 title: Indicators For The Sustainable Development Goals
 url: ""
@@ -145,3 +146,12 @@ exclude:
 #    max_zoom: 10
 #    subfolder: my-geojson-subfolder
 #    label: My map layer label (can be a translation key)
+
+site_config_form:
+  repository_link: https://github.com/open-sdg/open-sdg-site-starter
+indicator_config_form:
+  repository_link: https://github.com/open-sdg/open-sdg-data-starter/tree/develop/meta
+indicator_metadata_form:
+  repository_link: https://github.com/open-sdg/open-sdg-data-starter/tree/develop/meta
+  scopes:
+    - national

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-open-sdg-plugins
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0.pre.beta1
 platform: ruby
 authors:
 - Brock Fanning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -72,6 +72,7 @@ files:
 - lib/jekyll-open-sdg-plugins/create_pages.rb
 - lib/jekyll-open-sdg-plugins/fetch_remote_data.rb
 - lib/jekyll-open-sdg-plugins/helpers.rb
+- lib/jekyll-open-sdg-plugins/metadata_schema_to_config.rb
 - lib/jekyll-open-sdg-plugins/schema-indicator-config.json
 - lib/jekyll-open-sdg-plugins/schema-site-config.json
 - lib/jekyll-open-sdg-plugins/sdg_variables.rb
@@ -100,9 +101,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: