restructure and relative menu links

config.toml

@@ -13,30 +13,47 @@ relativeURLs = false
     identifier = "about"
     name = "About"
     url = "/about"
-    post = "angle-down"
     weight = 1
 [[menu.main]]
-    identifier = "team"
     parent = "about"
     name = "Team"
     url = "/about/team"
     weight = 1
 [[menu.main]]
+    identifier = "covidcast"
     name = "COVIDcast"
     pre = "map"
     url = "/covidcast"
     weight = 2
 [[menu.main]]
+    parent = "covidcast"
+    name = "Surveys"
+    url = "/covidcast/surveys"
+    weight = 1
+[[menu.main]]
+    parent = "covidcast"
+    name = "Methods"
+    url = "/covidcast/methodology"
+    weight = 2
+[[menu.main]]
+    parent = "covidcast"
+    name = "Terms Of Use"
+    url = "/covidcast/terms-of-use"
+    weight = 3
+[[menu.main]]
+    identifier = "blog"
     name = "Blog"
     pre = "blog"
     url = "/blog"
     weight = 3
 [[menu.main]]
+    identifier = "github"
     name = "GitHub"
     pre = "github"
     url = "https://github.com/cmu-delphi/"
     weight = 4
 [[menu.main]]
+    identifier = "api"
     name = "API"
     pre = "api"
     url = "https://cmu-delphi.github.io/delphi-epidata/"

content/about.md → content/about/_index.md

@@ -1,6 +1,7 @@
 ---
 date: "2020-07-28"
 title: About
