From 0c433bab1f2a01d4bff6fec22eaf1fa3227b8037 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Tue, 16 Jul 2024 20:48:07 +0300 Subject: [PATCH 01/33] Research -> Publications --- config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.toml b/config.toml index ce84b5ba..a83a7f4f 100644 --- a/config.toml +++ b/config.toml @@ -39,7 +39,7 @@ relativeURLs = false weight = 4 [[menu.main]] parent = "about" - name = "Research" + name = "Publications" url = "/about/publications" weight = 5 [[menu.main]] From 5514c5e7530f63f1b263669cf00b8dacb26ea978 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Tue, 16 Jul 2024 23:24:55 +0300 Subject: [PATCH 02/33] Changed Career section (temp) --- config.toml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index a83a7f4f..06da4258 100644 --- a/config.toml +++ b/config.toml @@ -54,9 +54,20 @@ relativeURLs = false weight = 7 [[menu.main]] parent = "about" - name = "Careers" - url = "/about/careers" + name = "Join Us" + url = "" + identifier = "join-us" weight = 8 +[[menu.main]] + parent = "join-us" + name = "Open invitation to faculty, students, and volunteers" + url = "" + weight = 20 +[[menu.main]] + parent = "join-us" + name = "Open paid positions" + url = "/about/careers" + weight = 30 [[menu.main]] parent = "about" name = "Contact Us" From dbaf31a4ba34fe060e58538822d653b9e7561bf4 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Wed, 17 Jul 2024 19:27:23 +0300 Subject: [PATCH 03/33] Added new items to 'About' section. --- config.toml | 23 ++++++++++++++++++- .../assets/css/layout/_header_footer.scss | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index 06da4258..75602c05 100644 --- a/config.toml +++ b/config.toml @@ -68,11 +68,32 @@ relativeURLs = false name = "Open paid positions" url = "/about/careers" weight = 30 +[[menu.main]] + parent = "about" + name = "Help Us Suggest new data sources (your own, or others)" + identifier = "suggest-data" + url = "" + weight = 9 +[[menu.main]] + parent = "suggest-data" + name = "Suggest an addition or improvement" + url = "" + weight = 20 +[[menu.main]] + parent = "suggest-data" + name = "Suggest an addition or improvement" + url = "" + weight = 20 +[[menu.main]] + parent = "about" + name = "Support Us (Donate to support our mission)" + url = "" + weight = 10 [[menu.main]] parent = "about" name = "Contact Us" url = "https://docs.google.com/forms/d/e/1FAIpQLScqgT1fKZr5VWBfsaSp-DNaN03aV6EoZU4YljIzHJ1Wl_zmtg/viewform" - weight = 9 + weight = 11 # epidemic-signals [[menu.main]] diff --git a/themes/delphi/assets/css/layout/_header_footer.scss b/themes/delphi/assets/css/layout/_header_footer.scss index 95eb694b..cf8f0d0f 100644 --- a/themes/delphi/assets/css/layout/_header_footer.scss +++ b/themes/delphi/assets/css/layout/_header_footer.scss @@ -38,7 +38,7 @@ $mobile-margin: 15px; } .uk-navbar-dropdown { - width: 13em; + width: auto; } } From 5380d1dff98fa83da3685ae46c14f5f26c86ef76 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Thu, 18 Jul 2024 17:05:54 +0300 Subject: [PATCH 04/33] Epidemic Signals menu restructuring. --- config.toml | 67 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 16 deletions(-) diff --git a/config.toml b/config.toml index 75602c05..d8ccc732 100644 --- a/config.toml +++ b/config.toml @@ -104,40 +104,75 @@ relativeURLs = false weight = 2 [[menu.main]] parent = "epidemic-signals" - name = "About COVIDcast" + name = "About Delphi Epidata" url = "/epidemic-signals/" weight = 1 [[menu.main]] parent = "epidemic-signals" - name = "About CTIS" - url = "/epidemic-signals/ctis" - weight = 10 + name = "Signal Discovery & Selection" + url = "" + weight = 2 [[menu.main]] - identifier = "epidemic-signals-covidcast" parent = "epidemic-signals" - name = "COVIDcast Dashboard" - url = "/covidcast/" + name = "Signal Visualizaion" + url = "" + identifier = "signal-visualization" + weight = 3 +[[menu.main]] + parent = "signal-visualization" + name = "EpiVis" + url = "" + weight = 10 +[[menu.main]] + parent = "signal-visualization" + name = "Current “Covidcast Dashboard”" + url = "" weight = 20 [[menu.main]] - parent = "epidemic-signals" - name = "CTIS Dashboard" - url = "/covidcast/survey-results" + parent = "signal-visualization" + name = "Covidcast 1.0 (“Classic”)" + url = "" weight = 30 [[menu.main]] parent = "epidemic-signals" - name = "Export Data" + name = "Signal Export" url = "/covidcast/export" - weight = 40 + weight = 4 [[menu.main]] parent = "epidemic-signals" - name = "Flu & Other Pathogens" - url = "/flu/" - weight = 50 + name = "Dashboard Builder" + url = "/covidcast/dashboard" + weight = 5 +[[menu.main]] + parent = "epidemic-signals" + name = "Signal Availability, Coverage & Latency" + url = "/covidcast/indicator-status" + weight = 6 +[[menu.main]] + parent = "epidemic-signals" + name = "Signal API" + url = "" + weight = 7 +[[menu.main]] + parent = "epidemic-signals" + name = "Report a problem" + url = "" + weight = 8 +[[menu.main]] + parent = "epidemic-signals" + name = "Suggest or request a new data source" + url = "" + weight = 9 +[[menu.main]] + parent = "epidemic-signals" + name = "Learn more" + url = "" + weight = 10 [[menu.main]] parent = "epidemic-signals" name = "Terms Of Use" url = "/epidemic-signals/terms-of-use" - weight = 60 + weight = 11 # tools [[menu.main]] From c17c3ff0c93d609cc8175a1f66c89afdbee191d1 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Fri, 19 Jul 2024 11:05:11 +0300 Subject: [PATCH 05/33] Added few changes --- config.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index d8ccc732..439f3824 100644 --- a/config.toml +++ b/config.toml @@ -121,12 +121,12 @@ relativeURLs = false [[menu.main]] parent = "signal-visualization" name = "EpiVis" - url = "" + url = "/epivis/" weight = 10 [[menu.main]] parent = "signal-visualization" name = "Current “Covidcast Dashboard”" - url = "" + url = "/covidcast/" weight = 20 [[menu.main]] parent = "signal-visualization" From 60edef2c2dfffc51ecc6bdfee115718665af4af7 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Fri, 19 Jul 2024 17:11:03 +0300 Subject: [PATCH 06/33] Added 'Nowcasting and Forecasting' and 'For Modelers and Developers section'. --- config.toml | 342 ++++++++++++++++++++++++++++++++------------------- package.json | 4 +- 2 files changed, 217 insertions(+), 129 deletions(-) diff --git a/config.toml b/config.toml index 439f3824..a3b44292 100644 --- a/config.toml +++ b/config.toml @@ -34,13 +34,13 @@ relativeURLs = false weight = 3 [[menu.main]] parent = "about" - name = "Center of Excellence" - url = "/about/center-of-excellence" + name = "Publications" + url = "/about/publications" weight = 4 [[menu.main]] parent = "about" - name = "Publications" - url = "/about/publications" + name = "Presentations" + url = "" weight = 5 [[menu.main]] parent = "about" @@ -101,23 +101,23 @@ relativeURLs = false name = "Epidemic Signals" pre = "solid/virus" url = "/epidemic-signals/" - weight = 2 + weight = 1 [[menu.main]] parent = "epidemic-signals" name = "About Delphi Epidata" url = "/epidemic-signals/" - weight = 1 + weight = 2 [[menu.main]] parent = "epidemic-signals" name = "Signal Discovery & Selection" url = "" - weight = 2 + weight = 3 [[menu.main]] parent = "epidemic-signals" name = "Signal Visualizaion" url = "" identifier = "signal-visualization" - weight = 3 + weight = 4 [[menu.main]] parent = "signal-visualization" name = "EpiVis" @@ -137,177 +137,265 @@ relativeURLs = false parent = "epidemic-signals" name = "Signal Export" url = "/covidcast/export" - weight = 4 + weight = 5 [[menu.main]] parent = "epidemic-signals" name = "Dashboard Builder" - url = "/covidcast/dashboard" - weight = 5 + url = "" + weight = 6 [[menu.main]] parent = "epidemic-signals" name = "Signal Availability, Coverage & Latency" url = "/covidcast/indicator-status" - weight = 6 + weight = 7 [[menu.main]] parent = "epidemic-signals" name = "Signal API" url = "" - weight = 7 + weight = 8 [[menu.main]] parent = "epidemic-signals" name = "Report a problem" url = "" - weight = 8 + weight = 9 [[menu.main]] parent = "epidemic-signals" name = "Suggest or request a new data source" url = "" - weight = 9 + weight = 10 [[menu.main]] parent = "epidemic-signals" name = "Learn more" url = "" - weight = 10 + weight = 11 [[menu.main]] parent = "epidemic-signals" name = "Terms Of Use" url = "/epidemic-signals/terms-of-use" - weight = 11 + weight = 12 -# tools -[[menu.main]] - identifier = "tools" - name = "Tools" - pre = "solid/screwdriver-wrench" - url = "/tools/" - weight = 5 +# nowcasting-and-forecasting [[menu.main]] - parent = "tools" - name = "Tools Overview" - url = "/tools/" + identifier = "nowcasting-and-forecasting" + name = "Nowcasting and Forecasting" + url = "" weight = 1 -# utils -[[menu.main]] - parent = "tools" - identifier = "utils" - name = "Dashboards" - url = "/tools/#dashboards" - weight = 9 -[[menu.main]] - parent = "utils" - name = "Delphi Epidata Dashboard" - url = "/covidcast/" - weight = 10 [[menu.main]] - parent = "utils" - name = "Indicator Status" - url = "/covidcast/indicator-status" - weight = 20 + parent = "nowcasting-and-forecasting" + name = "Ongoing forecasts" + url = "" + weight = 2 [[menu.main]] - parent = "utils" - name = "Dashboard Builder" - url = "/covidcast/dashboard" - weight = 30 + parent = "nowcasting-and-forecasting" + name = "Historical forecasts" + url = "" + weight = 3 [[menu.main]] - parent = "utils" + parent = "nowcasting-and-forecasting" name = "Forecast Evaluation" url = "/forecast-eval/" - weight = 40 -[[menu.main]] - parent = "utils" - name = "Epi Signal Visualization" - url = "/epivis/" - weight = 50 + weight = 4 [[menu.main]] - parent = "tools" - name = "Archived" - url = "/tools/#archived" - weight = 80 - + parent = "nowcasting-and-forecasting" + name = "Forecast Hub" + url = "" + weight = 5 [[menu.main]] - parent = "tools" - identifier = "forecasting" - name = "Forecasting" - url = "/tools/#forecasting" - weight = 50 + parent = "nowcasting-and-forecasting" + name = "Learn More" + url = "" + weight = 6 +# for-modelers-and-developers [[menu.main]] - parent = "forecasting" - name = "COVID Forecasting" - url = "https://covid19forecasthub.org/" - weight = 1 -[[menu.main]] - parent = "forecasting" - name = "Flu Forecasting" - url = "https://www.cdc.gov/flu/weekly/flusight/index.html" + identifier = "for-modelers-and-developers" + name = "For Modelers and Developers" + url = "" weight = 2 - -[[menu.main]] - identier = "Code" - pre = "solid/code" - name = "Code" - url = "code" - weight = 90 [[menu.main]] - parent = "Code" - name = "Code Overview" - url = "code" - weight = 1 + parent = "for-modelers-and-developers" + pre = "brands/github" + name = "GitHub" + url = "https://github.com/cmu-delphi/" + weight = 3 [[menu.main]] - parent = "Code" - identifier = "APIClients" - name = "API and Clients" - url = "/code/#api-and-clients" - weight = 2 + parent = "for-modelers-and-developers" + name = "Epidata signal API" + url = "" + weight = 4 [[menu.main]] - parent = "APIClients" - name = "Epidata" - url = "https://github.com/cmu-delphi/delphi-epidata" - weight = 7 + parent = "for-modelers-and-developers" + identifier = "r-packages" + name = "R packages" + weight = 5 [[menu.main]] - parent = "APIClients" - name = "Epidatr" + parent = "r-packages" + name = "epidatr" url = "https://cmu-delphi.github.io/epidatr/" - weight = 8 -[[menu.main]] - parent = "APIClients" - name = "Epidatpy" - url = "https://github.com/cmu-delphi/epidatpy" - weight = 9 - -[[menu.main]] - parent = "Code" - identifier = "forecastingCode" - name = "Forecasting" - url = "code#forecasting" weight = 10 [[menu.main]] - parent = "forecastingCode" - name = "Forecasting Manual" - weight = 1 -[[menu.main]] - parent = "forecastingCode" - name = "Epiprocess" + parent = "r-packages" + name = "epiprocess" url = "https://cmu-delphi.github.io/epiprocess/" - weight = 7 + weight = 20 [[menu.main]] - parent = "forecastingCode" - name = "Epipredict" + parent = "r-packages" + name = "epipredict" url = "https://cmu-delphi.github.io/epipredict/" - weight = 7 + weight = 30 [[menu.main]] - parent = "Code" - name = "Github" - pre = "brands/github" - url = "https://github.com/cmu-delphi/" - weight = 70 - + parent = "for-modelers-and-developers" + identifier = "python-packages" + name = "Python packages" + weight = 6 +[[menu.main]] + parent = "python-packages" + name = "Util" + url = "" + weight = 10 [[menu.main]] - identifier = "api" - name = "Epidata API" - pre = "solid/database" - url = "https://cmu-delphi.github.io/delphi-epidata/" - weight = 100 + parent = "for-modelers-and-developers" + name = "Videos / Howtos" + url = "" + weight = 7 + + + + +# tools +#[[menu.main]] +# identifier = "tools" +# name = "Tools" +# pre = "solid/screwdriver-wrench" +# url = "/tools/" +# weight = 5 +#[[menu.main]] +# parent = "tools" +# name = "Tools Overview" +# url = "/tools/" +# weight = 1 +## utils +#[[menu.main]] +# parent = "tools" +# identifier = "utils" +# name = "Dashboards" +# url = "/tools/#dashboards" +# weight = 9 +#[[menu.main]] +# parent = "utils" +# name = "Delphi Epidata Dashboard" +# url = "/covidcast/" +# weight = 10 +#[[menu.main]] +# parent = "utils" +# name = "Indicator Status" +# url = "/covidcast/indicator-status" +# weight = 20 +#[[menu.main]] +# parent = "utils" +# name = "sdfasdfsadDashboard Builder" +# url = "/covidcast/dashboard" +# weight = 30 +#[[menu.main]] +# parent = "utils" +# name = "sladjfhjsadkhfkjsdhaForecast Evaluation" +# url = "/forecast-eval/" +# weight = 40 +#[[menu.main]] +# parent = "utils" +# name = "Epi Signal Visualization" +# url = "/epivis/" +# weight = 50 +#[[menu.main]] +# parent = "tools" +# name = "Archived" +# url = "/tools/#archived" +# weight = 80 + +#[[menu.main]] +# parent = "tools" +# identifier = "forecasting" +# name = "Forecasting" +# url = "/tools/#forecasting" +# weight = 50 + +#[[menu.main]] +# parent = "forecasting" +# name = "COVID Forecasting" +# url = "https://covid19forecasthub.org/" +# weight = 1 +#[[menu.main]] +# parent = "forecasting" +# name = "Flu Forecasting" +# url = "https://www.cdc.gov/flu/weekly/flusight/index.html" +# weight = 2 + +#[[menu.main]] +# identier = "Code" +# pre = "solid/code" +# name = "Code" +# url = "code" +# weight = 90 +#[[menu.main]] +# parent = "Code" +# name = "Code Overview" +# url = "code" +# weight = 1 +#[[menu.main]] +# parent = "Code" +# identifier = "APIClients" +# name = "API and Clients" +# url = "/code/#api-and-clients" +# weight = 2 +#[[menu.main]] +# parent = "APIClients" +# name = "Epidata" +# url = "https://github.com/cmu-delphi/delphi-epidata" +# weight = 7 +#[[menu.main]] +# parent = "APIClients" +# name = "Epidatr" +# url = "https://cmu-delphi.github.io/epidatr/" +# weight = 8 +#[[menu.main]] +# parent = "APIClients" +# name = "Epidatpy" +# url = "https://github.com/cmu-delphi/epidatpy" +# weight = 9 + +#[[menu.main]] +# parent = "Code" +# identifier = "forecastingCode" +# name = "Forecasting" +# url = "code#forecasting" +# weight = 10 +#[[menu.main]] +# parent = "forecastingCode" +# name = "Forecasting Manual" +# weight = 1 +#[[menu.main]] +# parent = "forecastingCode" +# name = "Epiprocess" +# url = "https://cmu-delphi.github.io/epiprocess/" +# weight = 7 +#[[menu.main]] +# parent = "forecastingCode" +# name = "Epipredict" +# url = "https://cmu-delphi.github.io/epipredict/" +# weight = 7 +#[[menu.main]] +# parent = "Code" +# name = "Github" +# pre = "brands/github" +# url = "https://github.com/cmu-delphi/" +# weight = 70 + +#[[menu.main]] +# identifier = "api" +# name = "Epidata API" +# pre = "solid/database" +# url = "https://cmu-delphi.github.io/delphi-epidata/" +# weight = 100 [params] description = "Developing the Theory and Practice of Epidemiological Forecasting" diff --git a/package.json b/package.json index 594f5d6c..05507be5 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "build:blog": "Rscript -e \"blogdown::build_site(local=FALSE, run_hugo=FALSE, build_rmd='md5sum')\"", "prebuild": "npm run clean", "build": "hugo --gc --minify", - "start": "hugo server -D", + "start": "hugo server -D --disableFastRender", "start:blog": "Rscript -e \"blogdown::serve_site(port=1313, browser=FALSE)\"", "format": "prettier *.* \"(.vscode|content|data|themes)/**\" --write", "lint": "prettier *.* \"(.vscode|content|data|themes)/**\" --check", @@ -47,4 +47,4 @@ "lint-staged": { "*.{js,scss,css,yaml,md,html,json,yml}": "prettier --write" } -} +} \ No newline at end of file From 992d5f4ac0cd1938d17a7fd782be5cd811f0c442 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Mon, 22 Jul 2024 23:39:27 +0300 Subject: [PATCH 07/33] Replaced bullets with dropdown menus. --- config.toml | 73 ++++++++++++------- .../assets/css/layout/_header_footer.scss | 1 + themes/delphi/layouts/partials/nav.html | 31 ++++---- 3 files changed, 60 insertions(+), 45 deletions(-) diff --git a/config.toml b/config.toml index a3b44292..e8b5c080 100644 --- a/config.toml +++ b/config.toml @@ -12,7 +12,6 @@ relativeURLs = false [[menu.main]] identifier = "about" name = "About" - pre = "solid/circle-info" url = "/about" weight = 1 @@ -37,11 +36,11 @@ relativeURLs = false name = "Publications" url = "/about/publications" weight = 4 -[[menu.main]] - parent = "about" - name = "Presentations" - url = "" - weight = 5 +#[[menu.main]] +# parent = "about" +# name = "Presentations" +# url = "" +# weight = 5 [[menu.main]] parent = "about" name = "Blog" @@ -58,11 +57,11 @@ relativeURLs = false url = "" identifier = "join-us" weight = 8 -[[menu.main]] - parent = "join-us" - name = "Open invitation to faculty, students, and volunteers" - url = "" - weight = 20 +#[[menu.main]] +# parent = "join-us" +# name = "Open invitation to faculty, students, and volunteers" +# url = "" +# weight = 20 [[menu.main]] parent = "join-us" name = "Open paid positions" @@ -99,7 +98,6 @@ relativeURLs = false [[menu.main]] identifier = "epidemic-signals" name = "Epidemic Signals" - pre = "solid/virus" url = "/epidemic-signals/" weight = 1 [[menu.main]] @@ -180,11 +178,11 @@ relativeURLs = false name = "Nowcasting and Forecasting" url = "" weight = 1 -[[menu.main]] - parent = "nowcasting-and-forecasting" - name = "Ongoing forecasts" - url = "" - weight = 2 +#[[menu.main]] +# parent = "nowcasting-and-forecasting" +# name = "Ongoing forecasts" +# url = "" +# weight = 2 [[menu.main]] parent = "nowcasting-and-forecasting" name = "Historical forecasts" @@ -200,11 +198,11 @@ relativeURLs = false name = "Forecast Hub" url = "" weight = 5 -[[menu.main]] - parent = "nowcasting-and-forecasting" - name = "Learn More" - url = "" - weight = 6 +#[[menu.main]] +# parent = "nowcasting-and-forecasting" +# name = "Learn More" +# url = "" +# weight = 6 # for-modelers-and-developers [[menu.main]] @@ -253,14 +251,33 @@ relativeURLs = false name = "Util" url = "" weight = 10 +#[[menu.main]] +# parent = "for-modelers-and-developers" +# name = "Videos / Howtos" +# url = "" +# weight = 7 + +# intranet [[menu.main]] - parent = "for-modelers-and-developers" - name = "Videos / Howtos" + identifier = "intranet" + name = "Intranet" url = "" - weight = 7 - - - + weight = 3 +[[menu.main]] + parent = "intranet" + name = "FLaSH (for internal triaging)" + url = "" + weight = 1 +[[menu.main]] + parent = "intranet" + name = "Delphi Calendar" + url = "" + weight = 2 +[[menu.main]] + parent = "intranet" + name = "Delphi Mailing Lists" + url = "" + weight = 3 # tools #[[menu.main]] diff --git a/themes/delphi/assets/css/layout/_header_footer.scss b/themes/delphi/assets/css/layout/_header_footer.scss index cf8f0d0f..8257ddb8 100644 --- a/themes/delphi/assets/css/layout/_header_footer.scss +++ b/themes/delphi/assets/css/layout/_header_footer.scss @@ -27,6 +27,7 @@ $mobile-margin: 15px; margin-top: 0; margin-bottom: 0; align-items: flex-end; + max-width: 1400px; } .uk-badge { diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index 7ab53bd7..e7ed3add 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -32,26 +32,23 @@
  • {{ partial "menu/item.html" . }} - {{ if (in (split $currentPage.Site.Params.highlightLinks ",") .URL) }} - New - {{ end }} + {{ if .HasChildren }} + {{ partial "font-awesome.html" "solid/angle-down" }} + {{ end}}
    • {{ if .HasChildren }} -
  • - -
    • +
    + +
    {{ end }} {{ end }} From 65c159a3cb61deee8720f6b974f6ab04c85110b7 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Mon, 22 Jul 2024 23:47:02 +0300 Subject: [PATCH 08/33] Prettier formatting --- package.json | 2 +- themes/delphi/layouts/partials/nav.html | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 05507be5..4df12868 100644 --- a/package.json +++ b/package.json @@ -47,4 +47,4 @@ "lint-staged": { "*.{js,scss,css,yaml,md,html,json,yml}": "prettier --write" } -} \ No newline at end of file +} diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index e7ed3add..4ccffef4 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -34,21 +34,21 @@ {{ partial "menu/item.html" . }} {{ if .HasChildren }} {{ partial "font-awesome.html" "solid/angle-down" }} - {{ end}} + {{ end }} {{ if .HasChildren }} -
    - -
    +
    + +
    {{ end }} {{ end }} From 113de6175726aaa9257e9fa03804c6ccd8ee37eb Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Tue, 23 Jul 2024 00:00:30 +0300 Subject: [PATCH 09/33] Changed navigation items --- config.toml | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/config.toml b/config.toml index e8b5c080..a533af68 100644 --- a/config.toml +++ b/config.toml @@ -69,7 +69,7 @@ relativeURLs = false weight = 30 [[menu.main]] parent = "about" - name = "Help Us Suggest new data sources (your own, or others)" + name = "Help Us" identifier = "suggest-data" url = "" weight = 9 @@ -85,7 +85,7 @@ relativeURLs = false weight = 20 [[menu.main]] parent = "about" - name = "Support Us (Donate to support our mission)" + name = "Support Us (Donate)" url = "" weight = 10 [[menu.main]] @@ -148,9 +148,25 @@ relativeURLs = false weight = 7 [[menu.main]] parent = "epidemic-signals" - name = "Signal API" + name = "Epidata API" url = "" weight = 8 +[[menu.main]] + parent = "epidemic-signals" + identifier = "ctis" + name = "CTIS (“The Facebook Covid Survey”)" + url = "" + weight = 9 +[[menu.main]] + parent = "ctis" + name = "About CTIS" + url = "" + weight = 10 +[[menu.main]] + parent = "ctis" + name = "CTIS Dashboard" + url = "" + weight = 20 [[menu.main]] parent = "epidemic-signals" name = "Report a problem" @@ -178,14 +194,14 @@ relativeURLs = false name = "Nowcasting and Forecasting" url = "" weight = 1 -#[[menu.main]] -# parent = "nowcasting-and-forecasting" -# name = "Ongoing forecasts" -# url = "" -# weight = 2 [[menu.main]] parent = "nowcasting-and-forecasting" - name = "Historical forecasts" + name = "COVID-19 Forecasting" + url = "" + weight = 2 +[[menu.main]] + parent = "nowcasting-and-forecasting" + name = "Flu Forecasting" url = "" weight = 3 [[menu.main]] @@ -193,16 +209,7 @@ relativeURLs = false name = "Forecast Evaluation" url = "/forecast-eval/" weight = 4 -[[menu.main]] - parent = "nowcasting-and-forecasting" - name = "Forecast Hub" - url = "" - weight = 5 -#[[menu.main]] -# parent = "nowcasting-and-forecasting" -# name = "Learn More" -# url = "" -# weight = 6 + # for-modelers-and-developers [[menu.main]] From 14a22195dac3324267417cd9e6de4b3799d92c4f Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Fri, 26 Jul 2024 23:14:37 +0300 Subject: [PATCH 10/33] Fixed navigation bar pulldown menus --- config.toml | 228 +++--------------------- themes/delphi/layouts/partials/nav.html | 91 +++------- 2 files changed, 54 insertions(+), 265 deletions(-) diff --git a/config.toml b/config.toml index a533af68..00e38d16 100644 --- a/config.toml +++ b/config.toml @@ -57,32 +57,11 @@ relativeURLs = false url = "" identifier = "join-us" weight = 8 -#[[menu.main]] -# parent = "join-us" -# name = "Open invitation to faculty, students, and volunteers" -# url = "" -# weight = 20 [[menu.main]] parent = "join-us" name = "Open paid positions" url = "/about/careers" - weight = 30 -[[menu.main]] - parent = "about" - name = "Help Us" - identifier = "suggest-data" - url = "" weight = 9 -[[menu.main]] - parent = "suggest-data" - name = "Suggest an addition or improvement" - url = "" - weight = 20 -[[menu.main]] - parent = "suggest-data" - name = "Suggest an addition or improvement" - url = "" - weight = 20 [[menu.main]] parent = "about" name = "Support Us (Donate)" @@ -108,7 +87,7 @@ relativeURLs = false [[menu.main]] parent = "epidemic-signals" name = "Signal Discovery & Selection" - url = "" + url = "/signals/" weight = 3 [[menu.main]] parent = "epidemic-signals" @@ -129,7 +108,7 @@ relativeURLs = false [[menu.main]] parent = "signal-visualization" name = "Covidcast 1.0 (“Classic”)" - url = "" + url = "/covidcast/classic/" weight = 30 [[menu.main]] parent = "epidemic-signals" @@ -138,55 +117,60 @@ relativeURLs = false weight = 5 [[menu.main]] parent = "epidemic-signals" - name = "Dashboard Builder" - url = "" + name = "Signal Documentation" + url = "https://cmu-delphi.github.io/delphi-epidata/api/covidcast_signals.html" weight = 6 +[[menu.main]] + parent = "epidemic-signals" + name = "Dashboard Builder" + url = "/covidcast/dashboard/" + weight = 7 [[menu.main]] parent = "epidemic-signals" name = "Signal Availability, Coverage & Latency" url = "/covidcast/indicator-status" - weight = 7 + weight = 8 [[menu.main]] parent = "epidemic-signals" name = "Epidata API" - url = "" - weight = 8 + url = "https://cmu-delphi.github.io/delphi-epidata/" + weight = 9 [[menu.main]] parent = "epidemic-signals" identifier = "ctis" name = "CTIS (“The Facebook Covid Survey”)" url = "" - weight = 9 + weight = 10 [[menu.main]] parent = "ctis" name = "About CTIS" - url = "" - weight = 10 + url = "/epidemic-signals/ctis/" + weight = 11 [[menu.main]] parent = "ctis" name = "CTIS Dashboard" - url = "" + url = "/covidcast/survey-results/" weight = 20 [[menu.main]] parent = "epidemic-signals" name = "Report a problem" url = "" - weight = 9 + weight = 12 [[menu.main]] parent = "epidemic-signals" name = "Suggest or request a new data source" url = "" - weight = 10 + weight = 13 [[menu.main]] parent = "epidemic-signals" name = "Learn more" url = "" - weight = 11 + weight = 14 [[menu.main]] parent = "epidemic-signals" name = "Terms Of Use" url = "/epidemic-signals/terms-of-use" - weight = 12 + weight = 15 # nowcasting-and-forecasting [[menu.main]] @@ -197,12 +181,12 @@ relativeURLs = false [[menu.main]] parent = "nowcasting-and-forecasting" name = "COVID-19 Forecasting" - url = "" + url = "https://covid19forecasthub.org/" weight = 2 [[menu.main]] parent = "nowcasting-and-forecasting" name = "Flu Forecasting" - url = "" + url = "https://www.cdc.gov/flu/weekly/flusight/index.html" weight = 3 [[menu.main]] parent = "nowcasting-and-forecasting" @@ -225,8 +209,8 @@ relativeURLs = false weight = 3 [[menu.main]] parent = "for-modelers-and-developers" - name = "Epidata signal API" - url = "" + name = "Epidata API" + url = "https://cmu-delphi.github.io/delphi-epidata/" weight = 4 [[menu.main]] parent = "for-modelers-and-developers" @@ -256,170 +240,8 @@ relativeURLs = false [[menu.main]] parent = "python-packages" name = "Util" - url = "" + url = "https://github.com/cmu-delphi/epidatpy" weight = 10 -#[[menu.main]] -# parent = "for-modelers-and-developers" -# name = "Videos / Howtos" -# url = "" -# weight = 7 - -# intranet -[[menu.main]] - identifier = "intranet" - name = "Intranet" - url = "" - weight = 3 -[[menu.main]] - parent = "intranet" - name = "FLaSH (for internal triaging)" - url = "" - weight = 1 -[[menu.main]] - parent = "intranet" - name = "Delphi Calendar" - url = "" - weight = 2 -[[menu.main]] - parent = "intranet" - name = "Delphi Mailing Lists" - url = "" - weight = 3 - -# tools -#[[menu.main]] -# identifier = "tools" -# name = "Tools" -# pre = "solid/screwdriver-wrench" -# url = "/tools/" -# weight = 5 -#[[menu.main]] -# parent = "tools" -# name = "Tools Overview" -# url = "/tools/" -# weight = 1 -## utils -#[[menu.main]] -# parent = "tools" -# identifier = "utils" -# name = "Dashboards" -# url = "/tools/#dashboards" -# weight = 9 -#[[menu.main]] -# parent = "utils" -# name = "Delphi Epidata Dashboard" -# url = "/covidcast/" -# weight = 10 -#[[menu.main]] -# parent = "utils" -# name = "Indicator Status" -# url = "/covidcast/indicator-status" -# weight = 20 -#[[menu.main]] -# parent = "utils" -# name = "sdfasdfsadDashboard Builder" -# url = "/covidcast/dashboard" -# weight = 30 -#[[menu.main]] -# parent = "utils" -# name = "sladjfhjsadkhfkjsdhaForecast Evaluation" -# url = "/forecast-eval/" -# weight = 40 -#[[menu.main]] -# parent = "utils" -# name = "Epi Signal Visualization" -# url = "/epivis/" -# weight = 50 -#[[menu.main]] -# parent = "tools" -# name = "Archived" -# url = "/tools/#archived" -# weight = 80 - -#[[menu.main]] -# parent = "tools" -# identifier = "forecasting" -# name = "Forecasting" -# url = "/tools/#forecasting" -# weight = 50 - -#[[menu.main]] -# parent = "forecasting" -# name = "COVID Forecasting" -# url = "https://covid19forecasthub.org/" -# weight = 1 -#[[menu.main]] -# parent = "forecasting" -# name = "Flu Forecasting" -# url = "https://www.cdc.gov/flu/weekly/flusight/index.html" -# weight = 2 - -#[[menu.main]] -# identier = "Code" -# pre = "solid/code" -# name = "Code" -# url = "code" -# weight = 90 -#[[menu.main]] -# parent = "Code" -# name = "Code Overview" -# url = "code" -# weight = 1 -#[[menu.main]] -# parent = "Code" -# identifier = "APIClients" -# name = "API and Clients" -# url = "/code/#api-and-clients" -# weight = 2 -#[[menu.main]] -# parent = "APIClients" -# name = "Epidata" -# url = "https://github.com/cmu-delphi/delphi-epidata" -# weight = 7 -#[[menu.main]] -# parent = "APIClients" -# name = "Epidatr" -# url = "https://cmu-delphi.github.io/epidatr/" -# weight = 8 -#[[menu.main]] -# parent = "APIClients" -# name = "Epidatpy" -# url = "https://github.com/cmu-delphi/epidatpy" -# weight = 9 - -#[[menu.main]] -# parent = "Code" -# identifier = "forecastingCode" -# name = "Forecasting" -# url = "code#forecasting" -# weight = 10 -#[[menu.main]] -# parent = "forecastingCode" -# name = "Forecasting Manual" -# weight = 1 -#[[menu.main]] -# parent = "forecastingCode" -# name = "Epiprocess" -# url = "https://cmu-delphi.github.io/epiprocess/" -# weight = 7 -#[[menu.main]] -# parent = "forecastingCode" -# name = "Epipredict" -# url = "https://cmu-delphi.github.io/epipredict/" -# weight = 7 -#[[menu.main]] -# parent = "Code" -# name = "Github" -# pre = "brands/github" -# url = "https://github.com/cmu-delphi/" -# weight = 70 - -#[[menu.main]] -# identifier = "api" -# name = "Epidata API" -# pre = "solid/database" -# url = "https://cmu-delphi.github.io/delphi-epidata/" -# weight = 100 [params] description = "Developing the Theory and Practice of Epidemiological Forecasting" diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index 4ccffef4..32ead6e9 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -15,80 +15,47 @@ uk-parent {{- end -}}" > - {{ if .HasChildren }} + {{ if .HasChildren }} {{ partial "menu/item.html" . }} {{ partial "font-awesome.html" "solid/angle-down" }} - {{ else }} - - {{ partial "menu/item.html" . }} - - {{ end }} - {{ if .HasChildren }}
    - + {{ if .HasChildren }} +
    + +
    + {{ end }} + + {{ end }} +
    + {{ else }} + + {{ partial "menu/item.html" . }} + + {{ end }} {{ end }}
    - From 8e2e2588cd27f2406e09aca6f56400d14314780b Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Fri, 26 Jul 2024 23:20:11 +0300 Subject: [PATCH 11/33] Fixed linting --- themes/delphi/layouts/partials/nav.html | 49 ++++++++++++------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index 32ead6e9..1756dd0f 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -15,43 +15,42 @@ uk-parent {{- end -}}" > - {{ if .HasChildren }} + {{ if .HasChildren }} {{ partial "menu/item.html" . }} {{ partial "font-awesome.html" "solid/angle-down" }}
    -
    {{ else }} {{ partial "menu/item.html" . }} - {{ end }} {{ end }} From 700498cffc20ea18932164e7576e533cf47e7bfc Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Mon, 29 Jul 2024 18:17:38 +0300 Subject: [PATCH 12/33] Added 'Open in new tab' if link goes to the external source. --- config.toml | 50 ++++++++++++++++--------- themes/delphi/layouts/partials/nav.html | 21 +++++++++-- 2 files changed, 50 insertions(+), 21 deletions(-) diff --git a/config.toml b/config.toml index 4ed18a87..a67c1f8e 100644 --- a/config.toml +++ b/config.toml @@ -36,42 +36,39 @@ relativeURLs = false name = "Publications" url = "/about/publications" weight = 4 -#[[menu.main]] -# parent = "about" -# name = "Presentations" -# url = "" -# weight = 5 [[menu.main]] parent = "about" name = "Blog" url = "/blog" - weight = 6 + weight = 5 [[menu.main]] parent = "about" name = "News" url = "/about/news" - weight = 7 + weight = 6 [[menu.main]] parent = "about" name = "Join Us" url = "" identifier = "join-us" - weight = 8 + weight = 7 [[menu.main]] parent = "join-us" name = "Open paid positions" url = "/about/careers" - weight = 9 + weight = 8 [[menu.main]] parent = "about" name = "Support Us (Donate)" url = "" - weight = 10 + weight = 9 [[menu.main]] parent = "about" name = "Contact Us" url = "https://docs.google.com/forms/d/e/1FAIpQLScqgT1fKZr5VWBfsaSp-DNaN03aV6EoZU4YljIzHJ1Wl_zmtg/viewform" - weight = 11 + weight = 10 + [menu.main.params] + external = true # epidemic-signals [[menu.main]] @@ -89,6 +86,8 @@ relativeURLs = false name = "Signal Discovery & Selection" url = "/signals/" weight = 3 + [menu.main.params] + external = true [[menu.main]] parent = "epidemic-signals" name = "Signal Visualizaion" @@ -120,6 +119,8 @@ relativeURLs = false name = "Signal Documentation" url = "https://cmu-delphi.github.io/delphi-epidata/api/covidcast_signals.html" weight = 6 + [menu.main.params] + external = true [[menu.main]] parent = "epidemic-signals" name = "Dashboard Builder" @@ -135,6 +136,8 @@ relativeURLs = false name = "Epidata API" url = "https://cmu-delphi.github.io/delphi-epidata/" weight = 9 + [menu.main.params] + external = true [[menu.main]] parent = "epidemic-signals" identifier = "ctis" @@ -161,16 +164,11 @@ relativeURLs = false name = "Suggest or request a new data source" url = "" weight = 13 -[[menu.main]] - parent = "epidemic-signals" - name = "Learn more" - url = "" - weight = 14 [[menu.main]] parent = "epidemic-signals" name = "Terms Of Use" url = "/epidemic-signals/terms-of-use" - weight = 15 + weight = 14 # nowcasting-and-forecasting [[menu.main]] @@ -183,16 +181,22 @@ relativeURLs = false name = "COVID-19 Forecasting" url = "https://covid19forecasthub.org/" weight = 2 + [menu.main.params] + external = true [[menu.main]] parent = "nowcasting-and-forecasting" name = "Flu Forecasting" url = "https://www.cdc.gov/flu/weekly/flusight/index.html" weight = 3 + [menu.main.params] + external = true [[menu.main]] parent = "nowcasting-and-forecasting" name = "Forecast Evaluation" url = "/forecast-eval/" weight = 4 + [menu.main.params] + external = true # for-modelers-and-developers @@ -207,11 +211,15 @@ relativeURLs = false name = "GitHub" url = "https://github.com/cmu-delphi/" weight = 3 + [menu.main.params] + external = true [[menu.main]] parent = "for-modelers-and-developers" name = "Epidata API" url = "https://cmu-delphi.github.io/delphi-epidata/" weight = 4 + [menu.main.params] + external = true [[menu.main]] parent = "for-modelers-and-developers" identifier = "r-packages" @@ -222,16 +230,22 @@ relativeURLs = false name = "epidatr" url = "https://cmu-delphi.github.io/epidatr/" weight = 10 + [menu.main.params] + external = true [[menu.main]] parent = "r-packages" name = "epiprocess" url = "https://cmu-delphi.github.io/epiprocess/" weight = 20 + [menu.main.params] + external = true [[menu.main]] parent = "r-packages" name = "epipredict" url = "https://cmu-delphi.github.io/epipredict/" weight = 30 + [menu.main.params] + external = true [[menu.main]] parent = "for-modelers-and-developers" identifier = "python-packages" @@ -242,6 +256,8 @@ relativeURLs = false name = "Util" url = "https://github.com/cmu-delphi/epidatpy" weight = 10 + [menu.main.params] + external = true [params] description = "Developing the Theory and Practice of Epidemiological Forecasting" diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index 1756dd0f..5c4bca75 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -16,7 +16,10 @@ {{- end -}}" > {{ if .HasChildren }} - + {{ partial "menu/item.html" . }} {{ partial "font-awesome.html" "solid/angle-down" }} @@ -24,7 +27,10 @@
      {{ range .Children }}
    • - + {{ partial "menu/item.html" . }} {{ if .HasChildren }} {{ partial "font-awesome.html" "solid/angle-right" }} @@ -35,7 +41,11 @@ {{ else }} - + {{ partial "menu/item.html" . }} {{ end }} From 78afb619583b433b982e2c7bfcee3883a6fa35e8 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Mon, 29 Jul 2024 19:40:22 +0300 Subject: [PATCH 13/33] Linting --- themes/delphi/layouts/partials/nav.html | 37 +++++++++++++++---------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index 5c4bca75..118cd514 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -16,10 +16,12 @@ {{- end -}}" > {{ if .HasChildren }} - + {{ partial "menu/item.html" . }} {{ partial "font-awesome.html" "solid/angle-down" }} @@ -27,10 +29,12 @@
        {{ range .Children }}
      • - + {{ partial "menu/item.html" . }} {{ if .HasChildren }} {{ partial "font-awesome.html" "solid/angle-right" }} @@ -41,11 +45,12 @@ {{ else }} - + {{ partial "menu/item.html" . }} {{ end }} From 7571a8247ac0dd4fd6b7973cd4b677482caa2325 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Tue, 30 Jul 2024 20:00:46 +0300 Subject: [PATCH 14/33] Added hamburger navigation menu --- .../assets/css/layout/_header_footer.scss | 4 ++ themes/delphi/layouts/partials/nav.html | 46 +++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/themes/delphi/assets/css/layout/_header_footer.scss b/themes/delphi/assets/css/layout/_header_footer.scss index 8257ddb8..ac827870 100644 --- a/themes/delphi/assets/css/layout/_header_footer.scss +++ b/themes/delphi/assets/css/layout/_header_footer.scss @@ -81,6 +81,10 @@ li.nav-entry { .nav-dropdown-child { padding-left: 2.2em; + + ul.nestedmenu { + margin-left: 1.5em; + }; } .nav-dropdown-parent { diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index 118cd514..18854e82 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -76,5 +76,51 @@ {{ end }}
      + From b2f9f490544d8c68b3094949760e985e3fa8168d Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Tue, 30 Jul 2024 20:01:06 +0300 Subject: [PATCH 15/33] Linting --- themes/delphi/assets/css/layout/_header_footer.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/delphi/assets/css/layout/_header_footer.scss b/themes/delphi/assets/css/layout/_header_footer.scss index ac827870..c4a5d853 100644 --- a/themes/delphi/assets/css/layout/_header_footer.scss +++ b/themes/delphi/assets/css/layout/_header_footer.scss @@ -84,7 +84,7 @@ li.nav-entry { ul.nestedmenu { margin-left: 1.5em; - }; + } } .nav-dropdown-parent { From 74b84c88e3928affc74aafa52997c51aa2fa93f9 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Tue, 30 Jul 2024 20:21:25 +0300 Subject: [PATCH 16/33] Removed unwanted change --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4df12868..f42ed4ff 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "build:blog": "Rscript -e \"blogdown::build_site(local=FALSE, run_hugo=FALSE, build_rmd='md5sum')\"", "prebuild": "npm run clean", "build": "hugo --gc --minify", - "start": "hugo server -D --disableFastRender", + "start": "hugo server -D", "start:blog": "Rscript -e \"blogdown::serve_site(port=1313, browser=FALSE)\"", "format": "prettier *.* \"(.vscode|content|data|themes)/**\" --write", "lint": "prettier *.* \"(.vscode|content|data|themes)/**\" --check", @@ -47,4 +47,4 @@ "lint-staged": { "*.{js,scss,css,yaml,md,html,json,yml}": "prettier --write" } -} +} \ No newline at end of file From 0416be450d0935facb2fc2f580852bf117d391b6 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Tue, 30 Jul 2024 20:22:20 +0300 Subject: [PATCH 17/33] Linting --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f42ed4ff..594f5d6c 100644 --- a/package.json +++ b/package.json @@ -47,4 +47,4 @@ "lint-staged": { "*.{js,scss,css,yaml,md,html,json,yml}": "prettier --write" } -} \ No newline at end of file +} From 9352e88cfae69840cb0cfee5d54a8cf72c2f8318 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Wed, 31 Jul 2024 12:43:52 +0300 Subject: [PATCH 18/33] Added 'external link' icons to the links that are going outside of the website --- .../assets/css/layout/_header_footer.scss | 4 ++ themes/delphi/layouts/partials/nav.html | 58 +++++++++++++++++-- 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/themes/delphi/assets/css/layout/_header_footer.scss b/themes/delphi/assets/css/layout/_header_footer.scss index c4a5d853..9d327030 100644 --- a/themes/delphi/assets/css/layout/_header_footer.scss +++ b/themes/delphi/assets/css/layout/_header_footer.scss @@ -231,3 +231,7 @@ ul.nestedmenu li > a { ul.nestedmenu li.active > a { color: rgb(247, 44, 114) !important; } + +div.external-link span > svg { + max-height: 13px!important; +} diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index 18854e82..99c74daa 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -23,6 +23,11 @@ {{ end }} > {{ partial "menu/item.html" . }} + {{ if .Params.external }} +
      + {{ partial "font-awesome.html" "solid/arrow-up-right-from-square" }} +
      + {{ end }} {{ partial "font-awesome.html" "solid/angle-down" }}
      @@ -36,6 +41,11 @@ {{ end }} > {{ partial "menu/item.html" . }} + {{ if .Params.external }} +
      + {{ partial "font-awesome.html" "solid/arrow-up-right-from-square" }} +
      + {{ end }} {{ if .HasChildren }} {{ partial "font-awesome.html" "solid/angle-right" }} {{ end }} @@ -52,6 +62,11 @@ {{ end }} > {{ partial "menu/item.html" . }} + {{ if .Params.external }} +
      + {{ partial "font-awesome.html" "solid/arrow-up-right-from-square" }} +
      + {{ end }}
      • {{ end }} @@ -70,6 +85,11 @@ {{ end }} > {{ partial "menu/item.html" . }} + {{ if .Params.external }} +
      + {{ partial "font-awesome.html" "solid/arrow-up-right-from-square" }} +
      + {{ end }} {{ end }} @@ -87,15 +107,35 @@ uk-nav-header {{- end -}} {{ if (eq $currentPage.Section .Identifier) -}}uk-active{{- end -}}" > - + {{ partial "menu/item.html" . }} + {{ if .Params.external }} +
      + {{ partial "font-awesome.html" "solid/arrow-up-right-from-square" }} +
      + {{ end }}       {{ if .HasChildren }} {{ range .Children }}
    • - + {{ partial "menu/item.html" . }} + {{ if .Params.external }} +
      + {{ partial "font-awesome.html" "solid/arrow-up-right-from-square" }} +
      + {{ end }}
      • {{ if .HasChildren }} @@ -103,10 +143,17 @@ {{ end }} - {{ end }} {{ end }} {{ end }} From 090fa93a058876744dd9e6c0f8c1876cc020477b Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Wed, 31 Jul 2024 12:45:13 +0300 Subject: [PATCH 19/33] Linting --- themes/delphi/assets/css/layout/_header_footer.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/delphi/assets/css/layout/_header_footer.scss b/themes/delphi/assets/css/layout/_header_footer.scss index 9d327030..342f720e 100644 --- a/themes/delphi/assets/css/layout/_header_footer.scss +++ b/themes/delphi/assets/css/layout/_header_footer.scss @@ -233,5 +233,5 @@ ul.nestedmenu li.active > a { } div.external-link span > svg { - max-height: 13px!important; + max-height: 13px !important; } From 0a7dfea06e7f2da125c1a23a45b361f3996720ee Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Wed, 31 Jul 2024 12:55:52 +0300 Subject: [PATCH 20/33] Fixed 'hybrid' moode hamburger menu --- themes/delphi/assets/css/layout/_header_footer.scss | 3 +++ themes/delphi/layouts/partials/nav.html | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/themes/delphi/assets/css/layout/_header_footer.scss b/themes/delphi/assets/css/layout/_header_footer.scss index 342f720e..92421144 100644 --- a/themes/delphi/assets/css/layout/_header_footer.scss +++ b/themes/delphi/assets/css/layout/_header_footer.scss @@ -100,6 +100,9 @@ li.nav-entry { .nav-burger { display: none; } + .nav-mobile { + top: 0 !important; + } } @media only screen and (max-width: $menu-mode-mobile-only) { diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index 99c74daa..65f99faf 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -99,7 +99,10 @@
      • -
        +
          {{ range .Site.Menus.main.ByWeight }}
        • Date: Thu, 1 Aug 2024 07:20:57 +0300 Subject: [PATCH 21/33] Added 'Archived Systems and Tools' under Nowcasting and Forecasting menu. Changed 'For modelers and developers' section. --- config.toml | 74 ++++++++++++-------- content/archived-systems-and-tools/_index.md | 24 +++++++ 2 files changed, 68 insertions(+), 30 deletions(-) create mode 100644 content/archived-systems-and-tools/_index.md diff --git a/config.toml b/config.toml index a67c1f8e..e7bf97d2 100644 --- a/config.toml +++ b/config.toml @@ -197,65 +197,79 @@ relativeURLs = false weight = 4 [menu.main.params] external = true - +[[menu.main]] + parent = "nowcasting-and-forecasting" + name = "Archived Systems and Tools" + url = "/archived-systems-and-tools/" + weight = 5 # for-modelers-and-developers [[menu.main]] identifier = "for-modelers-and-developers" name = "For Modelers and Developers" - url = "" + url = "code" weight = 2 [[menu.main]] parent = "for-modelers-and-developers" - pre = "brands/github" - name = "GitHub" - url = "https://github.com/cmu-delphi/" + name = "Code Overview" + url = "code" weight = 3 - [menu.main.params] - external = true [[menu.main]] parent = "for-modelers-and-developers" - name = "Epidata API" - url = "https://cmu-delphi.github.io/delphi-epidata/" + identifier = "api-and-clients" + name = "API and Clients" + url = "/code/#api-and-clients" weight = 4 +[[menu.main]] + parent = "api-and-clients" + name = "Epidata" + url = "https://github.com/cmu-delphi/delphi-epidata" + weight = 10 + [menu.main.params] + external = true +[[menu.main]] + parent = "api-and-clients" + name = "Epidatr" + url = "https://cmu-delphi.github.io/epidatr/" + weight = 20 + [menu.main.params] + external = true +[[menu.main]] + parent = "api-and-clients" + name = "Epidatpy" + url = "https://github.com/cmu-delphi/epidatpy" + weight = 30 [menu.main.params] external = true [[menu.main]] parent = "for-modelers-and-developers" - identifier = "r-packages" - name = "R packages" + identifier = "forecasting" + name = "Forecasting" + url = "code#forecasting" weight = 5 [[menu.main]] - parent = "r-packages" - name = "epidatr" - url = "https://cmu-delphi.github.io/epidatr/" + parent = "forecasting" + name = "Forecasting Manual" weight = 10 - [menu.main.params] - external = true [[menu.main]] - parent = "r-packages" - name = "epiprocess" - url = "https://cmu-delphi.github.io/epiprocess/" + parent = "forecasting" + name = "Epipredict" + url = "https://cmu-delphi.github.io/epipredict/" weight = 20 [menu.main.params] external = true [[menu.main]] - parent = "r-packages" - name = "epipredict" - url = "https://cmu-delphi.github.io/epipredict/" + parent = "forecasting" + name = "Epiprocess" + url = "https://cmu-delphi.github.io/epiprocess/" weight = 30 [menu.main.params] external = true [[menu.main]] parent = "for-modelers-and-developers" - identifier = "python-packages" - name = "Python packages" - weight = 6 -[[menu.main]] - parent = "python-packages" - name = "Util" - url = "https://github.com/cmu-delphi/epidatpy" - weight = 10 + name = "GitHub" + pre = "brands/github" + url = "https://github.com/cmu-delphi/" [menu.main.params] external = true diff --git a/content/archived-systems-and-tools/_index.md b/content/archived-systems-and-tools/_index.md new file mode 100644 index 00000000..e62f857e --- /dev/null +++ b/content/archived-systems-and-tools/_index.md @@ -0,0 +1,24 @@ +--- +title: Archived Systems and Tools +linkTitle: Archived Systems and Tools +layout: single +--- + +### [Crowdcast](/crowdcast) + +Delphi’s "Wisdom of crowds" forecasting system: Used for Chikungunya, flu and most recently Covid. In it's archived configuration, this system was set up to forecast ILI during the COVID-19 pandemic + +### [ILI Nearby](/nowcast) + +Flu nowcasting system. + +**Note:** This system is designed to nowcast ILI driven by seasonal +influenza and is NOT designed to nowcast ILI during the COVID-19 pandemic. + +### [Nowcast](https://github.com/cmu-delphi/nowcast) + +A sensor fusion based nowcasting system developed to predict ILI before the COVID-19 pandemic + +### [Fluscores](https://delphi.cmu.edu/misc/fluscores/) + +Visual comparison of scored submissions to CDC Flu Forecasting Challenge for 2014-16 (provide your own score files). From 1489c8bd27489a84f2cbdd0395f8adffc61538c4 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Fri, 2 Aug 2024 13:40:29 +0300 Subject: [PATCH 22/33] Renaming --- config.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index e7bf97d2..ef019d3a 100644 --- a/config.toml +++ b/config.toml @@ -78,7 +78,7 @@ relativeURLs = false weight = 1 [[menu.main]] parent = "epidemic-signals" - name = "About Delphi Epidata" + name = "About Delphi Epidata & COVIDcast" url = "/epidemic-signals/" weight = 2 [[menu.main]] @@ -101,7 +101,7 @@ relativeURLs = false weight = 10 [[menu.main]] parent = "signal-visualization" - name = "Covidcast Dashboard" + name = "Delphi Epidata Dashboard" url = "/covidcast/" weight = 20 [[menu.main]] From 93722684b16d5595d03ea9ae4800ff07a8cfebc5 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Fri, 2 Aug 2024 16:22:30 +0300 Subject: [PATCH 23/33] Added new page 'About Delphi Epidata & Covidcast'. --- config.toml | 2 +- content/epidemic-signals/_index.md | 13 +----------- .../about-delphi-epidata-covidcast.md | 21 +++++++++++++++++++ 3 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 content/epidemic-signals/about-delphi-epidata-covidcast.md diff --git a/config.toml b/config.toml index ef019d3a..b1d7e7a4 100644 --- a/config.toml +++ b/config.toml @@ -79,7 +79,7 @@ relativeURLs = false [[menu.main]] parent = "epidemic-signals" name = "About Delphi Epidata & COVIDcast" - url = "/epidemic-signals/" + url = "/epidemic-signals/about-delphi-epidata-covidcast" weight = 2 [[menu.main]] parent = "epidemic-signals" diff --git a/content/epidemic-signals/_index.md b/content/epidemic-signals/_index.md index f68d7328..2818440a 100644 --- a/content/epidemic-signals/_index.md +++ b/content/epidemic-signals/_index.md @@ -39,19 +39,8 @@ in the United States. It has several parts. submitted to the [COVID-19 Forecast Hub](https://covid19forecasthub.org/), serving as the basis for the [CDC's official forecast communications](https://www.cdc.gov/coronavirus/2019-ncov/covid-data/forecasting-us.html). - -## See Also - -- [Delphi Epidata dashboard]({{< relref "covidcast" >}}) -- [CTIS dashboard]({{< relref "covidcast/survey-results" >}}) -- [Export data tool]({{< relref "covidcast/export" >}}) -- [API documentation](https://cmu-delphi.github.io/delphi-epidata/api/covidcast.html) -- [R package](https://cmu-delphi.github.io/covidcast/covidcastR/) -- [Python package](https://cmu-delphi.github.io/covidcast/covidcast-py/html/) -- [GitHub repo](https://www.github.com/cmu-delphi/covidcast/) (see also - [related repos](https://github.com/cmu-delphi/covidcast/#related-repos)) -## Research Articles +## To Learn More A summary of some key parts of COVIDcast can be found in the December 2021 *Proceedings of the National Academy of Sciences* Special Feature: [Beyond cases and deaths: The benefits of auxiliary data diff --git a/content/epidemic-signals/about-delphi-epidata-covidcast.md b/content/epidemic-signals/about-delphi-epidata-covidcast.md new file mode 100644 index 00000000..bbd5bad3 --- /dev/null +++ b/content/epidemic-signals/about-delphi-epidata-covidcast.md @@ -0,0 +1,21 @@ +--- +title: About Delphi Epidata (including COVIDcast) +linkTitle: About Delphi Epidata (including COVIDcast) +layout: single + +--- + +Delphi Epidata is a database platform, repository, and API for epidemiological signals (also called "indicators"). It was launched in 2016 and significantly revamped during the pandemic. Delphi Epidata was purpose-designed for hosting signals for epidemic and pandemic detection, tracking and forecasting. It has built-in support for data versioning, calendar reporting effects, anomaly and trend detection, backfill projection, privacy-based censoring, and geographic, temporal and demographic breakdown and aggregation. The Delphi Epidata repository contains over 500 different current or historical signals, tracking flu, COVID-19, denge, norovirus and other pathogens, and covering all rungs of the [severity pyramid]({{< relref "epidemic-signals#severity-pyramid" >}}). + +We procure data streams that reflect epidemic and pandemic activity from a wide variety of sources -- including unique industry partnerships and scraping of publicly available data -- and extract from them in real-time disease-related signals at the finest possible geographic, demographic and temporal granularity. + +The COVID-19 related portion of Delphi Epidata is also known as **COVIDcast**, and constitute what we believe may be the largest public repository of real-time, geographically-detailed indicators of COVID-19 activity in the U.S. + +We make all our signals freely available in real-time to the greatest extent allowable, using a [public API](https://cmu-delphi.github.io/delphi-epidata/) which is updated with new data daily. We also provide: + - a [signal discovery](https://delphi.cmu.edu/signals/) tool, to explore what epi-signals are available in Delphi Epidata and elsewhere in the community + - a general [signal visualization](https://delphi.cmu.edu/epivis/) tool + - a [signal dashboard]({{< relref "/covidcast" >}}) and a "classic" [map-based version]({{< relref "/covidcast/classic" >}}) to visualize a core set of COVID-19 and flu indicators + - a [COVID-19 signal export]({{< relref "/covidcast/export" >}}) app, a [dashboard builder]({{< relref "/covidcast/dashboard" >}}), and more + - [R](https://cmu-delphi.github.io/epidatr/) and [Python](https://github.com/cmu-delphi/epidatpy) packages to extract signals from the Epidata repository, and R packages to further [process them](https://cmu-delphi.github.io/epiprocess/) and to create [epidemic forecasting models](https://cmu-delphi.github.io/epipredict/) ([learn more](https://docs.google.com/presentation/d/1XfnxQAzR8TcqpguIcFcn9XwG6vvpTyWP6S79cevVqhY/edit#slide=id.g2e3520ca017_0_70) about the packages) + +Some of the underlying data from which these signals are extracted would not exist or be publicly available without Delphi’s efforts. These include a massive national daily survey called the [COVID-19 Trends and Impact Survey (CTIS)]({{< relref "ctis" >}}) that we have deployed in partnership with Facebook, which has been taken by over 25 million Americans during 2020-2022; and aggregated counts extracted from an enormous database of de-identified medical insurance claims, covering more than 35% of the U.S. population, made possible through health system partners including Change Healthcare. \ No newline at end of file From 824cd9014b61a91b2433f72f5fb5d0a2ec349091 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Wed, 7 Aug 2024 15:07:01 +0300 Subject: [PATCH 24/33] Added 'Severity Pyramid' section to the About Delphi Epidata (including COVIDcast) section --- .../epidemic-signals/about-delphi-epidata-covidcast.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/content/epidemic-signals/about-delphi-epidata-covidcast.md b/content/epidemic-signals/about-delphi-epidata-covidcast.md index bbd5bad3..9c5f1f91 100644 --- a/content/epidemic-signals/about-delphi-epidata-covidcast.md +++ b/content/epidemic-signals/about-delphi-epidata-covidcast.md @@ -5,7 +5,7 @@ layout: single --- -Delphi Epidata is a database platform, repository, and API for epidemiological signals (also called "indicators"). It was launched in 2016 and significantly revamped during the pandemic. Delphi Epidata was purpose-designed for hosting signals for epidemic and pandemic detection, tracking and forecasting. It has built-in support for data versioning, calendar reporting effects, anomaly and trend detection, backfill projection, privacy-based censoring, and geographic, temporal and demographic breakdown and aggregation. The Delphi Epidata repository contains over 500 different current or historical signals, tracking flu, COVID-19, denge, norovirus and other pathogens, and covering all rungs of the [severity pyramid]({{< relref "epidemic-signals#severity-pyramid" >}}). +Delphi Epidata is a database platform, repository, and API for epidemiological signals (also called "indicators"). It was launched in 2016 and significantly revamped during the pandemic. Delphi Epidata was purpose-designed for hosting signals for epidemic and pandemic detection, tracking and forecasting. It has built-in support for data versioning, calendar reporting effects, anomaly and trend detection, backfill projection, privacy-based censoring, and geographic, temporal and demographic breakdown and aggregation. The Delphi Epidata repository contains over 500 different current or historical signals, tracking flu, COVID-19, denge, norovirus and other pathogens, and covering all rungs of the [severity pyramid](#severity-pyramid). We procure data streams that reflect epidemic and pandemic activity from a wide variety of sources -- including unique industry partnerships and scraping of publicly available data -- and extract from them in real-time disease-related signals at the finest possible geographic, demographic and temporal granularity. @@ -18,4 +18,9 @@ We make all our signals freely available in real-time to the greatest extent all - a [COVID-19 signal export]({{< relref "/covidcast/export" >}}) app, a [dashboard builder]({{< relref "/covidcast/dashboard" >}}), and more - [R](https://cmu-delphi.github.io/epidatr/) and [Python](https://github.com/cmu-delphi/epidatpy) packages to extract signals from the Epidata repository, and R packages to further [process them](https://cmu-delphi.github.io/epiprocess/) and to create [epidemic forecasting models](https://cmu-delphi.github.io/epipredict/) ([learn more](https://docs.google.com/presentation/d/1XfnxQAzR8TcqpguIcFcn9XwG6vvpTyWP6S79cevVqhY/edit#slide=id.g2e3520ca017_0_70) about the packages) -Some of the underlying data from which these signals are extracted would not exist or be publicly available without Delphi’s efforts. These include a massive national daily survey called the [COVID-19 Trends and Impact Survey (CTIS)]({{< relref "ctis" >}}) that we have deployed in partnership with Facebook, which has been taken by over 25 million Americans during 2020-2022; and aggregated counts extracted from an enormous database of de-identified medical insurance claims, covering more than 35% of the U.S. population, made possible through health system partners including Change Healthcare. \ No newline at end of file +Some of the underlying data from which these signals are extracted would not exist or be publicly available without Delphi’s efforts. These include a massive national daily survey called the [COVID-19 Trends and Impact Survey (CTIS)]({{< relref "ctis" >}}) that we have deployed in partnership with Facebook, which has been taken by over 25 million Americans during 2020-2022; and aggregated counts extracted from an enormous database of de-identified medical insurance claims, covering more than 35% of the U.S. population, made possible through health system partners including Change Healthcare. + + +## Severity Pyramid + +![](/epidemic-signals/images/severity-pyramid.svg) \ No newline at end of file From d0b712055b35d17cfda3b43a22cba2065dc4ff76 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Mon, 12 Aug 2024 22:53:08 +0300 Subject: [PATCH 25/33] Updated 'Terms of Use' --- content/epidemic-signals/terms-of-use.md | 43 ++++++++++++------------ 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/content/epidemic-signals/terms-of-use.md b/content/epidemic-signals/terms-of-use.md index bdffe8ec..0720e059 100644 --- a/content/epidemic-signals/terms-of-use.md +++ b/content/epidemic-signals/terms-of-use.md @@ -5,29 +5,31 @@ aliases: - /covidcast/terms-of-use --- -Version Date: November 25, 2020 +Version Date: August 25, 2024 ### Introduction/Scope -The Carnegie Mellon University (“CMU”) COVIDcast [website]({{< relref "/covidcast">}}) and related COVIDcast [Epidata API pages​]({{< apiref "/">}}) (collectively, the “Site”) displays signals related to COVID-19 activity levels across the United States, derived from a variety of anonymized, aggregated data sources made available by multiple partners. +The Carnegie Mellon University (“CMU”) Delphi [website]({{< relref "/covidcast">}}) and related Delphi Epidata API data (collectively, the “Site”) displays signals related to epidemic and pandemic activity levels across the United States, derived from a variety of anonymized, aggregated data sources made available by multiple partners. -Each signal may reflect the prevalence of COVID-19 infection, mild symptoms, or more severe disease over time. Each signal can be presented at multiple geographic resolutions: state, county, and/or metropolitan area. All these signals taken together may suggest heightened or rising COVID-19 activity in specific locations. +Each signal may reflect the prevalence of infection, mild symptoms, or more severe disease over time. Each signal can be presented at multiple geographic resolutions: state, county, and/or metropolitan area. All these signals taken together may suggest heightened or rising epidemic or pandemic activity in specific locations. -**THE COVID-19 INDICATORS VISUALIZED ON OUR MAP(S) ARE RESEARCH RESULTS AND PROJECTIONS DERIVED FROM VARIOUS DATA SOURCES. THIS MAP DATA AND SIGNAL INFORMATION IS PROVIDED ON AN AS-IS, AS-AVAILABLE BASIS AS MORE PARTICULARLY DESCRIBED IN THESE TERMS OF USE, AND IT SHOULD NOT BE USED FOR DIAGNOSTIC OR TREATMENT PURPOSES, OR FOR GUIDANCE ON ANY TYPE OF TRAVEL.** +**THE EPIDEMIC INDICATORS VISUALIZED ON OUR MAP(S) ARE RESEARCH RESULTS AND PROJECTIONS DERIVED FROM VARIOUS DATA SOURCES. THIS MAP DATA AND SIGNAL INFORMATION IS PROVIDED ON AN AS-IS, AS-AVAILABLE BASIS AS MORE PARTICULARLY DESCRIBED IN THESE TERMS OF USE, AND IT SHOULD NOT BE USED FOR DIAGNOSTIC OR TREATMENT PURPOSES, OR FOR GUIDANCE ON ANY TYPE OF TRAVEL.** Your use of the Site constitutes your agreement to these Terms of Use (**“TOU”**). ### Modification -CMU may update and change these TOU from time to time without notice to you. You must review these TOU each time you use this Site to make sure you are still in agreement to abide by them. You agree that by accessing this Site or the information on it after changes have been made to these Terms of Use, you are agreeing to accept and comply with those changes. +CMU may update and change these TOU from time to time without notice to you. You must review these TOU each time you use this Site to make sure you are still in agreement to abide by them. You agree that by accessing this Site or the information on it after changes have been made to these Terms of Use, you are agreeing to accept and comply with those changes. ### Permitted Use and License/Availability of the Site -Subject to other relevant provisions of the TOU and except as otherwise indicated on the Site, the Site and any information and data on it (**“​Site Content​”**) is provided to you under the CC-BY license ([https://creativecommons.org/licenses/by/4.0/](https://creativecommons.org/licenses/by/4.0/)). Without limiting the general nature of the prior sentence, as indicated on the Site, certain API signals are subject to the CC-BY-NC license ([https://creativecommons.org/licenses/by-nc/4.0/](https://creativecommons.org/licenses/by-nc/4.0/)). CMU (and/or its content providers, as applicable) own and retain all intellectual property rights they have in and to the Site Content, including but not limited to the underlying infrastructure. CMU shall have the right in its sole and absolute discretion to suspend or terminate the Site any or all access to it for any reason. As specified below, the Site (including Site Content) is provided on an “AS-IS, AS-AVAILABLE” basis. +Subject to other relevant provisions of the TOU and except as otherwise indicated on the Site and/or where the access to the relevant content is subject to access-key controls, the Site and any information and data on it (“Site Content”) is provided to you under the [CC-BY license](https://creativecommons.org/licenses/by/4.0/). Without limiting the general nature of the prior sentence, as indicated on the Site, certain API signals are subject to the [CC-BY-NC license](https://creativecommons.org/licenses/by-nc/4.0/) or access-key based restrictions. CMU in its sole discretion will determine the process for requesting access to any Site Content protected by access keys and if/how such access is granted. + +CMU (and/or its content providers, as applicable) own and retain all intellectual property rights they have in and to the Site Content, including but not limited to the underlying infrastructure. CMU shall have the right in its sole and absolute discretion to suspend or terminate the Site any or all access to it for any reason. As specified below, the Site (including Site Content) is provided on an “AS-IS, AS-AVAILABLE” basis. ### Prohibited Uses/Activities -Unless otherwise expressly permitted under these TOU or an applicable license, the following activities are prohibited with respect to your use of the Site: (a) using the Site or any content in a manner not permitted under these TOU or license; (b) taking any action using the Site that is harmful, threatening, abusive, harassing, tortious, defamatory, vulgar, obscene, libelous, invasive of another's privacy, hateful, discriminatory or racially, ethnically or otherwise objectionable or in violation of any applicable laws or regulations, or encourage and/or assist others to engage in these activities; (c) interfering with, removing or modifying any terms and conditions or other Site Content and/or any part of the Site used for the operation and/or security of the Site ; (d) impersonating any person or entity, including, but not limited to, any CMU personnel, or falsely stating or otherwise misrepresenting your affiliation with a person or entity; (e) knowingly uploading, posting, emailing, transmitting or otherwise making available any content that contains software viruses or any other computer code, files or programs designed to interrupt, destroy or limit the functionality of any computer software or hardware or telecommunications equipment; (f) interfering with or disrupting the Site or servers or networks connected to the Site , or disobeying any requirements, procedures, policies or regulations of networks connected to the Site (including but not limited to those of any relevant third party service providers used in connection with the Site ); and/or (g) taking Site Content from the Site and reformatting it and/or displaying it on any other website. +Unless otherwise expressly permitted under these TOU or an applicable license, the following activities are prohibited with respect to your use of the Site: (a) using the Site or any content in a manner not permitted under these TOU or license; (b) taking any action using the Site that is harmful, threatening, abusive, harassing, tortious, defamatory, vulgar, obscene, libelous, invasive of another's privacy, hateful, discriminatory or racially, ethnically or otherwise objectionable or in violation of any applicable laws or regulations, or encourage and/or assist others to engage in these activities; (c) interfering with, removing or modifying any terms and conditions or other Site Content and/or any part of the Site used for the operation and/or security of the Site, including but not limited to circumventing or attempting to circumvent any access-key based restrictions or other access or security controls; (d) impersonating any person or entity, including, but not limited to, any CMU personnel, or falsely stating or otherwise misrepresenting your affiliation with a person or entity; (e) knowingly uploading, posting, emailing, transmitting or otherwise making available any content that contains software viruses or any other computer code, files or programs designed to interrupt, destroy or limit the functionality of any computer software or hardware or telecommunications equipment; (f) interfering with or disrupting the Site or servers or networks connected to the Site, or disobeying any requirements, procedures, policies or regulations of networks connected to the Site (including but not limited to those of any relevant third party service providers used in connection with the Site ); and/or (g) taking Site Content from the Site and reformatting it and/or displaying it on any other website. ### Features of the Site; Use of Third Party Providers @@ -39,32 +41,31 @@ CMU’s servers and operations are located primarily in the United States and ou ### Notice to California Residents -BY USING THE SERVICES, YOU WAIVE YOUR RIGHTS WITH RESPECT TO CALIFORNIA CIVIL CODE SECTION 1542, WHICH SAYS "A GENERAL RELEASE DOES NOT EXTEND TO CLAIMS WHICH THE CREDITOR DOES NOT KNOW ​OR​ SUSPECT TO EXIST IN HIS FAVOR AT THE TIME OF EXECUTING THE RELEASE, WHICH, IF KNOWN BY HIM MUST HAVE MATERIALLY AFFECTED HIS SETTLEMENT WITH THE DEBTOR." - -If the Site is at any time deemed an electronic commercial service (as defined under California Civil Code Section 1789.3), California residents are entitled to the following specific consumer rights information: +BY USING THE SERVICES, YOU WAIVE YOUR RIGHTS WITH RESPECT TO CALIFORNIA CIVIL CODE SECTION 1542, WHICH SAYS "A GENERAL RELEASE DOES NOT EXTEND TO CLAIMS WHICH THE CREDITOR DOES NOT KNOW OR SUSPECT TO EXIST IN HIS FAVOR AT THE TIME OF EXECUTING THE RELEASE, WHICH, IF KNOWN BY HIM MUST HAVE MATERIALLY AFFECTED HIS SETTLEMENT WITH THE DEBTOR." -The provider of the Site is: +If the Site is at any time deemed an electronic commercial service (as defined under California Civil Code Section 1789.3), California residents are entitled to the following specific consumer rights information: +The provider of the Site is: -Carnegie Mellon University -5000 Forbes Avenue -Pittsburgh, PA 15213 +Carnegie Mellon University +5000 Forbes Avenue +Pittsburgh, PA 15213 412-268-2000 -If the Site is deemed as electronic commercial service, you may file a complaint regarding the Site or to receive further information regarding use of the Site by sending a letter to the attention of “Legal Department” at the above address. - -### Disclaimer of Warranties +If the Site is deemed as an electronic commercial service, you may file a complaint regarding the Site or to receive further information regarding use of the Site by sending a letter to the attention of “Legal Department” at the above address. -THE SITE, AND ALL MATERIALS, INFORMATION, PRODUCTS AND SERVICES INCLUDED IN OR AVAILABLE THROUGH THE SITE ARE PROVIDED "AS IS," WITH NO WARRANTIES WHATSOEVER. CMU, ITS TRUSTEES, OFFICERS, EMPLOYEES, AGENTS, REPRESENTATIVES, AFFILIATES, LICENSORS, CONTENT PROVIDERS, CONTRACTORS (INCLUDING ANY THIRD PARTY PROVIDERS) AND SPONSORS (COLLECTIVELY THE **​“SITE PARTIES”​**) EXPRESSLY DISCLAIM TO THE FULLEST EXTENT PERMITTED BY LAW ALL EXPRESS, IMPLIED, AND STATUTORY WARRANTIES AND DUTIES, INCLUDING, WITHOUT LIMITATION: THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT; AND ANY WARRANTIES REGARDING THE SECURITY, RELIABILITY, TIMELINESS, AND PERFORMANCE OF THE SITE. -YOU ARE PROHIBITED FROM MAKING ANY EXPRESS OR IMPLIED WARRANTY TO ANY THIRD PARTY ON BEHALF OF CMU RELATING TO ANY MATTER, INCLUDING THE APPLICATION OF OR THE RESULTS TO BE OBTAINED FROM THE INFORMATION, MATERIALS, SERVICES, INTELLECTUAL PROPERTY OR OTHER PROPERTY OR RIGHTS (INCLUDING COVIDCAST) GRANTED AND/OR PROVIDED BY CMU​. +### Disclaimer of Warranties +THE SITE, AND ALL MATERIALS, INFORMATION, PRODUCTS AND SERVICES INCLUDED IN OR AVAILABLE THROUGH THE SITE ARE PROVIDED "AS IS," WITH NO WARRANTIES WHATSOEVER. CMU, ITS TRUSTEES, OFFICERS, EMPLOYEES, AGENTS, REPRESENTATIVES, AFFILIATES, LICENSORS, CONTENT PROVIDERS, CONTRACTORS (INCLUDING ANY THIRD PARTY PROVIDERS) AND SPONSORS (COLLECTIVELY THE **“SITE PARTIES”**) EXPRESSLY DISCLAIM TO THE FULLEST EXTENT PERMITTED BY LAW ALL EXPRESS, IMPLIED, AND STATUTORY WARRANTIES AND DUTIES, INCLUDING, WITHOUT LIMITATION: THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT; AND ANY WARRANTIES REGARDING THE SECURITY, RELIABILITY, TIMELINESS, AND PERFORMANCE OF THE SITE. +YOU ARE PROHIBITED FROM MAKING ANY EXPRESS OR IMPLIED WARRANTY TO ANY THIRD PARTY ON BEHALF OF CMU RELATING TO ANY MATTER, INCLUDING THE APPLICATION OF OR THE RESULTS TO BE OBTAINED FROM THE INFORMATION, MATERIALS, SERVICES, INTELLECTUAL PROPERTY OR OTHER PROPERTY OR RIGHTS (INCLUDING DELPHI EPIDATA AND COVIDCAST) GRANTED AND/OR PROVIDED BY CMU. YOU UNDERSTAND AND AGREE THAT YOU OBTAIN ANY AND ALL INFORMATION, MATERIAL, DATA AND/OR OTHER CONTENT THROUGH THE USE OF THE SITE AT YOUR OWN DISCRETION AND CMU IS NOT ASSUMING RESPONSIBILITY FOR ANY DAMAGES TO YOUR COMPUTER SYSTEM OR LOSS OF DATA THAT RESULTS FROM THE USE OF SUCH ITEMS. IN ADDITION, SOME STATES OR OTHER JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSIONS MAY NOT APPLY TO YOU. YOU MAY ALSO HAVE OTHER RIGHTS THAT VARY FROM STATE TO STATE AND JURISDICTION TO JURISDICTION. + ### LIMITATION OF LIABILITY; LIMITATION ON DAMAGES UNDER NO CIRCUMSTANCES ARE CMU OR ANY OTHER SITE PARTIES BE LIABLE TO YOU, YOUR ORGANIZATION OR ANY OTHER USER ON ACCOUNT OF USE OR MISUSE OF OR RELIANCE ON THE SITE ARISING FROM ANY CLAIM FOR THE RECOVERY OF INDIRECT, INCIDENTAL, CONSEQUENTIAL, SPECIAL, EXEMPLARY, AND PUNITIVE DAMAGES WHETHER SUCH CLAIM IS BASED ON WARRANTY, CONTRACT, TORT, OR OTHERWISE, (EVEN IF CMU AND/OR THE SITE PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES). -Some states or other jurisdictions do not allow the exclusion or limitation of liability for certain damages, so the above limitations and exclusions shall apply only to the extent permitted under applicable law. +Some states or other jurisdictions do not allow the exclusion or limitation of liability for certain damages, so the above limitations and exclusions shall apply only to the extent permitted under applicable law. ### Force Majeure @@ -76,4 +77,4 @@ Using the Site does not confer any CMU course credit and/or any employment or st ### Miscellaneous -If any provision of these TOU is held to be invalid or unenforceable, such provision shall be deemed superseded by a valid enforceable provision that most closely matches the intent of the original provision and the remaining provisions shall be enforced. CMU’s failure to act with respect to a breach by you or any other users does not waive CMU’s right to act with respect to subsequent or similar breaches. The failure of CMU to exercise or enforce any right or provision of these terms and conditions shall not constitute a waiver of such right or provision. The section headings and subheadings contained in these TOU are included for convenience only, and shall not limit or otherwise affect the terms of these TOU. These TOU and any disputes related to them shall be interpreted in accordance with the laws of the Commonwealth of Pennsylvania without regard to its conflicts of laws provisions. All claims and/or controversies of every kind and nature arising out of or relating to these TOU, including any questions concerning its existence, negotiation, validity, meaning, performance, non-performance, breach, continuance or termination shall be settled (1) at CMU’s election, by binding arbitration administered by the American Arbitration Association ("AAA") in accordance with its Commercial Arbitration Rules and, in such case (a) the arbitration proceedings shall be conducted before a panel of three arbitrators, with each party selecting one disinterested arbitrator from a list submitted by the AAA and the two disinterested arbitrators selecting a third arbitrator from the list, (b) each party shall bear its own costs of arbitration, (c) all arbitration hearings shall be conducted in Allegheny County, Pennsylvania, and (d) the provisions hereof shall be a complete defense to any suit, action or proceeding instituted in any Federal, state or local court or before any administrative tribunal with respect to any claim or controversy arising out of or relating to these TOU and which is arbitrable as provided in these TOU, provided that either party may seek injunctive relief in a court of law or equity to assert, protect or enforce its rights hereunder (2) in the event that CMU does not elect binding arbitration as permitted in point (1) above, exclusively in the United States District Court for the Western District of Pennsylvania or, if such Court does not have jurisdiction, in any court of general jurisdiction in Allegheny County, Pennsylvania and each party consents to the exclusive jurisdiction of any such courts and waives any objection which such party may have to the laying of venue in any such courts. Notwithstanding any provision hereof, for all purposes of these TOU each party shall be and act as an independent contractor and not as partner, joint venture, agent, employee or employer of the other and shall not bind nor attempt to bind the other to any contract. You are agreeing to these TOU on behalf of yourself. You agree that, except for the disclaimers and limitations of liability made for the benefit of the other Site Parties, there shall be no third-party beneficiaries to these TOU. +If any provision of these TOU is held to be invalid or unenforceable, such provision shall be deemed superseded by a valid enforceable provision that most closely matches the intent of the original provision and the remaining provisions shall be enforced. CMU’s failure to act with respect to a breach by you or any other users does not waive CMU’s right to act with respect to subsequent or similar breaches. The failure of CMU to exercise or enforce any right or provision of these terms and conditions shall not constitute a waiver of such right or provision. The section headings and subheadings contained in these TOU are included for convenience only and shall not limit or otherwise affect the terms of these TOU. These TOU and any disputes related to them shall be interpreted in accordance with the laws of the Commonwealth of Pennsylvania without regard to its conflicts of laws provisions. All claims and/or controversies of every kind and nature arising out of or relating to these TOU, including any questions concerning its existence, negotiation, validity, meaning, performance, non-performance, breach, continuance or termination shall be settled (1) at CMU’s election, by binding arbitration administered by the American Arbitration Association ("AAA") in accordance with its Commercial Arbitration Rules and, in such case (a) the arbitration proceedings shall be conducted before a panel of three arbitrators, with each party selecting one disinterested arbitrator from a list submitted by the AAA and the two disinterested arbitrators selecting a third arbitrator from the list, (b) each party shall bear its own costs of arbitration, (c) all arbitration hearings shall be conducted in Allegheny County, Pennsylvania, and (d) the provisions hereof shall be a complete defense to any suit, action or proceeding instituted in any Federal, state or local court or before any administrative tribunal with respect to any claim or controversy arising out of or relating to these TOU and which is arbitrable as provided in these TOU, provided that either party may seek injunctive relief in a court of law or equity to assert, protect or enforce its rights hereunder (2) in the event that CMU does not elect binding arbitration as permitted in point (1) above, exclusively in the United States District Court for the Western District of Pennsylvania or, if such Court does not have jurisdiction, in any court of general jurisdiction in Allegheny County, Pennsylvania and each party consents to the exclusive jurisdiction of any such courts and waives any objection which such party may have to the laying of venue in any such courts. Notwithstanding any provision hereof, for all purposes of these TOU each party shall be and act as an independent contractor and not as partner, joint venture, agent, employee or employer of the other and shall not bind nor attempt to bind the other to any contract. You are agreeing to these TOU on behalf of yourself. You agree that, except for the disclaimers and limitations of liability made for the benefit of the other Site Parties, there shall be no third-party beneficiaries to these TOU. From 05817073cdf705395bb7eab153ca0d9ea8217ebf Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Mon, 12 Aug 2024 22:58:58 +0300 Subject: [PATCH 26/33] Updated 'Terms of Use' --- content/epidemic-signals/terms-of-use.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/epidemic-signals/terms-of-use.md b/content/epidemic-signals/terms-of-use.md index 0720e059..b3caa961 100644 --- a/content/epidemic-signals/terms-of-use.md +++ b/content/epidemic-signals/terms-of-use.md @@ -46,10 +46,10 @@ BY USING THE SERVICES, YOU WAIVE YOUR RIGHTS WITH RESPECT TO CALIFORNIA CIVIL CO If the Site is at any time deemed an electronic commercial service (as defined under California Civil Code Section 1789.3), California residents are entitled to the following specific consumer rights information: The provider of the Site is: -Carnegie Mellon University -5000 Forbes Avenue -Pittsburgh, PA 15213 -412-268-2000 +Carnegie Mellon University +5000 Forbes Avenue +Pittsburgh, PA 15213 +412-268-2000 If the Site is deemed as an electronic commercial service, you may file a complaint regarding the Site or to receive further information regarding use of the Site by sending a letter to the attention of “Legal Department” at the above address. From e006069f9f5c27cb38d5b3b90862c784337d2ea2 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Mon, 19 Aug 2024 18:17:49 +0300 Subject: [PATCH 27/33] Added two more items to the 'Join Us' section. --- config.toml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/config.toml b/config.toml index b1d7e7a4..51b79c97 100644 --- a/config.toml +++ b/config.toml @@ -56,7 +56,21 @@ relativeURLs = false parent = "join-us" name = "Open paid positions" url = "/about/careers" - weight = 8 + weight = 10 +[[menu.main]] + parent = "join-us" + name = "Invitation to faculty" + url = "https://docs.google.com/forms/d/e/1FAIpQLSeAKmjTuRZePMy4qneyloxhQ3HT9u6ukb3KcyAnIL89uGflxw/viewform" + weight = 20 + [menu.main.params] + external = true +[[menu.main]] + parent = "join-us" + name = "Invitation to students and volunteers" + url = "https://docs.google.com/forms/d/e/1FAIpQLSdPz62Zxg7DC2iyqN7Yv9dCxagpUaOXNIXJjLFJ-R848X0FOQ/viewform" + weight = 30 + [menu.main.params] + external = true [[menu.main]] parent = "about" name = "Support Us (Donate)" From df7fcf8b0c7c98c078da6e18928f930c53babf4e Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Tue, 27 Aug 2024 19:05:09 +0300 Subject: [PATCH 28/33] Few more changes to the main menu --- config.toml | 46 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/config.toml b/config.toml index 51b79c97..8a3dd8c3 100644 --- a/config.toml +++ b/config.toml @@ -23,13 +23,13 @@ relativeURLs = false weight = 1 [[menu.main]] parent = "about" - name = "Delphi Milestones" - url = "/about/milestones" + name = "Our Team" + url = "/about/team" weight = 2 [[menu.main]] parent = "about" - name = "Our Team" - url = "/about/team" + name = "Delphi Milestones" + url = "/about/milestones" weight = 3 [[menu.main]] parent = "about" @@ -123,9 +123,14 @@ relativeURLs = false name = "Covidcast 1.0 (“Classic”)" url = "/covidcast/classic/" weight = 30 +[[menu.main]] + parent = "signal-visualization" + name = "Dashboard Builder" + url = "/covidcast/dashboard/" + weight = 40 [[menu.main]] parent = "epidemic-signals" - name = "Signal Export" + name = "Signal Download" url = "/covidcast/export" weight = 5 [[menu.main]] @@ -135,34 +140,23 @@ relativeURLs = false weight = 6 [menu.main.params] external = true -[[menu.main]] - parent = "epidemic-signals" - name = "Dashboard Builder" - url = "/covidcast/dashboard/" - weight = 7 + [[menu.main]] parent = "epidemic-signals" name = "Signal Availability, Coverage & Latency" url = "/covidcast/indicator-status" weight = 8 -[[menu.main]] - parent = "epidemic-signals" - name = "Epidata API" - url = "https://cmu-delphi.github.io/delphi-epidata/" - weight = 9 - [menu.main.params] - external = true [[menu.main]] parent = "epidemic-signals" identifier = "ctis" name = "CTIS (“The Facebook Covid Survey”)" url = "" - weight = 10 + weight = 9 [[menu.main]] parent = "ctis" name = "About CTIS" url = "/epidemic-signals/ctis/" - weight = 11 + weight = 10 [[menu.main]] parent = "ctis" name = "CTIS Dashboard" @@ -172,17 +166,12 @@ relativeURLs = false parent = "epidemic-signals" name = "Report a problem" url = "" - weight = 12 + weight = 11 [[menu.main]] parent = "epidemic-signals" name = "Suggest or request a new data source" url = "" - weight = 13 -[[menu.main]] - parent = "epidemic-signals" - name = "Terms Of Use" - url = "/epidemic-signals/terms-of-use" - weight = 14 + weight = 12 # nowcasting-and-forecasting [[menu.main]] @@ -211,11 +200,6 @@ relativeURLs = false weight = 4 [menu.main.params] external = true -[[menu.main]] - parent = "nowcasting-and-forecasting" - name = "Archived Systems and Tools" - url = "/archived-systems-and-tools/" - weight = 5 # for-modelers-and-developers [[menu.main]] From 84a35540940f6702466d0ff9c8e2aa461d0e2746 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Tue, 27 Aug 2024 23:55:45 +0300 Subject: [PATCH 29/33] Added missing links --- config.toml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config.toml b/config.toml index 8a3dd8c3..6cd33dc9 100644 --- a/config.toml +++ b/config.toml @@ -165,14 +165,17 @@ relativeURLs = false [[menu.main]] parent = "epidemic-signals" name = "Report a problem" - url = "" + url = "https://forms.gle/WV4Ndhc3ftvkkgVCA" weight = 11 + [menu.main.params] + external = true [[menu.main]] parent = "epidemic-signals" name = "Suggest or request a new data source" - url = "" + url = "https://forms.gle/cMG7v7uUrnLVszRu5" weight = 12 - + [menu.main.params] + external = true # nowcasting-and-forecasting [[menu.main]] identifier = "nowcasting-and-forecasting" From 7b2a1a7defb718f4f46d5e644f4d6d19837f72f4 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Thu, 29 Aug 2024 00:35:42 +0300 Subject: [PATCH 30/33] Changed footer --- config.toml | 15 ++-- .../about-delphi-epidata-covidcast.md | 4 +- .../assets/css/layout/_header_footer.scss | 9 ++ themes/delphi/layouts/partials/footer.html | 89 +++---------------- 4 files changed, 34 insertions(+), 83 deletions(-) diff --git a/config.toml b/config.toml index 6cd33dc9..4c6d6218 100644 --- a/config.toml +++ b/config.toml @@ -74,8 +74,10 @@ relativeURLs = false [[menu.main]] parent = "about" name = "Support Us (Donate)" - url = "" + url = "https://givenow.cmu.edu/campaigns/42524/donations/new" weight = 9 + [menu.main.params] + external = true [[menu.main]] parent = "about" name = "Contact Us" @@ -164,14 +166,14 @@ relativeURLs = false weight = 20 [[menu.main]] parent = "epidemic-signals" - name = "Report a problem" + name = "Report a Data Problem" url = "https://forms.gle/WV4Ndhc3ftvkkgVCA" weight = 11 [menu.main.params] external = true [[menu.main]] parent = "epidemic-signals" - name = "Suggest or request a new data source" + name = "Suggest a New Data Source" url = "https://forms.gle/cMG7v7uUrnLVszRu5" weight = 12 [menu.main.params] @@ -224,7 +226,7 @@ relativeURLs = false [[menu.main]] parent = "api-and-clients" name = "Epidata" - url = "https://github.com/cmu-delphi/delphi-epidata" + url = "https://cmu-delphi.github.io/delphi-epidata/" weight = 10 [menu.main.params] external = true @@ -251,7 +253,10 @@ relativeURLs = false [[menu.main]] parent = "forecasting" name = "Forecasting Manual" + url = "https://cmu-delphi.github.io/delphi-tooling-book/" weight = 10 + [menu.main.params] + external = true [[menu.main]] parent = "forecasting" name = "Epipredict" @@ -268,7 +273,7 @@ relativeURLs = false external = true [[menu.main]] parent = "for-modelers-and-developers" - name = "GitHub" + name = "Delphi on Github" pre = "brands/github" url = "https://github.com/cmu-delphi/" [menu.main.params] diff --git a/content/epidemic-signals/about-delphi-epidata-covidcast.md b/content/epidemic-signals/about-delphi-epidata-covidcast.md index 9c5f1f91..0f0db16e 100644 --- a/content/epidemic-signals/about-delphi-epidata-covidcast.md +++ b/content/epidemic-signals/about-delphi-epidata-covidcast.md @@ -5,7 +5,7 @@ layout: single --- -Delphi Epidata is a database platform, repository, and API for epidemiological signals (also called "indicators"). It was launched in 2016 and significantly revamped during the pandemic. Delphi Epidata was purpose-designed for hosting signals for epidemic and pandemic detection, tracking and forecasting. It has built-in support for data versioning, calendar reporting effects, anomaly and trend detection, backfill projection, privacy-based censoring, and geographic, temporal and demographic breakdown and aggregation. The Delphi Epidata repository contains over 500 different current or historical signals, tracking flu, COVID-19, denge, norovirus and other pathogens, and covering all rungs of the [severity pyramid](#severity-pyramid). +Delphi Epidata is a database platform, repository, and API for epidemiological signals (also called "indicators"). It was launched in 2016 and significantly revamped during the pandemic. Delphi Epidata was purpose-designed for hosting signals for epidemic and pandemic detection, tracking and forecasting. It has built-in support for data versioning, calendar reporting effects, anomaly and trend detection, backfill projection, privacy-based censoring, and geographic, temporal and demographic breakdown and aggregation. The Delphi Epidata repository contains over 500 different current or historical signals, tracking flu, COVID-19, dengue, norovirus and other pathogens, and covering all rungs of the [severity pyramid](#severity-pyramid). We procure data streams that reflect epidemic and pandemic activity from a wide variety of sources -- including unique industry partnerships and scraping of publicly available data -- and extract from them in real-time disease-related signals at the finest possible geographic, demographic and temporal granularity. @@ -18,7 +18,7 @@ We make all our signals freely available in real-time to the greatest extent all - a [COVID-19 signal export]({{< relref "/covidcast/export" >}}) app, a [dashboard builder]({{< relref "/covidcast/dashboard" >}}), and more - [R](https://cmu-delphi.github.io/epidatr/) and [Python](https://github.com/cmu-delphi/epidatpy) packages to extract signals from the Epidata repository, and R packages to further [process them](https://cmu-delphi.github.io/epiprocess/) and to create [epidemic forecasting models](https://cmu-delphi.github.io/epipredict/) ([learn more](https://docs.google.com/presentation/d/1XfnxQAzR8TcqpguIcFcn9XwG6vvpTyWP6S79cevVqhY/edit#slide=id.g2e3520ca017_0_70) about the packages) -Some of the underlying data from which these signals are extracted would not exist or be publicly available without Delphi’s efforts. These include a massive national daily survey called the [COVID-19 Trends and Impact Survey (CTIS)]({{< relref "ctis" >}}) that we have deployed in partnership with Facebook, which has been taken by over 25 million Americans during 2020-2022; and aggregated counts extracted from an enormous database of de-identified medical insurance claims, covering more than 35% of the U.S. population, made possible through health system partners including Change Healthcare. +Some of the underlying data from which our signals are extracted would not exist or be publicly available without Delphi’s efforts. These include a massive national daily survey called the [COVID-19 Trends and Impact Survey (CTIS)]({{< relref "ctis" >}}) that we have deployed in partnership with Facebook, which has been taken by over 25 million Americans during 2020-2022; and aggregated counts extracted from an enormous database of de-identified medical insurance claims, covering more than 35% of the U.S. population, made possible through health system partners including Change Healthcare. ## Severity Pyramid diff --git a/themes/delphi/assets/css/layout/_header_footer.scss b/themes/delphi/assets/css/layout/_header_footer.scss index 92421144..be936552 100644 --- a/themes/delphi/assets/css/layout/_header_footer.scss +++ b/themes/delphi/assets/css/layout/_header_footer.scss @@ -238,3 +238,12 @@ ul.nestedmenu li.active > a { div.external-link span > svg { max-height: 13px !important; } + +div.footer-links { + width: 100%; +} + +div.footer-links > a { + margin-left: 0.5rem; + margin-right: 2rem; +} diff --git a/themes/delphi/layouts/partials/footer.html b/themes/delphi/layouts/partials/footer.html index ba941d4a..9a1ebafb 100644 --- a/themes/delphi/layouts/partials/footer.html +++ b/themes/delphi/layouts/partials/footer.html @@ -4,83 +4,20 @@ >{{ .Site.Title }}
          -
          -
          Epidemic Signals
          - -
          -
          -
          Resources
          - -
          -
          -
          About
          - -
          -
          -{{ if .Params.feedback }} - -{{ end }} From 04db474e3a921a5b7c8e7dff091bb903ddf5c627 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Thu, 29 Aug 2024 16:44:23 +0300 Subject: [PATCH 31/33] Renamed few elements in the footer --- themes/delphi/layouts/partials/footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/delphi/layouts/partials/footer.html b/themes/delphi/layouts/partials/footer.html index 9a1ebafb..945f22c6 100644 --- a/themes/delphi/layouts/partials/footer.html +++ b/themes/delphi/layouts/partials/footer.html @@ -13,9 +13,9 @@ target="_blank" >Contact Us - Delphi Github Org + Delphi Github Delphi Epidata documentationDelphi Epidata API
        From fcd952aea8bd4afdf57b6c79aa82f35100e477df Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Thu, 29 Aug 2024 23:43:38 +0300 Subject: [PATCH 32/33] Changed donation link. Removed breadcrumbs, fixed some words. --- config.toml | 4 ++-- content/epidemic-signals/terms-of-use.md | 2 +- themes/delphi/layouts/_default/baseof.html | 2 +- themes/delphi/layouts/blog/list.html | 4 ++-- themes/delphi/layouts/blog/single.html | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config.toml b/config.toml index 4c6d6218..eb525f0b 100644 --- a/config.toml +++ b/config.toml @@ -74,7 +74,7 @@ relativeURLs = false [[menu.main]] parent = "about" name = "Support Us (Donate)" - url = "https://givenow.cmu.edu/campaigns/42524/donations/new" + url = "https://givenow.cmu.edu/scs/?a=8476342&designation=delphiepidemicforecastinggroup" weight = 9 [menu.main.params] external = true @@ -186,7 +186,7 @@ relativeURLs = false weight = 1 [[menu.main]] parent = "nowcasting-and-forecasting" - name = "COVID-19 Forecasting" + name = "COVID-19 Forecasting" url = "https://covid19forecasthub.org/" weight = 2 [menu.main.params] diff --git a/content/epidemic-signals/terms-of-use.md b/content/epidemic-signals/terms-of-use.md index b3caa961..d07eb447 100644 --- a/content/epidemic-signals/terms-of-use.md +++ b/content/epidemic-signals/terms-of-use.md @@ -1,5 +1,5 @@ --- -title: Carnegie Mellon University COVIDcast Website Terms of Use +title: Carnegie Mellon University Delphi Website Terms of Use linkTitle: Terms of Use aliases: - /covidcast/terms-of-use diff --git a/themes/delphi/layouts/_default/baseof.html b/themes/delphi/layouts/_default/baseof.html index 5f3ff173..612d0283 100644 --- a/themes/delphi/layouts/_default/baseof.html +++ b/themes/delphi/layouts/_default/baseof.html @@ -8,7 +8,7 @@ {{ partial "nav.html" . }} - {{ block "breadcrumb" . }}{{ partial "menu/breadcrumb.html" . }}{{ end }} + {{ block "main" . }}{{ end }} {{ partial "footer.html" . }} {{ partial "scripts.html" . }} diff --git a/themes/delphi/layouts/blog/list.html b/themes/delphi/layouts/blog/list.html index ceaa7f8d..da183c28 100644 --- a/themes/delphi/layouts/blog/list.html +++ b/themes/delphi/layouts/blog/list.html @@ -1,6 +1,6 @@ -{{ define "breadcrumb" }} + {{ define "main" }} {{ $images := ($.GetPage "/blog/images").Resources.ByType "image" }}
        diff --git a/themes/delphi/layouts/blog/single.html b/themes/delphi/layouts/blog/single.html index a0f3e491..cac43420 100644 --- a/themes/delphi/layouts/blog/single.html +++ b/themes/delphi/layouts/blog/single.html @@ -2,9 +2,9 @@ {{ $blog_style := resources.Get "css/blog_extra.scss" | toCSS | minify | fingerprint }} {{ end }} -{{ define "breadcrumb" }} + {{ define "scripts" }} {{ $script_blog := resources.Get "js/blog/index.js" | js.Build | minify | fingerprint -}} From b760e156b8d8c76bdbe16a8f571a1fdbb60c4c7b Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Thu, 29 Aug 2024 23:47:20 +0300 Subject: [PATCH 33/33] Changed size of 'external link' icon --- themes/delphi/assets/css/layout/_header_footer.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/delphi/assets/css/layout/_header_footer.scss b/themes/delphi/assets/css/layout/_header_footer.scss index be936552..a8df2f1d 100644 --- a/themes/delphi/assets/css/layout/_header_footer.scss +++ b/themes/delphi/assets/css/layout/_header_footer.scss @@ -236,7 +236,7 @@ ul.nestedmenu li.active > a { } div.external-link span > svg { - max-height: 13px !important; + max-height: 10px !important; } div.footer-links {