From 3b554900b57476c159f8e71b04c51029ed15c9f1 Mon Sep 17 00:00:00 2001 From: Dmytro Trotsko Date: Thu, 5 Sep 2024 19:49:43 +0300 Subject: [PATCH] Menu restructuring (#996) * Research -> Publications * Changed Career section (temp) * Added new items to 'About' section. * Epidemic Signals menu restructuring. * Added few changes * Added 'Nowcasting and Forecasting' and 'For Modelers and Developers section'. * Replaced bullets with dropdown menus. * Prettier formatting * Changed navigation items * Fixed navigation bar pulldown menus * Fixed linting * Added 'Open in new tab' if link goes to the external source. * Linting * Added hamburger navigation menu * Linting * Removed unwanted change * Linting * Added 'external link' icons to the links that are going outside of the website * Linting * Fixed 'hybrid' moode hamburger menu * Added 'Archived Systems and Tools' under Nowcasting and Forecasting menu. Changed 'For modelers and developers' section. * Renaming * Added new page 'About Delphi Epidata & Covidcast'. * Added 'Severity Pyramid' section to the About Delphi Epidata (including COVIDcast) section * Updated 'Terms of Use' * Updated 'Terms of Use' * Added two more items to the 'Join Us' section. * Few more changes to the main menu * Added missing links * Changed footer * Renamed few elements in the footer * Changed donation link. Removed breadcrumbs, fixed some words. * Changed size of 'external link' icon --- config.toml | 295 ++++++++++-------- content/archived-systems-and-tools/_index.md | 24 ++ content/epidemic-signals/_index.md | 13 +- .../about-delphi-epidata-covidcast.md | 26 ++ content/epidemic-signals/terms-of-use.md | 43 +-- .../assets/css/layout/_header_footer.scss | 23 +- themes/delphi/layouts/_default/baseof.html | 2 +- themes/delphi/layouts/blog/list.html | 4 +- themes/delphi/layouts/blog/single.html | 4 +- themes/delphi/layouts/partials/footer.html | 89 +----- themes/delphi/layouts/partials/nav.html | 140 +++++++-- 11 files changed, 388 insertions(+), 275 deletions(-) create mode 100644 content/archived-systems-and-tools/_index.md create mode 100644 content/epidemic-signals/about-delphi-epidata-covidcast.md diff --git a/config.toml b/config.toml index 631cee61b..eb525f0b5 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 @@ -22,225 +21,263 @@ relativeURLs = false name = "About Delphi" url = "/about" weight = 1 -[[menu.main]] - parent = "about" - name = "Delphi Milestones" - url = "/about/milestones" - weight = 2 [[menu.main]] parent = "about" name = "Our Team" url = "/about/team" - weight = 3 + weight = 2 [[menu.main]] parent = "about" - name = "Center of Excellence" - url = "/about/center-of-excellence" - weight = 4 + name = "Delphi Milestones" + url = "/about/milestones" + weight = 3 [[menu.main]] parent = "about" - name = "Research" + name = "Publications" url = "/about/publications" - weight = 5 + weight = 4 [[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 = "Careers" + name = "Join Us" + url = "" + identifier = "join-us" + weight = 7 +[[menu.main]] + 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)" + url = "https://givenow.cmu.edu/scs/?a=8476342&designation=delphiepidemicforecastinggroup" + weight = 9 + [menu.main.params] + external = true [[menu.main]] parent = "about" name = "Contact Us" url = "https://docs.google.com/forms/d/e/1FAIpQLScqgT1fKZr5VWBfsaSp-DNaN03aV6EoZU4YljIzHJ1Wl_zmtg/viewform" - weight = 9 + weight = 10 + [menu.main.params] + external = true # epidemic-signals [[menu.main]] identifier = "epidemic-signals" name = "Epidemic Signals" - pre = "solid/virus" url = "/epidemic-signals/" + weight = 1 +[[menu.main]] + parent = "epidemic-signals" + name = "About Delphi Epidata & COVIDcast" + url = "/epidemic-signals/about-delphi-epidata-covidcast" weight = 2 [[menu.main]] parent = "epidemic-signals" - name = "About COVIDcast" - url = "/epidemic-signals/" - weight = 1 + name = "Signal Discovery & Selection" + url = "/signals/" + weight = 3 + [menu.main.params] + external = true [[menu.main]] parent = "epidemic-signals" - name = "About CTIS" - url = "/epidemic-signals/ctis" + name = "Signal Visualizaion" + url = "" + identifier = "signal-visualization" + weight = 4 +[[menu.main]] + parent = "signal-visualization" + name = "EpiVis" + url = "/epivis/" weight = 10 [[menu.main]] - identifier = "epidemic-signals-covidcast" - parent = "epidemic-signals" + parent = "signal-visualization" name = "Delphi Epidata Dashboard" url = "/covidcast/" weight = 20 [[menu.main]] - parent = "epidemic-signals" - name = "CTIS Dashboard" - url = "/covidcast/survey-results" + parent = "signal-visualization" + name = "Covidcast 1.0 (“Classic”)" + url = "/covidcast/classic/" weight = 30 [[menu.main]] - parent = "epidemic-signals" - name = "Export Data" - url = "/covidcast/export" + parent = "signal-visualization" + name = "Dashboard Builder" + url = "/covidcast/dashboard/" weight = 40 [[menu.main]] parent = "epidemic-signals" - name = "Flu & Other Pathogens" - url = "/flu/" - weight = 50 + name = "Signal Download" + url = "/covidcast/export" + weight = 5 [[menu.main]] parent = "epidemic-signals" - name = "Terms Of Use" - url = "/epidemic-signals/terms-of-use" - weight = 60 + name = "Signal Documentation" + url = "https://cmu-delphi.github.io/delphi-epidata/api/covidcast_signals.html" + weight = 6 + [menu.main.params] + external = true -# 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 + parent = "epidemic-signals" + name = "Signal Availability, Coverage & Latency" + url = "/covidcast/indicator-status" + weight = 8 [[menu.main]] - parent = "tools" - identifier = "utils" - name = "Dashboards" - url = "/tools/#dashboards" + parent = "epidemic-signals" + identifier = "ctis" + name = "CTIS (“The Facebook Covid Survey”)" + url = "" weight = 9 [[menu.main]] - parent = "utils" - name = "Delphi Epidata Dashboard" - url = "/covidcast/" + parent = "ctis" + name = "About CTIS" + url = "/epidemic-signals/ctis/" weight = 10 [[menu.main]] - parent = "utils" - name = "Indicator Status" - url = "/covidcast/indicator-status" + parent = "ctis" + name = "CTIS Dashboard" + url = "/covidcast/survey-results/" weight = 20 [[menu.main]] - parent = "utils" - name = "Dashboard Builder" - url = "/covidcast/dashboard" - weight = 30 -[[menu.main]] - parent = "utils" - name = "Forecast 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 - + parent = "epidemic-signals" + name = "Report a Data Problem" + url = "https://forms.gle/WV4Ndhc3ftvkkgVCA" + weight = 11 + [menu.main.params] + external = true [[menu.main]] - parent = "tools" - identifier = "forecasting" - name = "Forecasting" - url = "/tools/#forecasting" - weight = 50 - + parent = "epidemic-signals" + name = "Suggest a New Data Source" + url = "https://forms.gle/cMG7v7uUrnLVszRu5" + weight = 12 + [menu.main.params] + external = true +# nowcasting-and-forecasting +[[menu.main]] + identifier = "nowcasting-and-forecasting" + name = "Nowcasting and Forecasting" + url = "" + weight = 1 [[menu.main]] - parent = "forecasting" - name = "COVID Forecasting" + parent = "nowcasting-and-forecasting" + name = "COVID-19 Forecasting" url = "https://covid19forecasthub.org/" - weight = 1 + weight = 2 + [menu.main.params] + external = true [[menu.main]] - parent = "forecasting" + parent = "nowcasting-and-forecasting" name = "Flu Forecasting" url = "https://www.cdc.gov/flu/weekly/flusight/index.html" - weight = 2 + 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 [[menu.main]] - identier = "Code" - pre = "solid/code" - name = "Code" + identifier = "for-modelers-and-developers" + name = "For Modelers and Developers" url = "code" - weight = 90 + weight = 2 [[menu.main]] - parent = "Code" + parent = "for-modelers-and-developers" name = "Code Overview" url = "code" - weight = 1 + weight = 3 [[menu.main]] - parent = "Code" - identifier = "APIClients" + parent = "for-modelers-and-developers" + identifier = "api-and-clients" name = "API and Clients" url = "/code/#api-and-clients" - weight = 2 + weight = 4 [[menu.main]] - parent = "APIClients" + parent = "api-and-clients" name = "Epidata" - url = "https://github.com/cmu-delphi/delphi-epidata" - weight = 7 + url = "https://cmu-delphi.github.io/delphi-epidata/" + weight = 10 + [menu.main.params] + external = true [[menu.main]] - parent = "APIClients" + parent = "api-and-clients" name = "Epidatr" url = "https://cmu-delphi.github.io/epidatr/" - weight = 8 + weight = 20 + [menu.main.params] + external = true [[menu.main]] - parent = "APIClients" + parent = "api-and-clients" name = "Epidatpy" url = "https://github.com/cmu-delphi/epidatpy" - weight = 9 - + weight = 30 + [menu.main.params] + external = true [[menu.main]] - parent = "Code" - identifier = "forecastingCode" + parent = "for-modelers-and-developers" + identifier = "forecasting" name = "Forecasting" url = "code#forecasting" - weight = 10 + weight = 5 [[menu.main]] - parent = "forecastingCode" + parent = "forecasting" name = "Forecasting Manual" - weight = 1 -[[menu.main]] - parent = "forecastingCode" - name = "Epiprocess" - url = "https://cmu-delphi.github.io/epiprocess/" - weight = 7 + url = "https://cmu-delphi.github.io/delphi-tooling-book/" + weight = 10 + [menu.main.params] + external = true [[menu.main]] - parent = "forecastingCode" + parent = "forecasting" name = "Epipredict" url = "https://cmu-delphi.github.io/epipredict/" - weight = 7 + weight = 20 + [menu.main.params] + external = true [[menu.main]] - parent = "Code" - name = "Github" + 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" + name = "Delphi on 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 + [menu.main.params] + external = true [params] description = "Developing the Theory and Practice of Epidemiological Forecasting" diff --git a/content/archived-systems-and-tools/_index.md b/content/archived-systems-and-tools/_index.md new file mode 100644 index 000000000..e62f857ec --- /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). diff --git a/content/epidemic-signals/_index.md b/content/epidemic-signals/_index.md index f68d7328c..2818440a6 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 000000000..0f0db16e9 --- /dev/null +++ b/content/epidemic-signals/about-delphi-epidata-covidcast.md @@ -0,0 +1,26 @@ +--- +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, 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. + +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 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 + +![](/epidemic-signals/images/severity-pyramid.svg) \ No newline at end of file diff --git a/content/epidemic-signals/terms-of-use.md b/content/epidemic-signals/terms-of-use.md index bdffe8ec3..d07eb4478 100644 --- a/content/epidemic-signals/terms-of-use.md +++ b/content/epidemic-signals/terms-of-use.md @@ -1,33 +1,35 @@ --- -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 --- -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 -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. +Pittsburgh, PA 15213 +412-268-2000 -### 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. diff --git a/themes/delphi/assets/css/layout/_header_footer.scss b/themes/delphi/assets/css/layout/_header_footer.scss index 95eb694b7..a8df2f1df 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 { @@ -38,7 +39,7 @@ $mobile-margin: 15px; } .uk-navbar-dropdown { - width: 13em; + width: auto; } } @@ -80,6 +81,10 @@ li.nav-entry { .nav-dropdown-child { padding-left: 2.2em; + + ul.nestedmenu { + margin-left: 1.5em; + } } .nav-dropdown-parent { @@ -95,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) { @@ -226,3 +234,16 @@ ul.nestedmenu li > a { ul.nestedmenu li.active > a { color: rgb(247, 44, 114) !important; } + +div.external-link span > svg { + max-height: 10px !important; +} + +div.footer-links { + width: 100%; +} + +div.footer-links > a { + margin-left: 0.5rem; + margin-right: 2rem; +} diff --git a/themes/delphi/layouts/_default/baseof.html b/themes/delphi/layouts/_default/baseof.html index 5f3ff173b..612d0283c 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 ceaa7f8d3..da183c28b 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 a0f3e4915..cac434208 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 -}} diff --git a/themes/delphi/layouts/partials/footer.html b/themes/delphi/layouts/partials/footer.html index ba941d4a2..945f22c69 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
- -
-
-
Contact
- +
+ About Delphi + Terms of Use + Contact Us + Delphi Github + Delphi Epidata API
-{{ if .Params.feedback }} - -{{ end }} diff --git a/themes/delphi/layouts/partials/nav.html b/themes/delphi/layouts/partials/nav.html index 7ab53bd72..65f99faf1 100644 --- a/themes/delphi/layouts/partials/nav.html +++ b/themes/delphi/layouts/partials/nav.html @@ -16,46 +16,81 @@ {{- end -}}" > {{ if .HasChildren }} - + {{ 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" }} - {{ else }} - - {{ partial "menu/item.html" . }} - - {{ end }} - {{ if .HasChildren }}
+ {{ else }} + + {{ partial "menu/item.html" . }} + {{ if .Params.external }} +
+ {{ partial "font-awesome.html" "solid/arrow-up-right-from-square" }} +
+ {{ end }} + {{ end }} {{ end }} @@ -64,7 +99,10 @@