Remove the campaign.v2025.7.3

6 files changed, 120 insertions, 363 deletions

diff --git a/src/koszko_org_website/templates/en/__footer.html.jinja b/src/koszko_org_website/templates/en/__footer.html.jinja
index 5d1791f..ec5664b 100644
--- a/src/koszko_org_website/templates/en/__footer.html.jinja
+++ b/src/koszko_org_website/templates/en/__footer.html.jinja
@@ -19,7 +19,7 @@ Copyright (C) 2022 Wojtek Kosior <koszko@koszko.org>
 {% endblock %}
 
 {% call para(ensure_containing_section=false) %}
-  The rest is made by {{ link(same_lang_url('koszko.html'), 'Wojtek') }},
+  The rest is made by {{ link(same_lang_url(''), 'Wojtek') }},
   available
   {{ link('https://git.koszko.org/koszko-org-website/', 'here') }}
   under the terms of
diff --git a/src/koszko_org_website/templates/en/__footer_for_qr.html.jinja b/src/koszko_org_website/templates/en/__footer_for_qr.html.jinja
deleted file mode 100644
index f06ea2f..0000000
--- a/src/koszko_org_website/templates/en/__footer_for_qr.html.jinja
+++ /dev/null
@@ -1,19 +0,0 @@
-{#
-SPDX-License-Identifier: CC0-1.0
-
-Footer text of the koszko.org website qr page (english).
-
-Copyright (C) 2022 Wojtek Kosior <koszko@koszko.org>
-#}
-{% extends 'en/__footer.html.jinja' %}
-
-{% block extra_footer_copyright_info %}
-  {% call para(ensure_containing_section=false) %}
-    The Easter eggs photo has been taken from
-    {% call link('https://commons.wikimedia.org/wiki/File:20110423_Easter_eggs_(3).jpg') -%}
-      Wikimedia Commons
-    {%- endcall %}
-    and is available under the terms of
-    {{ link('/static/cc-by-3.0.txt', 'CC BY 3.0 Unported') }}.
-  {% endcall %}
-{% endblock %}
diff --git a/src/koszko_org_website/templates/en/__index.html.jinja b/src/koszko_org_website/templates/en/__index.html.jinja
index d426103..b9fb9ab 100644
--- a/src/koszko_org_website/templates/en/__index.html.jinja
+++ b/src/koszko_org_website/templates/en/__index.html.jinja
@@ -1,168 +1,158 @@
 {#
 SPDX-License-Identifier: CC0-1.0
 
-koszko.org website start page (english).
+koszko.org website personal page (english).
 
 Copyright (C) 2021,2022 Wojtek Kosior <koszko@koszko.org>
 #}
 {% extends "__index.html.jinja" %}
 
-{% block title %} Libre programs {% endblock %}
+{% block title %} Wojtek {% endblock %}
+
+{% block subheading_text %} personal site {% endblock %}
+
+{% set include_not_facebookd = true %}
 
 {% block content %}
-  {{ header(1, 'Campaign for libre software') }}
+  {% call section('contact') %}
+    {{ header(2, 'Contact') }}
 
-  {% call section('what-software') %}
-    {{ header(2, 'What software?') }}
+    {% call descriptions() %}
+      {{ desc_term('Tel.:') }}
+      {{ desc_desc('(+48) 12 350 64 74') }}
 
-    {% call para() %}
-      Libre program is one its user can use for any purpose, modify in the form
-      of source code and redistribute, including for commercial
-      purposes. Examples are GNU/Linux operating system, VLC media player, GIMP,
-      LibreOffice, WordPress and also (except for certain components): Firefox
-      browser, Android operating system and Chromium browser. A program user
-      cannot modify or redistribute for either legal or technical reasons is
-      called proprietary or nonfree.
+      {{ desc_term('Email:') }}
+      {% call desc_desc() -%}
+        {{ link('mailto:koszko@koszko.org', 'koszko@koszko.org') }}
+      {%- endcall %}
     {% endcall %}
   {% endcall %}
 
-  {% call section('who-needs-this') %}
-    {{ header(2, 'Who needs this?') }}
+  {% call section('pubkeys') %}
+    {{ header(2, 'Public keys') }}
 
-    {% call para() %}
-      Libre program gives user control. Computer is a useful device, yet is does
-      nothing by itself. To work it needs a program. Computer's owner is only
-      able to control it indirectly, through a program. If the software being
-      run is libre, the user has control over it and hence over the device. A
-      proprietary program, on the other hand, is controlled by its vendor (or
-      speaking 100% strictly — the party holding its cource code). Such program
-      only does what its vendor wants it to. As a result, the device also does
-      not what its owner wants but rather what program's vendor wants. Instead
-      of the desired situation where device user controls the device, we get a
-      reversed one: vendor, through program, controls the user and decides what
-      user can and cannot do. Of course, in practice we witness different levels
-      of users mistreatment. One edge case is an operating system only allowing
-      installation of applications approved by its vendor.
-    {% endcall %}
+    {% call unordered_list() %}
+      {% call list_entry() %}
+        {{ link('/static/key.gpg', 'PGP') }}
+
+        {% call unordered_list() %}
+          {% call list_entry() %}
+            {% call link('/static/key.gpg.sig') -%}
+              PGP key signature made with signify key
+            {%- endcall %}
+          {% endcall %}
+        {% endcall %}
+      {% endcall %}
 
-    {% call para() %}
-      Everyone should care about using libre programs simply because it is good
-      to have control over one's own devices. The issue is not, however, limited
-      to personal preferences. The more people in a society rely on proprietary,
-      incompatible tools, the harder life is for those willing to choose libre
-      ones.
+      {% call list_entry() %}
+        {{ link('/static/key.pub', 'signify') }}
+
+        {% call unordered_list() %}
+          {% call list_entry() %}
+            {% call link('/static/key.pub.asc') -%}
+	      signify key signature made with PGP key
+            {%- endcall %}
+          {% endcall %}
+        {% endcall %}
+      {% endcall %}
     {% endcall %}
+  {% endcall %}
+
+  {% call section('portal') %}
+    {{ header(2, 'Portal') }}
 
     {% call para() %}
-      The problem is also worth looking at on a different scale. A state with
-      proprietary programs in widespread use is not fully independent — it
-      depends indirectly on vendors of these programs. For this reason a duty of
-      responsibility for one's state also means taking action to stop its
-      economy and education from relying on proprietary operating systems or
-      tools.
+      This portal of mine is online since april 2021. Sites comprising it are
+      listed below.
     {% endcall %}
-  {% endcall %}
 
-  {% call section('how-this-matters-to-non-programmers') %}
-    {{ header(2, 'How does all this matter to someone who cannot program?') }}
+    {% call descriptions() %}
+      {% call desc_term() -%}
+        {{ link(same_lang_url(''), 'koszko.org') }}
+      {%- endcall %}
+      —
+      {{ desc_desc('my personal website (you\'re viewing it)') }}
+
+      {% call desc_term() -%}
+        {{ link('https://pray.koszko.org', 'pray.koszko.org') }}
+      {%- endcall %}
+      —
+      {{ desc_desc('prayer sheets website') }}
 
-    {% call para() %}
-      One does not need to be a programmer in order to utilize the control libre
-      programs give. Quite often when a direction of some libre program is bad
-      (e.g. antifeatures are being added like telemetry in Firefox), independent
-      people come up with a version of that program without the original
-      drawbacks (example would be the
-      {{ link('https://librewolf-community.gitlab.io/', 'LibreWolf') }}
-      browser). All that's needed is a bit of demand for a modified version of
-      some program. Bussinessmen, on the other hand, might find it practical to
-      employ someone to adapt a libre program to company's needs.
+      {% call desc_term() -%}
+        {{ link('https://sheets.koszko.org', 'sheets.koszko.org') }}
+      {%- endcall %}
+      —
+      {{ desc_desc('world changing sheets website') }}
+
+      {% call desc_term() -%}
+        {{ link('https://haketilo.koszko.org', 'haketilo.koszko.org') }}
+      {%- endcall %}
+      —
+      {{ desc_desc('Haketilo proxy website') }}
+
+      {% call desc_term() -%}
+        {{ link('https://git.koszko.org', 'git.koszko.org') }}
+      {%- endcall %}
+      —
+      {{ desc_desc('my repositories') }}
     {% endcall %}
   {% endcall %}
 
-  {% call section('how-is-moneymaking-affected') %}
-    {% call header(2) %}
-      Does it mean programmers shouldn't be paid for writing software?
+  {% call section('request') %}
+    {{ header(2, 'Personal message to the world') }}
+
+    {% call aside() %}
+      I finished the novena mentioned below after 54 days — 'cause that's how
+      long it takes.
     {% endcall %}
 
     {% call para() %}
-      Equating libre program with gratis and proprietary with paid is a very
-      common misunderstanding. In reality proprietary programs often come for
-      free (Adobe Reader, Chrome browser, Google Docs) and libre tools can also
-      be made available for a fee (e.g. commercial GNU/Linux distrubutions).
-      Many people associate programming with a business model where a customer
-      is being sold a license for use of some proprietary program. Because such
-      model is less practical in case of libre programs, some think their
-      creation cannot be commercialized. However, most code — both libre and
-      nonfree — is not being written with the goal of selling licenses for its
-      use. Income often comes from different sources, such as selling services
-      or hardware the program works with.
+      Since 2023-04-20 I am praying Our Lady of Pompeii Novena for the digital
+      freedom in my country, Poland.
+      Everyone is invited to join and start praying for other countries.
+      You can also share
+      {{
+        link(
+          'https://friendica.me/display/78ea265d-7964-5689-270c-acd451615930',
+          'my post on Fediverse'
+        )
+      }}.
     {% endcall %}
-  {% endcall %}
-
-  {% call section('how-it-started') %}
-    {{ header(2, 'Who came up with all this?') }}
 
     {% call para() %}
-      In 1983
-      {% call link('https://en.wikipedia.org/wiki/Richard_Stallman') -%}
-        Richard Stallman
-      {%- endcall %},
-      a
-      {% call link('https://en.wikipedia.org/wiki/Massachusetts_Institute_of_Technology') -%}
-        MIT
-      {%- endcall %}
-      scientist, started the
-      {{ link('https://www.gnu.org/', 'GNU project') }} with a goal of
-      developing a libre replacement for proprietary UNIX system. 2 years later
-      in Boston he founded the
-      {{ link('https://www.fsf.org/', 'Free Software Foundation (FSF)') }} which
-      still promotes and develops these ideals.
+      Why? The solely material efforts of the Free Software Movement so far gave
+      little effect — the bulk of today's society instead of using ethical
+      technologies ({{ link('https://joinpeertube.org/', 'PeerTube') }},
+      {{ link('https://joinmastodon.org/', 'Mastodon') }},
+      {{ link('https://trisquel.info/', 'GNU+Linux') }}) drowns in centralized
+      platforms like Facebook and YouTube and in proprietary software like
+      Windows.
+      As we can see, volunteer work and advocacy done by many have proved
+      insufficient.
+      I now want to take example from history where — for example — simple "Hail
+      Mary"'s of the rosary saved Austria from communist rule in 1955.
     {% endcall %}
-  {% endcall %}
-
-  {% call section('how-to-come-to-the-good-side') %}
-    {{ header(2, 'How to come to the good side?') }}
 
     {% call para() %}
-      You can help in many ways. For example by
+      Earlier on this place used to be displayed my double request — to software
+      freedom enthusiast and to all Christians so that they seriously consider
+      what the other ones have to say.
+      That request was also a bit of a brickbat and I am happy to have had
+      changed it for something better and more constructive.
+      If you nevertheless want to, you can still find the old text in the
+      {{
+        link(
+          'https://web.archive.org/web/20220625043220/https://koszko.org/en/koszko.html#request',
+          'Wayback Machine'
+        )
+      }}.
     {% endcall %}
+  {% endcall %}
 
-    {% call unordered_list() %}
-      {% call list_entry() %}
-        {{
-          link(
-            'https://friendica.me/display/78ea265d-7964-5689-270c-acd451615930',
-            'praying for digital freedom'
-          )
-        }},
-      {% endcall %}
-      {% call list_entry() %}
-        using libre programs on daily basis,
-      {% endcall %}
-      {% call list_entry() %}
-        making others aware of the problem (you can link this site
-        or the {{ link('https://fsf.org', 'FSF\'s site') }}),
-      {% endcall %}
-      {% call list_entry() %}
-        refusing to use proprietary tools to the best of your ability,
-      {% endcall %}
-      {% call list_entry() %}
-        complaining to vendors of proprietary programs asking for their source
-        code to be released under some libre license,
-      {% endcall %}
-      {% call list_entry() %}
-        calling on people in charge of various organizations and educational
-        facilities to deploy a libre operating system and tools,
-      {% endcall %}
-      {% call list_entry() %}
-        calling on politicians to enact laws good for software freedom
-        (e.g. making code written for public money available under a libre
-        license) and
-      {% endcall %}
-      {% call list_entry() %}
-        {{ link('https://my.fsf.org/join', 'donating to the FSF') }} or various
-        projects developing libre programs.
-      {% endcall %}
-    {% endcall %}
+  {% call section('posts') %}
+    {{ header(2, 'Posts') }}
+
+    {{ posts() }}
   {% endcall %}
 {% endblock %}
diff --git a/src/koszko_org_website/templates/en/author.html.jinja b/src/koszko_org_website/templates/en/author.html.jinja
deleted file mode 100644
index e3a01c3..0000000
--- a/src/koszko_org_website/templates/en/author.html.jinja
+++ /dev/null
@@ -1,33 +0,0 @@
-{#
-SPDX-License-Identifier: CC0-1.0
-
-koszko.org website "about author" page (english).
-
-Copyright (C) 2021,2022 Wojtek Kosior <koszko@koszko.org>
-#}
-{% extends "__campaign_base.html.jinja" %}
-
-{% block title %} Campaign author {% endblock %}
-
-{% block content %}
-  {{ header(1, 'About campaign author') }}
-
-  {% call section() %}
-    {% call para() %}
-      My name is Wojciech Kosior. I am (as one could easily guess) a software
-      freedom proponent and (as you might not yet know) a catholic. In 2021 I
-      {% call link('https://www.gnu.org/education/how-i-fought-to-graduate-without-using-non-free-software.html') -%}
-        successfully defended
-      {%- endcall %}
-      my BSc thesis in infomatics at
-      {{ link('https://en.wikipedia.org/wiki/AGH_University_of_Science_and_Technology', 'AGH') }}
-      in Kraków, Poland. I am now striving to make people care more about their
-      digital freedom.
-    {% endcall %}
-
-    {% call para() %}
-      You can find more information on
-      {{ link(same_lang_url('koszko.html'), 'my personal page') }}.
-    {% endcall %}
-  {% endcall %}
-{% endblock %}
diff --git a/src/koszko_org_website/templates/en/koszko.html.jinja b/src/koszko_org_website/templates/en/koszko.html.jinja
deleted file mode 100644
index 4f1720e..0000000
--- a/src/koszko_org_website/templates/en/koszko.html.jinja
+++ /dev/null
@@ -1,153 +0,0 @@
-{#
-SPDX-License-Identifier: CC0-1.0
-
-koszko.org website personal page (english).
-
-Copyright (C) 2021,2022 Wojtek Kosior <koszko@koszko.org>
-#}
-{% extends "koszko.html.jinja" %}
-
-{% block title %} Wojtek {% endblock %}
-
-{% block subheading_text %} personal site {% endblock %}
-
-{% set include_not_facebookd = true %}
-
-{% block content %}
-  {% call section('contact') %}
-    {{ header(2, 'Contact') }}
-
-    {% call descriptions() %}
-      {{ desc_term('Tel.:') }}
-      {{ desc_desc('(+48) 12 350 64 74') }}
-
-      {{ desc_term('Email:') }}
-      {% call desc_desc() -%}
-        {{ link('mailto:koszko@koszko.org', 'koszko@koszko.org') }}
-      {%- endcall %}
-    {% endcall %}
-  {% endcall %}
-
-  {% call section('pubkeys') %}
-    {{ header(2, 'Public keys') }}
-
-    {% call unordered_list() %}
-      {% call list_entry() %}
-        {{ link('/static/key.gpg', 'PGP') }}
-
-        {% call unordered_list() %}
-          {% call list_entry() %}
-            {% call link('/static/key.gpg.sig') -%}
-              PGP key signature made with signify key
-            {%- endcall %}
-          {% endcall %}
-        {% endcall %}
-      {% endcall %}
-
-      {% call list_entry() %}
-        {{ link('/static/key.pub', 'signify') }}
-
-        {% call unordered_list() %}
-          {% call list_entry() %}
-            {% call link('/static/key.pub.asc') -%}
-	      signify key signature made with PGP key
-            {%- endcall %}
-          {% endcall %}
-        {% endcall %}
-      {% endcall %}
-    {% endcall %}
-  {% endcall %}
-
-  {% call section('portal') %}
-    {{ header(2, 'Portal') }}
-
-    {% call para() %}
-      This portal of mine is online since april 2021. Sites comprising it are
-      listed below.
-    {% endcall %}
-
-    {% call descriptions() %}
-      {% call desc_term() -%}
-        {{ link(same_lang_url('koszko.html'), 'koszko.org/koszko.html') }}
-      {%- endcall %}
-      —
-      {{ desc_desc('my personal website (you\'re viewing it)') }}
-
-      {% call desc_term() -%}
-        {{ link('https://pray.koszko.org', 'pray.koszko.org') }}
-      {%- endcall %}
-      —
-      {{ desc_desc('prayer sheets website') }}
-
-      {% call desc_term() -%}
-        {{ link('https://sheets.koszko.org', 'sheets.koszko.org') }}
-      {%- endcall %}
-      —
-      {{ desc_desc('world changing sheets website') }}
-
-      {% call desc_term() -%}
-        {{ link('https://haketilo.koszko.org', 'haketilo.koszko.org') }}
-      {%- endcall %}
-      —
-      {{ desc_desc('Haketilo proxy website') }}
-
-      {% call desc_term() -%}
-        {{ link('https://git.koszko.org', 'git.koszko.org') }}
-      {%- endcall %}
-      —
-      {{ desc_desc('my repositories') }}
-    {% endcall %}
-  {% endcall %}
-
-  {% call section('request') %}
-    {{ header(2, 'Personal message to the world') }}
-
-    {% call para() %}
-      Since 2023-04-20 I am praying Our Lady of Pompeii Novena for the digital
-      freedom in my country, Poland.
-      Everyone is invited to join and start praying for other countries.
-      You can also share
-      {{
-        link(
-          'https://friendica.me/display/78ea265d-7964-5689-270c-acd451615930',
-          'my post on Fediverse'
-        )
-      }}.
-    {% endcall %}
-
-    {% call para() %}
-      Why? The solely material efforts of the Free Software Movement so far gave
-      little effect — the bulk of today's society instead of using ethical
-      technologies ({{ link('https://joinpeertube.org/', 'PeerTube') }},
-      {{ link('https://joinmastodon.org/', 'Mastodon') }},
-      {{ link('https://trisquel.info/', 'GNU+Linux') }}) drowns in centralized
-      platforms like Facebook and YouTube and in proprietary software like
-      Windows.
-      As we can see, volunteer work and advocacy done by many have proved
-      insufficient.
-      I now want to take example from history where — for example — simple "Hail
-      Mary"'s of the rosary saved Austria from communist rule in 1955.
-    {% endcall %}
-
-    {% call para() %}
-      Earlier on this place used to be displayed my double request — to software
-      freedom enthusiast and to all Christians so that they seriously consider
-      what the other ones have to say.
-      That request was also a bit of a brickbat and I am happy to have had
-      changed it for something better and more constructive.
-      If you nevertheless want to, you can still find the old text in the
-      {{
-        link(
-          'https://web.archive.org/web/20220625043220/https://koszko.org/en/koszko.html#request',
-          'Wayback Machine'
-        )
-      }}.
-    {% endcall %}
-  {% endcall %}
-
-  {% call section('posts') %}
-    {{ header(2, 'Posts') }}
-
-    {{ posts() }}
-  {% endcall %}
-{% endblock %}
diff --git a/src/koszko_org_website/templates/en/qr.html.jinja b/src/koszko_org_website/templates/en/qr.html.jinja
deleted file mode 100644
index 1fe1545..0000000
--- a/src/koszko_org_website/templates/en/qr.html.jinja
+++ /dev/null
@@ -1,28 +0,0 @@
-{#
-SPDX-License-Identifier: CC0-1.0
-
-koszko.org website QR code easter egg page (english).
-
-Copyright (C) 2021,2022 Wojtek Kosior <koszko@koszko.org>
-#}
-{% extends "__campaign_base.html.jinja" %}
-
-{% block title %} Easter eggs {% endblock %}
-
-{% block content %}
-  {{ header(1, 'QR code') }}
-
-  {% call section() %}
-    {% call para() %}
-      So you scanned the QR code? You'll see something cool then.
-    {% endcall %}
-
-    {% set alt_text = 'photo of Easter eggs lying on the grass' %}
-    {{ img('/static/easter-eggs.jpg', alt_text) }}
-
-    {% call para() %}
-      You can now move to {{ link(same_lang_url(''), 'the target page') }}
-      {{ unicode(128578) }}
-    {% endcall %}
-  {% endcall %}
-{% endblock %}