Merge lp:~diddledani/loco-team-portal/django-1.5 into lp:loco-team-portal

Proposed by Dani Llewellyn
Status: Needs review
Proposed branch: lp:~diddledani/loco-team-portal/django-1.5
Merge into: lp:loco-team-portal
Diff against target: 1375 lines (+203/-205)
58 files modified
loco_directory/articles/models.py (+1/-1)
loco_directory/events/feeds.py (+1/-1)
loco_directory/events/models.py (+2/-2)
loco_directory/events/urls.py (+1/-1)
loco_directory/local_settings.py.sample (+1/-1)
loco_directory/manage.py (+6/-8)
loco_directory/meetings/feeds.py (+1/-1)
loco_directory/meetings/models.py (+3/-3)
loco_directory/meetings/urls.py (+1/-1)
loco_directory/services/urls.py (+1/-1)
loco_directory/settings.py (+1/-1)
loco_directory/teams/feeds.py (+1/-1)
loco_directory/teams/models.py (+5/-5)
loco_directory/teams/urls.py (+1/-1)
loco_directory/templates/404.html (+3/-3)
loco_directory/templates/about_loco.html (+3/-3)
loco_directory/templates/articles/article_detail.html (+2/-2)
loco_directory/templates/base.html (+9/-9)
loco_directory/templates/events/event_history_list.html (+1/-1)
loco_directory/templates/events/event_list.html (+7/-7)
loco_directory/templates/events/global_event_detail.html (+5/-5)
loco_directory/templates/events/global_event_detail.inc.html (+1/-1)
loco_directory/templates/events/global_jam_dashboard.html (+5/-5)
loco_directory/templates/events/team_event_detail.html (+4/-4)
loco_directory/templates/events/team_event_detail.inc.html (+5/-5)
loco_directory/templates/events/team_event_detail_attendee.inc.html (+2/-2)
loco_directory/templates/events/team_event_detail_comments.inc.html (+3/-3)
loco_directory/templates/events/team_event_li.inc.html (+1/-1)
loco_directory/templates/index.html (+11/-11)
loco_directory/templates/lc_edit.html (+2/-2)
loco_directory/templates/loco_council.html (+3/-3)
loco_directory/templates/loco_setup.html (+1/-1)
loco_directory/templates/meetings/agenda_item_delete_confirm.html (+2/-2)
loco_directory/templates/meetings/agenda_item_new.html (+1/-1)
loco_directory/templates/meetings/agenda_item_update.html (+3/-3)
loco_directory/templates/meetings/meeting_history_list.html (+1/-1)
loco_directory/templates/meetings/meeting_list.html (+3/-3)
loco_directory/templates/meetings/team_meeting_detail.html (+5/-5)
loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html (+3/-3)
loco_directory/templates/meetings/team_meeting_detail_basic.inc.html (+1/-1)
loco_directory/templates/meetings/team_meeting_li.inc.html (+1/-1)
loco_directory/templates/profiles/details.html (+3/-3)
loco_directory/templates/teams/merge_teams.html (+1/-1)
loco_directory/templates/teams/select_other_team.html (+1/-1)
loco_directory/templates/teams/team_detail.html (+20/-20)
loco_directory/templates/teams/team_event_history.html (+19/-19)
loco_directory/templates/teams/team_event_list.html (+4/-4)
loco_directory/templates/teams/team_meeting_history.html (+18/-18)
loco_directory/templates/teams/team_meeting_list.html (+3/-3)
loco_directory/templates/teams/team_reapprovals.html (+2/-2)
loco_directory/templates/venues/venue_detail.html (+3/-3)
loco_directory/urls.py (+2/-2)
loco_directory/userprofiles/models.py (+2/-2)
loco_directory/userprofiles/urls.py (+1/-1)
loco_directory/venues/models.py (+1/-1)
loco_directory/venues/urls.py (+1/-1)
requirements/dev.txt (+4/-4)
requirements/prod.txt (+4/-4)
To merge this branch: bzr merge lp:~diddledani/loco-team-portal/django-1.5
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+302109@code.launchpad.net

Description of the change

Update to django 1.5

reference: lp:~diddledan/loco-team-portal/django-1.4

To post a comment you must log in.

Unmerged revisions

686. By Dani Llewellyn

Update to django 1.5

- builds on/supercedes lp:~diddledan/loco-team-portal/django-1.4

685. By Dani Llewellyn

