jekyll-open-sdg-plugins 1.3.0 → 1.5.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee38bdf65103fdf29cdc1c5718b11ade6f0af536bbc2df47744b2d4864178adb
-  data.tar.gz: 45620f6186df1d77b8ec1b831ad178e9f038b3f07ac38ce627fe7a6590d096f3
+  metadata.gz: 06e9d51fe6fddfeab87a899fb547b6b1762d0832d59de269f12d5bddd6aeedc4
+  data.tar.gz: 8f1728d821fffbb4cc51382cbc705e1e1e565c8b34cba3fbfdbe7bedd0ae4c3d
 SHA512:
-  metadata.gz: 33d1c39b8177fb409b3b094b0b0ca85c856087746d5538440fea445e98260f83bd55dd1052431b6b8d3886475f7f82c2637ae2ee0cec33aec4bd5545dfa35e36
-  data.tar.gz: 18543063111561aa2d5ba9c5ce2e73773e0b4c842c7067beecc0a8a5f7c9de5a2f618c9a4feb87fd7fcf6734d994aed74bcaaed9a858029d0f0bcd0998026726
+  metadata.gz: 68c29fd1482b09b1b22875375277ea93e748d6f8bfa9a89e986cea37790782761ad5f790d1e49d12335578a048140e76e9979b6cd16c1a1cd7fcbca0356670a7
+  data.tar.gz: 8af06e8364fd7ce44039fab11617ba98ff6e8f6eb63ea5e9b4839fcb1bd36e81746d2ec333422159f10931737bda790719895e1f6e66a28fec5212b6116622fc

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

@@ -26,7 +26,7 @@ module JekyllOpenSdgPlugins
           if indicator.has_key?('standalone') and indicator['standalone']
             next
           end
-          goal = inid.split('-')[0].to_i
+          goal = inid.split('-')[0]
           goals[goal] = true
         end
         # Decide what layout to use for the goal pages.
@@ -44,11 +44,13 @@ module JekyllOpenSdgPlugins
             language_public = languages_public[language]
           end
           # Loop through the goals.
-          goals.sort.each do |goal, value|
+          goal_index = 0
+          goals.keys.sort.each do |goal|
             # Add the language subfolder for all except the default (first) language.
             dir = index == 0 ? goal.to_s : File.join(language_public, goal.to_s)
             # Create the goal page.
-            site.collections['goals'].docs << GoalPage.new(site, site.source, dir, goal, language, layout)
+            site.collections['goals'].docs << GoalPage.new(site, site.source, dir, goal, language, layout, goal_index)
+            goal_index += 1
           end
         end
       end
@@ -57,7 +59,7 @@ module JekyllOpenSdgPlugins
 
   # A Page subclass used in the `CreateGoals` class.
   class GoalPage < Jekyll::Page
-    def initialize(site, base, dir, goal, language, layout)
+    def initialize(site, base, dir, goal, language, layout, goal_index)
       @site = site
       @base = base
       @dir  = dir
@@ -65,8 +67,8 @@ module JekyllOpenSdgPlugins
 
       goal_content = ''
       if site.config['create_goals'].has_key?('goals')
-        if !site.config['create_goals']['goals'][goal - 1].nil?
-          goal_content = site.config['create_goals']['goals'][goal - 1]['content']
+        if !site.config['create_goals']['goals'][goal_index].nil?
+          goal_content = site.config['create_goals']['goals'][goal_index]['content']
         end
       end
       @content = goal_content

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

@@ -248,6 +248,7 @@
                                 "type": "string",
                                 "format": "color",
                                 "title": "Line color",
