Daniel Holbach has proposed merging lp:~dholbach/loco-directory/581641 into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#581641 reapprovals throws google maps API warning
https://bugs.launchpad.net/bugs/581641
--
https://code.launchpad.net/~dholbach/loco-directory/581641/+merge/25419
Your team loco-directory-dev is requested to review the proposed merge of
lp:~dholbach/loco-directory/581641 into lp:loco-directory.
=== modified file 'loco_directory/teams/urls.py'
--- loco_directory/teams/urls.py 2009-12-26 10:00:19 +0000
+++ loco_directory/teams/urls.py 2010-05-17 10:10:51 +0000
@@ -2,7 +2,7 @@
urlpatterns = patterns('',
url(r'^$', 'teams.views.team_list', name='team-list'),
- url(r'reapprovals', 'teams.views.reapprovals'),
+ url(r'^reapprovals$', 'teams.views.reapprovals', name='reapprovals'),
url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/edit$', 'teams.views.team_edit', name='team-edit'),
url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/events$', 'teams.views.team_event_list', name='team-event-list'),
url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)$', 'teams.views.team_detail', name='team-detail'),
=== modified file 'loco_directory/templates/teams/team_reapprovals.html'
--- loco_directory/templates/teams/team_reapprovals.html 2010-04-27 14:45:00 +0000
+++ loco_directory/templates/teams/team_reapprovals.html 2010-05-17 10:10:51 +0000
@@ -2,6 +2,9 @@
{% load i18n %}
{% block title %}{% trans "Ubuntu LoCo Team Approvals List" %}{% endblock %}
+{% block extrahead %}{{ block.super }}
+{{form.media}}
+{% endblock %}
{% block content %}
<div class="mainpage">
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
