diff --git a/.github/workflows/blog.yaml b/.github/workflows/blog.yaml index a9b55a12b..902bfe6d4 100644 --- a/.github/workflows/blog.yaml +++ b/.github/workflows/blog.yaml @@ -63,7 +63,7 @@ jobs: ./content/blog ./static/blog - - uses: actions/setup-node@v2.1.5 + - uses: actions/setup-node@v2.2.0 with: node-version: "12" - uses: actions/cache@v2.1.6 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 98d31a83c..b17c6fba0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,7 +11,7 @@ jobs: # submodules: true # Fetch Hugo themes (true OR recursive) fetch-depth: 3 # Fetch all history for .GitInfo and .Lastmod - - uses: actions/setup-node@v2.1.5 + - uses: actions/setup-node@v2.2.0 with: node-version: "14" - uses: actions/cache@v2.1.6 diff --git a/.github/workflows/release_main.yml b/.github/workflows/release_main.yml index bc02bf29a..a13c8e319 100644 --- a/.github/workflows/release_main.yml +++ b/.github/workflows/release_main.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Check out code uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.5 + - uses: actions/setup-node@v2.2.0 with: node-version: "14" - name: Extract version @@ -43,7 +43,7 @@ jobs: steps: - name: Check out code uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.5 + - uses: actions/setup-node@v2.2.0 with: node-version: "14" - name: Cache Node.js modules diff --git a/config.toml b/config.toml index 9c69f44ea..0dbee3ec1 100644 --- a/config.toml +++ b/config.toml @@ -93,7 +93,7 @@ relativeURLs = false weight = 50 [[menu.main]] parent = "covidcast" - name = "Survey Results" + name = "CTIS Results Dashboard" url = "/covidcast/survey-results" weight = 51 [[menu.main]] diff --git a/content/_index.md b/content/_index.md index 343fe4408..4fe7c7e7f 100644 --- a/content/_index.md +++ b/content/_index.md @@ -20,9 +20,9 @@ carousel: alt: Explore the new COVID-19 forecast evaluation dashboard image: forecast_evaluation_dashboard.jpg - pre: Our Tools - title: National COVID Survey Dashboard + title: CTIS Results Dashboard ref: covidcast/survey-results - alt: Explore the Survey Results + alt: Explore the COVID-19 Trends and Impact Survey Results image: covidcast_survey.jpg - pre: Our Blog Post title: New and improved COVID Symptom Survey Tracks Testing and Mask-Wearing diff --git a/content/covidcast/classic.md b/content/covidcast/classic.md index 1556ed04c..3e5e55ce1 100644 --- a/content/covidcast/classic.md +++ b/content/covidcast/classic.md @@ -2,8 +2,7 @@ title: COVIDcast | Classic Map linkTitle: Classic Map description: COVIDcast tracks and forecasts the spread of COVID-19. By Carnegie Mellon's Delphi Research Group. -layout: covidcast_app -app_mode: classic +layout: covidcast_classic_app order: 3 heroImage: images/landing-page/hero-images/covidcast_v2.jpg feedback: true diff --git a/content/covidcast/surveys.md b/content/covidcast/surveys.md index e9b71f931..379a13987 100644 --- a/content/covidcast/surveys.md +++ b/content/covidcast/surveys.md @@ -1,12 +1,12 @@ --- -title: Delphi's COVID-19 Surveys +title: Delphi's COVID-19 Trends and Impact Surveys (CTIS) --- {{< alert category="primary">}} Summary results for the survey are now available. [Click here to explore]({{< relref "covidcast/survey-results" >}}) {{< /alert >}} -In collaboration with Facebook, along with a consortium of universities and public health officials, the [Delphi group]({{< relref "/" >}}) at [Carnegie Mellon University](https://www.cmu.edu/) conducts research surveys to monitor the spread and impact of the COVID-19 pandemic in the United States. This survey is advertised through Facebook. It has run continuously since early April 2020, and about 50,000 people in the United States participate **every day**. Survey results are publicly available on our [National COVID Survey Dashboard]({{< relref "covidcast/survey-results" >}}), [COVIDcast Map]({{< relref "covidcast" >}}), [COVIDcast Exporter]({{< relref "covidcast/export" >}}), and in our [COVIDcast API]({{< apiref "api/covidcast.html" >}}). +In collaboration with Facebook, along with a consortium of universities and public health officials, the [Delphi group]({{< relref "/" >}}) at [Carnegie Mellon University](https://www.cmu.edu/) conducts the COVID-19 Trends and Impact Survey to monitor the spread and impact of the COVID-19 pandemic in the United States. This survey is advertised through Facebook. It has run continuously since early April 2020, and about 50,000 people in the United States participate **every day**. Survey results are publicly available on our [CTIS Results Dashboard]({{< relref "covidcast/survey-results" >}}), [COVIDcast Map]({{< relref "covidcast" >}}), [COVIDcast Exporter]({{< relref "covidcast/export" >}}), and in our [COVIDcast API]({{< apiref "api/covidcast.html" >}}). Such detailed data has never before been available during a public health emergency, and it will help public health officials understand how to save lives and how to safely reopen public life. The data will also help researchers understand the social, economic, and health effects of the COVID-19 pandemic. @@ -38,7 +38,7 @@ To account for the differences between Facebook users and the United States popu ## Where can I see the results? -Our [National COVID Survey Dashboard]({{< relref "covidcast/survey-results" >}}) shows aggregate survey results, ranging from rates of COVID-like symptoms over mask usage to mental health. In addition, our [COVIDcast dashboard]({{< relref "covidcast" >}}) shows basic aggregate survey results, revealing the rates of mask usage and COVID-like symptoms across the United States. The data used by both tools is also freely available for download through the [COVIDcast API]({{< apiref "api/covidcast.html">}}) and our [COVIDcast Exporter]({{< relref "covidcast/export" >}}). Facebook also publishes [a map](https://covid-survey.dataforgood.fb.com/) based on the United States and international aggregate data. +Our [CTIS Results Dashboard]({{< relref "covidcast/survey-results" >}}) shows aggregate survey results, ranging from rates of COVID-like symptoms over mask usage to mental health. In addition, our [COVIDcast dashboard]({{< relref "covidcast" >}}) shows basic aggregate survey results, revealing the rates of mask usage and COVID-like symptoms across the United States. The data used by both tools is also freely available for download through the [COVIDcast API]({{< apiref "api/covidcast.html">}}) and our [COVIDcast Exporter]({{< relref "covidcast/export" >}}). Facebook also publishes [a map](https://covid-survey.dataforgood.fb.com/) based on the United States and international aggregate data. ### Blog posts and reports diff --git a/package-lock.json b/package-lock.json index 27cf6f624..086b05977 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "www-main", - "version": "2.9.0", + "version": "2.9.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -401,9 +401,9 @@ "dev": true }, "config-chain": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", - "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", + "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", "dev": true, "requires": { "ini": "^1.3.4", @@ -956,9 +956,9 @@ "dev": true }, "hugo-bin": { - "version": "0.71.1", - "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.71.1.tgz", - "integrity": "sha512-H+aBkwtR6oSMcu1kCyzQlan+lcQ45k70JGX4v72h8mb0e4AbvaF58kAy6EDRK/U+/hD6ghTf0a6eLr5sENjaAg==", + "version": "0.72.5", + "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.72.5.tgz", + "integrity": "sha512-fxjt9yTnhS5gFlmsxJ4xYCtE2RgeSysmIgnrwjcS6HlZ6Zm/2FU9n7V8m5+uvIA7qPE/BZGsIgA9Pv9D1MbYlw==", "dev": true, "requires": { "bin-wrapper": "^4.1.0", @@ -974,9 +974,9 @@ "dev": true }, "husky": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/husky/-/husky-6.0.0.tgz", - "integrity": "sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.0.tgz", + "integrity": "sha512-xK7lO0EtSzfFPiw+oQncQVy/XqV7UVVjxBByc+Iv5iK3yhW9boDoWgvZy3OGo48QKg/hUtZkzz0hi2HXa0kn7w==", "dev": true }, "ieee754": { @@ -1626,9 +1626,9 @@ } }, "mime-db": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz", - "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==", "dev": true }, "mimic-fn": { @@ -1935,16 +1935,19 @@ "dev": true }, "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", + "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", "dev": true }, "prettier-plugin-go-template": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.10.tgz", - "integrity": "sha512-TaHPqiMK/zfk+YhvKRf/1WZDgQ6ffnlxJZX5rwphqfxBOVEezZQtYistTB348MKrKnnwKpyXZWpMRo0/KCVB+A==", - "dev": true + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/prettier-plugin-go-template/-/prettier-plugin-go-template-0.0.11.tgz", + "integrity": "sha512-qtgoEjvbgmcDp9TOqYNgrPrA41s6S1UMyzMqjcxdxQahTX0webWfbamyA/x3XeBFEEJmgXrRAirzJrIVzImsMg==", + "dev": true, + "requires": { + "ulid": "^2.3.0" + } }, "process-nextick-args": { "version": "2.0.1", @@ -2471,9 +2474,15 @@ "dev": true }, "uikit": { - "version": "3.6.22", - "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.6.22.tgz", - "integrity": "sha512-c8jz0lzvGPrPbOG4K5HvOCgUe7i9A6blZmMq2M/EYqoY7FT9dBayGFZYbBeio2s9WCpADIcCAj2QX/5L3EByOQ==" + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.7.0.tgz", + "integrity": "sha512-N0xluQ380EHey26toMmNA4H2YLtvVRHMaYksG31qDxW2VaAAf9i0Q0aT82zeMdrK2Tx9sqnHz6GaOMTIYYM0ZQ==" + }, + "ulid": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/ulid/-/ulid-2.3.0.tgz", + "integrity": "sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==", + "dev": true }, "unbzip2-stream": { "version": "1.4.3", @@ -2559,10 +2568,24 @@ "dev": true }, "www-covidcast": { - "version": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.2/www-covidcast-2.5.2.tgz", - "integrity": "sha512-AgWueUWfWuND8mbVOLdyqhft/tV9c7LeKq9PJA/DeNZNKp7azDYjmMMqh0IgzcilOlm5fqB4ecJ1OGOeHTruXQ==", + "version": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.3/www-covidcast-2.5.3.tgz", + "integrity": "sha512-TxiapT12gAgSjogiEUfR+Eivtr1MWRI9iIAtK6mVWRRN2RFu8d8OjQwx+kg9Oqpl8+ETcECjOT/2qMQN3wJawA==", "requires": { - "uikit": "^3.6.22" + "uikit": "^3.7.0" + } + }, + "www-covidcast-classic": { + "version": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.5.3/www-covidcast-classic-2.5.3.tgz", + "integrity": "sha512-uiIqXzt3gY/HMTBnw1ocgSupioYX+hgHWkF7+NjKgeADSqDYfOjmIMZkKHCMAKQjU/KibLvkxEglqiKCjBkLmg==", + "requires": { + "uikit": "^3.7.0" + }, + "dependencies": { + "uikit": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.7.0.tgz", + "integrity": "sha512-N0xluQ380EHey26toMmNA4H2YLtvVRHMaYksG31qDxW2VaAAf9i0Q0aT82zeMdrK2Tx9sqnHz6GaOMTIYYM0ZQ==" + } } }, "www-epivis": { diff --git a/package.json b/package.json index 32f918a53..e8b48c20b 100644 --- a/package.json +++ b/package.json @@ -1,21 +1,22 @@ { "name": "www-main", - "version": "2.9.0", + "version": "2.9.1", "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.3", "highlight.js": "^11.0.1", "katex": "^0.13.11", - "uikit": "^3.6.22", - "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.2/www-covidcast-2.5.2.tgz", + "uikit": "^3.7.0", + "www-covidcast": "https://github.com/cmu-delphi/www-covidcast/releases/download/v2.5.3/www-covidcast-2.5.3.tgz", + "www-covidcast-classic": "https://github.com/cmu-delphi/www-covidcast-classic/releases/download/v2.5.3/www-covidcast-classic-2.5.3.tgz", "www-epivis": "https://github.com/cmu-delphi/www-epivis/releases/download/v2.0.1/www-epivis-2.0.1.tgz" }, "devDependencies": { - "hugo-bin": "^0.71.1", - "husky": "^6.0.0", + "hugo-bin": "^0.72.5", + "husky": "^7.0.0", "lint-staged": "^11.0.0", - "prettier": "~2.2.1", - "prettier-plugin-go-template": "^0.0.10", + "prettier": "^2.3.2", + "prettier-plugin-go-template": "^0.0.11", "rimraf": "^3.0.2", "shx": "^0.3.3" }, @@ -26,8 +27,9 @@ "clean": "rimraf \"*.tgz\" public", "copy_fonts": "shx cp -r \"node_modules/katex/dist/fonts/*\" themes/delphi/static/css/fonts/", "copy_covidcast": "shx rm -rf \"static/covidcast/*\" && shx cp \"node_modules/www-covidcast/public/**/*.{js,txt,css,map}\" static/covidcast/", + "copy_covidcast_classic": "shx rm -rf \"static/covidcast/classic/*\" && shx mkdir -p static/covidcast/classic/ && shx cp \"node_modules/www-covidcast-classic/public/**/*.{js,txt,css,map}\" static/covidcast/classic/", "copy_epivis": "shx rm -rf \"static/epivis/*\" && shx cp \"node_modules/www-epivis/public/**/*.{js,txt,css,map}\" static/epivis/", - "postinstall": "npm run copy_fonts && npm run copy_covidcast && npm run copy_epivis", + "postinstall": "npm run copy_fonts && npm run copy_covidcast && npm run copy_epivis && npm run copy_covidcast_classic", "build:blog": "Rscript -e \"blogdown::build_site(local=FALSE, run_hugo=FALSE, build_rmd='md5sum')\"", "prebuild": "npm run clean", "build": "hugo --gc --minify", diff --git a/themes/delphi/assets/js/main.js b/themes/delphi/assets/js/main.js index 958fa67c3..c20f64e01 100644 --- a/themes/delphi/assets/js/main.js +++ b/themes/delphi/assets/js/main.js @@ -8,4 +8,6 @@ window.UIkit = UIkit; // define for covidcast at which base url it is embedded window.DELPHI_COVIDCAST_PAGE = "/covidcast/"; // define for covidcast at which base url it is embedded +window.DELPHI_COVIDCAST_CLASSIC_PAGE = "/covidcast/classic/"; +// define for covidcast at which base url it is embedded window.DELPHI_EPIVIS_PAGE = "/epivis/"; diff --git a/themes/delphi/layouts/_default/baseof.html b/themes/delphi/layouts/_default/baseof.html index f2389b0a8..1d5a9a1eb 100644 --- a/themes/delphi/layouts/_default/baseof.html +++ b/themes/delphi/layouts/_default/baseof.html @@ -4,14 +4,14 @@ {{ partial "head/meta.html" . }} {{ partial "head/styles.html" . }} - {{ block "styles" . }} {{ end }} + {{ block "styles" . }}{{ end }} {{ partial "nav.html" . }} {{ block "breadcrumb" . }}{{ partial "menu/breadcrumb.html" . }}{{ end }} - {{ block "main" . }} {{ end }} + {{ block "main" . }}{{ end }} {{ partial "footer.html" . }} {{ partial "scripts.html" . }} - {{ block "scripts" . }} {{ end }} + {{ block "scripts" . }}{{ end }} diff --git a/themes/delphi/layouts/_default/coe.html b/themes/delphi/layouts/_default/coe.html index fe5bde5bd..af81b7c36 100644 --- a/themes/delphi/layouts/_default/coe.html +++ b/themes/delphi/layouts/_default/coe.html @@ -22,6 +22,7 @@

