Split reports and blog sections

ooni · Nov 16, 2019 · 131dc23 · 131dc23
1 parent bdcd374
commit 131dc23
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 20 deletions.
diff --git a/content/data/content.md b/content/data/content.md
@@ -1,9 +1,3 @@
----
-aliases:
-  - /reports
-  - /reports/0.1/
----
-
 ## This URL is old
 
 Raw ooniprobe measurements now live at:

diff --git a/content/reports/content.md b/content/reports/content.md
@@ -0,0 +1 @@
+
diff --git a/layouts/index.html b/layouts/index.html
@@ -38,7 +38,7 @@ <h2>Measure internet censorship</h2>
    <div class="container">
      <h2>Recent Reports</h2>
      <hr />
-     {{ range first 5 (where (where .Site.Pages.ByDate.Reverse "Section" "post") "Kind" "page") }}
+     {{ range first 5 .Site.Taxonomies.categories.report }}
      <div class="row">
        <a class="report-link" href="{{ .RelPermalink }}">
          <p class="title">{{ .Title }}</p>
@@ -72,14 +72,16 @@ <h2>Uncover evidence of internet censorship worldwide</h2>
    <div class="container">
      <h2>Recent News</h2>
      <hr />
-     {{ range first 5 (where (where .Site.Pages.ByDate.Reverse "Section" "post") "Kind" "page") }}
+     {{ with .Site.Taxonomies.categories.blog }}
+     {{ range first 5 . }}
      <div class="row">
        <a class="report-link" href="{{ .RelPermalink }}">
          <p class="title">{{ .Title }}</p>
          <p class="date">{{ .Date.Format "2 Jan 2006" }}</p>
        </a>
      </div>
      {{ end }}
+     {{ end }}
      <a class="learn-more" href="/post/">View All</a>
    </div>
  </div>

diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
@@ -7,17 +7,12 @@
       <img src="/images/homepage/OONI-HorizontalMonochromeInverted.png" srcset="[email protected] 2x" alt="OONI logo" />
       </a>
     </div>
-    <div class="col-2">
+    <div class="col-4 nav-items">
       <a href="/about/"
       {{ if in $selectedMenu "about" }}
       class="active"
       {{end}}
       >About</a>
-      <a href="/install/"
-      {{ if in $selectedMenu "install" }}
-      class="active"
-      {{end}}
-      >Install</a>
       <a href="/nettest/"
       {{ if in $selectedMenu "nettest" }}
       class="active"
@@ -33,12 +28,23 @@
       class="active"
       {{end}}
       >Get Involved</a>
+      <a href="/reports/"
+      {{ if in $selectedMenu "reports" }}
+      class="active"
+      {{end}}
+      >Reports</a>
       <a href="/post/"
       {{ if in $selectedMenu "post" }}
       class="active"
       {{end}}
       >Blog</a>
-
+      <a href="/install/"
+      {{ if in $selectedMenu "install" }}
+      class="active btn btn-small"
+      {{ else }}
+      class="btn btn-small"
+      {{end}}
+      >Install OONI Probe</a>
     </div>
   </div>
 </nav>
diff --git a/layouts/section/post.html b/layouts/section/post.html
@@ -5,7 +5,8 @@
 <div class="container">
   <main class="col-3">
     <h2>Blog posts</h2>
-    {{ range where .Data.Pages.ByDate.Reverse "Section" "post" }}
+     {{ with .Site.Taxonomies.categories.blog }}
+     {{ range . }}
 
       <div class="row blog-summary">
         <div>
@@ -22,6 +23,7 @@ <h2>Blog posts</h2>
       </div>
 
     {{ end }}
+    {{ end }}
   </main>
 
 </div>

diff --git a/layouts/section/reports.html b/layouts/section/reports.html
@@ -0,0 +1,30 @@
+{{ .Scratch.Set "basePrefix" "../../" }}
+{{ partial "head.html" . }}
+
+{{ partial "nav.html" . }}
+<div class="container">
+  <main class="col-3">
+    <h2>Research reports</h2>
+
+    {{ range .Site.Taxonomies.categories.report }}
+
+      <div class="row blog-summary">
+        <div>
+          <a href="{{ .RelPermalink }}" style="margin-bottom: 0">
+            <p class="title">{{ .Title }}</p>
+          </a>
+          <p class="byline" style="margin-bottom: 0">{{ .Date.Format "2 Jan 2006" }}</p>
+          {{ if .IsTranslated }}
+            <p>Translations: {{ range .Translations }}<a style="display: inline-block;margin-bottom: 0;padding-right: 10px" href="{{ .RelPermalink }}">{{ if eq .Lang "en" }}English{{ else if eq .Lang "pt" }}Portuguese{{ else if eq .Lang "fr" }}French{{ else if eq .Lang "es"  }}Spanish{{ else if eq .Lang "ca"  }}Catalan{{ else }}{{ .Lang }}{{ end }}</a>{{ end }}
+            </p>
+          {{ else }}
+          {{ end }}
+        </div>
+      </div>
+
+    {{ end }}
+  </main>
+
+</div>
+
+{{ partial "footer.html" . }}
diff --git a/static/css/master.css b/static/css/master.css
@@ -478,19 +478,19 @@ td:last-child {
 /* ================================================================== */
 /* Navigation */
 
-nav .col-2 {
+nav .nav-items {
   flex: 1 1;
 }
 
-nav .col-2 a {
+nav .nav-items a {
   color: white;
 }
 
-nav .col-2 a:hover {
+nav .nav-items a:hover {
   border-bottom: 2px solid white;
 }
 
-nav .col-2 a.active {
+nav .nav-items a.active {
   color: white;
   border-bottom: 2px solid white;
 }
@@ -1000,6 +1000,11 @@ pre span.lw {
   color: #0588CB;
 }
 
+.btn-small {
+  font-size: 0.8em;
+  padding: 6px 5px;
+}
+
 /*  Tests section */
 p.test-intro {
   margin-top: 1.6em;