From: Ruben Rodriguez <ruben@gnu.org>
Date: Mon, 27 Feb 2023 17:05:15 +0000 (+0100)
Subject: More validation fixes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=db2a42d569f8fa31f426a37454500d1807863457;p=financial-reports.git

More validation fixes
---

diff --git a/output/author/free-software-foundation.html b/output/author/free-software-foundation.html
index ddf7585..0c48f02 100644
--- a/output/author/free-software-foundation.html
+++ b/output/author/free-software-foundation.html
@@ -3,7 +3,6 @@
 <html lang="en">
 <head>
 <title>Free Software Foundation - Free Software Foundation Annual Reports</title>
-<link href="http://127.0.0.1:8000" rel="canonical"/>
 <link href="./theme/css/b-side-base.css" rel="stylesheet"/>
 <meta charset="utf-8"/>
 <meta content="width=680" name="viewport"><link href="./theme/css/b-side-wide.css" rel="stylesheet"/> </meta></head>
@@ -11,7 +10,7 @@
 <header class="top-menu no-print">
 <nav class="top-menu">
 <ul>
-<li><a href="http://127.0.0.1:8000">Free Software Foundation Annual Reports</a></li>
+<li><a href="#">Free Software Foundation Annual Reports</a></li>
 <li><a href="https://my.fsf.org">Join the fsf</a></li>
 </ul>
 </nav>
@@ -20,13 +19,13 @@
 <div>
 <h1>Free Software Foundation</h1>
 <div class="bside-summary">
-<h2><a href="http://127.0.0.1:8000/fy2018.html" rel="bookmark">Fiscal year 2018</a></h2>
+<h2><a href="/fy2018.html" rel="bookmark">Fiscal year 2018</a></h2>
 <ul class="bulletless">
 <li>Highlighting activities and detailed financials for Fiscal Year 2018</li> <li class="smaller dim"><em><time datetime="2023-02-05T10:20:00-05:00">October 1, 2017 - September 30, 2018</time></em></li>
 <li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
 </ul>
 </div><div class="bside-summary">
-<h2><a href="http://127.0.0.1:8000/fy2017.html" rel="bookmark">Fiscal year 2017</a></h2>
+<h2><a href="/fy2017.html" rel="bookmark">Fiscal year 2017</a></h2>
 <ul class="bulletless">
 <li>Highlighting activities and detailed financials for Fiscal Year 2017</li> <li class="smaller dim"><em><time datetime="2017-12-05T10:20:00-05:00">October 1, 2016 - September 30, 2017</time></em></li>
 <li class="smaller dim"><a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">Sources and materials</a></li>
diff --git a/output/fy2015.html b/output/fy2015.html
index 82ae578..cfe0eff 100644
--- a/output/fy2015.html
+++ b/output/fy2015.html
@@ -3,7 +3,6 @@
 <html lang="en">
 <head>
 <title>FY2015 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="http://127.0.0.1:8000" rel="canonical"/>
 <link href="./theme/css/b-side-base.css" rel="stylesheet"/>
 <meta charset="utf-8"/>
 <meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
diff --git a/output/fy2016.html b/output/fy2016.html
index 9756991..f07d91e 100644
--- a/output/fy2016.html
+++ b/output/fy2016.html
@@ -3,7 +3,6 @@
 <html lang="en">
 <head>
 <title>FY2016 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="http://127.0.0.1:8000" rel="canonical"/>
 <link href="./theme/css/b-side-base.css" rel="stylesheet"/>
 <meta charset="utf-8"/>
 <meta content="width=680" name="viewport"><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