+                                "default": "#949494",
                                 "description": "The color of the line.",
                                 "links": [
                                     {
@@ -257,9 +258,14 @@
                                 ]
                             },
                             "borderDash": {
-                                "type": "string",
+                                "type": "array",
                                 "title": "Line dash type",
                                 "description": "The type of line dash.",
+                                "default": [10, 5],
+                                "items": {
+                                    "type": "number"
+                                },
+                                "minItems": 2,
                                 "links": [
                                     {
                                         "rel": "More information on the line dash setting",
@@ -294,12 +300,13 @@
                                         "type": "string",
                                         "format": "color",
                                         "title": "Label color",
-                                        "description": "Color for the label text."
+                                        "description": "Color for the label text.",
+                                        "default": "#000000"
                                     },
                                     "backgroundColor": {
                                         "type": "string",
                                         "format": "color",
-                                        "default": "#FFFFFFF",
+                                        "default": "#ffffff",
                                         "title": "Background color",
                                         "description": "Background color for the label text."
                                     }
@@ -313,7 +320,7 @@
                                     "borderColor": {
                                         "type": "string",
                                         "format": "color",
-                                        "default": "#FFFFFF",
+                                        "default": "#ffffff",
                                         "title": "High-contrast line color",
                                         "description": "The color of the line in high-contrast mode."
                                     },
@@ -325,7 +332,7 @@
                                             "fontColor": {
                                                 "type": "string",
                                                 "format": "color",
-                                                "default": "#FFFFFF",
+                                                "default": "#ffffff",
                                                 "title": "High-contrast label color",
                                                 "description": "Color for the label text in high-contrast mode."
                                             },
@@ -386,6 +393,40 @@
                 }
             ]
         },
+        "graph_series_breaks": {
+            "options": {"collapsed": true},
+            "type": "array",
+            "title": "Graph series breaks",
+            "description": "A list of series break (ie, a gap among the years) lines to display on the graph.",
+            "items": {
+                "type": "object",
+                "title": "Series break",
+                "allOf": [
+                    { "$ref": "#/definitions/series_unit_constraint" },
+                    {
+                        "properties": {
+                            "label_content": {
+                                "type": "string",
+                                "title": "Label content",
+                                "default": "indicator.annotation_series_break",
+                                "description": "The text to display for this series break."
+                            },
+                            "value": {
+                                "type": "number",
+                                "title": "Value",
+                                "description": "The numeric value at which to place the series break. This number should be between 0 (the left side of the chart) and the number of years minus 1 (the right side of the chart)."
+                            }
+                        }
+                    }
+                ]
+            },
+            "links": [
+                {
+                    "rel": "More information on the graph target lines setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/indicator-configuration/#graph_series_breaks"
+                }
+            ]
+        },
         "graph_stacked_disaggregation": {
             "type": "string",
             "title": "Stacked disaggregation",
@@ -397,6 +438,40 @@
                 }
             ]
         },
+        "graph_target_lines": {
+            "options": {"collapsed": true},
+            "type": "array",
+            "title": "Graph target lines",
+            "description": "A list of target lines to display on the graph.",
+            "items": {
+                "type": "object",
+                "title": "Target line",
+                "allOf": [
+                    { "$ref": "#/definitions/series_unit_constraint" },
+                    {
+                        "properties": {
+                            "label_content": {
+                                "type": "string",
+                                "title": "Label content",
+                                "default": "indicator.annotation_2030_target",
+                                "description": "The text to display for this target line."
+                            },
+                            "value": {
+                                "type": "number",
+                                "title": "Value",
+                                "description": "The numeric value at which to place the target line."
+                            }
+                        }
+                    }
+                ]
+            },
+            "links": [
+                {
+                    "rel": "More information on the graph target lines setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/indicator-configuration/#graph_target_lines"
+                }
+            ]
+        },
         "graph_title": {
             "type": "string",
             "title": "Graph title",
@@ -443,6 +518,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",
@@ -493,6 +579,18 @@
                 }
             ]
         },
