summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2018-01-15 13:52:00 -0500
committerLuke Shumaker <lukeshu@parabola.nu>2019-02-24 12:58:40 -0500
commit7077f10e144b0d2f467dd016be2af87b734a3de8 (patch)
treef26bd7c1d63671e7e82e190ab0c984eee773f414
parenta38a826e7f226d0e30c633ea37b074571d89237a (diff)
branding: Replace now-configurable strings in templates
Diffstat
-rw-r--r--templates/base.html10
-rw-r--r--templates/mirrors/mirror_details.html3
-rw-r--r--templates/mirrors/mirrorlist_generate.html7
-rw-r--r--templates/packages/flag.html2
-rw-r--r--templates/packages/flaghelp.html2
-rw-r--r--templates/packages/opensearch.xml4
-rw-r--r--templates/public/download.html5
-rw-r--r--templates/public/feeds.html14
-rw-r--r--templates/public/index.html23
-rw-r--r--templates/public/svn.html6
-rw-r--r--templates/releng/add.html2
-rw-r--r--templates/releng/results.html1
12 files changed, 42 insertions, 37 deletions
diff --git a/templates/base.html b/templates/base.html
index df789601..a5e747a8 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}<!DOCTYPE html>
+{% load static from staticfiles %}{% load wiki %}<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@@ -18,11 +18,11 @@
<div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">{{ BRANDING_DISTRONAME }}</a></h1></div>
<div id="archnavbarmenu">
<ul id="archnavbarlist">
- <li id="anb-home"><a href="/" title="Arch news, packages, projects and more">Home</a></li>
- <li id="anb-packages"><a href="/packages/" title="Arch Package Database">Packages</a></li>
+ <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 }} Package Database">Packages</a></li>
<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
- <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
- <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</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>
<li id="anb-aur"><a href="https://aur.archlinux.org/" title="{{ BRANDING_DISTRONAME }} User Repository">AUR</a></li>
<li id="anb-download"><a href="{% url 'page-download' as pdl %}{{ pdl }}" title="Get {{ BRANDING_DISTRONAME }}">Download</a></li>
</ul>
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 9a553e69..5fe1c585 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -4,6 +4,7 @@
{% load mirror_status %}
{% load flags %}
{% load admin_urls %}
+{% load bugs %}
{% block title %}{{ BRANDING_DISTRONAME }} - {{ mirror.name }} - Mirror Details{% endblock %}
@@ -63,7 +64,7 @@
</tr>
<tr>
<th>Flyspray Issue:</th>
- <td>{% if mirror.bug %}<a href="https://bugs.archlinux.org/task/{{ mirror.bug }}">FS#{{ mirror.bug }}</a>{% endif %}</td>
+ <td>{% if mirror.bug %}{% bug_link mirror.bug %}{% endif %}</td>
</tr>
<tr>
<th>Notes:</th>
diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html
index 71ba6557..7501a9af 100644
--- a/templates/mirrors/mirrorlist_generate.html
+++ b/templates/mirrors/mirrorlist_generate.html
@@ -1,5 +1,6 @@
{% extends "base.html" %}
{% load package_extras %}
+{% load wiki %}
{% block title %}{{ BRANDING_DISTRONAME }} - Pacman Mirrorlist Generator{% endblock %}
{% block content %}
@@ -7,8 +8,8 @@
<h2>Pacman Mirrorlist Generator</h2>
- <p>This page generates the most up-to-date mirrorlist possible for Arch
- Linux. The data used here comes straight from the developers' internal
+ <p>This page generates the most up-to-date mirrorlist possible for {{ BRANDING_DISTRONAME }}.
+ The data used here comes straight from the developers' internal
mirror database used to track mirror availability and tiering. There are
two main options: get a mirrorlist with every available mirror, or get a
mirrorlist tailored to your geography.</p>
@@ -29,7 +30,7 @@
<p>The following form can generate a custom up-to-date
<a href="{% wiki_url 'Pacman' %}"
- title="ArchWiki: Pacman">pacman</a> mirrorlist based on geography and
+ title="{{ BRANDING_WIKINAME }}: Pacman">pacman</a> mirrorlist based on geography and
desired protocol(s). Simply replace the contents of
<code>/etc/pacman.d/mirrorlist</code> with your generated list.
Additionally, the mirror status data can be incorporated into the generated
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index 34f1c7fb..e66d3472 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -29,7 +29,7 @@
<p><strong>Note:</strong> Do <em>not</em> use this facility if the
package is broken! The package will be unflagged and the report will be ignored!
- <a href="https://bugs.archlinux.org/" title="{{ BRANDING_DISTRONAME }} Bugtracker">Use the
+ <a href="{{ BUGTRACKER_URL }}" title="{{ BRANDING_DISTRONAME }} Bugtracker">Use the
bugtracker to file a bug</a> instead.</p>
<p>Please confirm your flag request for {{package.pkgname}}:</p>
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index eb2226f2..5f013cd7 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -29,7 +29,7 @@
with your additional text.</p>
<p><strong>Note:</strong> Please do <em>not</em> use this facility if the
- package is broken! Use the <a target="_blank" href="https://bugs.archlinux.org/"
+ package is broken! Use the <a target="_blank" href="{{ BUGTRACKER_URL }}"
title="{{ BRANDING_DISTRONAME }} Bugtracker">bugtracker</a> instead.</p>
</body>
</html>
diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml
index e7e13617..4c0f9acf 100644
--- a/templates/packages/opensearch.xml
+++ b/templates/packages/opensearch.xml
@@ -1,9 +1,9 @@
{% load static from staticfiles %}<?xml version="1.0" encoding="UTF-8"?>
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
- <ShortName>Arch Packages</ShortName>
+ <ShortName>{{ BRANDING_SHORTNAME }} Packages</ShortName>
<LongName>{{ BRANDING_DISTRONAME }} Package Repository Search</LongName>
<Description>Search the {{ BRANDING_DISTRONAME }} package repositories by keyword in package names and descriptions.</Description>
- <Tags>linux archlinux package software</Tags>
+ <Tags>{{ BRANDING_OSEARCH_TAGS }}</Tags>
<Image height="16" width="16" type="image/x-icon">{{ domain }}{% static "favicon.ico" %}</Image>
<Image height="64" width="64" type="image/png">{{ domain }}{% static "logos/icon-transparent-64x64.png" %}</Image>
<Language>en-us</Language>
diff --git a/templates/public/download.html b/templates/public/download.html
index dcf93d70..ae8273c7 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -2,6 +2,7 @@
{% load cache %}
{% load static from staticfiles %}
{% load flags %}
+{% load wiki %}
{% block title %}{{ BRANDING_DISTRONAME }} - Downloads{% endblock %}
@@ -45,9 +46,9 @@
<div class="article-content">{{ release.info_html }}</div>
{% endif %}
- <h3>Existing Arch Users</h3>
+ <h3>Existing {{ BRANDING_SHORTNAME }} Users</h3>
- <p>If you are an existing Arch user, there is no need to download a new ISO
+ <p>If you are an existing {{ BRANDING_SHORTNAME }} user, there is no need to download a new ISO
to update your existing system. You may be looking for
<a href="{% url 'mirrorlist' %}">an updated mirrorlist</a> instead.</p>
diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index e72cf616..2957692f 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.html" %}{% load wiki %}
{% block title %}{{ BRANDING_DISTRONAME }} - RSS Feeds{% endblock %}
{% block content %}
@@ -6,7 +6,7 @@
<h2>RSS Feeds</h2>
- <p>Several RSS feeds are available for consumption from the Arch website.
+ <p>Several RSS feeds are available for consumption from the {{ BRANDING_SHORTNAME }} website.
The majority of these are package-related and allow feeds to be customized
for the updates you care about.</p>
@@ -15,10 +15,10 @@
<p>Grab the <a href="/feeds/news/" class="rss" title="{{ BRANDING_DISTRONAME }} news feed">news item feed</a>
to keep up-to-date with the latest news from the {{ BRANDING_DISTRONAME }} development staff.</p>
- <p>The <a href="https://wiki.archlinux.org/index.php?title=Special:RecentChanges&amp;feed=rss"
- title="ArchWiki Recent Changes feed" class="rss">Arch Wiki: Recent changes feed</a>
- is also available to track document changes from the <a href="https://wiki.archlinux.org/"
- title="Arch Wiki community documentation">Arch Wiki</a>.</p>
+ <p>The <a href="{% wiki_url 'Special:RecentChanges?feed=rss' %}"
+ title="{{ BRANDING_WIKINAME }} Recent Changes feed" class="rss">{{ BRANDING_WIKINAME }}: Recent changes feed</a>
+ is also available to track document changes from the <a href="{% wiki_url %}"
+ title="{{ BRANDING_WIKINAME }} community documentation">{{ BRANDING_WIKINAME }}</a>.</p>
<h3>Package Feeds</h3>
@@ -73,7 +73,7 @@
<h3>Development Feeds</h3>
<p>Subscribe to any of the following to track bug tickets and feature
- requests from the <a href="https://bugs.archlinux.org/" title="{{ BRANDING_DISTRONAME }} Bugs">{{ BRANDING_DISTRONAME }} Bugtracker</a>:</p>
+ requests from the <a href="{{ BUGTRACKER_URL }}" title="{{ BRANDING_DISTRONAME }} Bugs">{{ BRANDING_DISTRONAME }} Bugtracker</a>:</p>
<table class="pretty2">
<thead>
diff --git a/templates/public/index.html b/templates/public/index.html
index 5c71496d..1189fff8 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -1,6 +1,7 @@
{% extends "base.html" %}
{% load cache %}
{% load static from staticfiles %}
+{% load wiki %}
{% block head %}
<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISTRONAME }} News Updates" href="/feeds/news/" />
@@ -26,10 +27,10 @@
on the range of skillsets and uses for Arch that stem from it. Please
check out our <a href="https://bbs.archlinux.org/" title="Arch Forums">forums</a>
and <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/"
- title="Arch Mailing Lists">mailing lists</a>
- to get your feet wet. Also glance through our <a href="https://wiki.archlinux.org/"
- title="Arch Wiki">wiki</a>
- if you want to learn more about Arch.</p>
+ title="{{ BRANDING_SHORTNAME }} Mailing Lists">mailing lists</a>
+ to get your feet wet. Also glance through our <a href="{% wiki_url %}"
+ title="{{ BRANDING_WIKINAME }}">wiki</a>
+ if you want to learn more about {{ BRANDING_SHORTNAME }}.</p>
<p class="readmore"><a href="{% url 'page-about' %}"
title="Learn more about {{ BRANDING_DISTRONAME }}">Learn more...</a></p>
@@ -41,7 +42,7 @@
<span class="arrow"></span>
</h3>
- <a href="/feeds/news/" title="Arch News RSS Feed"
+ <a href="/feeds/news/" title="{{ BRANDING_SHORTNAME }} News RSS Feed"
class="rss-icon"><img width="16" height="16" src="{% static "rss.png" %}" alt="RSS Feed" /></a>
{% for news in news_updates %}{% if forloop.counter0 < 5 %}
@@ -88,7 +89,7 @@
<h3>Recent Updates <span class="more">(<a href="/packages/?sort=-last_update"
title="Browse all of the latest packages">more</a>)</span></h3>
- <a href="/feeds/packages/" title="Arch Package Updates RSS Feed"
+ <a href="/feeds/packages/" title="{{ BRANDING_SHORTNAME }} Package Updates RSS Feed"
class="rss-icon"><img width="16" height="16" src="{% static "rss.png" %}" alt="RSS Feed" /></a>
<table>
@@ -109,7 +110,7 @@
<div id="nav-sidebar" class="widget">
<h4>Documentation</h4>
<ul>
- <li><a href="https://wiki.archlinux.org/"
+ <li><a href="{% wiki_url %}"
title="Community documentation">Wiki</a></li>
<li><a href="{% wiki_url 'Installation_guide' %}"
title="Installation guide">Installation Guide</a></li>
@@ -124,7 +125,7 @@
<li><a href="https://planet.archlinux.org/"
title="Arch in the blogosphere">Planet Arch</a></li>
<li><a href="{% wiki_url 'International_communities' %}"
- title="Arch communities in your native language">International Communities</a></li>
+ title="{{ BRANDING_SHORTNAME }} communities in your native language">International Communities</a></li>
</ul>
<h4>Support</h4>
@@ -152,8 +153,8 @@
<h4>Development</h4>
<ul>
- <li><a href="https://projects.archlinux.org/"
- title="Official Arch projects (git)">Projects in Git</a></li>
+ <li><a href="{{ PROJECTS_URL }}"
+ title="Official {{ BRANDING_SHORTNAME }} projects (git)">Projects in Git</a></li>
<li><a href="{% url 'page-svn' %}"
title="View SVN entries for packages">SVN Repositories</a></li>
<li><a href="{% wiki_url 'DeveloperWiki' %}"
@@ -183,7 +184,7 @@
<ul>
<li><a href="{% wiki_url 'Arch_Linux_press_coverage' %}"
title="{{ BRANDING_DISTRONAME }} in the media">Press Coverage</a></li>
- <li><a href="{% url 'page-art' %}" title="Arch logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
+ <li><a href="{% url 'page-art' %}" title="{{ BRANDING_SHORTNAME }} logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
<li><a href="{% url 'news-list' %}" title="News Archives">News Archives</a></li>
<li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li>
</ul>
diff --git a/templates/public/svn.html b/templates/public/svn.html
index 020a00bf..01c2ef80 100644
--- a/templates/public/svn.html
+++ b/templates/public/svn.html
@@ -9,9 +9,9 @@
</p>
<p>The SVN repositories have been cloned into git repositories and can be
viewed via the cgit interface.
- <a href="https://projects.archlinux.org/svntogit/packages.git/">All
+ <a href="{{ PROJECTS_URL }}/svntogit/packages.git/">All
packages</a> are available here except for
- <a href="https://projects.archlinux.org/svntogit/community.git/">community
+ <a href="{{ PROJECTS_URL }}/svntogit/community.git/">community
and multilib</a> which are available in a different repository.</p>
<p>
You can also get individual PKGBUILDs directly from SVN. This can be
@@ -31,7 +31,7 @@ cd community
svn update &lt;your-package-name&gt;</pre>
<p>
- Visit <a href="https://wiki.archlinux.org/index.php?title=Getting_PKGBUILDS_From_SVN">the wiki</a>
+ Visit <a href="{% wiki_url 'Getting_PKGBUILDS_From_SVN' %}">the wiki</a>
for more tips on checking out and updating svn PKGBUILDs.
</p>
diff --git a/templates/releng/add.html b/templates/releng/add.html
index 3b289ea1..f4919adf 100644
--- a/templates/releng/add.html
+++ b/templates/releng/add.html
@@ -4,7 +4,7 @@
{% block content %}
<div class="box">
- <h2>Arch Releng Testbuild Feedback Entry</h2>
+ <h2>{{ BRANDING_SHORTNAME }} Releng Testbuild Feedback Entry</h2>
<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
diff --git a/templates/releng/results.html b/templates/releng/results.html
index 72206325..71a31fef 100644
--- a/templates/releng/results.html
+++ b/templates/releng/results.html
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% load wiki %}
{% block title %}{{ BRANDING_DISTRONAME }} - Release Engineering Testbuild Results{% endblock %}
generated by cgit v1.2.2 (git 2.25.0) at 2024-05-02 00:08:47 +0000