Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prep for version 1 #1004

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4737a8a
Point to latest open-sdg code
brockfanning Apr 3, 2020
25b9e58
Bump version of jekyll-open-sdg-plugins and remove jekyll-get-json
brockfanning Apr 3, 2020
e5a4f97
Remove lots of files that will be auto-generated by jekyll-open-sdg-p…
brockfanning Apr 3, 2020
d95655d
Change remotedatabaseurl to remote_data_prefix
brockfanning Apr 3, 2020
634f46f
Remove jekyll_get_json
brockfanning Apr 3, 2020
8e4e179
Remove github repo info
brockfanning Apr 3, 2020
a578d46
Remove defaults section
brockfanning Apr 3, 2020
1b1f9d8
Update used plugins
brockfanning Apr 3, 2020
fa03558
Remove custom_css config
brockfanning Apr 3, 2020
fb6dac7
Add link templates for data and metadata
brockfanning Apr 3, 2020
0018013
Auto-generate goals, indicators, and other required pages
brockfanning Apr 3, 2020
437fb0d
Add footer menu
brockfanning Apr 3, 2020
84c4a33
Add non_global_metadata label
brockfanning Apr 3, 2020
82b4045
Remove override of scripts.html
brockfanning Apr 3, 2020
e5027aa
Remove override of head.html
brockfanning Apr 3, 2020
f186dda
Update the override of footer.html
brockfanning Apr 3, 2020
7251457
Update the override of indicator-content.html
brockfanning Apr 3, 2020
06283a6
Remove outdated map code
brockfanning Apr 3, 2020
8d12b33
Move custom css to _sass folder
brockfanning Apr 3, 2020
cd30c5b
Update the override of reportinstatus.html
brockfanning Apr 3, 2020
2b9f00b
Update override of frontpage.html
brockfanning Apr 3, 2020
2c4fe2e
Minor style tweaks to mesh with latest Open SDG visual changes
brockfanning Apr 3, 2020
0c1a31f
Pin to latest version of Open SDG - 1.1.0
brockfanning Aug 5, 2020
7978937
Update 't...' to 'page.t...' in include files
brockfanning Aug 5, 2020
c95fda4
Style fixes around dev-disclaimer component
brockfanning Aug 5, 2020
34500d1
Ran bundle lock --update
brockfanning Aug 20, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ source "https://rubygems.org"
gem "jekyll", "~> 3.8.4"
gem "html-proofer", ">= 3.13.0"
gem "jekyll-remote-theme", ">= 0.4.1"
gem "jekyll-open-sdg-plugins", "~> 0.0.16"
gem "jekyll-get-json", "~> 0.0.2"
gem "jekyll-open-sdg-plugins", "~> 1.0.0"
8 changes: 2 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-get-json (0.0.2)
deep_merge (~> 1.2)
jekyll (>= 3.0)
jekyll-open-sdg-plugins (0.0.16)
jekyll-open-sdg-plugins (1.0.0)
deep_merge (~> 1.2)
jekyll (~> 3.0)
jekyll-remote-theme (0.4.2)
Expand Down Expand Up @@ -90,8 +87,7 @@ PLATFORMS
DEPENDENCIES
html-proofer (>= 3.13.0)
jekyll (~> 3.8.4)
jekyll-get-json (~> 0.0.2)
jekyll-open-sdg-plugins (~> 0.0.16)
jekyll-open-sdg-plugins (~> 1.0.0)
jekyll-remote-theme (>= 0.4.1)

BUNDLED WITH
Expand Down
51 changes: 23 additions & 28 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,20 @@ baseurl: "" # the subpath of your site, e.g. /blog
url: ""
data_dir: data
environment: production
remotedatabaseurl: "https://gsa.github.io/sdg-data-usa/prod"
remote_data_prefix: "https://gsa.github.io/sdg-data-usa/prod"
# permalink: /news/:year/:month/:day/:title.html

jekyll_get_json:
- data: meta
json: 'https://gsa.github.io/sdg-data-usa/prod/meta/all.json'
- data: headlines
json: 'https://gsa.github.io/sdg-data-usa/prod/headline/all.json'
- data: schema
json: 'https://gsa.github.io/sdg-data-usa/prod/meta/schema.json'
- data: translations
json: 'https://gsa.github.io/sdg-translations/translations-0.4.0.json'
# URL for the "Edit Data" button on indicators.
data_edit_url: http://prose.io/#GSA/sdg-data-usa/edit/develop/data-wide/indicator_[id].csv
# URL for the "Edit Metadata" button on indicators.
metadata_edit_url: http://prose.io/#GSA/sdg-data-usa/edit/develop/meta/[id].md

# Automatically create indicator pages, goal pages, and other required pages.
create_indicators:
layout: indicator
create_goals:
layout: goal
create_pages: true

analytics:
ga_prod: 'UA-42145528-4'
Expand All @@ -35,11 +37,6 @@ email_contacts:
functional: [email protected]
###################################################################################################

# Github Repo for Data
repo_name: sdg-data-usa
branch: develop
org_name: GSA

# Build settings
markdown: kramdown

Expand Down Expand Up @@ -82,29 +79,27 @@ menu:
- path: /faq
translation_key: menu.faq

footer_menu:
- path: /contact
translation_key: menu.contact_us
- path: /about/cookies-and-privacy/
translation_key: menu.cookies

# The list of languages that are translated. The first one is the default.
languages:
- en
- es
- fr

# This makes sure that all pages have a language.
defaults:
-
scope:
path: ""
values:
language: "en"

# Point to remote location of goal images.
goal_image_base: https://open-sdg.github.io/sdg-translations/assets/img/goals

# Configure the text (or "translation key") to be used on the
# non-global metadata tab.
non_global_metadata: indicator.national_metadata

plugins:
- jekyll-remote-theme
- jekyll-open-sdg-plugins
- jekyll-get-json

remote_theme: open-sdg/[email protected]

custom_css:
- /assets/css/custom.css
remote_theme: open-sdg/[email protected]
7 changes: 0 additions & 7 deletions _goals/01_no-poverty.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/02_zero-hunger.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/03_good-health-and-well-being.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/04_quality-education.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/05_gender-equality.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/06_clean-water-and-sanitation.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/07_affordable-and-clean-energy.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/08_decent-jobs-and-economic-growth.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/09_industry-innovation-and-infrastructure.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/10_reduced-inequalities.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/11_sustainable-cities-communities.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/12_responsible-consumption-and-production.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/13_climate-action.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/14_life-below-water.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/15_life-on-land.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/16_peace-and-justice-strong-institutions.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/17_partnerships-for-the-goals.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/01_no-poverty.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/02_zero-hunger.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/03_good-health-and-well-being.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/04_quality-education.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/05_gender-equality.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/06_clean-water-and-sanitation.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/07_affordable-and-clean-energy.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/08_decent-jobs-and-economic-growth.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/09_industry-innovation-and-infrastructure.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/10_reduced-inequalities.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/11_sustainable-cities-communities.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/12_responsible-consumption-and-production.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/13_climate-action.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/14_life-below-water.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/15_life-on-land.md

This file was deleted.

7 changes: 0 additions & 7 deletions _goals/es/16_peace-and-justice-strong-institutions.md

This file was deleted.

Loading