+        "placeholder": {
+            "title": "Placeholder indicator",
+            "type": "string",
+            "description": "Entering text here identifies this as a 'placeholder' indicator. The text will be displayed on the goal page, in place of a link to the indicator page.",
+            "format": "textarea",
+            "links": [
+                {
+                    "rel": "More information the placeholder setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/indicator-configuration/#placeholder"
+                }
+            ]
+        },
         "precision": {
             "options": {"collapsed": true},
             "type": "array",
@@ -565,6 +663,17 @@
                     "href": "https://open-sdg.readthedocs.io/en/latest/metadata-format/#recommended-special-fields"
                 }
             ]
+        },
+        "x_axis_label": {
+            "type": "string",
+            "title": "X axis label",
+            "description": "A label beneath the X axis on charts. This overrides the same site configuration setting.",
+            "links": [
+                {
+                    "rel": "More information on the X axis label setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/indicator-configuration/#x_axis_label"
+                }
+            ]
         }
     },
     "additionalProperties": true,

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

@@ -31,12 +31,22 @@
             "options": {"collapsed": true},
             "type": "object",
             "title": "Analytics",
-            "description": "If these settings are used, usage statistics will be sent to Google Analytics.",
+            "description": "If these settings are used, usage statistics will be sent to Google Analytics. These are optional, and you don't have to use all of them. Typically you would just use one, such as the 'ua' option.",
             "properties": {
-                "ga_prod": {
+                "ua": {
                     "type": "string",
-                    "title": "Google Analytics tracking ID",
-                    "description": "The tracking ID (UA code) for your property on Google Analytics."
+                    "title": "Universal Analytics (ua) tracking ID",
+                    "description": "The tracking ID for the analytics.js approach, for your property on Google Analytics. Typically starts with 'UA-'."
+                },
+                "gtag": {
+                    "type": "string",
+                    "title": "gtag.js (gtag) tracking ID",
+                    "description": "The tracking ID for the gtag.js approach, for your property on Google Analytics. Typically starts with 'G-'."
+                },
+                "gtm": {
+                    "type": "string",
+                    "title": "Google Tag Manager (gtm) tracking ID",
+                    "description": "Your tracking ID for Google Tag Manager. Typically starts with 'GTM-'. Though this is included as an analytics approach, it requires additional configuration within Google Tag Manager in order to capture analytics."
                 }
             },
             "links": [
@@ -87,6 +97,45 @@
                 }
             ]
         },
+        "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"
+                }
+            ]
+        },
+        "cookie_consent_form": {
+            "options": {"collapsed": true},
+            "type": "object",
+            "title": "Cookie consent form",
+            "description": "A cookie consent form for users",
+            "properties": {
+                "enabled": {
+                    "type": "boolean",
+                    "title": "Enabled",
+                    "description": "Whether the cookie consent form will be enabled",
+                    "format": "checkbox"
+                }
+            },
+            "links": [
+                {
+                    "rel": "More information on the cookie_consent_form setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/configuration/#cookie_consent_form"
+                }
+            ]
+        },
         "country": {
             "options": {"collapsed": true},
             "type": "object",
@@ -113,35 +162,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 +635,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 +649,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 +701,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",
@@ -732,6 +766,30 @@
                 }
             ]
         },
+        "hide_single_series": {
+            "title": "Hide single series",
+            "type": "boolean",
+            "description": "This setting can be used to hide the 'Series' toggle on indicators where there is only one choice.",
+            "format": "checkbox",
+            "links": [
+                {
+                    "rel": "More information on the hide single series setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/configuration/#hide_single_series"
+                }
+            ]
+        },
+        "hide_single_unit": {
+            "title": "Hide single unit",
+            "type": "boolean",
+            "description": "This setting can be used to hide the 'Unit' toggle on indicators where there is only one choice.",
+            "format": "checkbox",
+            "links": [
+                {
+                    "rel": "More information on the hide single unit setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/configuration/#hide_single_unit"
+                }
+            ]
+        },
         "indicator_config_form": {
             "options": {"collapsed": true},
             "type": "object",
@@ -739,6 +797,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 +908,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 +1209,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 +1243,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",
@@ -1186,6 +1364,17 @@
                     "href": "https://open-sdg.readthedocs.io/en/latest/configuration/#validate_site_config"
                 }
             ]