We work closely with

{{ partial "coe/research-papers.html" . }} +

Supporters

@@ -38,7 +39,7 @@

Supporters

-

Special thank to

+

Special thanks to

diff --git a/themes/delphi/layouts/_default/covidcast_classic_app.html b/themes/delphi/layouts/_default/covidcast_classic_app.html new file mode 100644 index 000000000..89ce80bc8 --- /dev/null +++ b/themes/delphi/layouts/_default/covidcast_classic_app.html @@ -0,0 +1,18 @@ +{{ define "styles" }} + +{{ end }} +{{ define "scripts" }} + +{{ end }} +{{ define "breadcrumb" }}{{ end }} +{{ define "body_class" }}{{ if eq .Params.footer false }}covidcast_wrapper{{ end }}{{ end }} +{{ define "main" }} +
+ +
+{{ end }} diff --git a/themes/delphi/layouts/_default/team.html b/themes/delphi/layouts/_default/team.html index 1a83b675b..b04900f87 100644 --- a/themes/delphi/layouts/_default/team.html +++ b/themes/delphi/layouts/_default/team.html @@ -20,6 +20,7 @@

{{ .Content }} +
Abbreviations diff --git a/themes/delphi/layouts/_internal/pagination.html b/themes/delphi/layouts/_internal/pagination.html index 3d5dfb0a3..aefff961a 100644 --- a/themes/delphi/layouts/_internal/pagination.html +++ b/themes/delphi/layouts/_internal/pagination.html @@ -1,10 +1,10 @@ {{ $pag := $.Paginator }} {{ if gt $pag.TotalPages 1 -}}
    -
  • +
  • {{ if $pag.HasPrev }} - {{ else }} + {{ else }} {{ end }}
    • @@ -18,24 +18,24 @@ {{- if $showNumber -}} {{- $ellipsed = false -}} {{- $shouldEllipse = false -}} - {{- else -}} + {{- else -}} {{- $shouldEllipse = not $ellipsed -}} {{- $ellipsed = true -}} {{- end -}} {{- if $showNumber }} -
  • +
  • {{ .PageNumber }}
    • - {{- else if $shouldEllipse }} + {{- else if $shouldEllipse }}
    • {{- end -}} {{- end }} -
  • +
  • {{ if $pag.HasNext }} - {{ else }} + {{ else }} {{ end }}
    • diff --git a/themes/delphi/layouts/blog/single.html b/themes/delphi/layouts/blog/single.html index e9d96cf99..9512219d8 100644 --- a/themes/delphi/layouts/blog/single.html +++ b/themes/delphi/layouts/blog/single.html @@ -3,8 +3,7 @@ {{ end }} {{ define "scripts" }} - {{ $script_blog := resources.Get "js/blog/index.js" | js.Build | minify | fingerprint -}} - + {{ $script_blog := resources.Get "js/blog/index.js" | js.Build | minify | fingerprint -}} {{ end }} {{ define "main" }} {{ $currentPage := . }} @@ -33,7 +32,7 @@

    {{ .Title }}

    {{ if gt (len .Params.authors) 1 }} {{ partial "font-awesome.html" "solid/users" }} - {{ else }} + {{ else }} {{ partial "font-awesome.html" "solid/user" }} {{ end }} @@ -78,7 +77,7 @@
    Outline
    {{ with (partial "get-person.html" (dict "Site" $currentPage.Site "key" .)) }} {{ if isset . "link" }} {{ .name | safeHTML }} - {{ else }} + {{ else }} {{ .name | safeHTML }} {{ end }} {{ .description }} diff --git a/themes/delphi/layouts/partials/about/collaborators.html b/themes/delphi/layouts/partials/about/collaborators.html index 8e30e6151..6a4b0c5f2 100644 --- a/themes/delphi/layouts/partials/about/collaborators.html +++ b/themes/delphi/layouts/partials/about/collaborators.html @@ -6,7 +6,7 @@

    Collaborators

      {{ range .Params.collaborators }}
    • - {{ if eq .group "sponsor" }}With support from {{ end }} + {{ if eq .group "sponsor" }}With support from{{ end }} {{ .name }}
      • diff --git a/themes/delphi/layouts/partials/blog/license.html b/themes/delphi/layouts/partials/blog/license.html index c94c31847..29ad6d1e6 100644 --- a/themes/delphi/layouts/partials/blog/license.html +++ b/themes/delphi/layouts/partials/blog/license.html @@ -1,7 +1,8 @@
      © {{ now.Format "2006" }} Delphi group authors. Text and figures released under - CC BY 4.0 {{ partial "font-awesome.html" "brands/creative-commons" }} + CC BY 4.0 + {{ partial "font-awesome.html" "brands/creative-commons" }} {{ partial "font-awesome.html" "brands/creative-commons-by" }} ; code under the MIT license.
      diff --git a/themes/delphi/layouts/partials/covidcast_classic/find-file.html b/themes/delphi/layouts/partials/covidcast_classic/find-file.html new file mode 100644 index 000000000..ef4749223 --- /dev/null +++ b/themes/delphi/layouts/partials/covidcast_classic/find-file.html @@ -0,0 +1,10 @@ + +{{ $pattern := . }} +{{ $matchedFile := false }} +{{ range (readDir "./static/covidcast/classic") }} + {{ $testFile := . }} + {{ with (index (findRE $pattern .Name 1) 0) }} + {{ $matchedFile = path.Join "./covidcast/classic" $testFile.Name }} + {{ end }} +{{ end }} +{{ return $matchedFile }} diff --git a/themes/delphi/layouts/partials/font-awesome.html b/themes/delphi/layouts/partials/font-awesome.html index e79719aa5..ecf915735 100644 --- a/themes/delphi/layouts/partials/font-awesome.html +++ b/themes/delphi/layouts/partials/font-awesome.html @@ -4,7 +4,7 @@ {{- $localPath := path.Join "./themes/delphi/assets/" $fileName -}} {{- if fileExists $localPath -}} {{ readFile $localPath | safeHTML }} - {{- else -}} + {{- else -}} {{ readFile $faPath | safeHTML }} {{- end -}} diff --git a/themes/delphi/layouts/partials/footer.html b/themes/delphi/layouts/partials/footer.html index 8f2b1a516..cce7fe3c0 100644 --- a/themes/delphi/layouts/partials/footer.html +++ b/themes/delphi/layouts/partials/footer.html @@ -11,7 +11,9 @@
      COVIDcast
    • Forecast Evaluation
    • Surveys
    • - Survey Results + CTIS Results Dashboard

