diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:01:59 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:01:59 -0500 |
| commit | 764182c0ca66b538cef994409f04f876681598cd (patch) | |
| tree | 2f399c618484c00f84875b437f3fcfcc9c509424 /templates/base.html | |
| parent | 8844fd0c6361d3a6ccd88647276e9af0e6cd64d2 (diff) | |
| parent | 822898e57bc6d4e008ef58da309857e9ef8c98e6 (diff) | |
Merge commit '822898e' (Merge branch 'django14')
Conflicts:
requirements.txt
requirements_prod.txt
templates/base.html
templates/devel/clock.html
templates/public/download.html
templates/public/index.html
templates/releng/results.html
Diffstat (limited to 'templates/base.html')
| -rw-r--r-- | templates/base.html | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/templates/base.html b/templates/base.html index f5e8609a..6a874b78 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,4 +1,4 @@ -<!DOCTYPE html> +{% load url from future %}<!DOCTYPE html> <html lang="en"> <head> <title>{% block title %}Parabola GNU/Linux-libre{% endblock %}</title> @@ -7,7 +7,7 @@ <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}archweb-print.css" media="print" /> <link rel="icon" type="image/x-icon" href="{{ STATIC_URL }}favicon.ico" /> <link rel="shortcut icon" type="image/x-icon" href="{{ STATIC_URL }}favicon.ico" /> - <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch-packages as osp %}{{ osp }}" title="Parabola Packages" /> + <link rel="search" type="application/opensearchdescription+xml" href="{% url 'opensearch-packages' as osp %}{{ osp }}" title="Parabola Packages" /> {% block head %}{% endblock %} </head> <body class="{% if user.is_authenticated %}devmode {% endif %}{% block bodyclass %}{% endblock %}"> @@ -21,7 +21,7 @@ <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-projects"><a href="https://projects.parabolagnulinux.org" title="Our Code">Projects</a></li> - <li id="anb-download"><a href="https://wiki.parabolagnulinux.org/Download" title="Get Parabola">Download</a></li> + <li id="anb-download"><a href="{% url 'page-download' as pdl %}{{ pdl }}" title="Get Parabola">Download</a></li> </ul> </div> </div><!-- #archnavbar --> @@ -30,16 +30,18 @@ <div id="archdev-navbar"> {% if user.is_authenticated %} <ul> - <li><a href="/devel/" title="Developer Dashboard">Dashboard</a></li> - <li><a href="https://projects.parabolagnulinux.org/" title="Git Projects">Projects</a></li> - <li><a href="{% url news-list as newsl %}{{ newsl }}" title="Manage news articles">News</a></li> + <li><a href="{% url 'devel-index' %}" title="Developer Dashboard">Dashboard</a></li> + <li><a href="https://wiki.parabolagnulinux.org/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="/packages/differences/" title="Package architecture differences">Architecture Differences</a></li> - <li><a href="https://lists.parabolagnulinux.org/pipermail/dev/" title="dev mailing list archives">Archives</a></li> - <li><a href="/devel/clock/" title="Developer world clocks">Dev Clocks</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/" + title="dev mailing list archives">Archives</a></li> + <li><a href="/mirrors/" title="Mirror server statistics">Mirrors</a></li> {% if user.is_staff %} - <li><a href="{% url admin:index %}" title="Django Admin Interface">Django Admin</a></li> + <li><a href="{% url 'admin:index' %}" title="Django Admin Interface">Django Admin</a></li> {% endif %} <li><a href="/devel/profile/" title="Modify your account profile">Profile</a></li> <li><a href="/logout/" title="Logout of the developer interface">Logout</a></li> |