Merge branch 'master' of github.com:dibaunaumh/tc-django

dibaunaumh · Mar 9, 2010 · 2068a9e · 2068a9e
2 parents 48d0b6c + 78136a7
commit 2068a9e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/tcdjango/community/templates/index.html b/tcdjango/community/templates/index.html
@@ -1,2 +1,11 @@
 {% extends 'admin/base_site.html' %}
 {% load i18n %}
+{% block nav-global %}
+<table width="80%">
+<tr>
+{% for domain in domains %}
+   <td><a href="/domain/{{domain.name}}/">{{ domain.name }}</a></td>
+{% endfor %}
+</tr>
+</table>
+{% endblock %}
diff --git a/tcdjango/community/urls.py b/tcdjango/community/urls.py
@@ -8,7 +8,7 @@
     # Example:
     (r'^comments/', include('django.contrib.comments.urls')),
     (r'domain/(?P<domain>\w+)/$', 'tcdjango.community.views.home'),
-    (r'article/(?P<slug>\w+)/$', 'tcdjango.community.views.view_article'),
+    (r'article/(?P<slug>\w+)$', 'tcdjango.community.views.view_article'),
     (r'', 'tcdjango.community.views.home'),