diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 19:29:00 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 19:29:00 -0400 |
| commit | ca9e5e41f43a8430f4b282bfddf2dcf3ba2c3d7c (patch) | |
| tree | d662eaaec049edd26bda8091b31c22edc340e18a /main | |
| parent | 16e941c68ddb2d37d7e94d0c60da7e9d3dba65a0 (diff) | |
| parent | 91c451821ce7000cbc268cec8427d208a6cedd7e (diff) | |
Merge commit '91c451'
Conflicts:
devel/views.py
feeds.py
local_settings.py.example
packages/management/commands/signoff_report.py
packages/views/flag.py
public/views.py
templates/404.html
templates/base.html
templates/devel/clock.html
templates/devel/index.html
templates/devel/packages.html
templates/devel/profile.html
templates/general_form.html
templates/mirrors/mirror_details.html
templates/mirrors/mirrorlist.txt
templates/mirrors/mirrorlist_generate.html
templates/mirrors/mirrorlist_status.txt
templates/mirrors/mirrors.html
templates/mirrors/status.html
templates/news/add.html
templates/news/delete.html
templates/news/list.html
templates/news/view.html
templates/packages/details.html
templates/packages/differences.html
templates/packages/files.html
templates/packages/flag.html
templates/packages/flag_confirmed.html
templates/packages/flagged.html
templates/packages/flaghelp.html
templates/packages/groups.html
templates/packages/opensearch.xml
templates/packages/packages_list.html
templates/packages/search.html
templates/packages/signoff_options.html
templates/packages/signoffs.html
templates/packages/stale_relations.html
templates/public/about.html
templates/public/art.html
templates/public/blank.html
templates/public/donate.html
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
templates/public/keys.html
templates/public/svn.html
templates/public/userlist.html
templates/registration/login.html
templates/registration/logout.html
templates/releng/add.html
templates/releng/results.html
templates/releng/thanks.html
templates/todolists/list.html
templates/todolists/public_list.html
templates/todolists/todolist_confirm_delete.html
templates/todolists/view.html
templates/visualize/index.html
todolists/views.py
Diffstat (limited to 'main')
| -rw-r--r-- | main/context_processors.py | 12 | ||||
| -rw-r--r-- | main/templatetags/wiki.py | 9 |
2 files changed, 21 insertions, 0 deletions
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(' ', '_') |