update to django 1.4

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/articles/models.py'
2--- loco_directory/articles/models.py 2012-12-25 22:00:46 +0000
3+++ loco_directory/articles/models.py 2016-08-05 03:04:29 +0000
4@@ -37,7 +37,7 @@
5 class Feed(models.Model):
6 user = models.ForeignKey(UserProfile, blank=True, null=True)
7 team = models.ForeignKey(Team, blank=True, null=True)
8- url = models.URLField(verify_exists=False)
9+ url = models.URLField()
10 title = models.CharField(max_length=128, null=True, blank=True)
11 last_updated = models.DateTimeField(null=False, blank=False, default=datetime.datetime(1970, 1, 1))
12 active = models.BooleanField(default=True)
13
14=== modified file 'loco_directory/events/feeds.py'
15--- loco_directory/events/feeds.py 2013-03-31 01:15:06 +0000
16+++ loco_directory/events/feeds.py 2016-08-05 03:04:29 +0000
17@@ -1,6 +1,6 @@
18 # -*- coding: utf-8 -*-
19 from django.core.urlresolvers import reverse
20-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
21+from django.contrib.syndication.views import Feed, FeedDoesNotExist
22 from django.utils.translation import ugettext as _
23 from django.utils import translation
24 from django.template import loader, Context
25
26=== modified file 'loco_directory/events/models.py'
27--- loco_directory/events/models.py 2014-04-07 12:45:02 +0000
28+++ loco_directory/events/models.py 2016-08-05 03:04:29 +0000
29@@ -33,7 +33,7 @@
30 date_begin = models.DateTimeField(help_text=_('Local date and time that the event starts'), verbose_name=_('Local Start Time'), db_index=True)
31 date_end = models.DateTimeField(help_text=_('Local date and time that the event ends'), verbose_name=_('Local End Time'), db_index=True)
32 description = models.TextField(help_text=_('Description of the Event'), blank=True, null=True)
33- announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL for the announcement'), max_length=200, verify_exists=False, blank=True, null=True)
34+ announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL for the announcement'), max_length=200, blank=True, null=True)
35 date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now, db_index=True)
36
37 def __unicode__(self):
38@@ -94,7 +94,7 @@
39 global_event = models.ForeignKey(GlobalEvent, help_text=_('this team event is part of the selected global event'), verbose_name=_('Related Global Event'), blank=True, null=True)
40 venue = models.ForeignKey(Venue, help_text=_('Venue for the Event'), verbose_name=_('Event Venue'), blank=True, null=True)
41 channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True)
42- registration = models.URLField(verbose_name=_('Registration URL'), help_text=_('URL to register attendance (leave blank to use the built-in registration system)'), max_length=200, verify_exists=False, blank=True, null=True)
43+ registration = models.URLField(verbose_name=_('Registration URL'), help_text=_('URL to register attendance (leave blank to use the built-in registration system)'), max_length=200, blank=True, null=True)
44
45 objects = TeamEventManager()
46
47
48=== modified file 'loco_directory/events/urls.py'
49--- loco_directory/events/urls.py 2013-03-11 21:49:37 +0000
50+++ loco_directory/events/urls.py 2016-08-05 03:04:29 +0000
51@@ -1,5 +1,5 @@
52 # -*- coding: utf-8 -*-
53-from django.conf.urls.defaults import *
54+from django.conf.urls import *
55
56 urlpatterns = patterns('',
57 #all events
58
59=== modified file 'loco_directory/local_settings.py.sample'
60--- loco_directory/local_settings.py.sample 2012-12-26 16:16:17 +0000
61+++ loco_directory/local_settings.py.sample 2016-08-05 03:04:29 +0000
62@@ -9,7 +9,7 @@
63 },
64 }
65
66-SECRET_KEY = ''
67+SECRET_KEY = 'abc123'
68
69 DEBUG_USERS = ('')
70
71
72=== modified file 'loco_directory/manage.py'
73--- loco_directory/manage.py 2011-06-29 18:35:40 +0000
74+++ loco_directory/manage.py 2016-08-05 03:04:29 +0000
75@@ -1,11 +1,9 @@
76 #!/usr/bin/env python
77-from django.core.management import execute_manager
78-try:
79- import settings # Assumed to be in the same directory.
80-except ImportError:
81- import sys
82- sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
83- sys.exit(1)
84+import os, sys
85
86 if __name__ == "__main__":
87- execute_manager(settings)
88+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
89+
90+ from django.core.management import execute_from_command_line
91+
92+ execute_from_command_line(sys.argv)
93\ No newline at end of file
94
95=== modified file 'loco_directory/meetings/feeds.py'
96--- loco_directory/meetings/feeds.py 2013-03-31 01:10:52 +0000
97+++ loco_directory/meetings/feeds.py 2016-08-05 03:04:29 +0000
98@@ -1,6 +1,6 @@
99 # -*- coding: utf-8 -*-
100 from django.core.urlresolvers import reverse
101-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
102+from django.contrib.syndication.views import Feed, FeedDoesNotExist
103 from django.utils import translation
104 from django.template import loader, Context
105
106
107=== modified file 'loco_directory/meetings/models.py'
108--- loco_directory/meetings/models.py 2013-10-25 23:03:37 +0000
109+++ loco_directory/meetings/models.py 2016-08-05 03:04:29 +0000
110@@ -17,8 +17,8 @@
111 date_begin = models.DateTimeField(help_text=_('Local date and time that the meeting starts'), verbose_name=_('Begins'), db_index=True)
112 date_end = models.DateTimeField(help_text=_('Local date and time that the meeting ends'), verbose_name=_('Ends'), db_index=True)
113 channel = models.CharField(max_length=150, verbose_name=_('Meeting Channel'), help_text=_('Channel that the meeting will be held in. Ex. #ubuntu-us-fl'), null=True)
114- logs = models.URLField(verbose_name=_('Meeting Log'), help_text=_('After the meeting, add a link to the meeting log (leave blank to use the built-in irclog.ubuntu.com'), max_length=200, verify_exists=False, blank=True, null=True)
115- minutes = models.URLField(verbose_name=_('Meeting Minutes'), help_text=_('After the meeting, add a link to the meeting minutes'), max_length=200, verify_exists=False, blank=True, null=True)
116+ logs = models.URLField(verbose_name=_('Meeting Log'), help_text=_('After the meeting, add a link to the meeting log (leave blank to use the built-in irclog.ubuntu.com'), max_length=200, blank=True, null=True)
117+ minutes = models.URLField(verbose_name=_('Meeting Minutes'), help_text=_('After the meeting, add a link to the meeting minutes'), max_length=200, blank=True, null=True)
118 date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now, db_index=True)
119 chair = models.ForeignKey(UserProfile, verbose_name=_('Meeting Chair'), blank=True, null=True)
120
121@@ -167,7 +167,7 @@
122 description = models.TextField(verbose_name=_('Description'), help_text=_('detailed description of this agenda item'), blank=True, null=True)
123 parent = models.ForeignKey('self', verbose_name=_('Parent Agenda Item'), related_name='children', help_text=_('agenda item that contains this agenda item'), blank=True, null=True)
124 order = models.PositiveIntegerField(verbose_name=_('Order'), help_text=_('index number of where this agenda item falls in the agenda'), default=1)
125- log = models.URLField(verbose_name=_('Log URL'), max_length=200, verify_exists=False, help_text=_('URL to this agenda item\'s discussion'), blank=True, null=True)
126+ log = models.URLField(verbose_name=_('Log URL'), max_length=200, help_text=_('URL to this agenda item\'s discussion'), blank=True, null=True)
127
128 objects = AgendaItemManager()
129
130
131=== modified file 'loco_directory/meetings/urls.py'
132--- loco_directory/meetings/urls.py 2013-04-14 23:00:20 +0000
133+++ loco_directory/meetings/urls.py 2016-08-05 03:04:29 +0000
134@@ -1,4 +1,4 @@
135-from django.conf.urls.defaults import *
136+from django.conf.urls import *
137
138 urlpatterns = patterns('',
139 #all meetings
140
141=== modified file 'loco_directory/services/urls.py'
142--- loco_directory/services/urls.py 2011-01-22 16:05:24 +0000
143+++ loco_directory/services/urls.py 2016-08-05 03:04:29 +0000
144@@ -3,7 +3,7 @@
145
146 @author: mhall
147 '''
148-from django.conf.urls.defaults import *
149+from django.conf.urls import *
150
151 urlpatterns = patterns('',
152 #venues
153
154=== modified file 'loco_directory/settings.py'
155--- loco_directory/settings.py 2013-03-31 01:10:52 +0000
156+++ loco_directory/settings.py 2016-08-05 03:04:29 +0000
157@@ -128,7 +128,7 @@
158 "common.context_processors.languages_menu",
159 )
160
161-ROOT_URLCONF = 'loco_directory.urls'
162+ROOT_URLCONF = 'urls'
163
164 TEMPLATE_DIRS = (
165 # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
166
167=== modified file 'loco_directory/teams/feeds.py'
168--- loco_directory/teams/feeds.py 2013-03-31 01:10:52 +0000
169+++ loco_directory/teams/feeds.py 2016-08-05 03:04:29 +0000
170@@ -1,5 +1,5 @@
171 # -*- coding: utf-8 -*-
172-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
173+from django.contrib.syndication.views import Feed, FeedDoesNotExist
174 from django.utils.translation import ugettext as _
175 from django.utils import translation
176
177
178=== modified file 'loco_directory/teams/models.py'
179--- loco_directory/teams/models.py 2014-05-17 22:18:32 +0000
180+++ loco_directory/teams/models.py 2016-08-05 03:04:29 +0000
181@@ -95,10 +95,10 @@
182 countries = models.ManyToManyField(Country)
183 spr = models.CharField(_("State/Province/Region"), max_length=50, null=True, blank=True)
184 city = models.CharField(_("City"), max_length=50, null=True, blank=True)
185- wiki_url = models.URLField(_("Ubuntu Wiki Page"), verify_exists=False, null=True, blank=True)
186- web_url = models.URLField(_("Website"), verify_exists=False, null=True, blank=True)
187- ml_url = models.URLField(_("Mailing List URL"), verify_exists=False, null=True, blank=True)
188- forum_url = models.URLField(_("Forums URL"), verify_exists=False, null=True, blank=True)
189+ wiki_url = models.URLField(_("Ubuntu Wiki Page"), null=True, blank=True)
190+ web_url = models.URLField(_("Website"), null=True, blank=True)
191+ ml_url = models.URLField(_("Mailing List URL"), null=True, blank=True)
192+ forum_url = models.URLField(_("Forums URL"), null=True, blank=True)
193 email = models.EmailField(_("Email Address"), null=True, blank=True)
194 irc_chan = models.CharField(_("IRC Channel"),
195 max_length=25, null=True, blank=True,
196@@ -112,7 +112,7 @@
197 owner_profile = models.ForeignKey(UserProfile, related_name='owner', null=True)
198 admin_profiles = models.ManyToManyField(UserProfile, related_name='admins')
199 contact_profiles = models.ManyToManyField(UserProfile, related_name='contacts')
200- mugshot_url = models.URLField(_("Team Logo"), verify_exists=False, null=True, blank=True)
201+ mugshot_url = models.URLField(_("Team Logo"), null=True, blank=True)
202 languages = models.ManyToManyField(Language)
203 flickr_id = models.CharField(_("Flickr User/Group ID"), max_length=20, null=True, blank=True,
204 help_text=_("To get your Flickr user id go to http://idgettr.com. Ex. 47353004@N03"))
205
206=== modified file 'loco_directory/teams/urls.py'
207--- loco_directory/teams/urls.py 2013-02-19 22:23:46 +0000
208+++ loco_directory/teams/urls.py 2016-08-05 03:04:29 +0000
209@@ -1,4 +1,4 @@
210-from django.conf.urls.defaults import *
211+from django.conf.urls import *
212
213 urlpatterns = patterns('',
214 url(r'^$', 'teams.views.team_list', name='team-list'),
215
216=== modified file 'loco_directory/templates/404.html'
217--- loco_directory/templates/404.html 2012-05-26 12:20:08 +0000
218+++ loco_directory/templates/404.html 2016-08-05 03:04:29 +0000
219@@ -10,9 +10,9 @@
220
221 <p>
222 <ul>
223- <li><a href="{% url team-list %}">{% trans "You can browse the full list of teams." %}</a></li>
224- <li><a href="{% url event-list %}">{% trans "You can browse the full list of events." %}</a></li>
225- <li><a href="{% url venue-list %}">{% trans "You can browse the full list of venues." %}</a></li>
226+ <li><a href="{% url "team-list" %}">{% trans "You can browse the full list of teams." %}</a></li>
227+ <li><a href="{% url "event-list" %}">{% trans "You can browse the full list of events." %}</a></li>
228+ <li><a href="{% url "venue-list" %}">{% trans "You can browse the full list of venues." %}</a></li>
229 </ul>
230 </p>
231 <p>{% trans "If you believe the reason you are here is a bug in the LoCo Team Portal please " %} <a href='https://bugs.launchpad.net/loco-team-portal/+filebug'>{% trans "Report it!" %}</a></p>
232
233=== modified file 'loco_directory/templates/about_loco.html'
234--- loco_directory/templates/about_loco.html 2012-05-26 12:20:08 +0000
235+++ loco_directory/templates/about_loco.html 2016-08-05 03:04:29 +0000
236@@ -4,7 +4,7 @@
237 {% block page_name %}{% trans "About Local Community (LoCo) Teams" %}{% endblock %}
238
239 {% block sub_nav_links %}
240-<li><a class="sub-nav-item" href="{% url loco_setup %}">{% trans "Setting up a new Local Community (LoCo) Team" %}</a></li>
241+<li><a class="sub-nav-item" href="{% url "loco_setup" %}">{% trans "Setting up a new Local Community (LoCo) Team" %}</a></li>
242 {% endblock %}
243
244 {% block content %}
245@@ -12,7 +12,7 @@
246 <div class="row">
247 <section class="span-12">
248 <h2>{% trans "About Local Community (LoCo) Teams" %}</h2>
249- <p>{% trans "With the incredible success of Ubuntu around the world, the LoCo project is here to help groups of Ubuntu fans and enthusiasts work together in regional teams to help advocate, promote, translate, develop and otherwise improve Ubuntu. Our worldwide network of LoCo teams is providing a strong backbone to our already vast and extensive Ubuntu community. Why not go and see the" %} <a title="{% trans "See All LoCo Teams" %}" href="{% url team-list %}">{% trans "full list of teams!" %}</a></p>
250+ <p>{% trans "With the incredible success of Ubuntu around the world, the LoCo project is here to help groups of Ubuntu fans and enthusiasts work together in regional teams to help advocate, promote, translate, develop and otherwise improve Ubuntu. Our worldwide network of LoCo teams is providing a strong backbone to our already vast and extensive Ubuntu community. Why not go and see the" %} <a title="{% trans "See All LoCo Teams" %}" href="{% url "team-list" %}">{% trans "full list of teams!" %}</a></p>
251 </section></div>
252
253 <div class="row">
254@@ -22,7 +22,7 @@
255 {% with '</a>' as link_end %}
256 {% with '<a title="' as start_link_title %}
257 {% with '" href="' as start_link_href %}
258- {% url team-list as url_team_list %}
259+ {% url "team-list" as url_team_list %}
260 {% with '">' as end_link_href %}
261 {% with 'https://wiki.ubuntu.com/LoCoTeamHowto' as url_locohowto %}
262 <li>{% blocktrans %}Do you want to join a LoCo Team? It's easy! Just {{ start_link_title }}See All LoCo Teams{{ start_link_href }}{{ url_team_list }}{{ end_link_href }}find a team{{ link_end }} in your area and click the 'Join This Team!' link at the top of their page.{% endblocktrans %}</li>
263
264=== modified file 'loco_directory/templates/articles/article_detail.html'
265--- loco_directory/templates/articles/article_detail.html 2012-12-13 23:11:46 +0000
266+++ loco_directory/templates/articles/article_detail.html 2016-08-05 03:04:29 +0000
267@@ -28,11 +28,11 @@
268 <h4 class="blog-entry-title"><a href="{{ article.link }}" target="_blank" title="{{ article.title }}">{{ article.title }}</a></h4>
269 <div class="blog-entry-author">
270 {% if article.source.team %}
271- <a class="team" href="{% url team-detail article.source.team %}" target="_blank">{{ article.source.team.name }}</a>
272+ <a class="team" href="{% url "team-detail" article.source.team %}" target="_blank">{{ article.source.team.name }}</a>
273 {% endif %}
274 {% if article.source.user %}
275 {% if article.source.team %}, {% endif %}
276- <a class="user" href="{% url profile-detail article.source.user.user.username %}" target="_blank">{{ article.source.user }}</a>
277+ <a class="user" href="{% url "profile-detail" article.source.user.user.username %}" target="_blank">{{ article.source.user }}</a>
278 {% endif %}
279 </div>
280 <div class="share">
281
282=== modified file 'loco_directory/templates/base.html'
283--- loco_directory/templates/base.html 2014-01-12 21:29:40 +0000
284+++ loco_directory/templates/base.html 2016-08-05 03:04:29 +0000
285@@ -26,13 +26,13 @@
286
287 {% block top_nav_login_links %}
288 {% if user.is_authenticated %}
289- {% trans "Welcome" %} <a class="top-login-item" href="{% url profile-detail user.username %}">{{ user.username }}</a>
290+ {% trans "Welcome" %} <a class="top-login-item" href="{% url "profile-detail" user.username %}">{{ user.username }}</a>
291 <span class="top-login-separator">|</span>
292 {% if user.is_staff %}
293 <a class="top-login-item" href="/admin" title="Admin">{% trans "Admin" %}</a>
294 <span class="top-login-separator">|</span>
295 {% endif %}
296- <a class="top-login-item" href="{% url logout %}" title="{% trans "Log Out" %}: {{ user.username }}">{% trans "Log Out" %}</a>
297+ <a class="top-login-item" href="{% url "logout" %}" title="{% trans "Log Out" %}: {{ user.username }}">{% trans "Log Out" %}</a>
298 {% else %}
299 <a class="top-login-item" href="/openid/login?next={{ login_next }}" title="{% trans "Log In" %}">{% trans "Log In" %}</a>
300 {% endif %}
301@@ -40,12 +40,12 @@
302
303 {% block main_nav_links %}
304 <ul class="clearfix">
305- <li {% ifequal url_base 'teams' %}class="active"{% endifequal %}><a class="main-nav-item" title="{% trans "Show All Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a></li>
306- <li {% ifequal url_base 'events' %}class="active"{% endifequal %}><a class="main-nav-item" title="{% trans "Show All Events" %}" href="{% url event-list %}">{% trans "Events" %}</a></li>
307- <li {% ifequal url_base 'meetings' %}class="active"{% endifequal %}><a class="main-nav-item" title="{% trans "Show All Meetings" %}" href="{% url meeting-list %}">{% trans "Meetings" %}</a></li>
308- <li {% ifequal url_base 'loco-council' %}class="active"{% endifequal %}><a class="main-nav-item" title="{% trans "Governance" %}" href="{% url loco_council %}">{% trans "Governance" %}</a></li>
309- <li {% ifequal url_base 'about-loco' %}class="active"{% endifequal %}><a class="main-nav-item" title="{% trans "About LoCo Teams" %}" href="{% url about_loco %}">{% trans "About LoCos" %}</a></li>
310- <li {% ifequal url_base 'irc' %}class="active"{% endifequal %}><a class="main-nav-item" title="{% trans "IRC Chat" %}" href="{% url irc_chat %}">{% trans "IRC Chat" %}</a></li>
311+ <li {% ifequal url_base 'teams' %}class="active"{% endifequal %}><a class="main-nav-item" title="{% trans "Show All Teams" %}" href="{% url "team-list" %}">{% trans "Teams" %}</a></li>
312+ <li {% ifequal url_base 'events' %}class="active"{% endifequal %}><a class="main-nav-item" title="{% trans "Show All Events" %}" href="{% url "event-list" %}">{% trans "Events" %}</a></li>
313+ <li {% ifequal url_base 'meetings' %}class="active"{% endifequal %}><a class="main-nav-item" title="{% trans "Show All Meetings" %}" href="{% url "meeting-list" %}">{% trans "Meetings" %}</a></li>
314+ <li {% ifequal url_base 'loco-council' %}class="active"{% endifequal %}><a class="main-nav-item" title="{% trans "Governance" %}" href="{% url "loco_council" %}">{% trans "Governance" %}</a></li>
315+ <li {% ifequal url_base 'about-loco' %}class="active"{% endifequal %}><a class="main-nav-item" title="{% trans "About LoCo Teams" %}" href="{% url "about_loco" %}">{% trans "About LoCos" %}</a></li>
316+ <li {% ifequal url_base 'irc' %}class="active"{% endifequal %}><a class="main-nav-item" title="{% trans "IRC Chat" %}" href="{% url "irc_chat" %}">{% trans "IRC Chat" %}</a></li>
317 </ul>
318 {% endblock %}
319
320@@ -53,7 +53,7 @@
321 {% endblock %}
322
323 {% block search_box %}
324-<form id="site_search_form" action="{% url common.views.site_search %}" method="get">{% csrf_token %}
325+<form id="site_search_form" action="{% url "common.views.site_search" %}" method="get">{% csrf_token %}
326 {{ search_form.q }}
327 <input type="image" src="/media/img/search.png" title="{% trans "Search" %}" alt="{% trans "Search" %}" />
328 </form>
329
330=== modified file 'loco_directory/templates/events/event_history_list.html'
331--- loco_directory/templates/events/event_history_list.html 2012-06-15 21:30:31 +0000
332+++ loco_directory/templates/events/event_history_list.html 2016-08-05 03:04:29 +0000
333@@ -9,7 +9,7 @@
334 {% block page_name %}{% trans "Ubuntu LoCo Events History" %}{% endblock %}
335
336 {% block sub_nav_links %}
337-<li><a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a></li>
338+<li><a class="sub-nav-item" href="{% url "event-list" %}">{% trans "Back to Events List" %}</a></li>
339 {% endblock %}
340
341 {% block content %}
342
343=== modified file 'loco_directory/templates/events/event_list.html'
344--- loco_directory/templates/events/event_list.html 2012-06-04 22:14:50 +0000
345+++ loco_directory/templates/events/event_list.html 2016-08-05 03:04:29 +0000
346@@ -11,7 +11,7 @@
347 <script type="text/javascript">
348 //<![CDATA[
349 $(function(){
350- $('#venue-map').showLocations({markers_url:'{% url team-event-locations %}',
351+ $('#venue-map').showLocations({markers_url:'{% url "team-event-locations" %}',
352 marker_icon: '{{ MEDIA_URL }}/img/marker.png'});
353 });
354 //]]>
355@@ -19,12 +19,12 @@
356 {% endblock %}
357
358 {% block sub_nav_links %}
359-<li><a class="sub-nav-item" title="{% trans "Show All Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a>
360+<li><a class="sub-nav-item" title="{% trans "Show All Venues" %}" href="{% url "venue-list" %}">{% trans "Venues" %}</a>
361 {% if user_is_on_lc %}
362-<li><a class="sub-nav-item" href="{% url global-event-new %}">{% trans "Add Global Event" %}</a></li>
363+<li><a class="sub-nav-item" href="{% url "global-event-new" %}">{% trans "Add Global Event" %}</a></li>
364 {% endif %}
365-<li><a class="sub-nav-item" href="{% url team-event-select %}">{% trans "Add Team Event" %}</a></li>
366-<li><a class="sub-nav-item" href="{% url event-history-list %}">{% trans "Past Events" %}</a></li>
367+<li><a class="sub-nav-item" href="{% url "team-event-select" %}">{% trans "Add Team Event" %}</a></li>
368+<li><a class="sub-nav-item" href="{% url "event-history-list" %}">{% trans "Past Events" %}</a></li>
369 {% endblock %}
370
371 {% block content %}
372@@ -32,7 +32,7 @@
373 <section class="span-6">
374 <h2>{% trans "Ubuntu LoCo Global Events" %}
375 {% if global_event_list %}
376-<a class="global_event_ical" href="{% url global-event-list-ical %}">
377+<a class="global_event_ical" href="{% url "global-event-list-ical" %}">
378 <img src="{{MEDIA_URL}}images/ical.png" title="{% trans "Global Events as ical" %}"/></a></h2>
379
380 <p>{% trans "Select a global event below to see more information about it:" %}</p>
381@@ -52,7 +52,7 @@
382 <section class="span-12">
383 <h2>{% trans "Ubuntu LoCo Team Events" %}
384 {% if team_event_list %}
385-<a class="teams_event_ical" href="{% url teams-event-list-ical %}">
386+<a class="teams_event_ical" href="{% url "teams-event-list-ical" %}">
387 <img src="{{MEDIA_URL}}images/ical.png" title="{% trans "Team Events as ical" %}"/></a></h2>
388 <p>{% trans "Select a team event below to see more information about it:" %}</p>
389
390
391=== modified file 'loco_directory/templates/events/global_event_detail.html'
392--- loco_directory/templates/events/global_event_detail.html 2012-12-22 23:22:32 +0000
393+++ loco_directory/templates/events/global_event_detail.html 2016-08-05 03:04:29 +0000
394@@ -27,7 +27,7 @@
395 ]
396 });
397 $('#venue-map').showLocations({
398- markers_url:'{% url global-event-locations global_event_id=global_event.id %}',
399+ markers_url:'{% url "global-event-locations" global_event_id=global_event.id %}',
400 marker_icon: '{{ MEDIA_URL }}img/marker.png'});
401 });
402 //]]>
403@@ -49,11 +49,11 @@
404 {% endblock %}
405
406 {% block sub_nav_links %}
407-<li><a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a></li>
408-<li><a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{ global_event.id }}">{% trans "Add Team Event" %}</a></li>
409+<li><a class="sub-nav-item" href="{% url "event-list" %}">{% trans "Back to Events List" %}</a></li>
410+<li><a class="sub-nav-item" href="{% url "team-event-select" %}?global_event_id={{ global_event.id }}">{% trans "Add Team Event" %}</a></li>
411 {% if user_is_on_lc %}
412-<li><a class="sub-nav-item" href="{% url global-event-update global_event.id %}">{% trans "Edit Details" %}</a></li>
413-<li><a class="sub-nav-item" href="{% url global-event-delete global_event.id %}">{% trans "Delete Event" %}</a></li>
414+<li><a class="sub-nav-item" href="{% url "global-event-update" global_event.id %}">{% trans "Edit Details" %}</a></li>
415+<li><a class="sub-nav-item" href="{% url "global-event-delete" global_event.id %}">{% trans "Delete Event" %}</a></li>
416 {% endif %}
417 {% endblock %}
418
419
420=== modified file 'loco_directory/templates/events/global_event_detail.inc.html'
421--- loco_directory/templates/events/global_event_detail.inc.html 2012-12-22 23:22:32 +0000
422+++ loco_directory/templates/events/global_event_detail.inc.html 2016-08-05 03:04:29 +0000
423@@ -18,7 +18,7 @@
424 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
425 <g:plusone size="medium"></g:plusone>
426 <a href="http://twitter.com/share" class="twitter-share-button" data-lang="en">Tweet</a>
427- <div class="fb-like" data-href="http://loco.ubuntu.com{% url global-event-detail global_event.id %}" data-send="false" data-layout="button_count" data-width="40" data-show-faces="false" data-font="arial"></div>
428+ <div class="fb-like" data-href="http://loco.ubuntu.com{% url "global-event-detail" global_event.id %}" data-send="false" data-layout="button_count" data-width="40" data-show-faces="false" data-font="arial"></div>
429 </div>
430
431 <div>
432
433=== modified file 'loco_directory/templates/events/global_jam_dashboard.html'
434--- loco_directory/templates/events/global_jam_dashboard.html 2012-06-04 22:14:50 +0000
435+++ loco_directory/templates/events/global_jam_dashboard.html 2016-08-05 03:04:29 +0000
436@@ -84,11 +84,11 @@
437 {% block title %}{% trans global_event_object.name %} | {% trans "Ubuntu LoCo Team Portal" %} {% endblock %}
438
439 {% block sub_nav_links %}
440- <li><a class="sub-nav-item" href="{% url global-event-detail global_event_object.id %}">{% trans "Show Event Details" %}</a></li>
441- <li><a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add Team Event" %}</a></li>
442+ <li><a class="sub-nav-item" href="{% url "global-event-detail" global_event_object.id %}">{% trans "Show Event Details" %}</a></li>
443+ <li><a class="sub-nav-item" href="{% url "team-event-select" %}?global_event_id={{global_event_object.id}}">{% trans "Add Team Event" %}</a></li>
444 {% if user_is_on_lc %}
445- <li><a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit Details" %}</a></li>
446- <li><a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Event" %}</a></li>
447+ <li><a class="sub-nav-item" href="{% url "global-event-update" global_event_object.id %}">{% trans "Edit Details" %}</a></li>
448+ <li><a class="sub-nav-item" href="{% url "global-event-delete" global_event_object.id %}">{% trans "Delete Event" %}</a></li>
449 {% endif %}
450 {% endblock %}
451
452@@ -157,7 +157,7 @@
453 js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=127188230723188";
454 fjs.parentNode.insertBefore(js, fjs);
455 }(document, 'script', 'facebook-jssdk'));</script>
456- <div class="fb-like" data-href="http://loco.ubuntu.com{% url global-event-detail global_event_object.id %}" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>
457+ <div class="fb-like" data-href="http://loco.ubuntu.com{% url "global-event-detail" global_event_object.id %}" data-send="false" data-layout="box_count" data-width="40" data-show-faces="false" data-font="arial"></div>
458 <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
459 <g:plusone size="tall"></g:plusone>
460 <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>
461
462=== modified file 'loco_directory/templates/events/team_event_detail.html'
463--- loco_directory/templates/events/team_event_detail.html 2013-05-17 11:08:24 +0000
464+++ loco_directory/templates/events/team_event_detail.html 2016-08-05 03:04:29 +0000
465@@ -53,12 +53,12 @@
466
467 {% if user.is_authenticated %}
468 {% if user_is_team_member %}
469- <li><a class="sub-nav-item" href="{% url team-event-update team_event.first_team.lp_name team_event.id %}">{% trans "Edit Details" %}</a></li>
470- <li><a class="sub-nav-item" href="{% url team-event-delete team_event.first_team.lp_name team_event.id %}">{% trans "Delete Event" %}</a></li>
471- <li><a class="sub-nav-item" href="{% url team-event-copy team_event.first_team.lp_name team_event.id %}">{% trans "Copy Event" %}</a></li>
472+ <li><a class="sub-nav-item" href="{% url "team-event-update" team_event.first_team.lp_name team_event.id %}">{% trans "Edit Details" %}</a></li>
473+ <li><a class="sub-nav-item" href="{% url "team-event-delete" team_event.first_team.lp_name team_event.id %}">{% trans "Delete Event" %}</a></li>
474+ <li><a class="sub-nav-item" href="{% url "team-event-copy" team_event.first_team.lp_name team_event.id %}">{% trans "Copy Event" %}</a></li>
475 {% endif %}
476 {% endif %}
477-<li><a class="sub-nav-item" href="{% url event-ical team_event.first_team.lp_name team_event.id %}">{% trans "iCal Feed" %}</a></li>
478+<li><a class="sub-nav-item" href="{% url "event-ical" team_event.first_team.lp_name team_event.id %}">{% trans "iCal Feed" %}</a></li>
479 {% endblock %}
480
481 {% block content %}
482
483=== modified file 'loco_directory/templates/events/team_event_detail.inc.html'
484--- loco_directory/templates/events/team_event_detail.inc.html 2013-05-11 19:24:14 +0000
485+++ loco_directory/templates/events/team_event_detail.inc.html 2016-08-05 03:04:29 +0000
486@@ -109,7 +109,7 @@
487 {% if team_event.contact %}
488 <div>
489 <span class="pictogram personne"></span>
490- <a class="pictogram-l" title="{{ team_event.contact.realname }}" href="{% url profile-detail team_event.contact.user %}">{{ team_event.contact.realname }}</a>
491+ <a class="pictogram-l" title="{{ team_event.contact.realname }}" href="{% url "profile-detail" team_event.contact.user %}">{{ team_event.contact.realname }}</a>
492 </div>
493 {% endif %}
494
495@@ -126,9 +126,9 @@
496 <a class="submit-button rsvp-link" href="{{team_event.registration}}" target="external_registration">{% trans 'Register' %}</a>
497 {% else %}
498 {% if user.is_authenticated and user_is_attending %}
499- <a class="submit-button rsvp-link" href="{% url team-event-register team_event.first_team.lp_name team_event.id %}">{% trans 'Update Registration' %}</a>
500+ <a class="submit-button rsvp-link" href="{% url "team-event-register" team_event.first_team.lp_name team_event.id %}">{% trans 'Update Registration' %}</a>
501 {% else %}
502- <a class="submit-button rsvp-link" href="{% url team-event-register team_event.first_team.lp_name team_event.id %}">{% trans 'Register' %}</a>
503+ <a class="submit-button rsvp-link" href="{% url "team-event-register" team_event.first_team.lp_name team_event.id %}">{% trans 'Register' %}</a>
504 {% endif %}
505 {% endif %}
506
507@@ -137,12 +137,12 @@
508 <ul class="attendees">
509 <li class="attendee-cell">
510 <div class="attendee-mugshot">
511- <a href="{% url profile-detail team_event.created_by.username %}">
512+ <a href="{% url "profile-detail" team_event.created_by.username %}">
513 <img src="{% if team_event.created_by.get_profile.mugshot %}{{ team_event.created_by.get_profile.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" width="32px" height="32px" alt="{{ team_event.created_by.get_profile.realname }}">
514 </a>
515 </div>
516 <div class="attendee-infos">
517- <a href="{% url profile-detail team_event.created_by.username %}">{{ team_event.created_by.get_profile.realname }}</a>
518+ <a href="{% url "profile-detail" team_event.created_by.username %}">{{ team_event.created_by.get_profile.realname }}</a>
519 </div>
520 </li>
521 </ul>
522
523=== modified file 'loco_directory/templates/events/team_event_detail_attendee.inc.html'
524--- loco_directory/templates/events/team_event_detail_attendee.inc.html 2013-09-08 11:45:02 +0000
525+++ loco_directory/templates/events/team_event_detail_attendee.inc.html 2016-08-05 03:04:29 +0000
526@@ -2,11 +2,11 @@
527
528 <li class="attendee-cell">
529 <div class="attendee-mugshot">
530- <a href="{% url profile-detail registration.attendee_profile.user.username %}">
531+ <a href="{% url "profile-detail" registration.attendee_profile.user.username %}">
532 <img src="{% if registration.attendee_profile.mugshot %}{{ registration.attendee_profile.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" width="32px" height="32px" alt="{{ registration.attendee_profile.realname }}">
533 </a>
534 </div>
535 <div class="attendee-infos">
536- <a href="{% url profile-detail registration.attendee_profile.user.username %}">{{ registration.attendee_profile.realname }} {% if registration.guests %}(+{{ registration.guests }}){% endif %}</a>
537+ <a href="{% url "profile-detail" registration.attendee_profile.user.username %}">{{ registration.attendee_profile.realname }} {% if registration.guests %}(+{{ registration.guests }}){% endif %}</a>
538 </div>
539 </li>
540
541=== modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html'
542--- loco_directory/templates/events/team_event_detail_comments.inc.html 2013-08-28 23:20:35 +0000
543+++ loco_directory/templates/events/team_event_detail_comments.inc.html 2016-08-05 03:04:29 +0000
544@@ -9,12 +9,12 @@
545 {% for comment in team_event.comments_set %}
546 <li id="comment-{{ comment.pk }}" class="response">
547 <div class="mugshot">
548- <a href="{% url profile-detail comment.commenter_profile.user.username %}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
549+ <a href="{% url "profile-detail" comment.commenter_profile.user.username %}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
550 <img alt="" class="photo fn" src="{% if comment.commenter_profile.mugshot %}{{ comment.commenter_profile.mugshot }}{% else %}{{ MEDIA_URL }}img/default-mugshot.png{% endif %}">
551 </a>
552 </div>
553 <div class="comment-body">
554- <a href="{% url profile-detail comment.commenter_profile.user.username %}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
555+ <a href="{% url "profile-detail" comment.commenter_profile.user.username %}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
556 {% if comment.commenter_profile.user.get_full_name %}
557 {{ comment.commenter_profile.user.get_full_name }}
558 {% else %}
559@@ -29,7 +29,7 @@
560 <a href="#comment-{{ comment.pk }}" class="posted" title="{{ comment.local_date_created }}">
561 {{ comment.local_date_created|date:"d F Y" }}</a>
562 {% if comment.commenter_profile.user.username == user.username %}
563- · <a class="edit" href="#">{% trans "Edit" %}</a> - <a href="{% url team-event-comment-delete comment.id %}?next={{ team_event.get_absolute_url }}">{% trans "Delete" %}</a>
564+ · <a class="edit" href="#">{% trans "Edit" %}</a> - <a href="{% url "team-event-comment-delete" comment.id %}?next={{ team_event.get_absolute_url }}">{% trans "Delete" %}</a>
565 {% endif %}
566 </p>
567 </div>
568
569=== modified file 'loco_directory/templates/events/team_event_li.inc.html'
570--- loco_directory/templates/events/team_event_li.inc.html 2011-03-16 18:35:53 +0000
571+++ loco_directory/templates/events/team_event_li.inc.html 2016-08-05 03:04:29 +0000
572@@ -1,5 +1,5 @@
573 {% load i18n %}
574 {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
575 <li>
576- <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.first_team.lp_name team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}
577+ <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url "team-event-detail" team_event.first_team.lp_name team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}
578 </li>
579
580=== modified file 'loco_directory/templates/index.html'
581--- loco_directory/templates/index.html 2013-03-30 22:07:37 +0000
582+++ loco_directory/templates/index.html 2016-08-05 03:04:29 +0000
583@@ -2,8 +2,8 @@
584 {% load i18n %}
585
586 {% block sub_nav_links %}
587-<li><a class="sub-nav-item" href="{% url about_loco %}">{% trans "About Local Community (LoCo) Teams" %}</a></li>
588-<li><a class="sub-nav-item" href="{% url using_locodir %}">{% trans "Using the LoCo Team Portal" %}</a></li>
589+<li><a class="sub-nav-item" href="{% url "about_loco" %}">{% trans "About Local Community (LoCo) Teams" %}</a></li>
590+<li><a class="sub-nav-item" href="{% url "using_locodir" %}">{% trans "Using the LoCo Team Portal" %}</a></li>
591 {% endblock %}
592
593 {% block extrahead %}{{block.super}}
594@@ -29,27 +29,27 @@
595 <h1 class="centered">{% trans "Ubuntu Local Community (LoCo) Team Portal" %}</h1>
596 <ul id="continents">
597 <li id="northamerica">
598- <a href="{% url team-list %}#North%20America">
599+ <a href="{% url "team-list" %}#North%20America">
600 </a>
601 </li>
602 <li id="southamerica">
603- <a href="{% url team-list %}#South%20America">
604+ <a href="{% url "team-list" %}#South%20America">
605 </a>
606 </li>
607 <li id="asia">
608- <a href="{% url team-list %}#Asia">
609+ <a href="{% url "team-list" %}#Asia">
610 </a>
611 </li>
612 <li id="australia">
613- <a href="{% url team-list %}#Australia/Oceania">
614+ <a href="{% url "team-list" %}#Australia/Oceania">
615 </a>
616 </li>
617 <li id="africa">
618- <a href="{% url team-list %}#Africa">
619+ <a href="{% url "team-list" %}#Africa">
620 </a>
621 </li>
622 <li id="europe">
623- <a href="{% url team-list %}#Europe">
624+ <a href="{% url "team-list" %}#Europe">
625 </a>
626 </li>
627 </ul>
628@@ -72,11 +72,11 @@
629 <h4 class="blog-entry-title"><a href="{{ article.get_absolute_url }}">{{ article.title }}</a></h4>
630 <div class="blog-entry-author">
631 {% if article.source.team %}
632- <a class="post-team" href="{% url team-detail article.source.team %}">{{ article.source.team.name }}</a>
633+ <a class="post-team" href="{% url "team-detail" article.source.team %}">{{ article.source.team.name }}</a>
634 {% endif %}
635 {% if article.source.user %}
636 {% if article.source.team %}, {% endif %}
637- <a class="post-user" href="{% url profile-detail article.source.user.user.username %}">{{ article.source.user }}</a>
638+ <a class="post-user" href="{% url "profile-detail" article.source.user.user.username %}">{{ article.source.user }}</a>
639 {% endif %}
640 </div>
641 <div class="blog-entry-text">
642@@ -90,7 +90,7 @@
643 </section>
644 <section class="span-4 last">
645 <h2>{% if team_event_count %}{{ team_event_count }} {% endif %}{% trans "Upcoming Events" %}</h2>
646- <a href="{% url event-list %}"><img src="{{ MEDIA_URL }}img/home-map.png" /></a>
647+ <a href="{% url "event-list" %}"><img src="{{ MEDIA_URL }}img/home-map.png" /></a>
648 <h2>{% trans "Latest social messages" %}</h2>
649 <div class="twidenash" id="locoteams"></div>
650 </section>
651
652=== modified file 'loco_directory/templates/lc_edit.html'
653--- loco_directory/templates/lc_edit.html 2013-02-17 12:25:47 +0000
654+++ loco_directory/templates/lc_edit.html 2016-08-05 03:04:29 +0000
655@@ -9,8 +9,8 @@
656
657 {% block sub_nav_links %}
658 <li><a class="sub-nav-item" href="approved">{% trans "Approved Teams" %}</a></li>
659- {% if is_admin %}<li><a class="sub-nav-item" href="{% url lc_edit %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
660- {% if is_member %}<li><a class="sub-nav-item" href="{% url team-meeting-new team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a></li>{% endif %}
661+ {% if is_admin %}<li><a class="sub-nav-item" href="{% url "lc_edit" %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
662+ {% if is_member %}<li><a class="sub-nav-item" href="{% url "team-meeting-new" team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a></li>{% endif %}
663 {% endblock %}
664
665 {% block content %}
666
667=== modified file 'loco_directory/templates/loco_council.html'
668--- loco_directory/templates/loco_council.html 2014-01-12 20:44:07 +0000
669+++ loco_directory/templates/loco_council.html 2016-08-05 03:04:29 +0000
670@@ -5,8 +5,8 @@
671
672 {% block sub_nav_links %}
673 <li><a class="sub-nav-item" href="approved">{% trans "Approved Teams" %}</a></li>
674- {% if is_admin %}<li><a class="sub-nav-item" href="{% url lc_edit %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
675- {% if is_member %}<li><a class="sub-nav-item" href="{% url team-meeting-new team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a></li>{% endif %}
676+ {% if is_admin %}<li><a class="sub-nav-item" href="{% url "lc_edit" %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
677+ {% if is_member %}<li><a class="sub-nav-item" href="{% url "team-meeting-new" team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a></li>{% endif %}
678 {% endblock %}
679
680 {% block content %}
681@@ -147,7 +147,7 @@
682 <h3 class="title">{% trans "Members" %}</h3>
683 <div class="team-admins">
684 {% for member in members %}
685- <a href="{% url profile-detail member.username %}">
686+ <a href="{% url "profile-detail" member.username %}">
687 <img src="{% if member.get_profile.mugshot %}{{ member.get_profile.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
688 <p>{{ member.get_profile.realname }}</p>
689 </a>
690
691=== modified file 'loco_directory/templates/loco_setup.html'
692--- loco_directory/templates/loco_setup.html 2012-06-15 21:30:31 +0000
693+++ loco_directory/templates/loco_setup.html 2016-08-05 03:04:29 +0000
694@@ -4,7 +4,7 @@
695 {% block page_name %}{% trans "Setting up a LoCo Team" %}{% endblock %}
696
697 {% block sub_nav_links %}
698-<li><a class="sub-nav-item" href="{% url about_loco %}">{% trans "About Local Community (LoCo) Teams" %}</a></li>
699+<li><a class="sub-nav-item" href="{% url "about_loco" %}">{% trans "About Local Community (LoCo) Teams" %}</a></li>
700 {% endblock %}
701
702 {% block content %}
703
704=== modified file 'loco_directory/templates/meetings/agenda_item_delete_confirm.html'
705--- loco_directory/templates/meetings/agenda_item_delete_confirm.html 2012-12-26 17:23:50 +0000
706+++ loco_directory/templates/meetings/agenda_item_delete_confirm.html 2016-08-05 03:04:29 +0000
707@@ -5,7 +5,7 @@
708 {% block page_name %}{% trans "Delete Agenda Item" %}{% endblock %}
709
710 {% block sub_nav_links %}
711-<li><a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a></li>
712+<li><a class="sub-nav-item" href="{% url "team-meeting-detail" team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a></li>
713 {% endblock %}
714
715 {% block extrahead %}{{ block.super }}
716@@ -24,7 +24,7 @@
717 <ol class="agenda-list">
718 {% loop %}
719 <li class="agenda-item">
720- <a class="agenda-title" title="{% trans 'Update Agenda Item:' %} {{item.title}}" href="{% url agenda-item-update team_meeting_object.id item.id %}">{{ item.title }}</a>
721+ <a class="agenda-title" title="{% trans 'Update Agenda Item:' %} {{item.title}}" href="{% url "agenda-item-update" team_meeting_object.id item.id %}">{{ item.title }}</a>
722 - <a class="agenda-sig" target="launchpaduser" href="https://launchpad.net/~{{ item.owner.user.username}}">{{ item.owner.realname }}</a>
723 @ {{ item.created_date|date:"D, d N Y H:i T" }}
724 </li>
725
726=== modified file 'loco_directory/templates/meetings/agenda_item_new.html'
727--- loco_directory/templates/meetings/agenda_item_new.html 2013-03-31 12:32:27 +0000
728+++ loco_directory/templates/meetings/agenda_item_new.html 2016-08-05 03:04:29 +0000
729@@ -4,7 +4,7 @@
730 {% block page_name %}{% trans "New Agenda Item" %}{% endblock %}
731
732 {% block sub_nav_links %}
733-<li><a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a></li>
734+<li><a class="sub-nav-item" href="{% url "team-meeting-detail" team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a></li>
735 {% endblock %}
736
737 {% block extrahead %}{{ block.super }}
738
739=== modified file 'loco_directory/templates/meetings/agenda_item_update.html'
740--- loco_directory/templates/meetings/agenda_item_update.html 2013-04-14 23:00:20 +0000
741+++ loco_directory/templates/meetings/agenda_item_update.html 2016-08-05 03:04:29 +0000
742@@ -4,9 +4,9 @@
743 {% block page_name %}{% trans "Update Agenda Item" %}{% endblock %}
744
745 {% block sub_nav_links %}
746-<li><a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a></li>
747-<li><a class="sub-nav-item" href="{% url agenda-item-add-child team_meeting_object.id agenda_item_object.id %}">{% trans "Add Child Item" %}</a></li>
748-<li><a class="sub-nav-item" href="{% url agenda-item-delete team_meeting_object.id agenda_item_object.id %}">{% trans "Delete Agenda Item" %}</a></li>
749+<li><a class="sub-nav-item" href="{% url "team-meeting-detail" team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a></li>
750+<li><a class="sub-nav-item" href="{% url "agenda-item-add-child" team_meeting_object.id agenda_item_object.id %}">{% trans "Add Child Item" %}</a></li>
751+<li><a class="sub-nav-item" href="{% url "agenda-item-delete" team_meeting_object.id agenda_item_object.id %}">{% trans "Delete Agenda Item" %}</a></li>
752 {% endblock %}
753
754 {% block extrahead %}{{ block.super }}
755
756=== modified file 'loco_directory/templates/meetings/meeting_history_list.html'
757--- loco_directory/templates/meetings/meeting_history_list.html 2012-07-14 20:07:11 +0000
758+++ loco_directory/templates/meetings/meeting_history_list.html 2016-08-05 03:04:29 +0000
759@@ -9,7 +9,7 @@
760 {% block page_name %}{% trans "Ubuntu Teams Meeting History" %}{% endblock %}
761
762 {% block sub_nav_links %}
763-<li><a class="sub-nav-item" href="{% url meeting-list %}">{% trans "Back to Meetings List" %}</a></li>
764+<li><a class="sub-nav-item" href="{% url "meeting-list" %}">{% trans "Back to Meetings List" %}</a></li>
765 {% endblock %}
766
767 {% block content %}
768
769=== modified file 'loco_directory/templates/meetings/meeting_list.html'
770--- loco_directory/templates/meetings/meeting_list.html 2012-06-02 11:50:27 +0000
771+++ loco_directory/templates/meetings/meeting_list.html 2016-08-05 03:04:29 +0000
772@@ -4,8 +4,8 @@
773 {% block page_name %}{% trans "Ubuntu Teams Meeting List" %}{% endblock %}
774
775 {% block sub_nav_links %}
776-<li><a class="sub-nav-item" href="{% url team-meeting-select %}">{% trans "Add Team Meeting" %}</a></li>
777-<li><a class="sub-nav-item" href="{% url meeting-history-list %}">{% trans "Past Meetings" %}</a></li>
778+<li><a class="sub-nav-item" href="{% url "team-meeting-select" %}">{% trans "Add Team Meeting" %}</a></li>
779+<li><a class="sub-nav-item" href="{% url "meeting-history-list" %}">{% trans "Past Meetings" %}</a></li>
780 {% endblock %}
781
782 {% block content %}
783@@ -13,7 +13,7 @@
784 <section class="span-12">
785 <h2>{% trans "Ubuntu Teams Meetings" %}
786 {% if team_meeting_list %}
787-<a class="teams_meeting_ical" href="{% url teams-meeting-list-ical %}">
788+<a class="teams_meeting_ical" href="{% url "teams-meeting-list-ical" %}">
789 <img src="/media/images/ical.png" title="{% trans "Team Meetings as ical" %}"/></a></h2>
790 <p>{% trans "Select a team meeting below to see more information about it:" %}</p>
791
792
793=== modified file 'loco_directory/templates/meetings/team_meeting_detail.html'
794--- loco_directory/templates/meetings/team_meeting_detail.html 2013-11-24 13:57:29 +0000
795+++ loco_directory/templates/meetings/team_meeting_detail.html 2016-08-05 03:04:29 +0000
796@@ -5,7 +5,7 @@
797 {% block extrahead %}{{ block.super }}
798 <meta property="fb:app_id" content="127188230723188"/>
799 <meta property="og:title" content="{{ team_meeting.name }}" />
800-<meta property="og:url" content="http://loco.ubuntu.com{% url team-meeting-detail team_meeting.first_team.lp_name team_meeting.id %}"/>
801+<meta property="og:url" content="http://loco.ubuntu.com{% url "team-meeting-detail" team_meeting.first_team.lp_name team_meeting.id %}"/>
802 <meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
803 <meta property="og:site_name" content="Loco Team Portal"/>
804 <meta property="og:type" content="loco-team-portal:meeting"/>
805@@ -15,12 +15,12 @@
806 {% for team in team_meeting.teams.all %}<li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}</li>
807 {% if user.is_authenticated %}
808 {% if user_is_team_member %}
809- <li><a class="sub-nav-item" href="{% url team-meeting-update team_meeting.first_team.lp_name team_meeting.id %}">{% trans "Edit Details" %}</a></li>
810- <li><a class="sub-nav-item" href="{% url team-meeting-delete team_meeting.first_team.lp_name team_meeting.id %}">{% trans "Delete Meeting" %}</a></li>
811- <li><a class="sub-nav-item" href="{% url team-meeting-copy team_meeting.first_team.lp_name team_meeting.id %}">{% trans "Copy Meeting" %}</a></li>
812+ <li><a class="sub-nav-item" href="{% url "team-meeting-update" team_meeting.first_team.lp_name team_meeting.id %}">{% trans "Edit Details" %}</a></li>
813+ <li><a class="sub-nav-item" href="{% url "team-meeting-delete" team_meeting.first_team.lp_name team_meeting.id %}">{% trans "Delete Meeting" %}</a></li>
814+ <li><a class="sub-nav-item" href="{% url "team-meeting-copy" team_meeting.first_team.lp_name team_meeting.id %}">{% trans "Copy Meeting" %}</a></li>
815 {% endif %}
816 {% endif %}
817-<li><a class="sub-nav-item" href="{% url meeting-ical team_meeting.first_team.lp_name team_meeting.id %}">{% trans "iCal Feed" %}</a></li>
818+<li><a class="sub-nav-item" href="{% url "meeting-ical" team_meeting.first_team.lp_name team_meeting.id %}">{% trans "iCal Feed" %}</a></li>
819 {% endblock %}
820
821 {% block content %}
822
823=== modified file 'loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html'
824--- loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html 2013-11-24 14:11:54 +0000
825+++ loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html 2016-08-05 03:04:29 +0000
826@@ -1,7 +1,7 @@
827 {% load i18n markup %}
828 {% load recurse %}
829 {% if user_is_team_member %}
830- <a style="margin-bottom: 10px;" class="contact-button" href="{% url agenda-item-new team_meeting.id %}">{% trans 'Add Agenda Item' %}</a>
831+ <a style="margin-bottom: 10px;" class="contact-button" href="{% url "agenda-item-new" team_meeting.id %}">{% trans 'Add Agenda Item' %}</a>
832 {% endif %}
833
834 {% if team_meeting.agenda %}
835@@ -12,11 +12,11 @@
836 <div style="overflow: auto">
837 <div style="float: left; width: 615px">
838 {% if user_is_team_member %}
839- <a class="agenda-title" title="{% trans 'Update Agenda Item:' %} {{ item.title }}" href="{% url agenda-item-update team_meeting.id item.id %}">{{ item.title }}</a>
840+ <a class="agenda-title" title="{% trans 'Update Agenda Item:' %} {{ item.title }}" href="{% url "agenda-item-update" team_meeting.id item.id %}">{{ item.title }}</a>
841 {% else %}
842 <span class="agenda-title" >{{ item.title }}</span>
843 {% endif %}
844- ‒ <a class="agenda-sig" href="{% url profile-detail item.owner.user.username %}">{{ item.owner.realname }}</a>
845+ ‒ <a class="agenda-sig" href="{% url "profile-detail" item.owner.user.username %}">{{ item.owner.realname }}</a>
846 {% if item.description %}
847 <div class="agenda-description">{{ item.description|markdown:'safe' }}</div>
848 {% endif %}
849
850=== modified file 'loco_directory/templates/meetings/team_meeting_detail_basic.inc.html'
851--- loco_directory/templates/meetings/team_meeting_detail_basic.inc.html 2013-11-24 13:57:29 +0000
852+++ loco_directory/templates/meetings/team_meeting_detail_basic.inc.html 2016-08-05 03:04:29 +0000
853@@ -20,7 +20,7 @@
854 <span title="{% trans "Meeting Chair" %}" class="pictogram language"></span>
855 <span class="value ellipsis" style="width: 350px;">
856 {% if team_meeting.chair %}
857- <a href="{% url profile-detail team_meeting.chair.user.username %}" >{{ team_meeting.chair }}</a>
858+ <a href="{% url "profile-detail" team_meeting.chair.user.username %}" >{{ team_meeting.chair }}</a>
859 {% else %}
860 {% trans "No Meeting Chair Assigned" %}
861 {% endif %}
862
863=== modified file 'loco_directory/templates/meetings/team_meeting_li.inc.html'
864--- loco_directory/templates/meetings/team_meeting_li.inc.html 2011-06-17 17:10:41 +0000
865+++ loco_directory/templates/meetings/team_meeting_li.inc.html 2016-08-05 03:04:29 +0000
866@@ -1,5 +1,5 @@
867 {% load i18n %}
868 {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
869 <li>
870- <a title="{{team_event.date_begin|date:"M d"}}" href="{% url team-meeting-detail team_event.first_team.lp_name team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}
871+ <a title="{{team_event.date_begin|date:"M d"}}" href="{% url "team-meeting-detail" team_event.first_team.lp_name team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}
872 </li>
873
874=== modified file 'loco_directory/templates/profiles/details.html'
875--- loco_directory/templates/profiles/details.html 2013-04-04 21:45:50 +0000
876+++ loco_directory/templates/profiles/details.html 2016-08-05 03:04:29 +0000
877@@ -15,12 +15,12 @@
878 <img src="{{ team.mugshot_url }}" alt="{{ team.name }}" class="mugshot" />
879 </div>
880 <div class="profil-team-meeting-wrapper">
881- <a href="{% url team-detail team_slug=team.lp_name %}" title="{{ team.name }}" class="link2">
882+ <a href="{% url "team-detail" team_slug=team.lp_name %}" title="{{ team.name }}" class="link2">
883 {{ team.name }}
884 </a>
885 <div style="float: right">
886- <a href="{% url team-meeting-new team_slug=team.lp_name %}" title="{% trans "Schedule a meeting" %}" class="new">{% trans "Schedule a meeting" %}</a>
887- <a href="{% url team-event-new team_slug=team.lp_name %}" title="{% trans "Create an event" %}" class="new">{% trans "Create an event" %}</a>
888+ <a href="{% url "team-meeting-new" team_slug=team.lp_name %}" title="{% trans "Schedule a meeting" %}" class="new">{% trans "Schedule a meeting" %}</a>
889+ <a href="{% url "team-event-new" team_slug=team.lp_name %}" title="{% trans "Create an event" %}" class="new">{% trans "Create an event" %}</a>
890 </div>
891 <h4 class="title">{% trans "Meetings" %}</h4>
892 <ul class="indent">
893
894=== modified file 'loco_directory/templates/teams/merge_teams.html'
895--- loco_directory/templates/teams/merge_teams.html 2012-06-02 11:50:27 +0000
896+++ loco_directory/templates/teams/merge_teams.html 2016-08-05 03:04:29 +0000
897@@ -15,7 +15,7 @@
898 {% if not team_object or not other_team_object %}
899 <p>{% trans "You need two valid teams you want to merge with another." %}</p>
900 {% else %}
901- <p><a href="{% url team-detail other_team_object %}">{% blocktrans with other_team_object.name as teamname %}Go back to the main page of {{teamname}}.{% endblocktrans %}</a></p>
902+ <p><a href="{% url "team-detail" other_team_object %}">{% blocktrans with other_team_object.name as teamname %}Go back to the main page of {{teamname}}.{% endblocktrans %}</a></p>
903 {% endif %}
904 </section>
905 </div>
906
907=== modified file 'loco_directory/templates/teams/select_other_team.html'
908--- loco_directory/templates/teams/select_other_team.html 2012-06-02 11:50:27 +0000
909+++ loco_directory/templates/teams/select_other_team.html 2016-08-05 03:04:29 +0000
910@@ -20,7 +20,7 @@
911 <td width="100%" valign="top">
912 <ul id="main-content">
913 {% for team in other_teams %}
914- <li><a href="{% url team-merge team_object.lp_name team.lp_name %}">{{ team.name }}</a></li>
915+ <li><a href="{% url "team-merge" team_object.lp_name team.lp_name %}">{{ team.name }}</a></li>
916 {% endfor %}
917 </ul>
918 </td>
919
920=== modified file 'loco_directory/templates/teams/team_detail.html'
921--- loco_directory/templates/teams/team_detail.html 2013-11-17 05:32:01 +0000
922+++ loco_directory/templates/teams/team_detail.html 2016-08-05 03:04:29 +0000
923@@ -4,12 +4,12 @@
924 {% block page_name %}{% trans team.name %}{% endblock %}
925
926 {% block sub_nav_links %}
927- <li><a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
928+ <li><a class="sub-nav-item" href="{% url "team-list" %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
929 {% if is_member %}{% else %}<li><a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join This Team!" %}</a></li>{% endif %}
930- {% if is_admin %}<li><a class="sub-nav-item" href="{% url team-edit team.lp_name %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
931- {% if is_admin and not team.active %}<li><a class="sub-nav-item" href="{% url select-other-team team.lp_name %}" title="{% trans "Merge with another team" %}">{% trans "Merge team" %}</a></li>{% endif %}
932- {% if is_member %}<li><a class="sub-nav-item" href="{% url team-event-new team.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a></li>{% endif %}
933- {% if is_member %}<li><a class="sub-nav-item" href="{% url team-meeting-new team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a></li>{% endif %}
934+ {% if is_admin %}<li><a class="sub-nav-item" href="{% url "team-edit" team.lp_name %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
935+ {% if is_admin and not team.active %}<li><a class="sub-nav-item" href="{% url "select-other-team" team.lp_name %}" title="{% trans "Merge with another team" %}">{% trans "Merge team" %}</a></li>{% endif %}
936+ {% if is_member %}<li><a class="sub-nav-item" href="{% url "team-event-new" team.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a></li>{% endif %}
937+ {% if is_member %}<li><a class="sub-nav-item" href="{% url "team-meeting-new" team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a></li>{% endif %}
938 {% endblock %}
939
940
941@@ -170,22 +170,22 @@
942 <h3 class="title">{% trans "Upcoming Events" %}</h3>
943 <div class="team-actions">
944 <span>
945- <a href="{% url team-event-list team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
946- </span>
947- <span>
948- <a href="{% url team-meeting-list team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
949- </span>
950- <span>
951- <a href="{% url team-event-history team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
952- </span>
953- <span>
954- <a href="{% url team-meeting-history team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
955+ <a href="{% url "team-event-list" team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
956+ </span>
957+ <span>
958+ <a href="{% url "team-meeting-list" team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
959+ </span>
960+ <span>
961+ <a href="{% url "team-event-history" team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
962+ </span>
963+ <span>
964+ <a href="{% url "team-meeting-history" team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
965 </span>
966 <span>
967 <a class="pictogram rss action" href="/feeds/teams/{{ team.lp_name }}/" title="{% trans "RSS Feed" %}"></a>
968 </span>
969 <span>
970- <a class="pictogram ical action" href="{% url team-calendar team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
971+ <a class="pictogram ical action" href="{% url "team-calendar" team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
972 </span>
973 </div>
974 </div>
975@@ -219,7 +219,7 @@
976 </h4>
977 <div class="blog-entry-author">
978 {% if article.source.user %}
979- <a class="user" href="{% url profile-detail article.source.user.user.username %}">{{ article.source.user }}</a>
980+ <a class="user" href="{% url "profile-detail" article.source.user.user.username %}">{{ article.source.user }}</a>
981 {% endif %}
982 </div>
983 <div class="blog-entry-text">
984@@ -262,12 +262,12 @@
985 <div class="team-admins">
986 {% for admin in team.admin_profiles.all %}
987 {% ifequal team.owner admin.user.username %}
988- <a href="{% url profile-detail admin.user.username %}">
989+ <a href="{% url "profile-detail" admin.user.username %}">
990 <img alt="" class="photo fn" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot">
991 <p>{{ admin.realname }}</p>
992 </a>
993 {% else %}
994- <a href="{% url profile-detail admin.user.username %}">
995+ <a href="{% url "profile-detail" admin.user.username %}">
996 <img alt="{{ admin.realname }}" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
997 <p>{{ admin.realname }}</p>
998 </a>
999@@ -278,7 +278,7 @@
1000 <div class="team-admins">
1001 {% if team.contact_profiles.all %}
1002 {% for contact in team.contact_profiles.all %}
1003- <a href="{% url profile-detail contact.user.username %}">
1004+ <a href="{% url "profile-detail" contact.user.username %}">
1005 <img alt="{{ contact.realname }}" src="{% if contact.mugshot %}{{ contact.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
1006 <p>{{ contact.realname }}</p>
1007 </a>
1008
1009=== modified file 'loco_directory/templates/teams/team_event_history.html'
1010--- loco_directory/templates/teams/team_event_history.html 2013-02-10 15:06:06 +0000
1011+++ loco_directory/templates/teams/team_event_history.html 2016-08-05 03:04:29 +0000
1012@@ -4,12 +4,12 @@
1013 {% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events History{% endblocktrans %}{% endblock %}
1014
1015 {% block sub_nav_links %}
1016- <li><a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
1017+ <li><a class="sub-nav-item" href="{% url "team-list" %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
1018 {% if is_member %}{% else %}<li><a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join This Team!" %}</a></li>{% endif %}
1019- {% if is_admin %}<li><a class="sub-nav-item" href="{% url team-edit team.lp_name %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
1020- {% if is_admin and not team.active %}<li><a class="sub-nav-item" href="{% url select-other-team team.lp_name %}" title="{% trans "Merge with another team" %}">{% trans "Merge team" %}</a></li>{% endif %}
1021- {% if is_member %}<li><a class="sub-nav-item" href="{% url team-event-new team.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a></li>{% endif %}
1022- {% if is_member %}<li><a class="sub-nav-item" href="{% url team-meeting-new team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a></li>{% endif %}
1023+ {% if is_admin %}<li><a class="sub-nav-item" href="{% url "team-edit" team.lp_name %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
1024+ {% if is_admin and not team.active %}<li><a class="sub-nav-item" href="{% url "select-other-team" team.lp_name %}" title="{% trans "Merge with another team" %}">{% trans "Merge team" %}</a></li>{% endif %}
1025+ {% if is_member %}<li><a class="sub-nav-item" href="{% url "team-event-new" team.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a></li>{% endif %}
1026+ {% if is_member %}<li><a class="sub-nav-item" href="{% url "team-meeting-new" team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a></li>{% endif %}
1027 {% endblock %}
1028
1029
1030@@ -125,22 +125,22 @@
1031 <h3 class="title">{% trans "Past Events" %}</h3>
1032 <div class="team-actions">
1033 <span>
1034- <a href="{% url team-event-list team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
1035- </span>
1036- <span>
1037- <a href="{% url team-meeting-list team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
1038- </span>
1039- <span>
1040- <a href="{% url team-event-history team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
1041- </span>
1042- <span>
1043- <a href="{% url team-meeting-history team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
1044+ <a href="{% url "team-event-list" team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
1045+ </span>
1046+ <span>
1047+ <a href="{% url "team-meeting-list" team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
1048+ </span>
1049+ <span>
1050+ <a href="{% url "team-event-history" team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
1051+ </span>
1052+ <span>
1053+ <a href="{% url "team-meeting-history" team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
1054 </span>
1055 <span>
1056 <a class="pictogram rss action" href="/feeds/teams/{{ team.lp_name }}/" title="{% trans "RSS Feed" %}"></a>
1057 </span>
1058 <span>
1059- <a class="pictogram ical action" href="{% url team-calendar team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
1060+ <a class="pictogram ical action" href="{% url "team-calendar" team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
1061 </span>
1062 </div>
1063 </div>
1064@@ -187,12 +187,12 @@
1065 <div class="team-admins">
1066 {% for admin in team.admin_profiles.all %}
1067 {% ifequal team.owner admin.user.username %}
1068- <a href="{% url profile-detail admin.user.username %}">
1069+ <a href="{% url "profile-detail" admin.user.username %}">
1070 <img alt="" class="photo fn" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot">
1071 <p>{{ admin.realname }}</p>
1072 </a>
1073 {% else %}
1074- <a href="{% url profile-detail admin.user.username %}">
1075+ <a href="{% url "profile-detail" admin.user.username %}">
1076 <img alt="{{ admin.realname }}" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
1077 <p>{{ admin.realname }}</p>
1078 </a>
1079@@ -203,7 +203,7 @@
1080 <div class="team-admins">
1081 {% if team.contact_profiles.all %}
1082 {% for contact in team.contact_profiles.all %}
1083- <a href="{% url profile-detail contact.user.username %}">
1084+ <a href="{% url "profile-detail" contact.user.username %}">
1085 <img alt="{{ contact.realname }}" src="{% if contact.mugshot %}{{ contact.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
1086 <p>{{ contact.realname }}</p>
1087 </a>
1088
1089=== modified file 'loco_directory/templates/teams/team_event_list.html'
1090--- loco_directory/templates/teams/team_event_list.html 2012-11-26 23:07:59 +0000
1091+++ loco_directory/templates/teams/team_event_list.html 2016-08-05 03:04:29 +0000
1092@@ -4,10 +4,10 @@
1093 {% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %}{% endblock %}
1094
1095 {% block sub_nav_links %}
1096-<li><a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
1097-<li><a class="sub-nav-item" href="{% url team-event-history team_object.lp_name %}">{% trans "Past Events" %}</a></li>
1098+<li><a class="sub-nav-item" href="{% url "team-detail" team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
1099+<li><a class="sub-nav-item" href="{% url "team-event-history" team_object.lp_name %}">{% trans "Past Events" %}</a></li>
1100 <li><a class="sub-nav-item" href="/feeds/events/{{ team_object.lp_name }}" title="{% trans "Team Events (RSS)" %}">{% trans "Team Events (RSS)" %}</a></li>
1101-{% if is_member %}<li><a class="sub-nav-item" href="{% url team-event-new team_object.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a></li>{% endif %}
1102+{% if is_member %}<li><a class="sub-nav-item" href="{% url "team-event-new" team_object.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a></li>{% endif %}
1103 {% endblock %}
1104
1105
1106@@ -19,7 +19,7 @@
1107 <div class="row">
1108 <section class="span-12">
1109 <h1>{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %}
1110-<a class="teams_event_ical" href="{% url team-event-list-ical team_object.lp_name %}">
1111+<a class="teams_event_ical" href="{% url "team-event-list-ical" team_object.lp_name %}">
1112 <img src="/media/images/ical32.png" title="ical"/></a></h1>
1113
1114 {% if team_event_list %}
1115
1116=== modified file 'loco_directory/templates/teams/team_meeting_history.html'
1117--- loco_directory/templates/teams/team_meeting_history.html 2013-02-10 15:06:06 +0000
1118+++ loco_directory/templates/teams/team_meeting_history.html 2016-08-05 03:04:29 +0000
1119@@ -4,12 +4,12 @@
1120 {% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Meetings History{% endblocktrans %}{% endblock %}
1121
1122 {% block sub_nav_links %}
1123- <li><a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
1124+ <li><a class="sub-nav-item" href="{% url "team-list" %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
1125 {% if is_member %}{% else %}<li><a class="sub-nav-item" href="https://launchpad.net/~{{ team.lp_name }}/+join">{% trans "Join This Team!" %}</a></li>{% endif %}
1126 {% if is_admin %}<li><a class="sub-nav-item" href="{% url team-edit team.lp_name %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
1127- {% if is_admin and not team.active %}<li><a class="sub-nav-item" href="{% url select-other-team team.lp_name %}" title="{% trans "Merge with another team" %}">{% trans "Merge team" %}</a></li>{% endif %}
1128- {% if is_member %}<li><a class="sub-nav-item" href="{% url team-event-new team.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a></li>{% endif %}
1129- {% if is_member %}<li><a class="sub-nav-item" href="{% url team-meeting-new team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a></li>{% endif %}
1130+ {% if is_admin and not team.active %}<li><a class="sub-nav-item" href="{% url "select-other-team" team.lp_name %}" title="{% trans "Merge with another team" %}">{% trans "Merge team" %}</a></li>{% endif %}
1131+ {% if is_member %}<li><a class="sub-nav-item" href="{% url "team-event-new" team.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a></li>{% endif %}
1132+ {% if is_member %}<li><a class="sub-nav-item" href="{% url "team-meeting-new" team.lp_name %}" title="{% trans "Add New Meeting" %}">{% trans "Add New Meeting" %}</a></li>{% endif %}
1133 {% endblock %}
1134
1135 {% block extrahead %}{{ block.super }}
1136@@ -124,22 +124,22 @@
1137 <h3 class="title">{% trans "Past Meetings" %}</h3>
1138 <div class="team-actions">
1139 <span>
1140- <a href="{% url team-event-list team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
1141- </span>
1142- <span>
1143- <a href="{% url team-meeting-list team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
1144- </span>
1145- <span>
1146- <a href="{% url team-event-history team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
1147- </span>
1148- <span>
1149- <a href="{% url team-meeting-history team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
1150+ <a href="{% url "team-event-list" team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
1151+ </span>
1152+ <span>
1153+ <a href="{% url "team-meeting-list" team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
1154+ </span>
1155+ <span>
1156+ <a href="{% url "team-event-history" team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
1157+ </span>
1158+ <span>
1159+ <a href="{% url "team-meeting-history" team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
1160 </span>
1161 <span>
1162 <a class="pictogram rss action" href="/feeds/teams/{{ team.lp_name }}/" title="{% trans "RSS Feed" %}"></a>
1163 </span>
1164 <span>
1165- <a class="pictogram ical action" href="{% url team-calendar team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
1166+ <a class="pictogram ical action" href="{% url "team-calendar" team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
1167 </span>
1168 </div>
1169 </div>
1170@@ -186,12 +186,12 @@
1171 <div class="team-admins">
1172 {% for admin in team.admin_profiles.all %}
1173 {% ifequal team.owner admin.user.username %}
1174- <a href="{% url profile-detail admin.user.username %}">
1175+ <a href="{% url "profile-detail" admin.user.username %}">
1176 <img alt="" class="photo fn" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot">
1177 <p>{{ admin.realname }}</p>
1178 </a>
1179 {% else %}
1180- <a href="{% url profile-detail admin.user.username %}">
1181+ <a href="{% url "profile-detail" admin.user.username %}">
1182 <img alt="{{ admin.realname }}" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
1183 <p>{{ admin.realname }}</p>
1184 </a>
1185@@ -202,7 +202,7 @@
1186 <div class="team-admins">
1187 {% if team.contact_profiles.all %}
1188 {% for contact in team.contact_profiles.all %}
1189- <a href="{% url profile-detail contact.user.username %}">
1190+ <a href="{% url "profile-detail" contact.user.username %}">
1191 <img alt="{{ contact.realname }}" src="{% if contact.mugshot %}{{ contact.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
1192 <p>{{ contact.realname }}</p>
1193 </a>
1194
1195=== modified file 'loco_directory/templates/teams/team_meeting_list.html'
1196--- loco_directory/templates/teams/team_meeting_list.html 2012-11-26 23:07:59 +0000
1197+++ loco_directory/templates/teams/team_meeting_list.html 2016-08-05 03:04:29 +0000
1198@@ -4,8 +4,8 @@
1199 {% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Meeting List{% endblocktrans %}{% endblock %}
1200
1201 {% block sub_nav_links %}
1202-<li><a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
1203-<li><a class="sub-nav-item" href="{% url team-meeting-history team_object.lp_name %}">{% trans "Past Meetings" %}</a></li>
1204+<li><a class="sub-nav-item" href="{% url "team-detail" team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
1205+<li><a class="sub-nav-item" href="{% url "team-meeting-history" team_object.lp_name %}">{% trans "Past Meetings" %}</a></li>
1206 <li><a class="sub-nav-item" href="/feeds/meetings/{{ team_object.lp_name }}" title="{% trans "Team Meetings (RSS)" %}">{% trans "Team Meetings (RSS)" %}</a></li>
1207 {% endblock %}
1208
1209@@ -17,7 +17,7 @@
1210 <div class="row">
1211 <section class="span-12">
1212 <h1>{% blocktrans with team_object.name as teamname %}{{teamname}} Meeting List{% endblocktrans %}
1213-<a class="teams_meeting_ical" href="{% url team-meeting-list-ical team_object.lp_name %}">
1214+<a class="teams_meeting_ical" href="{% url "team-meeting-list-ical" team_object.lp_name %}">
1215 <img src="/media/images/ical32.png" title="ical"/></a></h1>
1216
1217 {% if team_meeting_list %}
1218
1219=== modified file 'loco_directory/templates/teams/team_reapprovals.html'
1220--- loco_directory/templates/teams/team_reapprovals.html 2013-11-17 05:32:01 +0000
1221+++ loco_directory/templates/teams/team_reapprovals.html 2016-08-05 03:04:29 +0000
1222@@ -44,7 +44,7 @@
1223 <td width="100%" valign="top" class="col2_container">
1224 <ul id="main-content">
1225 {% for team in next_teams %}
1226- <li class="approved"><a href="{% url team-detail team.lp_name %}">{{ team.name }}</a>: {{ team.expires_date }}</li>
1227+ <li class="approved"><a href="{% url "team-detail" team.lp_name %}">{{ team.name }}</a>: {{ team.expires_date }}</li>
1228 {% endfor %}
1229 </ul>
1230 </td>
1231@@ -60,7 +60,7 @@
1232 <td width="100%" valign="top" class="col2_container">
1233 <ul id="main-content">
1234 {% for team in later_teams %}
1235- <li class="approved"><a href="{% url team-detail team.lp_name %}">{{ team.name }}</a>: {{ team.expires_date }}</li>
1236+ <li class="approved"><a href="{% url "team-detail" team.lp_name %}">{{ team.name }}</a>: {{ team.expires_date }}</li>
1237 {% endfor %}
1238 </ul>
1239 </td>
1240
1241=== modified file 'loco_directory/templates/venues/venue_detail.html'
1242--- loco_directory/templates/venues/venue_detail.html 2013-05-11 14:07:21 +0000
1243+++ loco_directory/templates/venues/venue_detail.html 2016-08-05 03:04:29 +0000
1244@@ -30,11 +30,11 @@
1245 <section class="span-6">
1246
1247 {% block sub_nav_links %}
1248-<li><a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Back to Venues List" %}</a></li>
1249+<li><a class="sub-nav-item" href="{% url "venue-list" %}" >{% trans "Back to Venues List" %}</a></li>
1250 {% if venue.country %}
1251-<li><a class="sub-nav-item" href="{% url venue-update venue.country.slug venue.id %}">{% trans "Edit Venue Details" %}</a></li>
1252+<li><a class="sub-nav-item" href="{% url "venue-update" venue.country.slug venue.id %}">{% trans "Edit Venue Details" %}</a></li>
1253 {% else %}
1254-<li><a class="sub-nav-item" href="{% url venue-update 'no_country' venue.id %}">{% trans "Edit Venue Details" %}</a></li>
1255+<li><a class="sub-nav-item" href="{% url "venue-update" 'no_country' venue.id %}">{% trans "Edit Venue Details" %}</a></li>
1256 {% endif %}
1257 {% endblock %}
1258
1259
1260=== modified file 'loco_directory/urls.py'
1261--- loco_directory/urls.py 2013-10-30 00:31:14 +0000
1262+++ loco_directory/urls.py 2016-08-05 03:04:29 +0000
1263@@ -1,4 +1,4 @@
1264-from django.conf.urls.defaults import *
1265+from django.conf.urls import *
1266 from django.conf import settings
1267 from django.contrib import admin
1268 import ubuntu_website
1269@@ -42,7 +42,7 @@
1270 url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'),
1271 url(r'^services/', include('services.urls')),
1272 url(r'^search/', 'common.views.site_search', name='site_search'),
1273- url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}, name='feed_view'),
1274+ url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.Feed', {'feed_dict': feeds}, name='feed_view'),
1275 url(r'^', include('userprofiles.urls')),
1276 )
1277
1278
1279=== modified file 'loco_directory/userprofiles/models.py'
1280--- loco_directory/userprofiles/models.py 2012-12-09 15:08:12 +0000
1281+++ loco_directory/userprofiles/models.py 2016-08-05 03:04:29 +0000
1282@@ -23,9 +23,9 @@
1283 user = models.OneToOneField(auth_models.User)
1284 realname = models.CharField(_("Real Name"), max_length=150, blank=True)
1285 tz = models.CharField(verbose_name=_('Timezone'), max_length=32, default='UTC')
1286- mugshot = models.URLField(verbose_name=_("Mugshot"), max_length=150, blank=True, verify_exists=False, null=True)
1287+ mugshot = models.URLField(verbose_name=_("Mugshot"), max_length=150, blank=True, null=True)
1288
1289- blog = models.URLField(verbose_name=_('Blog URL'), blank=True, null=True, verify_exists=False)
1290+ blog = models.URLField(verbose_name=_('Blog URL'), blank=True, null=True)
1291 twitter = models.CharField(verbose_name=_('Twitter ID'), max_length=32, blank=True, null=True)
1292 identica = models.CharField(verbose_name=_('Identi.ca ID'), max_length=32, blank=True, null=True)
1293 picasa = models.CharField(verbose_name=_('Picasa ID'), max_length=32, blank=True, null=True)
1294
1295=== modified file 'loco_directory/userprofiles/urls.py'
1296--- loco_directory/userprofiles/urls.py 2013-03-11 21:49:37 +0000
1297+++ loco_directory/userprofiles/urls.py 2016-08-05 03:04:29 +0000
1298@@ -1,5 +1,5 @@
1299 # -*- coding: utf-8 -*-
1300-from django.conf.urls.defaults import *
1301+from django.conf.urls import *
1302
1303 urlpatterns = patterns('userprofiles.views',
1304 url(r'^(?P<username>[-+.\w]+)/$', 'profile_detail', name='profile-detail'),
1305
1306=== modified file 'loco_directory/venues/models.py'
1307--- loco_directory/venues/models.py 2013-02-21 20:31:16 +0000
1308+++ loco_directory/venues/models.py 2016-08-05 03:04:29 +0000
1309@@ -33,7 +33,7 @@
1310 latitude = models.FloatField(help_text=_('Latitude in Degrees North'), null=True, blank=True)
1311 tz = models.CharField(max_length=32, verbose_name=_('Timezone'), default='UTC', choices=[(tz, tz) for tz in pytz.all_timezones], blank=False, null=False)
1312 venue_url = models.URLField(help_text=_('URL for the Venue Homepage'), verbose_name=_('URL of the Venue'),
1313- max_length=200, verify_exists=False, blank=True, null=True)
1314+ max_length=200, blank=True, null=True)
1315 comment = models.TextField(help_text=_('Comment about the Venue'), blank=True, null=True)
1316
1317 objects = VenueManager()
1318
1319=== modified file 'loco_directory/venues/urls.py'
1320--- loco_directory/venues/urls.py 2013-02-21 20:31:16 +0000
1321+++ loco_directory/venues/urls.py 2016-08-05 03:04:29 +0000
1322@@ -1,4 +1,4 @@
1323-from django.conf.urls.defaults import url, patterns
1324+from django.conf.urls import url, patterns
1325
1326 urlpatterns = patterns('',
1327 #venues
1328
1329=== modified file 'requirements/dev.txt'
1330--- requirements/dev.txt 2014-05-15 22:50:21 +0000
1331+++ requirements/dev.txt 2016-08-05 03:04:29 +0000
1332@@ -6,14 +6,14 @@
1333 # include patches applied by the package maintainers.
1334 #
1335
1336-Django==1.3.3
1337+Django==1.5
1338 South==0.7.3
1339-distribute==0.6.10
1340-django-openid-auth==0.4
1341+setuptools==25.1.4
1342+django-openid-auth==0.5
1343 python-openid==2.2.4
1344 pytz==2010b
1345 python-dateutil==1.5
1346-vobject==0.8.1c
1347+vobject==0.9.2
1348 simplejson==2.0.9
1349 feedparser
1350 python-gettext
1351
1352=== modified file 'requirements/prod.txt'
1353--- requirements/prod.txt 2016-02-12 00:54:37 +0000
1354+++ requirements/prod.txt 2016-08-05 03:04:29 +0000
1355@@ -6,16 +6,16 @@
1356 # include patches applied by the package maintainers.
1357 #
1358
1359-Django==1.3.3
1360+Django==1.5
1361 South==0.7.3
1362-distribute==0.6.10
1363-django-openid-auth==0.4
1364+setuptools==25.1.4
1365+django-openid-auth==0.5
1366 # pyscopg is only needed for production like environments
1367 # psycopg2==2.0.13
1368 python-openid==2.2.4
1369 pytz==2010b
1370 python-dateutil==1.5
1371-vobject==0.8.2
1372+vobject==0.9.2
1373 simplejson==2.0.9
1374 feedparser
1375 python-gettext

Subscribers

People subscribed via source and target branches