summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2019-02-24 13:46:15 -0500
committerLuke Shumaker <lukeshu@parabola.nu>2019-02-24 13:46:15 -0500
commitd133abc9d04696fa4ac2132b43237d29cda4ee97 (patch)
tree42f41abb966e5918e0a5c175bfc9707b16ded2f4 /templates
parentc5957b72419862b879b637b5e405289ef8784727 (diff)
parent5331e5b63e45db8f4ee6252c38dbd5ed79afae22 (diff)
Merge branch 'archweb-generic'parabolaweb-2019-02-24
Diffstat (limited to 'templates')
-rw-r--r--templates/base.html6
-rw-r--r--templates/public/index.html7
-rw-r--r--templates/public/keys.html2
-rw-r--r--templates/releng/add.html2
-rw-r--r--templates/releng/archlinux.ipxe14
-rw-r--r--templates/releng/netboot.html10
-rw-r--r--templates/releng/release_list.html4
-rw-r--r--templates/sitemaps/news_sitemap.xml.jinja2
8 files changed, 23 insertions, 24 deletions
diff --git a/templates/base.html b/templates/base.html
index b546ad81..fa253dec 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -19,11 +19,11 @@
<div id="archnavbarmenu">
<ul id="archnavbarlist">
<li id="anb-home"><a href="/" title="{{ BRANDING_SHORTNAME }} news, packages, projects and more">Home</a></li>
- <li id="anb-packages"><a href="/packages/" title="{{ BRANDING_SHORTNAME }} Packages Database">Packages</a></li>
+ <li id="anb-packages"><a href="/packages/" title="{{ BRANDING_SHORTNAME }} Package Database">Packages</a></li>
<!-- Free Culture or multimedia with mediagoblin -->
<!-- Social with GNU Social, Diaspora or another, it needs consensus -->
- <li id="anb-wiki"><a href="{% wiki_url %}" title="Parabola and community documentations">Wiki</a></li>
- <li id="anb-bugs"><a href="{{ BUGTRACKER_URL }}" title="Report and track issues">Issues</a></li>
+ <li id="anb-wiki"><a href="{% wiki_url %}" title="Community documentation">Wiki</a></li>
+ <li id="anb-bugs"><a href="{{ BUGTRACKER_URL }}" title="Report and track bugs">Bugs</a></li>
<!-- PUR -->
<li id="anb-projects"><a href="{{ PROJECTS_URL }}" title="Our code">Projects</a></li>
<li id="anb-download"><a href="{% url 'page-download' as pdl %}{{ pdl }}" title="Get {{ BRANDING_DISTRONAME }}">Download</a></li>
diff --git a/templates/public/index.html b/templates/public/index.html
index 953453b8..91adca7a 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -4,8 +4,8 @@
{% load wiki %}
{% block head %}
-<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISRONAME }} News Updates" href="/feeds/news/" />
-<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISRONAME }} Package Updates" href="/feeds/packages/" />
+<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISTRONAME }} News Updates" href="/feeds/news/" />
+<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISTRONAME }} Package Updates" href="/feeds/packages/" />
{% endblock %}
{% block content_left %}
@@ -146,8 +146,7 @@
<h4>Support</h4>
<ul>
- <li><a href="{% url 'page-donate' %}"
- title="Help support {{ BRANDING_DISTRONAME }}">Donate</a></li>
+ <li><a href="{% url 'page-donate' %}" title="Help support {{ BRANDING_DISTRONAME }}">Donate</a></li>
</ul>
<h4>Tools</h4>
diff --git a/templates/public/keys.html b/templates/public/keys.html
index f15ec1a9..856c6582 100644
--- a/templates/public/keys.html
+++ b/templates/public/keys.html
@@ -8,7 +8,7 @@
<div id="signing-keys" class="box">
<h2>Master Signing Keys</h2>
- <p>This page lists the {{ BRANDING_DISTORNAME }} Master Keys. This is a distributed set of
+ <p>This page lists the {{ BRANDING_DISTRONAME }} Master Keys. This is a distributed set of
keys that are seen as "official" signing keys of the distribution. Each key
is held by a different developer, and a revocation certificate for the key
is held by a different developer. Thus, no one developer has absolute hold
diff --git a/templates/releng/add.html b/templates/releng/add.html
index 80afda80..f4919adf 100644
--- a/templates/releng/add.html
+++ b/templates/releng/add.html
@@ -6,7 +6,7 @@
<div class="box">
<h2>{{ BRANDING_SHORTNAME }} Releng Testbuild Feedback Entry</h2>
- <p>This page allows you to submit feedback after testing an {{ BRANDING_SHORTNAME }} installation
+ <p>This page allows you to submit feedback after testing an {{ BRANDING_DISTRONAME }} installation
using a release engineering testbuild. Mark all the options you used during the
installation; at the end you can specify whether everything went OK. Be
sure to only denote a successful install after having checked the
diff --git a/templates/releng/archlinux.ipxe b/templates/releng/archlinux.ipxe
index 4945868c..81767f32 100644
--- a/templates/releng/archlinux.ipxe
+++ b/templates/releng/archlinux.ipxe
@@ -15,14 +15,14 @@ set extrabootoptions ip=dhcp net.ifnames=0
set countrycode
:main
-menu Arch Linux Netboot
+menu {{ BRANDING_DISTRONAME }} Netboot
item --gap Settings
item set_architecture Architecture: ${bootarch}
item set_release Release: ${release}
isset ${mirrorurl} && item set_mirror Mirror: ${mirrorurl} || item set_mirror Choose a mirror
item set_options Boot options: ${extrabootoptions}
item
-isset ${mirrorurl} && item boot Boot Arch Linux || item --gap Boot Arch Linux
+isset ${mirrorurl} && item boot Boot {{ BRANDING_DISTRONAME }} || item --gap Boot {{ BRANDING_DISTRONAME }}
item shell Drop to iPXE shell
item reboot Reboot
item exit Exit iPXE
@@ -41,7 +41,7 @@ reboot
exit
:set_architecture
-menu Arch Linux Netboot: Select Architecture
+menu {{ BRANDING_DISTRONAME }} Netboot: Select Architecture
item back back
item
item --gap Available architectures:
@@ -53,7 +53,7 @@ set bootarch ${selected}
goto main
:set_release
-menu Arch Linux Netboot: Select Release
+menu {{ BRANDING_DISTRONAME }} Netboot: Select Release
item back back
item
item --gap Available releases:
@@ -68,7 +68,7 @@ goto main
goto select_mirror_country
:select_mirror_country
-menu Arch Linux Netboot: Select Mirror
+menu {{ BRANDING_DISTRONAME }} Netboot: Select Mirror
item back back
item
item --gap Custom Configuration:
@@ -107,7 +107,7 @@ set countryname Global
:select_mirror_url_{{ mirrorgroup.grouper }}
set countryname {{ mirrorgroup.grouper.name }}
{% endif %}
-menu Arch Linux Netboot: Select Mirror
+menu {{ BRANDING_DISTRONAME }} Netboot: Select Mirror
item back back
item
item --gap Available mirrors in ${countryname}
@@ -124,7 +124,7 @@ echo -n Boot options: ${} && read extrabootoptions ||
goto main
:boot
-echo Booting Arch Linux ${bootarch} ${release} from ${mirrorurl}
+echo Booting {{ BRANDING_DISTRONAME }} ${bootarch} ${release} from ${mirrorurl}
echo
kernel ${mirrorurl}iso/${release}/arch/boot/${bootarch}/vmlinuz || goto failed_download
imgverify vmlinuz ${mirrorurl}iso/${release}/arch/boot/${bootarch}/vmlinuz.ipxe.sig || goto failed_verify
diff --git a/templates/releng/netboot.html b/templates/releng/netboot.html
index 36404588..1b87244b 100644
--- a/templates/releng/netboot.html
+++ b/templates/releng/netboot.html
@@ -1,20 +1,20 @@
{% extends "base.html" %}
{% load staticfiles %}
-{% block title %}Arch Linux - Netboot{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Netboot{% endblock %}
{% block content %}
<div id="arch-netboot" class="box">
-<h2>Arch Linux Netboot</h2>
+<h2>{{ BRANDING_DISTRONAME }} Netboot</h2>
<h3>About Netboot</h3>
-<p>Netboot images are small (&lt;1MB) images that can be used to download the latest Arch Linux release on the fly upon system boot.
+<p>Netboot images are small (&lt;1MB) images that can be used to download the latest {{ BRANDING_DISTRONAME }} release on the fly upon system boot.
It is unnecessary to update the netboot image, the newest release will be available automatically.</p>
<p>Netboot uses customized <a href="http://ipxe.org">iPXE</a> builds.
-The Linux kernel, initramfs and squashfs files for the live system are downloaded from an Arch Linux mirror.
+The Linux kernel, initramfs and squashfs files for the live system are downloaded from an {{ BRANDING_DISTRONAME }} mirror.
The integrity of all downloaded files is verified with cryptographic signatures.</p>
<h3>Requirements</h3>
@@ -48,7 +48,7 @@ For details, check out the <a href="https://aur.archlinux.org/packages/ipxe-netb
<h3>More information</h3>
-<p>For detailed usage instructions, check out the <a href="https://wiki.archlinux.org/index.php/Netboot">netboot wiki page</a>.
+<p>For detailed usage instructions, check out the <a href="{% wiki_url 'Netboot' %}">netboot wiki page</a>.
</div>
{% endblock %}
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index 2339dbfe..3092ddc9 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -12,14 +12,14 @@
<div id="release-list" class="box">
<h2>Releases</h2>
- <p>This is a list of ISO releases made by the {{BRANDING_DISTRONAME}} release
+ <p>This is a list of ISO releases made by the {{ BRANDING_DISTRONAME }} release
engineering team. These are typically done on a monthly cadence, containing
the latest kernel and base packages from the package repositories. Click
the version of each release to read any additional notes or details about
each release.</p>
<p>Torrents and magnet URIs are available to download the releases.
Releases listed as not available may still be seeded by peers, but are no
- longer registered via the official {{BRANDING_DISTRONAME}} torrent tracker. We always
+ longer registered via the official {{ BRANDING_DISTRONAME }} torrent tracker. We always
recommend running the latest available release.</p>
<table id="release-table" class="results">
diff --git a/templates/sitemaps/news_sitemap.xml.jinja b/templates/sitemaps/news_sitemap.xml.jinja
index 1a0be848..cbd86578 100644
--- a/templates/sitemaps/news_sitemap.xml.jinja
+++ b/templates/sitemaps/news_sitemap.xml.jinja
@@ -6,7 +6,7 @@
{% if url.changefreq %}<changefreq>{{ url.changefreq }}</changefreq>{% endif %}
{% if url.priority %}<priority>{{ url.priority }}</priority>{% endif %}
<news:news>
- <news:publication><news:name>{{BRANDING_DISTRONAME}} News</news:name><news:language>en</news:language></news:publication>
+ <news:publication><news:name>{{ BRANDING_DISTRONAME }} News</news:name><news:language>en</news:language></news:publication>
{% if url.item.postdate %}<news:publication_date>{{ url.item.postdate|date("c") }}</news:publication_date>{% endif %}
{% if url.item.title %}<news:title>{{ url.item.title }}</news:title>{% endif %}
</news:news>