diff --git a/output/fy2017.html b/output/fy2017.html
index 6ecb7e0..acf6ecd 100644
--- a/output/fy2017.html
+++ b/output/fy2017.html
@@ -3,7 +3,6 @@
 <html lang="en">
 <head>
 <title>FY2017 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="http://127.0.0.1:8000" rel="canonical"/>
 <link href="./theme/css/b-side-base.css" rel="stylesheet"/>
 <style>
 :root {
diff --git a/output/fy2018.html b/output/fy2018.html
index cc9f17c..8f65c92 100644
--- a/output/fy2018.html
+++ b/output/fy2018.html
@@ -3,7 +3,6 @@
 <html lang="en">
 <head>
 <title>FY2018 Annual Report - Free Software Foundation Annual Reports</title>
-<link href="http://127.0.0.1:8000" rel="canonical"/>
 <link href="./theme/css/b-side-base.css" rel="stylesheet"/>
 <style>
 :root {
diff --git a/output/images/fa2018.png b/output/images/fa2018.png
index 0c45db5..4a8c85a 100644
Binary files a/output/images/fa2018.png and b/output/images/fa2018.png differ
diff --git a/output/index.html b/output/index.html
index 2ff1d49..af87465 100644
--- a/output/index.html
+++ b/output/index.html
@@ -3,7 +3,6 @@
 <html lang="en">
 <head>
 <title>Free Software Foundation Annual Reports</title>
-<link href="http://127.0.0.1:8000" rel="canonical"/>
 <link href="./theme/css/b-side-base.css" rel="stylesheet"/>
 <meta charset="utf-8"/>
 <meta content="width=680" name="viewport"><link href="./theme/css/b-side-wide.css" rel="stylesheet"/><link href="./theme/css/b-side-post.css" rel="stylesheet"/> </meta></head>
@@ -11,7 +10,7 @@
 <header class="top-menu no-print">
 <nav class="top-menu">
 <ul>
-<li><a href="http://127.0.0.1:8000">Free Software Foundation Annual Reports</a></li>
+<li><a href="#">Free Software Foundation Annual Reports</a></li>
 <li><a href="https://my.fsf.org">Join the fsf</a></li>
 </ul>
 </nav>
@@ -42,13 +41,13 @@
 <section>
 <div class="summarylist">
 <div class="bside-summary">
-<h2><a href="http://127.0.0.1:8000/fy2018.html" rel="bookmark">Fiscal year 2018</a></h2>
+<h2><a href="/fy2018.html" rel="bookmark">Fiscal year 2018</a></h2>
 <ul class="bulletless">
 <li>Highlighting activities and detailed financials for Fiscal Year 2018</li> <li class="smaller dim"><em><time datetime="2023-02-05T10:20:00-05:00">October 1, 2017 - September 30, 2018</time></em></li>
 <li class="smaller dim"><a href="https://vcs.fsf.org/?p=financial-reports.git">Sources and materials</a></li>
 </ul>
 </div><div class="bside-summary">
-<h2><a href="http://127.0.0.1:8000/fy2017.html" rel="bookmark">Fiscal year 2017</a></h2>
+<h2><a href="/fy2017.html" rel="bookmark">Fiscal year 2017</a></h2>
 <ul class="bulletless">
 <li>Highlighting activities and detailed financials for Fiscal Year 2017</li> <li class="smaller dim"><em><time datetime="2017-12-05T10:20:00-05:00">October 1, 2016 - September 30, 2017</time></em></li>
 <li class="smaller dim"><a href="https://www.fsf.org/annual-reports/fy2017/fsf-report-2017-site.tar.gz">Sources and materials</a></li>
diff --git a/pelicanconf.py b/pelicanconf.py
index 8d6e198..da6c821 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -1,6 +1,6 @@
 AUTHOR = 'Free Software Foundation'
 SITENAME = 'Free Software Foundation Annual Reports'
-SITEURL = 'http://127.0.0.1:8000/'
+SITEURL = ''
 
 PATH = 'content'
 
diff --git a/theme/templates/base.html b/theme/templates/base.html
index 9a92b39..b51a79f 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -2,7 +2,6 @@
 <html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock html_lang %}">
   <head>
     <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
-    <link rel="canonical" href="{{ SITEURL }}">
     {% include "partials/head-style-base.html" %}
     {% include "partials/head-meta.html" %}
     {% include "partials/head-rss.html" %}
diff --git a/theme/templates/partials/body-header.html b/theme/templates/partials/body-header.html
index e89723b..ebbc5cd 100644
--- a/theme/templates/partials/body-header.html
+++ b/theme/templates/partials/body-header.html
@@ -1,9 +1,6 @@
 <header class="top-menu no-print">
   <nav class="top-menu">
     <ul>
-      {% if BADGE_IMAGE %}
-        <li><a class="highlight" href="{{ SITEURL }}"><img class="badge" src="{{ SITEURL }}/{{ BADGE_IMAGE }}" alt="{{ SITENAME }}"></a></li>
-      {% endif%} 
       {% if article %}
             <li><a class="highlight" href="/"{% if output_file == 'index.html' %} {% endif %}>Index of reports</a></li>
             <li><a href="{{ link }}#">FY{{ article.fy }}</a></li>
@@ -11,7 +8,7 @@
             <li><a href="#associate-membership">Join the fsf</a></li>
             <li><a href="extra/{{ article.fy }}.pdf">â¬PDF</a></li>
        {% else %}
-            <li><a href="{{ SITEURL }}"{% if output_file == 'index.html' %} {% endif %}>{{ SITENAME }}</a></li>
+            <li><a href="{{ SITEURL }}#"{% if output_file == 'index.html' %} {% endif %}>{{ SITENAME }}</a></li>
             <li><a href="https://my.fsf.org">Join the fsf</a></li>
        {% endif %}
     </ul>