+        },
+        "x_axis_label": {
+            "type": "string",
+            "title": "X axis label",
+            "description": "A label beneath the X axis on charts. This is overridden by the same indicator configuration setting.",
+            "links": [
+                {
+                    "rel": "More information on the X axis label setting",
+                    "href": "https://open-sdg.readthedocs.io/en/latest/configuration/#x_axis_label"
+                }
+            ]
         }
     },
     "additionalProperties": true,
@@ -1273,6 +1462,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 +1501,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?
@@ -61,10 +65,42 @@ module JekyllOpenSdgPlugins
       list[incremented]
     end
 
+    # Wrapper of get_previous_item specifically for indicators.
+    def get_previous_indicator(list, index)
+      indicator = get_previous_item(list, index)
+      # Skip placeholder indicators.
+      is_placeholder = (indicator.has_key?('placeholder') and indicator['placeholder'] != '')
+      while (is_placeholder)
+        index -= 1
+        if index < 0
+          index = list.length() - 1
+        end
+        indicator = get_previous_item(list, index)
+        is_placeholder = (indicator.has_key?('placeholder') and indicator['placeholder'] != '')
+      end
+      return indicator
+    end
+
+    # Wrapper of get_next_item specifically for indicators.
+    def get_next_indicator(list, index)
+      indicator = get_next_item(list, index)
+      # Skip placeholder indicators.
+      is_placeholder = (indicator.has_key?('placeholder') and indicator['placeholder'] != '')
+      while (is_placeholder)
+        index += 1
+        if index >= list.length()
+          index = 0
+        end
+        indicator = get_next_item(list, index)
+        is_placeholder = (indicator.has_key?('placeholder') and indicator['placeholder'] != '')
+      end
+      return indicator
+    end
+
     # 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 +308,8 @@ module JekyllOpenSdgPlugins
             end
           end
 
-          is_standalone = meta.has_key?('standalone') and meta['standalone']
+          is_standalone = (meta.has_key?('standalone') and meta['standalone'])
+          is_placeholder = (meta.has_key?('placeholder') and meta['placeholder'] != '')
 
           # Set the goal for this language, once only.
           if !is_standalone && already_added[language].index(goal_number) == nil
@@ -323,6 +360,14 @@ module JekyllOpenSdgPlugins
             # Allow metadata 'sort' field to override the default sort.
             indicator_sort = meta['sort']
           end
+          if meta.has_key?('graph_annotations') && meta['graph_annotations'].length > 0
+            meta['graph_annotations'].each do |annotation|
+              if annotation.has_key?('borderDash') && annotation['borderDash'].is_a?(String)
+                annotation['borderDash'] = [2, 2]
+                opensdg_notice('The "borderDash" property in graph annotations must be an array. Using [2, 2].')
+              end
+            end
+          end
           available_indicator = {
             'number' => indicator_number,
             'slug' => indicator_number.gsub('.', '-'),
@@ -383,8 +428,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.
@@ -406,8 +479,8 @@ module JekyllOpenSdgPlugins
             doc.data['target'] = available_targets[language].find {|x| x['number'] == target_number}
             indicator_index = available_indicators[language].find_index {|x| x['number'] == indicator_number}
             doc.data['indicator'] = available_indicators[language][indicator_index]
-            doc.data['next'] = get_next_item(available_indicators[language], indicator_index)
-            doc.data['previous'] = get_previous_item(available_indicators[language], indicator_index)
+            doc.data['next'] = get_next_indicator(available_indicators[language], indicator_index)
+            doc.data['previous'] = get_previous_indicator(available_indicators[language], indicator_index)
 
           elsif collection == 'goals'
             # For goals we also set the current 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.0".freeze
+  VERSION = "1.5.0-beta1".freeze
 end

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/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.0
+  version: 1.5.0.pre.beta1
 platform: ruby
 authors:
 - Brock Fanning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-09-09 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: