projects / financial-reports.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 00febd8)
More validation fixes
authorRuben Rodriguez <ruben@gnu.org>
Mon, 27 Feb 2023 17:05:15 +0000 (18:05 +0100)
committerRuben Rodriguez <ruben@gnu.org>
Mon, 27 Feb 2023 17:05:15 +0000 (18:05 +0100)
output/author/free-software-foundation.html patch | blob | blame | history
output/fy2015.html patch | blob | blame | history
output/fy2016.html patch | blob | blame | history
output/fy2017.html patch | blob | blame | history
output/fy2018.html patch | blob | blame | history
output/images/fa2018.png patch | blob | blame | history
output/index.html patch | blob | blame | history
pelicanconf.py patch | blob | blame | history
theme/templates/base.html patch | blob | blame | history
theme/templates/partials/body-header.html patch | blob | blame | history

diff --git a/output/author/free-software-foundation.html b/output/author/free-software-foundation.html
index ddf75852ada63b3c0936cd863e5360928420118c..0c48f029370689d43da184788ece9bf0ca3278b2 100644 (file)
--- 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 82ae578e9b1b7d1bc1e3725a59ef99406329214c..cfe0effb4faa106f6dc2ec8fc163303ac11ab16c 100644 (file)
--- 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 9756991f6155058f2e5f757cbe77f164a92a59dd..f07d91e6848c814f0b7a48cb86a9a40ea0b919bc 100644 (file)
--- 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 6ecb7e099c0ba5ffd423702a020101006a44f7eb..acf6ecdd61c1670aa6d3d3c47c5250417e8b1203 100644 (file)
--- 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 cc9f17ca35c09082065d1deba912148b66382fe8..8f65c9238b6df89a2a5621578aea13adb08e1f12 100644 (file)
--- 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 0c45db5c4a4d5fd61f39368bad635f9e32a0084d..4a8c85aa2742b57e53479fb0bce97a5198ce6d5a 100644 (file)
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 2ff1d4937e2d80efda8cbf538adf8596a186de7d..af874652b9c4b9e235589277ccf0898c09ff8a66 100644 (file)
--- 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 8d6e1987778e25dbbe28f0e2337e603ad7250207..da6c8210960f1eb909a0627016a3d4e904a4043b 100644 (file)
--- 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 9a92b390afc9497f782985dd3add53be670c0538..b51a79ff6625e8e4be2bceccb638c15a23648aa0 100644 (file)
--- 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 e89723bb75f77ecae47c9bcc1135df0ffe27fd55..ebbc5cd0ed0a4e9fe04fdd1898e1250a9d853ca2 100644 (file)
--- 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>
Unnamed repository; edit this file 'description' to name the repository.