diff --git a/themes/delphi/layouts/partials/head/meta.html b/themes/delphi/layouts/partials/head/meta.html index 98f3408d4..98f752da0 100644 --- a/themes/delphi/layouts/partials/head/meta.html +++ b/themes/delphi/layouts/partials/head/meta.html @@ -5,6 +5,7 @@ {{ partial "head/socialmedia.html" . }} + diff --git a/themes/delphi/layouts/partials/head/socialmedia.html b/themes/delphi/layouts/partials/head/socialmedia.html index 5c898d391..697b5a4b5 100644 --- a/themes/delphi/layouts/partials/head/socialmedia.html +++ b/themes/delphi/layouts/partials/head/socialmedia.html @@ -4,15 +4,27 @@ @@ -26,6 +38,7 @@ {{- end -}} {{- end -}} + @@ -46,7 +59,7 @@ - {{- else -}} +{{- else -}} {{- end -}} @@ -54,12 +67,13 @@ {{- if .IsPage }} {{- if not .PublishDate.IsZero }} - {{ else if not .Date.IsZero }} + {{ else if not .Date.IsZero }} + {{ end }} {{- if not .Lastmod.IsZero }} - {{ end }} - {{- else }} + + {{ end }} +{{- else }} {{- if not .Date.IsZero }} {{- end }} diff --git a/themes/delphi/layouts/partials/landing/carousel.html b/themes/delphi/layouts/partials/landing/carousel.html index 7240454e4..9f645f19f 100644 --- a/themes/delphi/layouts/partials/landing/carousel.html +++ b/themes/delphi/layouts/partials/landing/carousel.html @@ -19,7 +19,7 @@

{{ .pre }}

{{ .title }}

{{ if isset . "ref" }} {{ partial "arrow-link.html" (dict "link" (relref $currentPage .ref) "alt" .alt) }} - {{ else }} + {{ else }} {{ partial "arrow-link.html" (dict "link" .link "alt" .alt) }} {{ end }}
diff --git a/themes/delphi/layouts/partials/landing/latest-news.html b/themes/delphi/layouts/partials/landing/latest-news.html index 200553297..a62edba56 100644 --- a/themes/delphi/layouts/partials/landing/latest-news.html +++ b/themes/delphi/layouts/partials/landing/latest-news.html @@ -15,6 +15,7 @@

Latest News

{{ $top := 10 }} +