From 94f972bb892dbf9a86f089f1872ae6d849c0cd0e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 21 Apr 2013 23:43:42 -0400 Subject: use a BRANDING_OSEARCH_TAGS for templates/packages/opensearch.xml --- README.BRANDING | 3 --- main/context_processors.py | 6 ++++-- settings.py | 2 +- templates/packages/opensearch.xml | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.BRANDING b/README.BRANDING index 027d7f9b..d155ed10 100644 --- a/README.BRANDING +++ b/README.BRANDING @@ -13,9 +13,6 @@ Files used to configure branding/url stuff Files with minor Arch stuff that's just easier to patch ------------------------------------------------------- -`templates/packages/opensearch.xml` - * `` includes `archlinux` - `templates/packages/flaghelp.html` * link to "arch-general" mailing list diff --git a/main/context_processors.py b/main/context_processors.py index 2543a3de..94e83e72 100644 --- a/main/context_processors.py +++ b/main/context_processors.py @@ -4,13 +4,15 @@ def secure(request): def branding(request): from django.conf import settings return { + 'MAILMAN_BASE_URL': settings.MAILMAN_BASE_URL, + 'BUGTRACKER_URL': settings.BUGTRACKER_URL, + '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, + 'BRANDING_OSEARCH_TAGS': settings.BRANDING_OSEARCH_TAGS, } # vim: set ts=4 sw=4 et: diff --git a/settings.py b/settings.py index de8afe66..7dfe7195 100644 --- a/settings.py +++ b/settings.py @@ -148,7 +148,7 @@ BRANDING_SHORTNAME = 'Parabola' BRANDING_WIKINAME = 'ParabolaWiki' BRANDING_EMAIL = 'Parabola Website Notification ' - +BRANDING_OSEARCH_TAGS = 'gnu linuxlibre parabola package software' ## Import local settings from local_settings import * diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml index 26185148..6bb1225a 100644 --- a/templates/packages/opensearch.xml +++ b/templates/packages/opensearch.xml @@ -2,7 +2,7 @@ {{BRANDING_DISTRONAME}} Packages Search the {{BRANDING_DISTRONAME}} package repositories. - gnu linuxlibre parabola package software + {{BRANDING_OSEARCH_TAGS}} {{domain}}/static/favicon.ico en-us UTF-8 -- cgit v1.2.3-54-g00ecf