diff options
59 files changed, 318 insertions, 140 deletions
diff --git a/README.BRANDING b/README.BRANDING new file mode 100644 index 00000000..00d2d1b0 --- /dev/null +++ b/README.BRANDING @@ -0,0 +1,71 @@ +It is now fairly easy to re-brand archweb. +Replacing logos is still a bit of work. +Here is a summary of the text files that need to be changed to +re-brand it. + +Files used to configure branding/url stuff +------------------------------------------ + + * `settings.py` + * `templates/templatetags/package_extras.py` + * `main/templatetags/wiki.py` + +Files with minor Arch stuff that's just easier to patch +------------------------------------------------------- + +`releng/views.py` + * link to `https://bugs.archlinux.org/index.php?project=6` + +`templates/packages/opensearch.xml` + * `<Tags>` includes `archlinux` + +`templates/packages/flaghelp.html` + * link to "arch-general" mailing list + +`templates/packages/flag.html` + * link to "arch-general" mailing list + +`templates/packages/search.html` + * link to AUR + +`templates/public/feeds.html` + * links to AUR + * links to feeds on `bugs.archlinux.org` + +Files with a significant amount of Arch-specific content: +--------------------------------------------------------- + +`templates/base.html` + * main navbar + * link to `bbs.archlinux.org` + * link to the AUR + * logged in navbar + * link to "arch-dev" mailing list + * link to `stats.archlinux.org/munin` + * copyright statement is Arch-specific. + +`templates/public/index.html` + * The text in the intro box describes Arch Linux. + * sidebar + * Community + * link to `planet.archlinux.org` + * Support + * link to `schwag.archlinux.ca` + * link to `www.zazzle.com/archlinux*` + * link to `www.freewear.org/?page=list_items&org=Archlinux` + * Development + * link to `projects.archlinux.org` ("Official Arch projects") + * More Resources + * link to wiki article "Arch Linux Press Review" + * Below sidebar + * Arch's donate button + * Arch's sponsors + +Files with totally Arch-specific content: +----------------------------------------- + + * `templates/public/about.html` + * `templates/public/art.html` + * `templates/public/donate.html` + * `templates/public/download.html` + * `templates/public/svn.html` diff --git a/devel/views.py b/devel/views.py index 0b9f8f18..7be3dc17 100644 --- a/devel/views.py +++ b/devel/views.py @@ -6,6 +6,7 @@ from string import ascii_letters, digits import time from django import forms +from django.conf import settings from django.http import HttpResponseRedirect from django.contrib.auth.decorators import \ login_required, permission_required, user_passes_test @@ -319,9 +320,9 @@ class NewUserForm(forms.ModelForm): 'password': password, }) - send_mail("Your new parabolaweb account", + send_mail("Your new "+settings.BRANDING_APPNAME+" account", template.render(ctx), - 'Parabola <dev@lists.parabolagnulinux.org>', + settings.BRANDING_EMAIL, [user.email], fail_silently=False) @@ -1,6 +1,7 @@ import hashlib import pytz +from django.conf import settings from django.contrib.sites.models import Site from django.contrib.syndication.views import Feed from django.db.models import Q @@ -68,7 +69,7 @@ class PackageFeed(Feed): return obj def title(self, obj): - s = 'Parabola GNU/Linux-libre: Recent package updates' + s = settings.BRANDING_DISTRONAME+': Recent package updates' if 'repo' in obj: s += ' (%s [%s])' % (obj['arch'].name, obj['repo'].name.lower()) elif 'arch' in obj: @@ -76,7 +77,7 @@ class PackageFeed(Feed): return s def description(self, obj): - s = 'Recently updated packages in the Parabola GNU/Linux-libre package repositories' + s = 'Recently updated packages in the '+settings.BRANDING_DISTRONAME+' package repositories' if 'arch' in obj: s += ' for the \'%s\' architecture' % obj['arch'].name.lower() if not obj['arch'].agnostic: @@ -117,9 +118,9 @@ def news_last_modified(request, *args, **kwargs): class NewsFeed(Feed): feed_type = GuidNotPermalinkFeed - title = 'Parabola GNU/Linux-libre: Recent news updates' + title = settings.BRANDING_DISTRONAME+': Recent news updates' link = '/news/' - description = 'The latest news from the Parabola GNU/Linux-libre distribution.' + description = 'The latest and greatest news from the '+settings.BRANDING_DISTRONAME+' distribution.' subtitle = description title_template = 'feeds/news_title.html' description_template = 'feeds/news_description.html' diff --git a/main/context_processors.py b/main/context_processors.py index a60d4e63..2543a3de 100644 --- a/main/context_processors.py +++ b/main/context_processors.py @@ -1,4 +1,16 @@ def secure(request): return {'secure': request.is_secure()} +def branding(request): + from django.conf import settings + return { + 'BRANDING_APPNAME': settings.BRANDING_APPNAME, + 'BRANDING_DISTRONAME': settings.BRANDING_DISTRONAME, + 'BRANDING_SHORTNAME': settings.BRANDING_SHORTNAME, + 'BRANDING_WIKINAME': settings.BRANDING_WIKINAME, + 'BRANDING_EMAIL': settings.BRANDING_EMAIL, + 'MAILMAN_BASE_URL': settings.MAILMAN_BASE_URL, + 'BUGTRACKER_URL': settings.BUGTRACKER_URL, + } + # vim: set ts=4 sw=4 et: diff --git a/main/templatetags/wiki.py b/main/templatetags/wiki.py new file mode 100644 index 00000000..b1b8dd55 --- /dev/null +++ b/main/templatetags/wiki.py @@ -0,0 +1,9 @@ +from django import template +register = template.Library() + +@register.simple_tag +def wiki_url(article=""): + if article == "": + return "https://wiki.archlinux.org/" + else: + return "https://wiki.archlinux.org/index.php/"+article.replace(' ', '_') diff --git a/packages/management/commands/signoff_report.py b/packages/management/commands/signoff_report.py index 70152cdb..498bb533 100644 --- a/packages/management/commands/signoff_report.py +++ b/packages/management/commands/signoff_report.py @@ -8,6 +8,7 @@ repository. Usage: ./manage.py signoff_report <email> <repository> """ +from django.conf import settings from django.core.mail import send_mail from django.core.urlresolvers import reverse from django.core.management.base import BaseCommand, CommandError @@ -120,7 +121,7 @@ def generate_report(email, repo_name): 'old_days': old_days, 'leaders': leaders, }) - from_addr = 'Parabola Website Notification <nobody@parabolagnulinux.org>' + from_addr = settings.BRANDING_EMAIL send_mail(subject, t.render(c), from_addr, [email]) # vim: set ts=4 sw=4 et: diff --git a/packages/views/flag.py b/packages/views/flag.py index 31eeda2d..760bdd94 100644 --- a/packages/views/flag.py +++ b/packages/views/flag.py @@ -98,7 +98,7 @@ def flag(request, name, repo, arch): }) send_mail(subject, tmpl.render(ctx), - 'Parabola Website Notification <nobody@parabolagnulinux.org>', + settings.BRANDING_EMAIL, toemail, fail_silently=True) diff --git a/public/views.py b/public/views.py index 29fec470..0e9287fa 100644 --- a/public/views.py +++ b/public/views.py @@ -27,11 +27,11 @@ def index(request): USER_LISTS = { 'hackers': { 'user_type': 'Hackers', - 'description': "This is a list of the current Parabola Hackers. They maintain the [libre] package repository and keep the [core], [extra] and [community] repositories clean of unfree software, in addition to doing any other developer duties.", + 'description': "This is a list of the current "+settings.BRANDING_SHORTNAME+" Hackers. They maintain the [libre] package repository and keep the [core], [extra] and [community] repositories clean of unfree software, in addition to doing any other developer duties.", }, 'fellows': { 'user_type': 'Fellows', - 'description': "Below you can find a list of ex-hackers (aka project fellows). These folks helped make Parabola what it is today. Thanks!", + 'description': "Below you can find a list of ex-hackers (aka project fellows). These folks helped make "+settings.BRANDING_SHORTNAME+" what it is today. Thanks!", }, } diff --git a/settings.py b/settings.py index 1202e836..98819250 100644 --- a/settings.py +++ b/settings.py @@ -1,5 +1,5 @@ import os -# Django settings for archweb project. +# Django settings for parabolaweb project. ## Set the debug values DEBUG = False @@ -54,6 +54,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.static', 'django.contrib.messages.context_processors.messages', 'main.context_processors.secure', + 'main.context_processors.branding', ) TEMPLATE_DIRS = ( @@ -138,6 +139,16 @@ PXEBOOT_URL = 'http://repo.parabolagnulinux.org/pxeboot/' # community bit on the end, repo.svn_root is appended) #SVN_BASE_URL = 'svn://svn.archlinux.org/' +MAILMAN_BASE_URL = 'https://lists.parabolagnulinux.org/' +BUGTRACKER_URL = 'https://labs.parabola.nu/' + +BRANDING_APPNAME = 'parabolaweb' +BRANDING_DISTRONAME = 'Parabola GNU/Linux-libre' +BRANDING_SHORTNAME = 'Parabola' +BRANDING_WIKINAME = 'ParabolaWiki' +BRANDING_EMAIL = 'Parabola Website Notification <nobody@parabolagnulinux.org>' + + ## Import local settings from local_settings import * diff --git a/templates/404.html b/templates/404.html index 756564be..7a667bac 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Parabola - Page Not Found{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Page Not Found{% endblock %} {% block content %} <div id="error-page" class="box 404"> diff --git a/templates/base.html b/templates/base.html index 6f4c73f5..54e38058 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,26 +1,29 @@ -{% load url from future %}{% load static from staticfiles %}<!DOCTYPE html> +{% load url from future %}{% load static from staticfiles %}{% load wiki %}<!DOCTYPE html> <html lang="en"> <head> - <title>{% block title %}Parabola GNU/Linux-libre{% endblock %}</title> + <title>{% block title %}{{ BRANDING_DISTRONAME }}{% endblock %}</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rel="stylesheet" type="text/css" href="{% static "archweb.css" %}" media="screen, projection" /> <link rel="stylesheet" type="text/css" href="{% static "archweb-print.css" %}" media="print" /> <link rel="icon" type="image/x-icon" href="{% static "favicon.ico" %}" /> <link rel="shortcut icon" type="image/x-icon" href="{% static "favicon.ico" %}" /> - <link rel="search" type="application/opensearchdescription+xml" href="{% url 'opensearch-packages' as osp %}{{ osp }}" title="Parabola Packages" /> + <link rel="apple-touch-icon" href="{% static "logos/apple-touch-icon-57x57.png" %}" /> + <link rel="apple-touch-icon" sizes="72x72" href="{% static "logos/apple-touch-icon-72x72.png" %}" /> + <link rel="apple-touch-icon" sizes="114x114" href="{% static "logos/apple-touch-icon-114x114.png" %}" /> + <link rel="search" type="application/opensearchdescription+xml" href="{% url 'opensearch-packages' as osp %}{{ osp }}" title="{{ BRANDING_DISTRONAME }} Packages" /> {% block head %}{% endblock %} </head> <body class="{% if user.is_authenticated %}devmode {% endif %}{% block bodyclass %}{% endblock %}"> <div id="archnavbar" class="{% block navbarclass %}anb-home{% endblock %}"> - <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Parabola</a></h1></div> + <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="Parabola news, packages, projects and more">Home</a></li> - <li id="anb-packages"><a href="/packages/" title="Package Database">Packages</a></li> - <li id="anb-wiki"><a href="https://wiki.parabolagnulinux.org" title="Community documentation">Wiki</a></li> - <li id="anb-bugs"><a href="https://labs.parabola.nu" title="Issue Tracker">Bugs</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-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-projects"><a href="https://projects.parabolagnulinux.org" title="Our Code">Projects</a></li> - <li id="anb-download"><a href="{% url 'page-download' as pdl %}{{ pdl }}" title="Get Parabola">Download</a></li> + <li id="anb-download"><a href="{% url 'page-download' as pdl %}{{ pdl }}" title="Get {{ BRANDING_DISTRONAME }}">Download</a></li> </ul> </div> </div> @@ -29,13 +32,13 @@ {% if user.is_authenticated %} <ul> <li><a href="{% url 'devel-index' %}" title="Developer Dashboard">Dashboard</a></li> - <li><a href="https://wiki.parabolagnulinux.org/DeveloperWiki" + <li><a href="{% wiki_url 'DeveloperWiki' %}" title="Developer Wiki">DevWiki</a></li> <li><a href="{% url 'news-list' as newsl %}{{ newsl }}" title="Manage news articles">News</a></li> <li><a href="/packages/signoffs/" title="Package signoffs">Signoffs</a></li> <li><a href="/todo/" title="Developer todo lists">Todos</a></li> <li><a href="{% url 'devel-clocks' %}" title="Developer world clocks">Dev Clocks</a></li> - <li><a href="https://lists.parabolagnulinux.org/pipermail/dev/" + <li><a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/dev/" title="dev mailing list archives">Archives</a></li> <li><a href="/mirrors/" title="Mirror server statistics">Mirrors</a></li> {% if user.is_staff %} @@ -65,9 +68,13 @@ {% endblock %} <div id="footer"> <p>Copyleft 2009-{% now "Y" %} Parabola Project. All content is - released under a <a - href="http://creativecommons.org/licenses/by-sa/3.0/" - rel="license">cc-by-sa 3.0 unported</a> license.</p> + released under the <a + href="http://creativecommons.org/licenses/by-sa/3.0/" + rel="license">cc by-sa 3.0 unported</a> license.</p> + <p>Website software and layout is derivative of archweb, + Copyright © 2002-{% now "Y" %} <a href="mailto:jvinet@zeroflux.org" + title="Contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" + title="Contact Aaron Griffin">Aaron Griffin</a>.</p> </div> </div> </body> diff --git a/templates/devel/clock.html b/templates/devel/clock.html index 0cad9d1b..9ee5494a 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -2,11 +2,11 @@ {% load static from staticfiles %} {% load tz %} -{% block title %}Parabola GNU/Linux-libre - Hackers World Clocks{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Hacker World Clocks{% endblock %} {% block content %} <div id="dev-clocks-box" class="box"> - <h2>Hackers World Clocks</h2> + <h2>Hacker World Clocks</h2> <p>This page helps prevent you from waking a sleeping hacker. It also depends on hackers keeping the time zone information up to date, so if diff --git a/templates/devel/index.html b/templates/devel/index.html index 9f897317..de132fd0 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -3,7 +3,7 @@ {% load cache %} {% load package_extras %} -{% block title %}Parabola - Hacker Dashboard{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Hacker Dashboard{% endblock %} {% block content %} <div id="dev-dashboard" class="box"> diff --git a/templates/devel/packages.html b/templates/devel/packages.html index 6979e8c2..77146891 100644 --- a/templates/devel/packages.html +++ b/templates/devel/packages.html @@ -3,7 +3,7 @@ {% load attributes %} {% load package_extras %} -{% block title %}Parabola - {{ title }}{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - {{ title }}{% endblock %} {% block content %} <div class="box"> diff --git a/templates/devel/profile.html b/templates/devel/profile.html index b497a20a..54a3771c 100644 --- a/templates/devel/profile.html +++ b/templates/devel/profile.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Parabola - Edit Profile{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Edit Profile{% endblock %} {% block content %} <div id="dev-edit-profile" class="box"> diff --git a/templates/general_form.html b/templates/general_form.html index 5e620087..c6d6cb1c 100644 --- a/templates/general_form.html +++ b/templates/general_form.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Parabola - {{title}}{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - {{title}}{% endblock %} {% block content %} <div id="generic-form" class="box"> diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index 65f71cb7..76ab3d5b 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -2,7 +2,7 @@ {% load static from staticfiles %} {% load mirror_status %} -{% block title %}Parabola - {{ mirror.name }} - Mirror Details{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - {{ mirror.name }} - Mirror Details{% endblock %} {% block content %} <!-- TODO: ids and classes --> diff --git a/templates/mirrors/mirrorlist.txt b/templates/mirrors/mirrorlist.txt index 3ea89417..bbe468fc 100644 --- a/templates/mirrors/mirrorlist.txt +++ b/templates/mirrors/mirrorlist.txt @@ -4,7 +4,7 @@ them, sacrifices have to be made. If editing this template, it is easiest to forget about where line breaks are happening until you are done getting the content right, and then go back later to fix it all up. {% endcomment %}{% autoescape off %}## -## Parabola repository mirrorlist +## {{ BRANDING_DISTRONAME }} repository mirrorlist ## Generated on {% now "Y-m-d" %} ##{% for mirror_url in mirror_urls %}{% ifchanged %} diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html index 35d84ddc..2025eec2 100644 --- a/templates/mirrors/mirrorlist_generate.html +++ b/templates/mirrors/mirrorlist_generate.html @@ -1,14 +1,15 @@ {% extends "base.html" %} {% load package_extras %} -{% block title %}Parabola - Pacman Mirrorlist Generator{% endblock %} +{% load wiki %} +{% block title %}{{ BRANDING_DISTRONAME }} - Pacman Mirrorlist Generator{% endblock %} {% block content %} <div id="mirrorlist-gen" class="box"> <h2>Pacman Mirrorlist Generator</h2> - <p>This page generates the most up-to-date mirrorlist possible for - Parabola. 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> @@ -28,8 +29,8 @@ <h3>Customized by country mirrorlist</h3> <p>The following form can generate a custom up-to-date - <a href="https://wiki.parabolagnulinux.org/Pacman">pacman</a> - mirrorlist based on geography and + <a href="{% wiki_url 'Pacman' %}" + 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/mirrors/mirrorlist_status.txt b/templates/mirrors/mirrorlist_status.txt index 34ed8fdc..61d0abb1 100644 --- a/templates/mirrors/mirrorlist_status.txt +++ b/templates/mirrors/mirrorlist_status.txt @@ -4,7 +4,7 @@ them, sacrifices have to be made. If editing this template, it is easiest to forget about where line breaks are happening until you are done getting the content right, and then go back later to fix it all up. {% endcomment %}{% autoescape off %}## -## Parabola repository mirrorlist +## {{ BRANDING_DISTRONAME }} repository mirrorlist ## Sorted by mirror score from mirror status page ## Generated on {% now "Y-m-d" %} ## diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html index 241c3557..aea458d8 100644 --- a/templates/mirrors/mirrors.html +++ b/templates/mirrors/mirrors.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% block title %}Parabola - Mirror Overview{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Mirror Overview{% endblock %} {% block content %} <div id="dev-mirrorlist" class="box"> diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html index e6861bfb..fbd4d520 100644 --- a/templates/mirrors/status.html +++ b/templates/mirrors/status.html @@ -2,12 +2,12 @@ {% load static from staticfiles %} {% load mirror_status %} -{% block title %}Parabola - Mirror Status{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Mirror Status{% endblock %} {% block content %} <div id="mirrorstatus" class="box"> <h2>Mirror Status</h2> - <p>This page reports the status of all known, public, and active Parabola + <p>This page reports the status of all known, public, and active {{ BRANDING_DISTRONAME }} mirrors. All data on this page reflects the status of the mirrors within the <em>last {{ cutoff|hours }}</em>. All listed times are UTC. The check script runs on a regular basis and polls for the <tt>lastsync</tt> file in the root of diff --git a/templates/news/add.html b/templates/news/add.html index 433218a0..a09366dc 100644 --- a/templates/news/add.html +++ b/templates/news/add.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% block title %}Parabola - News: {% if form.instance.id %}Edit{% else %}Add{% endif %} Article{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - News: {% if form.instance.id %}Edit{% else %}Add{% endif %} Article{% endblock %} {% block content %} <div id="news-add-article" class="box"> diff --git a/templates/news/delete.html b/templates/news/delete.html index 3bcd6e56..d8f71bd5 100644 --- a/templates/news/delete.html +++ b/templates/news/delete.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Parabola - Delete News{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Delete News{% endblock %} {% block content %} <div id="news-delete-entry" class="box"> diff --git a/templates/news/list.html b/templates/news/list.html index f686ff3e..98cf9a73 100644 --- a/templates/news/list.html +++ b/templates/news/list.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Parabola - News{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - News{% endblock %} {% block content %} <div id="news-article-list" class="box"> diff --git a/templates/news/view.html b/templates/news/view.html index 3cd14c99..47830867 100644 --- a/templates/news/view.html +++ b/templates/news/view.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% load markup %} -{% block title %}Parabola - News: {{ news.title }}{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - News: {{ news.title }}{% endblock %} {% block content %} <div class="news-article box"> diff --git a/templates/packages/details.html b/templates/packages/details.html index 0369aa96..c32586a6 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -3,7 +3,7 @@ {% load package_extras %} {% load pgp %} -{% block title %}Parabola - {{ pkg.pkgname }} {{ pkg.full_version }} - Package Details{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - {{ pkg.pkgname }} {{ pkg.full_version }} ({{ pkg.arch.name }}){% endblock %} {% block navbarclass %}anb-packages{% endblock %} {% load package_extras %} diff --git a/templates/packages/differences.html b/templates/packages/differences.html index a94089ce..999c1666 100644 --- a/templates/packages/differences.html +++ b/templates/packages/differences.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% block title %}Parabola - Package Differences Reports{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Package Differences Reports{% endblock %} {% block navbarclass %}anb-packages{% endblock %} {% block content %} diff --git a/templates/packages/files.html b/templates/packages/files.html index 46553b25..652dc133 100644 --- a/templates/packages/files.html +++ b/templates/packages/files.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Parabola - {{ pkg.pkgname }} {{ pkg.full_version }} ({{ pkg.arch.name }}) - File List{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - {{ pkg.pkgname }} {{ pkg.full_version }} ({{ pkg.arch.name }}) - File List{% endblock %} {% block navbarclass %}anb-packages{% endblock %} {% block content %} diff --git a/templates/packages/flag.html b/templates/packages/flag.html index f64622c9..b9737bb9 100644 --- a/templates/packages/flag.html +++ b/templates/packages/flag.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load package_extras %} -{% block title %}Parabola - Flag Package - {{ package.pkgname }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Flag Package - {{ package.pkgname }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %} {% block head %}<meta name="robots" content="noindex"/>{% endblock %} {% block navbarclass %}anb-packages{% endblock %} @@ -23,13 +23,13 @@ <p>The message box portion of the flag utility is optional, and meant for short messages only. If you need more than 200 characters for your message, then file a bug report, email the maintainer directly, or send - an email to the <a href="https://lists.parabolagnulinux.org/mailman/listinfo/dev" - title="Visit the dev mailing list">Parabola dev mailing list</a> + an email to the <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/dev" + title="Visit the dev mailing list">dev mailing list</a> with your additional text.</p> <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.parabolagnulinux.org/" title="Parabola 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/flag_confirmed.html b/templates/packages/flag_confirmed.html index 62080d62..a4c4db2a 100644 --- a/templates/packages/flag_confirmed.html +++ b/templates/packages/flag_confirmed.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load package_extras %} -{% block title %}Parabola - Package Flagged - {{ package.pkgname }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Package Flagged - {{ package.pkgname }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %} {% block head %}<meta name="robots" content="noindex"/>{% endblock %} {% block navbarclass %}anb-packages{% endblock %} diff --git a/templates/packages/flagged.html b/templates/packages/flagged.html index f7940cd1..4b12ca8f 100644 --- a/templates/packages/flagged.html +++ b/templates/packages/flagged.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load package_extras %} -{% block title %}Parabola - Flag Package - {{ pkg.pkgname }} {{ pkg.full_version }} ({{ pkg.arch.name }}){% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Flag Package - {{ pkg.pkgname }} {{ pkg.full_version }} ({{ pkg.arch.name }}){% endblock %} {% block head %}<meta name="robots" content="noindex"/>{% endblock %} {% block navbarclass %}anb-packages{% endblock %} diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html index 3320bf2a..59474be1 100644 --- a/templates/packages/flaghelp.html +++ b/templates/packages/flaghelp.html @@ -24,13 +24,13 @@ <p>The message box portion of the flag utility is optional, and meant for short messages only. If you need more than 200 characters for your message, then file a bug report, email the maintainer directly, or send - an email to the <a target="_blank" href="https://lists.parabolagnulinux.org/mailman/listinfo/dev" - title="Visit the parabola dev mailing list">Parabola dev mailing list</a> + an email to the <a target="_blank" href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/dev" + title="Visit the dev mailing list">dev mailing list</a> 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.parabolagnulinux.org" - title="Parabola Bugtracker">bugtracker</a> instead.</p> + 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/groups.html b/templates/packages/groups.html index 3f275ef4..7212c128 100644 --- a/templates/packages/groups.html +++ b/templates/packages/groups.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% block title %}Parabola - Package Groups{% if arch %} - {{ arch }}{% endif %}{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Package Groups{% if arch %} - {{ arch }}{% endif %}{% endblock %} {% block navbarclass %}anb-packages{% endblock %} {% block content %} diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml index 971266b0..26185148 100644 --- a/templates/packages/opensearch.xml +++ b/templates/packages/opensearch.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>Parabola Packages</ShortName> - <Description>Search the Parabola package repositories.</Description> + <ShortName>{{BRANDING_DISTRONAME}} Packages</ShortName> + <Description>Search the {{BRANDING_DISTRONAME}} package repositories.</Description> <Tags>gnu linuxlibre parabola package software</Tags> <Image height="16" width="16" type="image/x-icon">{{domain}}/static/favicon.ico</Image> <Language>en-us</Language> diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html index 6cdf815a..a7907f25 100644 --- a/templates/packages/packages_list.html +++ b/templates/packages/packages_list.html @@ -2,7 +2,7 @@ {% load static from staticfiles %} {% load package_extras %} -{% block title %}Parabola - {{ name }} ({{ arch.name }}) - {{ list_title }}{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - {{ name }} ({{ arch.name }}) - {{ list_title }}{% endblock %} {% block navbarclass %}anb-packages{% endblock %} {% block content %} diff --git a/templates/packages/search.html b/templates/packages/search.html index 974c190b..5b63dec3 100644 --- a/templates/packages/search.html +++ b/templates/packages/search.html @@ -2,7 +2,7 @@ {% load package_extras %} {% load admin_static %} -{% block title %}Parabola - Package Database{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Package Database{% endblock %} {% block navbarclass %}anb-packages{% endblock %} {% block head %} @@ -117,7 +117,7 @@ {% endif %} <div id="pkglist-about" class="box"> - <p>You are browsing the Parabola package database. From here you can find + <p>You are browsing the {{ BRANDING_DISTRONAME }} package database. From here you can find detailed information about packages located in the official supported repositories. If you need the sourceball from where a package is built, you can look at our <a href="https://repo.parabolagnulinux.org/sources/packages" diff --git a/templates/packages/signoff_options.html b/templates/packages/signoff_options.html index 950c80c1..40b7cac7 100644 --- a/templates/packages/signoff_options.html +++ b/templates/packages/signoff_options.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Parabola - Package Signoff Options - {{ package.pkgbase }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Package Signoff Options - {{ package.pkgbase }} {{ package.full_version }} ({{ package.arch.name }}){% endblock %} {% block head %}<meta name="robots" content="noindex"/>{% endblock %} {% block navbarclass %}anb-packages{% endblock %} diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html index 7b79c35b..06298249 100644 --- a/templates/packages/signoffs.html +++ b/templates/packages/signoffs.html @@ -2,7 +2,7 @@ {% load static from staticfiles %} {% load package_extras %} -{% block title %}Parabola - Package Signoffs{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Package Signoffs{% endblock %} {% block navbarclass %}anb-packages{% endblock %} {% block content %} diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html index 678d3bc9..326f7a2b 100644 --- a/templates/packages/stale_relations.html +++ b/templates/packages/stale_relations.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% block title %}Parabola - Stale Package Relations{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Stale Package Relations{% endblock %} {% block navbarclass %}anb-packages{% endblock %} {% block content %} diff --git a/templates/public/about.html b/templates/public/about.html index 402379d2..b31b05ed 100644 --- a/templates/public/about.html +++ b/templates/public/about.html @@ -1,10 +1,11 @@ {% extends "base.html" %} -{% block title %}Parabola - About{% endblock %} +{% load wiki %} +{% block title %}{{ BRANDING_DISTRONAME }} - About{% endblock %} {% block content %} <div class="box"> <h2 class="title">Parabola Presentation</h2> - <p>Almost a year ago we started a project to offer the Free Software + <p>In 2009 we started a project to offer the Free Software community the chance of using an Arch Linux system completely freed from proprietary software.</p> @@ -53,7 +54,7 @@ <li>Host repositories. Mirrors are not abundant.</li> - <li>Take a look at our <a href="https://wiki.parabolagnulinux.org/TODO" title="TODO">TODO list</a></li> + <li>Take a look at our <a href="{% wiki_url 'TODO' %}" title="TODO">TODO list</a></li> </ul> </div> diff --git a/templates/public/art.html b/templates/public/art.html index b32cbd92..8aad43f4 100644 --- a/templates/public/art.html +++ b/templates/public/art.html @@ -1,28 +1,25 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% block title %}Parabola - Artwork{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Artwork{% endblock %} {% block content %} <div id="artwork" class="box"> - <h2>Parabola Logos and Artwork</h2> + <h2>{{ BRANDING_DISTRONAME }} Logos and Artwork</h2> - <p>You can help by creating artwork for Parabola GNU/Linux-libre.</p> + <p>You can help by creating artwork for {{ BRANDING_DISTRONAME }}.</p> <p>Send your designs to dev@lists.parabolagnulinux.org and state they are CC-by-sa or another free culture friendly license.</p> - - - {% comment %} +{% comment %} <h3>Logos for Press Usage</h3> - <p>The following Parabola logos are available for press and other use.</p> + <p>The following {{BRANDING_DISTRONAME}} logos are available for press and other use.</p> - <p><strong>Two-color standard version</strong><br/> + <p><strong>Two-color standard version</strong><br /> -{% comment %} <!-- This is an example of how images should be added here --> <em>Also available in print-quality <a href="{% static "logos/parabola-logo-dark-1200dpi.png" %}" diff --git a/templates/public/blank.html b/templates/public/blank.html index b69b4e5d..3bf2cb2b 100644 --- a/templates/public/blank.html +++ b/templates/public/blank.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Parabola - Sample Page Title{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Sample Page Title{% endblock %} {% block content %} <div id="sample-page-id" class="box"> diff --git a/templates/public/donate.html b/templates/public/donate.html index e0771606..6e2cc853 100644 --- a/templates/public/donate.html +++ b/templates/public/donate.html @@ -1,8 +1,9 @@ {% extends "base.html" %} {% load cache %} {% load static from staticfiles %} +{% load wiki %} -{% block title %}Parabola - Donate{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Donate{% endblock %} {% block content %} {% cache 600 donations secure %} @@ -18,7 +19,7 @@ anything, because we are a really small community of hackers.</p> <p>If you want, we have a pretty nice <a - href="https://wiki.parabolagnulinux.org/TODO" title="The TODO + href="{% wiki_url 'TODO' %}" title="The TODO list!">TODO list</a> you can check to help us by donating some of your time. That will be very much appreciated by us :)</p> diff --git a/templates/public/feeds.html b/templates/public/feeds.html index 11c050a0..9fdd3162 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -1,32 +1,29 @@ -{% extends "base.html" %} -{% block title %}Parabola - RSS Feeds{% endblock %} +{% extends "base.html" %}{% load wiki %} +{% block title %}{{ BRANDING_DISTRONAME }} - RSS Feeds{% endblock %} {% block content %} <div id="rss-feeds" class="box"> <h2>RSS Feeds</h2> - <p>Several RSS feeds are available for consumption from the Parabola 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> <h3>News and Activity Feeds</h3> - <p>Grab the <a href="/feeds/news/" class="rss" title="Parabola News - feed">news item feed</a> to keep up-to-date with the latest news from - the Parabola staff.</p> + <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.parabolagnulinux.org/index.php?title=Special:RecentChanges&feed=atom" - title="ParabolaWiki Recent Changes feed" class="rss">Parabola Wiki: Recent - changes feed</a> is also available to track document changes from the - <a href="https://wiki.parabolagnulinux.org/" title="Parabola Wiki community - documentation">Parabola 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> <p>If you are interested in <a href="/feeds/packages/" class="rss" - title="Parabola package updates feed">all package updates</a>, + title="{{ BRANDING_DISTRONAME }} package updates feed">all package updates</a>, then grab this feed. Note that when a package is updated for multiple architectures, you will see each individual update show up here. Alternatively, you can select a packages feed from the below table that is @@ -58,5 +55,69 @@ </tbody> </table> + <h3>Development Feeds</h3> + + <p>Subscribe to any of the following to track bug tickets and feature + requests from the <a href="{{BUGTRACKER_URL}}" title="{{BRANDING_DISTRONAME}} Bugs">{{BRANDING_DISTRONAME}} Bugtracker</a>:</p> + + <table class="pretty2"> + <thead> + <tr> + <th>Project</th> + <th>Activity</th> + <th>Issues</th> + <th>News</th> + </tr> + </thead> + <tbody> + <tr> + <td>All Projects</td> + <td><a href="https://labs.parabola.nu/activity.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/issues.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/news.atom" class="rss">Feed</a></td> + </tr><tr> + <td>Art4Parabola</td> + <td><a href="https://labs.parabola.nu/projects/art4parabola/activity.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/art4parabola/issues.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/art4parabola/news.atom" class="rss">Feed</a></td> + </tr><tr> + <td>Documentation</td> + <td><a href="https://labs.parabola.nu/projects/documentation/activity.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/documentation/issues.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/documentation/news.atom" class="rss">Feed</a></td> + </tr><tr> + <td>Installation media (i686 and x86_64)</td> + <td><a href="https://labs.parabola.nu/projects/isos/activity.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/isos/issues.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/isos/news.atom" class="rss">Feed</a></td> + </tr><tr> + <td>Libretools</td> + <td><a href="https://labs.parabola.nu/projects/libretools/activity.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/libretools/issues.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/libretools/news.atom" class="rss">Feed</a></td> + </tr><tr> + <td>Packages (i686 and x86_64)</td> + <td><a href="https://labs.parabola.nu/projects/issue-tracker/activity.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/issue-tracker/issues.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/issue-tracker/news.atom" class="rss">Feed</a></td> + </tr><tr> + <td>Ports</td> + <td><a href="https://labs.parabola.nu/projects/ports/activity.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/ports/issues.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/ports/news.atom" class="rss">Feed</a></td> + </tr><tr> + <td>Port: Loongson 2F (mips64el)</td> + <td><a href="https://labs.parabola.nu/projects/mips64el/activity.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/mips64el/issues.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/mips64el/news.atom" class="rss">Feed</a></td> + </tr><tr> + <td>Servers</td> + <td><a href="https://labs.parabola.nu/projects/servers/activity.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/servers/issues.atom" class="rss">Feed</a></td> + <td><a href="https://labs.parabola.nu/projects/servers/news.atom" class="rss">Feed</a></td> + </tr> + </tbody> + </table> + </div> {% endblock %} diff --git a/templates/public/index.html b/templates/public/index.html index ebfcde27..a59e8eec 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -2,10 +2,11 @@ {% load markup cache %} {% load url from future %} {% load static from staticfiles %} +{% load wiki %} {% block head %} -<link rel="alternate" type="application/rss+xml" title="Parabola News Updates" href="/feeds/news/" /> -<link rel="alternate" type="application/rss+xml" title="Parabola Package Updates" href="/feeds/packages/" /> +<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/" /> {% endblock %} {% block content_left %} @@ -13,7 +14,7 @@ <div id="intro" class="box"> <h2>A <em>libre</em> version of Arch Linux</h2> - <p>You've reached the website for <strong>Parabola GNU/Linux-libre</strong>, + <p>You've reached the website for <strong>{{BRANDING_DISTRONAME}}</strong>, a project aiming to provide a fully free (as in freedom) derivative of Arch Linux, the lightweight and flexible GNU/Linux distribution that tries to Keep It Simple.</p> @@ -25,14 +26,14 @@ <p>Our strong community is diverse and helpful. Please check out our <a href="irc://chat.freenode.net#parabola" title="IRC channel">IRC channel</a> - and <a href="https://lists.parabolagnulinux.org/mailman/listinfo/" - title="Parabola Mailing Lists">mailing lists</a> - to get your feet wet. Also glance through our <a href="https://wiki.parabolagnulinux.org/" - title="Parabola Wiki">wiki</a> + and <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/" + 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 Parabola.</p> <p class="readmore"><a href="{% url 'page-about' %}" - title="Learn more about Parabola">Learn more...</a></p> + title="Learn more about {{ BRANDING_DISTRONAME }}">Learn more...</a></p> </div> <div id="news"> @@ -41,7 +42,7 @@ <span class="arrow"></span> </h3> - <a href="/feeds/news/" title="Parabola 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 %} @@ -94,7 +95,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="Parabola 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> @@ -114,30 +115,32 @@ <h4>Documentation</h4> <ul> - <li><a href="https://wiki.parabolagnulinux.org/" + <li><a href="{% wiki_url %}" title="Community documentation">Wiki</a></li> - <li><a href="https://wiki.parabolagnulinux.org/installation_guide" + <li><a href="{% wiki_url 'Installation Guide' %}" title="Official installation guide">Official Installation Guide</a></li> - <li><a href="https://wiki.parabolagnulinux.org/Migration" + <li><a href="{% wiki_url "Beginners'_Guide" %}" + title="A good place to start for beginners">Unofficial Beginners' Guide</a></li> + <li><a href="{% wiki_url 'Migration' %}" title="Free your Arch installation">Migration from Arch Linux</a></li> </ul> <h4>Community</h4> <ul> - <li><a href="https://lists.parabolagnulinux.org/mailman/listinfo/" + <li><a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/" title="Community and developer mailing lists">Mailing Lists</a></li> - <li><a href="https://lists.parabolagnulinux.org/pipermail/dev/" - title="dev mailing list archives">Dev Archives</a></li> - <li><a href="https://wiki.parabolagnulinux.org/IRC_Channels" + <li><a href="{% wiki_url 'IRC_Channels' %}" title="Official and regional IRC communities">IRC Channels</a></li> - <li><a href="https://identi.ca/group/parabola" title="Parabola at identi.ca">Identi.ca group</a></li> + <li><a href="https://identi.ca/group/parabola" + title="Parabola at identi.ca">Identi.ca group</a></li> </ul> <h4>Support</h4> <ul> - <li><a href="{% url 'page-donate' %}" title="Help support Parabola">Donate</a></li> + <li><a href="{% url 'page-donate' %}" + title="Help support {{ BRANDING_DISTRONAME }}">Donate</a></li> </ul> <h4>Tools</h4> @@ -160,7 +163,7 @@ {% comment %} <li><a href="{% url 'page-svn' %}" title="View SVN entries for packages">SVN Repositories</a></li> - <li><a href="https://wiki.archlinux.org/index.php/DeveloperWiki" + <li><a href="{% wiki_url 'DeveloperWiki' %}" title="Developer Wiki articles">Developer Wiki</a></li> {% endcomment %} <li><a href="/groups/" @@ -180,9 +183,9 @@ <li><a href="{% url 'page-keys' %}" title="Package/Database signing master keys">Signing Master Keys</a> <img width="16" height="16" src="{% static "new.png" %}" alt="New"/></li> - <li><a href="https://wiki.parabolagnulinux.org/Media" - title="Parabola in the media">Press Coverage</a></li> - <li><a href="{% url 'page-art' %}" title="Parabola logos and other artwork for promotional use">Logos & Artwork</a></li> + <li><a href="{% wiki_url 'Media' %}" + title="{{ BRANDING_DISTRONAME }} in the media">Press Coverage</a></li> + <li><a href="{% url 'page-art' %}" title="{{ BRANDING_SHORTNAME }} logos and other artwork for promotional use">Logos & 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> <li><a href="{% url 'page-devs' %}" title="Active hackers">Hackers Profiles</a></li> diff --git a/templates/public/keys.html b/templates/public/keys.html index 257a16ae..4afc6d6b 100644 --- a/templates/public/keys.html +++ b/templates/public/keys.html @@ -2,13 +2,13 @@ {% load static from staticfiles %} {% load pgp %} -{% block title %}Parabola - Master Signing Keys{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Master Signing Keys{% endblock %} {% block content %} <div id="signing-keys" class="box"> <h2>Master Signing Keys</h2> - <p>This page lists the Parabola Master Keys. This is a distributed set of + <p>This page lists the {{ BRANDING_DISTORNAME }} 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 @@ -53,7 +53,7 @@ personal key of the developer is signed by the given master key. A 'No' indicates it has not been signed; however, this does not necessarily mean the key should not be trusted.</p> - <p>All official Arch Linux developers and trusted users should have their + <p>All official {{ BRANDING_DISTRONAME }} developers and trusted users should have their key signed by at least three master keys if they are responsible for packaging software in the repositories. This is in accordance with the PGP <em>web of trust</em> concept. If a user is willing to marginally trust all diff --git a/templates/public/userlist.html b/templates/public/userlist.html index cfb08d80..197346c3 100644 --- a/templates/public/userlist.html +++ b/templates/public/userlist.html @@ -1,13 +1,12 @@ {% extends "base.html" %} {% load cache %} -{% block title %}Parabola - {{ user_type }}{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - {{ user_type }}{% endblock %} {% block content %} {% cache 600 dev-tu-profiles user_type %} <div id="dev-tu-profiles" class="box"> - - <h2>Parabola {{user_type}}</h2> + <h2>{{BRANDING_DISTRONAME}} {{user_type}}</h2> <p>{{description}}</p> diff --git a/templates/registration/login.html b/templates/registration/login.html index e81a007a..783070be 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Parabola - Developer Login{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Developer Login{% endblock %} {% block content %} <div id="dev-login" class="box"> diff --git a/templates/registration/logout.html b/templates/registration/logout.html index 9b507ec0..71daa2e8 100644 --- a/templates/registration/logout.html +++ b/templates/registration/logout.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Parabola - Logout successful{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Logout successful{% endblock %} {% block content %} <div id="dev-logout" class="box"> diff --git a/templates/releng/add.html b/templates/releng/add.html index 9ceea66e..ec3b6d8a 100644 --- a/templates/releng/add.html +++ b/templates/releng/add.html @@ -1,13 +1,13 @@ {% extends "base.html" %} {% load url from future %} -{% block title %}Parabola - Test Result Entry{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Test Result Entry{% endblock %} {% block content %} <div class="box"> - <h2>Parabola Releng Testbuild Feedback Entry</h2> + <h2>{{ BRANDING_SHORTNAME }} Releng Testbuild Feedback Entry</h2> - <p>This page allows you to submit feedback after testing an Parabola installation + <p>This page allows you to submit feedback after testing an {{ BRANDING_SHORTNAME }} 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/results.html b/templates/releng/results.html index 49d81ec4..df98d1ac 100644 --- a/templates/releng/results.html +++ b/templates/releng/results.html @@ -1,7 +1,8 @@ {% extends "base.html" %} {% load url from future %} +{% load wiki %} -{% block title %}Parabola - Release Engineering Testbuild Results{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Release Engineering Testbuild Results{% endblock %} {% block content %} <div class="box"> @@ -18,7 +19,7 @@ the <a href="{% url 'releng-iso-overview' %}">overview</a>.</p> <p>For more information, see the <a - href="https://wiki.parabolagnulinux.org/DeveloperWiki:releng_testimages_feedback">documentation + href="{% wiki_url 'DeveloperWiki:releng_testimages_feedback' %}">documentation on the wiki</a>.</p> <p>All ISOs referenced on this page are available from diff --git a/templates/releng/thanks.html b/templates/releng/thanks.html index 8b204eaa..1ad7260d 100644 --- a/templates/releng/thanks.html +++ b/templates/releng/thanks.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load url from future %} -{% block title %}Parabola - Feedback - Thanks!{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Feedback - Thanks!{% endblock %} {% block content %} <div class="box"> diff --git a/templates/todolists/list.html b/templates/todolists/list.html index 4826c300..36e0eac7 100644 --- a/templates/todolists/list.html +++ b/templates/todolists/list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% block title %}Parabola - Todo Lists{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Todo Lists{% endblock %} {% block content %} <div id="dev-todo" class="box"> diff --git a/templates/todolists/public_list.html b/templates/todolists/public_list.html index 9978fd00..09251a17 100644 --- a/templates/todolists/public_list.html +++ b/templates/todolists/public_list.html @@ -2,7 +2,7 @@ {% load static from staticfiles %} {% load package_extras %} -{% block title %}Parabola - Todo Lists{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Todo Lists{% endblock %} {% block content %} <div class="box"> diff --git a/templates/todolists/todolist_confirm_delete.html b/templates/todolists/todolist_confirm_delete.html index 4be65126..6d7ec0ab 100644 --- a/templates/todolists/todolist_confirm_delete.html +++ b/templates/todolists/todolist_confirm_delete.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}Parabola - Delete Todo List: {{object.name}}{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Delete Todo List: {{object.name}}{% endblock %} {% block content %} <div id="dev-todo-delete" class="box"> diff --git a/templates/todolists/view.html b/templates/todolists/view.html index a3a3666a..e53ead82 100644 --- a/templates/todolists/view.html +++ b/templates/todolists/view.html @@ -2,7 +2,7 @@ {% load static from staticfiles %} {% load package_extras %} -{% block title %}Parabola - Todo: {{ list.name }}{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Todo: {{ list.name }}{% endblock %} {% block content %} <div id="dev-todo-details" class="box"> diff --git a/templates/visualize/index.html b/templates/visualize/index.html index 70ddbead..617bf8d1 100644 --- a/templates/visualize/index.html +++ b/templates/visualize/index.html @@ -2,7 +2,7 @@ {% load static from staticfiles %} {% load url from future %} -{% block title %}Parabola - Visualizations{% endblock %} +{% block title %}{{ BRANDING_DISTRONAME }} - Visualizations{% endblock %} {% block content %} <div class="box"> diff --git a/todolists/views.py b/todolists/views.py index 4903ec54..379189ab 100644 --- a/todolists/views.py +++ b/todolists/views.py @@ -1,6 +1,7 @@ from django import forms from django.http import HttpResponse +from django.conf import settings from django.core.mail import send_mail from django.shortcuts import get_list_or_404, get_object_or_404, redirect from django.contrib.auth.decorators import login_required, permission_required @@ -174,7 +175,7 @@ def send_todolist_emails(todo_list, new_packages): template = loader.get_template('todolists/email_notification.txt') send_mail('Packages added to todo list \'%s\'' % todo_list.name, template.render(ctx), - 'Parabola <dev@lists.parabolagnulinux.org>', + settings.BRANDING_EMAIL, [maint], fail_silently=True) |