+layout: single
 ---
 
 In March 2020, the [Delphi group](https://delphi.cmu.edu) at Carnegie Mellon 

content/covidcast/_index.md

@@ -0,0 +1,6 @@
+---
+title: COVIDCast
+layout: single
+---
+
+Test

content/surveys.md → content/covidcast/surveys.md

@@ -2,7 +2,7 @@
 title: Delphi's COVID-19 Surveys
 ---
 
-In collaboration with Facebook, along with a consortium of universities and public health officials, the [Delphi group](https://delphi.cmu.edu/) at [Carnegie Mellon University](https://www.cmu.edu/) conducts research surveys to monitor the spread and impact of the COVID-19 pandemic in the United States. This survey is advertised through Facebook. It has run continuously since early April 2020, and about 70,000 people in the United States participate **every day**. Survey results are publicly available on our [COVIDcast map](https://covidcast.cmu.edu/index.html) and in our [COVIDcast API](https://cmu-delphi.github.io/delphi-epidata/api/covidcast.html).
+In collaboration with Facebook, along with a consortium of universities and public health officials, the [Delphi group]({{< relref "/" >}}) at [Carnegie Mellon University](https://www.cmu.edu/) conducts research surveys to monitor the spread and impact of the COVID-19 pandemic in the United States. This survey is advertised through Facebook. It has run continuously since early April 2020, and about 70,000 people in the United States participate **every day**. Survey results are publicly available on our [COVIDcast map]({{< relref "covidcast" >}}) and in our [COVIDcast API](https://cmu-delphi.github.io/delphi-epidata/api/covidcast.html).
 
 Such detailed data has never before been available during a public health emergency, and it will help public health officials understand how to save lives and how to safely reopen public life. The data will also help researchers understand the social, economic, and health effects of the COVID-19 pandemic.
 
@@ -15,14 +15,14 @@ An international version of the survey is conducted by the University of Marylan
 
 The survey asks respondents whether they are experiencing any symptoms, then asks a series of questions designed to help researchers understand the spread of COVID-19 and its effect on people in the United States. These include questions about COVID-19 testing, prior medical conditions, social distancing measures, mental health, demographics, and the economic effects of the pandemic.
 
-Delphi uses information from the survey as part of its public [COVIDcast map](https://covidcast.cmu.edu/index.html), to inform its forecasts (currently in development) of the pandemic’s spread, and to assist public health agency partners. By providing daily data from all parts of the United States, the survey allows comparisons between regions and allows careful tracking of changes over time. Other researchers use the survey to study factors related to the pandemic's spread, its effects on mental health, how different demographic groups are affected by the pandemic, and numerous other important questions.
+Delphi uses information from the survey as part of its public [COVIDcast map]({{< relref "covidcast" >}}), to inform its forecasts (currently in development) of the pandemic’s spread, and to assist public health agency partners. By providing daily data from all parts of the United States, the survey allows comparisons between regions and allows careful tracking of changes over time. Other researchers use the survey to study factors related to the pandemic's spread, its effects on mental health, how different demographic groups are affected by the pandemic, and numerous other important questions.
 
 Because the survey can reach thousands of respondents every day, its questions focus on what the respondents are experiencing right now. This allows us to track how conditions change across the country every day.
 
 
 ## Who is running these surveys?
 
-The surveys are a collaboration between [Delphi](https://delphi.cmu.edu/) at Carnegie Mellon University, numerous universities, and Facebook. Researchers at many institutions are analyzing the survey data and assisting in the survey’s development.
+The surveys are a collaboration between [Delphi]({{< relref "/" >}}) at Carnegie Mellon University, numerous universities, and Facebook. Researchers at many institutions are analyzing the survey data and assisting in the survey’s development.
 
 The survey protocol has been reviewed by the Carnegie Mellon University Institutional Review Board. Delphi only publicly releases aggregate data; de-identified individual data is made available to research partners. Our partners are bound by data use agreements to maintain the confidentiality of individual survey responses. Facebook refers its users to the survey, but it does not receive any individual survey data.
 
@@ -38,13 +38,13 @@ To account for the differences between Facebook users and the United States popu
 
 ## Where can I see the results?
 
-Our [COVIDcast map](https://covidcast.cmu.edu/) shows basic aggregate survey results, revealing the rate of COVID-like symptoms across the United States, and this data is also freely available for download through the [COVIDcast API](https://cmu-delphi.github.io/delphi-epidata/api/covidcast.html). Facebook also publishes [a map](https://covid-survey.dataforgood.fb.com/) based on the United States and international aggregate data.
+Our [COVIDcast map]({{< relref "covidcast" >}}) shows basic aggregate survey results, revealing the rate of COVID-like symptoms across the United States, and this data is also freely available for download through the [COVIDcast API](https://cmu-delphi.github.io/delphi-epidata/api/covidcast.html). Facebook also publishes [a map](https://covid-survey.dataforgood.fb.com/) based on the United States and international aggregate data.
 
 
 ### Blog posts and presentations
 
-- Ryan Tibshirani, September 21, 2020. [Can Symptom Surveys Improve COVID-19 Forecasts?](https://delphi.cmu.edu/blog/2020/09/21/can-symptoms-surveys-improve-covid-19-forecasts/) Delphi blog.
-- Alex Reinhart and Ryan Tibshirani, August 26, 2020. [COVID-19 Symptom Surveys through Facebook](https://delphi.cmu.edu/blog/2020/08/26/covid-19-symptom-surveys-through-facebook/). Delphi blog.
+- Ryan Tibshirani, September 21, 2020. [Can Symptom Surveys Improve COVID-19 Forecasts?]({{< relref "2020-09-21-forecast-demo" >}}) Delphi blog.
+- Alex Reinhart and Ryan Tibshirani, August 26, 2020. [COVID-19 Symptom Surveys through Facebook]({{< relref "2020-08-26-fb-survey" >}}). Delphi blog.
 
 ### Publications
 

content/terms-of-use.md → content/covidcast/terms-of-use.md

@@ -6,7 +6,7 @@ Version Date: May 18, 2020
 
 ### Introduction/Scope
 
-The Carnegie Mellon University (“CMU”) COVIDcast [website](https://covidcast.cmu.edu) (“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”) COVIDcast [website]({{< relref "/covidcast">}}) (“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.
 
 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.
 
@@ -20,7 +20,7 @@ CMU may update and change these TOU from time to time without notice to you. You
 
 ### Permitted Use and License/Availability of the Site
 
-Subject to other relevant provisions of the TOU, 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/ 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 Project content and 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, 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/) 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 Project content and 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
 

layouts/shortcodes/indicators.html

@@ -1,6 +1,6 @@
 
 <section>
-{{ $tools := .Site.GetPage "/indicators" }}
+{{ $tools := .Site.GetPage "/covidcast/indicators" }}
 {{ range sort (where ($tools.Resources.ByType "page") ".Params.category" "eq" (.Get "category")) ".Params.order" }}
   <article>
     <h4>{{ .Title }}</h4>

layouts/shortcodes/releasenotes.html

@@ -1,5 +1,5 @@
 
-{{ $tools := .Site.GetPage "/release-notes" }}
+{{ $tools := .Site.GetPage "/covidcast/release-notes" }}
 {{ range sort ($tools.Resources.ByType "page") "PublishDate" "desc" }}
   <h3>{{ .Title}} {{ .PublishDate.Format "Monday, January 2, 2006" }}</h3>
   {{ .Content }}

themes/delphi/assets/css/blog.scss

@@ -10,7 +10,7 @@
     font-weight: 600;
 }
 
-[aria-hidden="true"] {
+.content [aria-hidden="true"] {
     display: none;
 }
 

themes/delphi/layouts/partials/delphi-text-logo.html

@@ -1 +1 @@
-<a class="delphi-text-logo" href="https://delphi.cmu.edu/">DELPHI</a>
+<a class="delphi-text-logo" href="{{ relref . "/" }}">DELPHI</a>

themes/delphi/layouts/partials/footer.html

@@ -1,7 +1,6 @@
 <footer>
-	<!-- {{ partial "footer/legal.html" . }} -->
-	{{ partial "footer/desktop.html" }}
-	{{ partial "footer/mobile.html" }}
+	{{ partial "footer/desktop.html" . }}
+	{{ partial "footer/mobile.html" . }}
 
 	{{ $script := resources.Get "js/main.js" | js.Build | minify | fingerprint -}}
 	<script src="{{ $script.Permalink }}" {{ printf "integrity=%q" $script.Data.Integrity | safeHTMLAttr }}></script>

themes/delphi/layouts/partials/footer/blog.html

@@ -1 +1 @@
-<a href="https://delphi.cmu.edu/blog/">Blog</a>
+<a href="{{ relref . "/blog" }}">Blog</a>

themes/delphi/layouts/partials/footer/desktop.html

@@ -3,7 +3,7 @@
         <thead>
             <tr>
                 <th class="header">
-                    {{partial "delphi-text-logo.html"}}
+                    {{partial "delphi-text-logo.html" . }}
                 </th>
                 <th class="footer-header">COVIDcast</th>
                 <th class="footer-header">Resources</th>
@@ -14,25 +14,25 @@
         <tbody>
             <tr>
                 <td></td>
-                <td>{{partial "footer/methods.html"}}</td>
-                <td>{{partial "footer/cmu.html"}}</td>
-                <td>{{partial "footer/twitter.html"}}</td>
+                <td>{{partial "footer/methods.html" .}}</td>
+                <td>{{partial "footer/cmu.html" . }}</td>
+                <td>{{partial "footer/twitter.html" . }}</td>
             </tr>
             <tr>
                 <td></td>
-                <td>{{partial "footer/surveys.html"}}</td>
-                <td>{{partial "footer/api.html"}}</td>
-                <td>{{partial "footer/terms.html"}}</td>
+                <td>{{partial "footer/surveys.html" . }}</td>
+                <td>{{partial "footer/api.html" . }}</td>
+                <td>{{partial "footer/terms.html" . }}</td>
             </tr>
             <tr>
                 <td></td>
                 <td></td>
-                <td>{{partial "footer/github.html"}}</td>
+                <td>{{partial "footer/github.html" . }}</td>
             </tr>
             <tr>
                 <td></td>
                 <td></td>
-                <td>{{partial "footer/blog.html"}}</td>
+                <td>{{partial "footer/blog.html" . }}</td>
             </tr>
         </tbody>
     </table>

themes/delphi/layouts/partials/footer/methods.html

@@ -1 +1 @@
-<a href="https://delphi.cmu.edu/methodology/">Methods</a>
+<a href="{{ relref . "/covidcast/methodology" }}">Methods</a>

themes/delphi/layouts/partials/footer/mobile.html

@@ -1,19 +1,19 @@
 <div class="uk-hidden@s footer footer-small">
-    {{partial "delphi-text-logo.html"}}
+    {{partial "delphi-text-logo.html" . }}
 
     <div class="footer-header">COVIDcast</div>
-    <div>{{partial "footer/methods.html"}}</div>
-    <div>{{partial "footer/surveys.html"}}</div>
+    <div>{{partial "footer/methods.html" . }}</div>
+    <div>{{partial "footer/surveys.html" . }}</div>
 
     <div class="footer-header">Resources</div>
-    <div>{{partial "footer/api.html"}}</div>
-    <div>{{partial "footer/github.html"}}</div>
-    <div>{{partial "footer/blog.html"}}</div>
+    <div>{{partial "footer/api.html" . }}</div>
+    <div>{{partial "footer/github.html" . }}</div>
+    <div>{{partial "footer/blog.html" . }}</div>
 
     <div class="footer-header">About</div>
-    <div>{{partial "footer/cmu.html"}}</div>
-    <div>{{partial "footer/terms.html"}}</div>
+    <div>{{partial "footer/cmu.html" . }}</div>
+    <div>{{partial "footer/terms.html" . }}</div>
 
     <div class="footer-header">Contact</div>
-    <div>{{partial "footer/twitter.html"}}</div>
+    <div>{{partial "footer/twitter.html" . }}</div>
 </div>

themes/delphi/layouts/partials/footer/surveys.html

@@ -1 +1 @@
-<a href="https://delphi.cmu.edu/surveys/">Surveys</a>
+<a href="{{ relref . "/covidcast/surveys" }}">Surveys</a>

themes/delphi/layouts/partials/footer/terms.html

@@ -1 +1 @@
-<a href="https://delphi.cmu.edu/terms-of-use/">Terms</a>
+<a href="{{ relref . "/covidcast/terms-of-use" }}">Terms</a>

themes/delphi/layouts/partials/nav.html

@@ -1,19 +1,19 @@
+{{- $currentPage := . -}}
 <nav class="uk-visible@s uk-navbar-container" data-uk-navbar>
   <div class="uk-navbar-left">
       <ul class="uk-navbar-nav">
         <li>
-          {{partial "delphi-text-logo.html"}}
+          <a class="delphi-text-logo" href="{{ relref . "/" }}">DELPHI</a>
         </li>
-        {{ $currentPage := . }}
         {{ range .Site.Menus.main.ByWeight }}
-        <li class="{{ if (eq $currentPage.URL .URL) }}nav-active{{ end }}">
+        <li class="{{ if (eq $currentPage.Section .Identifier) }}nav-active{{ end }}">
           <a href="{{ .URL | relLangURL }}">
             {{ if .Pre }}
               {{ partial "font-awesome.html" .Pre }}
             {{end}}
             {{ .Name }}
-            {{ if .Post }}
-              {{ partial "font-awesome.html" .Post }}
+            {{ if .HasChildren }}
+              {{ partial "font-awesome.html" "angle-down" }}
             {{end}}
           </a>
           {{if .HasChildren}}
@@ -31,10 +31,9 @@
   </div>
 </nav>
 
-
 <!-- Mobile nav -->
 <nav class="uk-hidden@s mobile-nav">
-  {{partial "delphi-text-logo.html"}}
+  {{partial "delphi-text-logo.html" . }}
   <a class="uk-navbar-toggle" uk-navbar-toggle-icon href=""></a>
     <div uk-dropdown="mode: click" class="dropdown-mobile">
       <ul class="uk-nav uk-navbar-dropdown-nav">
@@ -55,4 +54,4 @@
         {{ end }}
       </ul>
     </div>
-</nav>
+</nav>