summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-03-11 21:15:11 -0600
committerDan McGee <dan@archlinux.org>2010-03-20 12:09:21 -0500
commitcb6df87f948756e8d680a4bb594698ae93a9aad0 (patch)
treef7e01e64a1eeb3c28af1061be990ec0a37451551
parent6c0d7e73c47ca16c3bb4bd205dd09f46a11bf938 (diff)
downloadarchweb-cb6df87f948756e8d680a4bb594698ae93a9aad0.tar.gz
archweb-cb6df87f948756e8d680a4bb594698ae93a9aad0.zip
Switch some hardcoded urls to url tag usage
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--templates/base.html6
-rw-r--r--templates/public/index.html20
-rw-r--r--urls.py2
3 files changed, 14 insertions, 14 deletions
diff --git a/templates/base.html b/templates/base.html
index 39b2a625..cc5fadd2 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="/media/arch.css" />
<link rel="icon" type="image/x-icon" href="/media/favicon.ico" />
<link rel="shortcut icon" type="image/x-icon" href="/media/favicon.ico" />
- <link rel="search" type="application/opensearchdescription+xml" href="/opensearch/packages/" title="Arch Linux Packages" />
+ <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch-packages %}" title="Arch Linux Packages" />
{% block head %}
{% endblock %}
</head>
@@ -24,7 +24,7 @@
<li><a href="http://wiki.archlinux.org/">Wiki</a></li>
<li><a href="http://bugs.archlinux.org/">Bugs</a></li>
<li><a href="http://aur.archlinux.org/">AUR</a></li>
- <li{% ifequal path '/download/' %} class="selected"{% endifequal %}><a href="/download/">Download</a></li>
+ <li{% ifequal path '/download/' %} class="selected"{% endifequal %}><a href="{% url page-download %}">Download</a></li>
</ul>
{% endblock %}
</div>
@@ -32,7 +32,7 @@
{% if user.is_authenticated %}
<ul>
<li><a href="/devel/">Dashboard</a></li>
- <li><a href="/news/">News</a></li>
+ <li><a href="{% url news-list %}">News</a></li>
<li><a href="/packages/signoffs/">Signoffs</a></li>
<li><a href="/todo/">Todos</a></li>
<li><a href="http://www.archlinux.org/mailman/private/arch-dev/">Archives</a></li>
diff --git a/templates/public/index.html b/templates/public/index.html
index e708e4e7..9ba1380b 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -24,7 +24,7 @@
to get your feet wet. Also glance through our <a href="http://wiki.archlinux.org">wiki</a>
if you want to learn more about Arch.
</p><p style="text-align: right">
- <a href="/about/"><span style="font-size:x-small">Learn more...</span></a>
+ <a href="{% url page-about %}"><span style="font-size:x-small">Learn more...</span></a>
</p>
</div>
<br /><br />
@@ -40,7 +40,7 @@
<p class="news">{{ news.content|striptags|truncatewords:60 }}</p>
<br />
{% endfor %}
- <span style="float:right;font-size:x-small"><a href="/news/">More News...</a></span>
+ <span style="float:right;font-size:x-small"><a href="{% url news-list %}">More News...</a></span>
<br /><br />
</div>
{% endblock %}
@@ -64,7 +64,7 @@
</tr>
{% endfor %}
<tr>
- <td style="font-size:x-small"><br /><a href="/feeds/">More Feeds...</a></td>
+ <td style="font-size:x-small"><br /><a href="{% url feeds-list %}">More Feeds...</a></td>
<td style="text-align:right;font-size:x-small"><br /><a href="/packages/?sort=-last_update">More Updates...</a></td>
</tr>
</table>
@@ -74,7 +74,7 @@
<h3>Dev Links:</h3>
<ul class="links">
<li><a href="/devel/">Dev Dashboard</a></li>
- <li><a href="/news/">News</a></li>
+ <li><a href="{% url news-list %}">News</a></li>
<li><a href="/packages/signoffs/">Signoffs</a></li>
<li><a href="/todo/">Todos</a></li>
<li><a href="http://www.archlinux.org/mailman/private/arch-dev/">Archives</a></li>
@@ -90,14 +90,14 @@
</ul>
<h3>Support Arch:</h3>
<ul class="links">
- <li><a href="/donate/">Donate</a></li>
+ <li><a href="{% url page-donate %}">Donate</a></li>
<li><a href="http://schwag.archlinux.ca/"
title="USB keys, Jewellery, case badges">Arch Schwag</a></li>
<li><a href="http://www.zazzle.com/archlinux*"
title="T-shirts, mugs, mouse pads, hoodies, posters, skateboards, shoes, etc.">Schwag via Zazzle</a></li>
<li><a href="http://www.freewear.org/?page=list_items&amp;org=Archlinux"
title="T-shirts">Schwag via Freewear</a></li>
- <li><a href="/art/">Logos &amp; Artwork</a></li>
+ <li><a href="{% url page-art %}">Logos &amp; Artwork</a></li>
</ul>
<h3>Community Links:</h3>
<ul class="links">
@@ -111,11 +111,11 @@
</ul>
<h3>Development:</h3>
<ul class="links">
- <li><a href="/developers/">Developers</a></li>
- <li><a href="/trustedusers/">Trusted Users</a></li>
- <li><a href="/fellows/">Fellows</a></li>
+ <li><a href="{% url page-devs %}">Developers</a></li>
+ <li><a href="{% url page-tus %}">Trusted Users</a></li>
+ <li><a href="{% url page-fellows %}">Fellows</a></li>
<li><a href="http://bugs.archlinux.org">Bug Tracker</a></li>
- <li><a href="/svn/">SVN</a></li>
+ <li><a href="{% url page-svn %}">SVN</a></li>
<li><a href="http://projects.archlinux.org">Projects</a></li>
</ul>
<a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="velocity network"><img src="/media/vnet_button.png" class="" title="" alt="velocity network - it's about time" /></a>
diff --git a/urls.py b/urls.py
index 5a8ccdfd..a84e8e17 100644
--- a/urls.py
+++ b/urls.py
@@ -112,7 +112,7 @@ urlpatterns = patterns('',
(r'^irc/$', direct_to_template, {'template': 'public/irc.html'}, 'page-irc'),
(r'^moreforums/$', 'public.views.moreforums', {}, 'page-forums'),
(r'^projects/$', 'public.views.projects', {}, 'page-projects'),
- (r'^opensearch/packages/$', 'packages.views.opensearch'),
+ (r'^opensearch/packages/$', 'packages.views.opensearch', {}, 'opensearch-packages'),
# Some django internals we use
(r'^jsi18n/$', 'django.views.i18n.null_javascript_catalog'),