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

[Lucy Llewellyn]

Update to django 1.5

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

Unmerged revisions

686. By Lucy Llewellyn on 2016-08-05

Update to django 1.5

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

685. By Lucy Llewellyn on 2016-08-05

update to django 1.4

=== modified file 'loco_directory/articles/models.py'
--- loco_directory/articles/models.py	2012-12-25 22:00:46 +0000
+++ loco_directory/articles/models.py	2016-08-05 03:04:29 +0000
@@ -37,7 +37,7 @@
 class Feed(models.Model):
     user = models.ForeignKey(UserProfile, blank=True, null=True)
     team = models.ForeignKey(Team, blank=True, null=True)
-    url = models.URLField(verify_exists=False)
+    url = models.URLField()
     title = models.CharField(max_length=128, null=True, blank=True)
     last_updated = models.DateTimeField(null=False, blank=False, default=datetime.datetime(1970, 1, 1))
     active = models.BooleanField(default=True)

=== modified file 'loco_directory/events/feeds.py'
--- loco_directory/events/feeds.py	2013-03-31 01:15:06 +0000
+++ loco_directory/events/feeds.py	2016-08-05 03:04:29 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.core.urlresolvers import reverse
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.translation import ugettext as _
 from django.utils import translation
 from django.template import loader, Context

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2014-04-07 12:45:02 +0000
+++ loco_directory/events/models.py	2016-08-05 03:04:29 +0000
@@ -33,7 +33,7 @@
     date_begin = models.DateTimeField(help_text=_('Local date and time that the event starts'), verbose_name=_('Local Start Time'), db_index=True)
     date_end = models.DateTimeField(help_text=_('Local date and time that the event ends'), verbose_name=_('Local End Time'), db_index=True)
     description = models.TextField(help_text=_('Description of the Event'), blank=True, null=True)
-    announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL for the announcement'), max_length=200, verify_exists=False, blank=True, null=True)
+    announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL for the announcement'), max_length=200, blank=True, null=True)
     date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now, db_index=True)
 
     def __unicode__(self):
@@ -94,7 +94,7 @@
     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)
     venue = models.ForeignKey(Venue, help_text=_('Venue for the Event'), verbose_name=_('Event Venue'), blank=True, null=True)
     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)
-    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)
+    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)
 
     objects = TeamEventManager()
 

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2013-03-11 21:49:37 +0000
+++ loco_directory/events/urls.py	2016-08-05 03:04:29 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('',
     #all events

=== modified file 'loco_directory/local_settings.py.sample'
--- loco_directory/local_settings.py.sample	2012-12-26 16:16:17 +0000
+++ loco_directory/local_settings.py.sample	2016-08-05 03:04:29 +0000
@@ -9,7 +9,7 @@
     },
 }
 
-SECRET_KEY = ''
+SECRET_KEY = 'abc123'
 
 DEBUG_USERS = ('')
 

=== modified file 'loco_directory/manage.py'
--- loco_directory/manage.py	2011-06-29 18:35:40 +0000
+++ loco_directory/manage.py	2016-08-05 03:04:29 +0000
@@ -1,11 +1,9 @@
 #!/usr/bin/env python
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    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__)
-    sys.exit(1)
+import os, sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
\ No newline at end of file

=== modified file 'loco_directory/meetings/feeds.py'
--- loco_directory/meetings/feeds.py	2013-03-31 01:10:52 +0000
+++ loco_directory/meetings/feeds.py	2016-08-05 03:04:29 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.core.urlresolvers import reverse
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils import translation
 from django.template import loader, Context
 

=== modified file 'loco_directory/meetings/models.py'
--- loco_directory/meetings/models.py	2013-10-25 23:03:37 +0000
+++ loco_directory/meetings/models.py	2016-08-05 03:04:29 +0000
@@ -17,8 +17,8 @@
     date_begin = models.DateTimeField(help_text=_('Local date and time that the meeting starts'), verbose_name=_('Begins'), db_index=True)
     date_end = models.DateTimeField(help_text=_('Local date and time that the meeting ends'), verbose_name=_('Ends'), db_index=True)
     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)
-    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)
-    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)
+    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)
+    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)
     date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now, db_index=True)
     chair = models.ForeignKey(UserProfile, verbose_name=_('Meeting Chair'), blank=True, null=True)
 
@@ -167,7 +167,7 @@
     description = models.TextField(verbose_name=_('Description'), help_text=_('detailed description of this agenda item'), blank=True, null=True)
     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)
     order = models.PositiveIntegerField(verbose_name=_('Order'), help_text=_('index number of where this agenda item falls in the agenda'), default=1)
-    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)
+    log = models.URLField(verbose_name=_('Log URL'), max_length=200, help_text=_('URL to this agenda item\'s discussion'), blank=True, null=True)
 
     objects = AgendaItemManager()
 

=== modified file 'loco_directory/meetings/urls.py'
--- loco_directory/meetings/urls.py	2013-04-14 23:00:20 +0000
+++ loco_directory/meetings/urls.py	2016-08-05 03:04:29 +0000
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('',
     #all meetings

=== modified file 'loco_directory/services/urls.py'
--- loco_directory/services/urls.py	2011-01-22 16:05:24 +0000
+++ loco_directory/services/urls.py	2016-08-05 03:04:29 +0000
@@ -3,7 +3,7 @@
 
 @author: mhall
 '''
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('',
     #venues

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2013-03-31 01:10:52 +0000
+++ loco_directory/settings.py	2016-08-05 03:04:29 +0000
@@ -128,7 +128,7 @@
     "common.context_processors.languages_menu",
 )
 
-ROOT_URLCONF = 'loco_directory.urls'
+ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".

=== modified file 'loco_directory/teams/feeds.py'
--- loco_directory/teams/feeds.py	2013-03-31 01:10:52 +0000
+++ loco_directory/teams/feeds.py	2016-08-05 03:04:29 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.translation import ugettext as _
 from django.utils import translation
 

=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py	2014-05-17 22:18:32 +0000
+++ loco_directory/teams/models.py	2016-08-05 03:04:29 +0000
@@ -95,10 +95,10 @@
     countries = models.ManyToManyField(Country)
     spr = models.CharField(_("State/Province/Region"), max_length=50, null=True, blank=True)
     city = models.CharField(_("City"), max_length=50, null=True, blank=True)
-    wiki_url = models.URLField(_("Ubuntu Wiki Page"), verify_exists=False, null=True, blank=True)
-    web_url = models.URLField(_("Website"), verify_exists=False, null=True, blank=True)
-    ml_url = models.URLField(_("Mailing List URL"), verify_exists=False, null=True, blank=True)
-    forum_url = models.URLField(_("Forums URL"), verify_exists=False, null=True, blank=True)
+    wiki_url = models.URLField(_("Ubuntu Wiki Page"), null=True, blank=True)
+    web_url = models.URLField(_("Website"), null=True, blank=True)
+    ml_url = models.URLField(_("Mailing List URL"), null=True, blank=True)
+    forum_url = models.URLField(_("Forums URL"), null=True, blank=True)
     email = models.EmailField(_("Email Address"), null=True, blank=True)
     irc_chan = models.CharField(_("IRC Channel"),
                                 max_length=25, null=True, blank=True,
@@ -112,7 +112,7 @@
     owner_profile = models.ForeignKey(UserProfile, related_name='owner', null=True)
     admin_profiles = models.ManyToManyField(UserProfile, related_name='admins')
     contact_profiles = models.ManyToManyField(UserProfile, related_name='contacts')
-    mugshot_url = models.URLField(_("Team Logo"), verify_exists=False, null=True, blank=True)
+    mugshot_url = models.URLField(_("Team Logo"), null=True, blank=True)
     languages = models.ManyToManyField(Language)
     flickr_id = models.CharField(_("Flickr User/Group ID"), max_length=20, null=True, blank=True,
                                 help_text=_("To get your Flickr user id go to http://idgettr.com. Ex. 47353004@N03"))

=== modified file 'loco_directory/teams/urls.py'
--- loco_directory/teams/urls.py	2013-02-19 22:23:46 +0000
+++ loco_directory/teams/urls.py	2016-08-05 03:04:29 +0000
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('',
     url(r'^$', 'teams.views.team_list', name='team-list'),

=== modified file 'loco_directory/templates/404.html'
--- loco_directory/templates/404.html	2012-05-26 12:20:08 +0000
+++ loco_directory/templates/404.html	2016-08-05 03:04:29 +0000
@@ -10,9 +10,9 @@
 
 <p>
 <ul>
-        <li><a href="{% url team-list %}">{% trans "You can browse the full list of teams." %}</a></li>
-        <li><a href="{% url event-list %}">{% trans "You can browse the full list of events." %}</a></li>
-        <li><a href="{% url venue-list %}">{% trans "You can browse the full list of venues." %}</a></li>
+        <li><a href="{% url "team-list" %}">{% trans "You can browse the full list of teams." %}</a></li>
+        <li><a href="{% url "event-list" %}">{% trans "You can browse the full list of events." %}</a></li>
+        <li><a href="{% url "venue-list" %}">{% trans "You can browse the full list of venues." %}</a></li>
 </ul>
 </p>
 <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>

=== modified file 'loco_directory/templates/about_loco.html'
--- loco_directory/templates/about_loco.html	2012-05-26 12:20:08 +0000
+++ loco_directory/templates/about_loco.html	2016-08-05 03:04:29 +0000
@@ -4,7 +4,7 @@
 {% block page_name %}{% trans "About Local Community (LoCo) Teams" %}{% endblock %}
 
 {% block sub_nav_links %}
-<li><a class="sub-nav-item" href="{% url loco_setup %}">{% trans "Setting up a new Local Community (LoCo) Team" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "loco_setup" %}">{% trans "Setting up a new Local Community (LoCo) Team" %}</a></li>
 {% endblock %}
 
 {% block content %}
@@ -12,7 +12,7 @@
 <div class="row">
     <section class="span-12">
     <h2>{% trans "About Local Community (LoCo) Teams" %}</h2>
-    <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>
+    <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>
 </section></div>
 
 <div class="row">
@@ -22,7 +22,7 @@
         {% with '</a>' as link_end %}
         {% with '<a title="' as start_link_title %}
         {% with '" href="' as start_link_href %}
-        {% url team-list as url_team_list %}
+        {% url "team-list" as url_team_list %}
         {% with '">' as end_link_href %}
         {% with 'https://wiki.ubuntu.com/LoCoTeamHowto' as url_locohowto %}
 	    <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>

=== modified file 'loco_directory/templates/articles/article_detail.html'
--- loco_directory/templates/articles/article_detail.html	2012-12-13 23:11:46 +0000
+++ loco_directory/templates/articles/article_detail.html	2016-08-05 03:04:29 +0000
@@ -28,11 +28,11 @@
                     <h4 class="blog-entry-title"><a href="{{ article.link }}" target="_blank" title="{{ article.title }}">{{ article.title }}</a></h4>
                     <div class="blog-entry-author">
                         {% if article.source.team %}
-                            <a class="team" href="{% url team-detail article.source.team %}" target="_blank">{{ article.source.team.name }}</a>
+                            <a class="team" href="{% url "team-detail" article.source.team %}" target="_blank">{{ article.source.team.name }}</a>
                         {% endif %}
                         {% if article.source.user %}
                             {% if article.source.team %}, {% endif %}
-                            <a class="user" href="{% url profile-detail article.source.user.user.username %}" target="_blank">{{ article.source.user }}</a>
+                            <a class="user" href="{% url "profile-detail" article.source.user.user.username %}" target="_blank">{{ article.source.user }}</a>
                         {% endif %}
                     </div>
                     <div class="share">

=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2014-01-12 21:29:40 +0000
+++ loco_directory/templates/base.html	2016-08-05 03:04:29 +0000
@@ -26,13 +26,13 @@
 
 {% block top_nav_login_links %}
     {% if user.is_authenticated %}
-        {% trans "Welcome" %} <a class="top-login-item" href="{% url profile-detail user.username %}">{{ user.username }}</a>
+        {% trans "Welcome" %} <a class="top-login-item" href="{% url "profile-detail" user.username %}">{{ user.username }}</a>
         <span class="top-login-separator">|</span>
         {% if user.is_staff %}
             <a class="top-login-item" href="/admin" title="Admin">{% trans "Admin" %}</a>
             <span class="top-login-separator">|</span>
         {% endif %}
-        <a class="top-login-item" href="{% url logout %}" title="{% trans "Log Out" %}: {{ user.username }}">{% trans "Log Out" %}</a>
+        <a class="top-login-item" href="{% url "logout" %}" title="{% trans "Log Out" %}: {{ user.username }}">{% trans "Log Out" %}</a>
     {% else %}
         <a class="top-login-item" href="/openid/login?next={{ login_next }}" title="{% trans "Log In" %}">{% trans "Log In" %}</a>
     {% endif %}
@@ -40,12 +40,12 @@
 
 {% block main_nav_links %}
 <ul class="clearfix">
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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>
 </ul>
 {% endblock %}
 
@@ -53,7 +53,7 @@
 {% endblock %}
 
 {% block search_box %}
-<form id="site_search_form" action="{% url common.views.site_search %}" method="get">{% csrf_token %}
+<form id="site_search_form" action="{% url "common.views.site_search" %}" method="get">{% csrf_token %}
         {{ search_form.q }}
         <input type="image" src="/media/img/search.png" title="{% trans "Search" %}" alt="{% trans "Search" %}" />
 </form>

=== modified file 'loco_directory/templates/events/event_history_list.html'
--- loco_directory/templates/events/event_history_list.html	2012-06-15 21:30:31 +0000
+++ loco_directory/templates/events/event_history_list.html	2016-08-05 03:04:29 +0000
@@ -9,7 +9,7 @@
 {% block page_name %}{% trans "Ubuntu LoCo Events History" %}{% endblock %}
 
 {% block sub_nav_links %}
-<li><a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "event-list" %}">{% trans "Back to Events List" %}</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/events/event_list.html'
--- loco_directory/templates/events/event_list.html	2012-06-04 22:14:50 +0000
+++ loco_directory/templates/events/event_list.html	2016-08-05 03:04:29 +0000
@@ -11,7 +11,7 @@
         <script type="text/javascript"> 
         //<![CDATA[
         $(function(){
-            $('#venue-map').showLocations({markers_url:'{% url team-event-locations %}',
+            $('#venue-map').showLocations({markers_url:'{% url "team-event-locations" %}',
                                            marker_icon: '{{ MEDIA_URL }}/img/marker.png'});
         });
         //]]>
@@ -19,12 +19,12 @@
 {% endblock %}
 
 {% block sub_nav_links %}
-<li><a class="sub-nav-item" title="{% trans "Show All Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a>
+<li><a class="sub-nav-item" title="{% trans "Show All Venues" %}" href="{% url "venue-list" %}">{% trans "Venues" %}</a>
 {% if user_is_on_lc %}
-<li><a class="sub-nav-item" href="{% url global-event-new %}">{% trans "Add Global Event" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "global-event-new" %}">{% trans "Add Global Event" %}</a></li>
 {% endif %}
-<li><a class="sub-nav-item" href="{% url team-event-select %}">{% trans "Add Team Event" %}</a></li>
-<li><a class="sub-nav-item" href="{% url event-history-list %}">{% trans "Past Events" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "team-event-select" %}">{% trans "Add Team Event" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "event-history-list" %}">{% trans "Past Events" %}</a></li>
 {% endblock %}
 
 {% block content %}
@@ -32,7 +32,7 @@
 <section class="span-6">
 <h2>{% trans "Ubuntu LoCo Global Events" %}
 {% if global_event_list %}
-<a class="global_event_ical" href="{% url global-event-list-ical %}">
+<a class="global_event_ical" href="{% url "global-event-list-ical" %}">
 <img src="{{MEDIA_URL}}images/ical.png" title="{% trans "Global Events as ical" %}"/></a></h2>
 
 <p>{% trans "Select a global event below to see more information about it:" %}</p>
@@ -52,7 +52,7 @@
 <section class="span-12">
 <h2>{% trans "Ubuntu LoCo Team Events" %}
 {% if team_event_list %}
-<a class="teams_event_ical" href="{% url teams-event-list-ical %}">
+<a class="teams_event_ical" href="{% url "teams-event-list-ical" %}">
 <img src="{{MEDIA_URL}}images/ical.png" title="{% trans "Team Events as ical" %}"/></a></h2>
 <p>{% trans "Select a team event below to see more information about it:" %}</p>
 

=== modified file 'loco_directory/templates/events/global_event_detail.html'
--- loco_directory/templates/events/global_event_detail.html	2012-12-22 23:22:32 +0000
+++ loco_directory/templates/events/global_event_detail.html	2016-08-05 03:04:29 +0000
@@ -27,7 +27,7 @@
         ]
     });
     $('#venue-map').showLocations({
-        markers_url:'{% url global-event-locations global_event_id=global_event.id %}',
+        markers_url:'{% url "global-event-locations" global_event_id=global_event.id %}',
         marker_icon: '{{ MEDIA_URL }}img/marker.png'});
     });
 //]]>
@@ -49,11 +49,11 @@
 {% endblock %}
 
 {% block sub_nav_links %}
-<li><a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a></li>
-<li><a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{ global_event.id }}">{% trans "Add Team Event" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "event-list" %}">{% trans "Back to Events List" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "team-event-select" %}?global_event_id={{ global_event.id }}">{% trans "Add Team Event" %}</a></li>
 {% if user_is_on_lc %}
-<li><a class="sub-nav-item" href="{% url global-event-update global_event.id %}">{% trans "Edit Details" %}</a></li>
-<li><a class="sub-nav-item" href="{% url global-event-delete global_event.id %}">{% trans "Delete Event" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "global-event-update" global_event.id %}">{% trans "Edit Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "global-event-delete" global_event.id %}">{% trans "Delete Event" %}</a></li>
 {% endif %}
 {% endblock %}
 

=== modified file 'loco_directory/templates/events/global_event_detail.inc.html'
--- loco_directory/templates/events/global_event_detail.inc.html	2012-12-22 23:22:32 +0000
+++ loco_directory/templates/events/global_event_detail.inc.html	2016-08-05 03:04:29 +0000
@@ -18,7 +18,7 @@
                     <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
                     <g:plusone size="medium"></g:plusone>
                     <a href="http://twitter.com/share" class="twitter-share-button" data-lang="en">Tweet</a>
-                    <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>
+                    <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>
                 </div>
 
                 <div>

=== modified file 'loco_directory/templates/events/global_jam_dashboard.html'
--- loco_directory/templates/events/global_jam_dashboard.html	2012-06-04 22:14:50 +0000
+++ loco_directory/templates/events/global_jam_dashboard.html	2016-08-05 03:04:29 +0000
@@ -84,11 +84,11 @@
 {% block title %}{% trans global_event_object.name %} | {% trans "Ubuntu LoCo Team Portal" %} {% endblock %}
 
 {% block sub_nav_links %}
-    <li><a class="sub-nav-item" href="{% url global-event-detail global_event_object.id %}">{% trans "Show Event Details" %}</a></li>
-    <li><a class="sub-nav-item" href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add Team Event" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url "global-event-detail" global_event_object.id %}">{% trans "Show Event Details" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url "team-event-select" %}?global_event_id={{global_event_object.id}}">{% trans "Add Team Event" %}</a></li>
     {% if user_is_on_lc %}
-        <li><a class="sub-nav-item" href="{% url global-event-update global_event_object.id %}">{% trans "Edit Details" %}</a></li>
-        <li><a class="sub-nav-item" href="{% url global-event-delete global_event_object.id %}">{% trans "Delete Event" %}</a></li>
+        <li><a class="sub-nav-item" href="{% url "global-event-update" global_event_object.id %}">{% trans "Edit Details" %}</a></li>
+        <li><a class="sub-nav-item" href="{% url "global-event-delete" global_event_object.id %}">{% trans "Delete Event" %}</a></li>
     {% endif %}
 {% endblock %}
 
@@ -157,7 +157,7 @@
             js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=127188230723188";
             fjs.parentNode.insertBefore(js, fjs);
             }(document, 'script', 'facebook-jssdk'));</script>
-            <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>
+            <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>
             <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
             <g:plusone size="tall"></g:plusone>
             <a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-lang="en">Tweet</a>

=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html	2013-05-17 11:08:24 +0000
+++ loco_directory/templates/events/team_event_detail.html	2016-08-05 03:04:29 +0000
@@ -53,12 +53,12 @@
 
 {% if user.is_authenticated %}
   {% if user_is_team_member %}
-    <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>
-    <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>
-    <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>
+    <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>
+    <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>
+    <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>
   {% endif %}
 {% endif %}
-<li><a class="sub-nav-item" href="{% url event-ical team_event.first_team.lp_name team_event.id %}">{% trans "iCal Feed" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "event-ical" team_event.first_team.lp_name team_event.id %}">{% trans "iCal Feed" %}</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/events/team_event_detail.inc.html'
--- loco_directory/templates/events/team_event_detail.inc.html	2013-05-11 19:24:14 +0000
+++ loco_directory/templates/events/team_event_detail.inc.html	2016-08-05 03:04:29 +0000
@@ -109,7 +109,7 @@
                     {% if team_event.contact %}
                     <div>
                         <span class="pictogram personne"></span>
-                        <a class="pictogram-l" title="{{ team_event.contact.realname }}" href="{% url profile-detail team_event.contact.user %}">{{ team_event.contact.realname }}</a>
+                        <a class="pictogram-l" title="{{ team_event.contact.realname }}" href="{% url "profile-detail" team_event.contact.user %}">{{ team_event.contact.realname }}</a>
                     </div>
                     {% endif %}
 
@@ -126,9 +126,9 @@
                 <a class="submit-button rsvp-link" href="{{team_event.registration}}" target="external_registration">{% trans 'Register' %}</a>
             {% else %}
                 {% if user.is_authenticated and user_is_attending %}
-                    <a class="submit-button rsvp-link" href="{% url team-event-register team_event.first_team.lp_name team_event.id %}">{% trans 'Update Registration' %}</a>
+                    <a class="submit-button rsvp-link" href="{% url "team-event-register" team_event.first_team.lp_name team_event.id %}">{% trans 'Update Registration' %}</a>
                 {% else %}
-                    <a class="submit-button rsvp-link" href="{% url team-event-register team_event.first_team.lp_name team_event.id %}">{% trans 'Register' %}</a>
+                    <a class="submit-button rsvp-link" href="{% url "team-event-register" team_event.first_team.lp_name team_event.id %}">{% trans 'Register' %}</a>
                 {% endif %}
             {% endif %}
 
@@ -137,12 +137,12 @@
                 <ul class="attendees">
                     <li class="attendee-cell">
                         <div class="attendee-mugshot">
-                            <a href="{% url profile-detail team_event.created_by.username %}">
+                            <a href="{% url "profile-detail" team_event.created_by.username %}">
                               <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 }}">
                             </a>
                         </div>
                         <div class="attendee-infos">
-                            <a href="{% url profile-detail team_event.created_by.username %}">{{ team_event.created_by.get_profile.realname }}</a>
+                            <a href="{% url "profile-detail" team_event.created_by.username %}">{{ team_event.created_by.get_profile.realname }}</a>
                         </div>
                     </li>
                 </ul>

=== modified file 'loco_directory/templates/events/team_event_detail_attendee.inc.html'
--- loco_directory/templates/events/team_event_detail_attendee.inc.html	2013-09-08 11:45:02 +0000
+++ loco_directory/templates/events/team_event_detail_attendee.inc.html	2016-08-05 03:04:29 +0000
@@ -2,11 +2,11 @@
 
 <li class="attendee-cell">
     <div class="attendee-mugshot">
-        <a href="{% url profile-detail registration.attendee_profile.user.username %}">
+        <a href="{% url "profile-detail" registration.attendee_profile.user.username %}">
           <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 }}">
         </a>
     </div>
     <div class="attendee-infos">
-        <a href="{% url profile-detail registration.attendee_profile.user.username %}">{{ registration.attendee_profile.realname }} {% if registration.guests %}(+{{ registration.guests }}){% endif %}</a>
+        <a href="{% url "profile-detail" registration.attendee_profile.user.username %}">{{ registration.attendee_profile.realname }} {% if registration.guests %}(+{{ registration.guests }}){% endif %}</a>
     </div>
 </li>

=== modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html'
--- loco_directory/templates/events/team_event_detail_comments.inc.html	2013-08-28 23:20:35 +0000
+++ loco_directory/templates/events/team_event_detail_comments.inc.html	2016-08-05 03:04:29 +0000
@@ -9,12 +9,12 @@
     {% for comment in team_event.comments_set %}
     <li id="comment-{{ comment.pk }}" class="response">
         <div class="mugshot">
-            <a href="{% url profile-detail comment.commenter_profile.user.username %}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
+            <a href="{% url "profile-detail" comment.commenter_profile.user.username %}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
                 <img alt="" class="photo fn" src="{% if comment.commenter_profile.mugshot %}{{ comment.commenter_profile.mugshot }}{% else %}{{ MEDIA_URL }}img/default-mugshot.png{% endif %}">
             </a>
         </div>
         <div class="comment-body">
-            <a href="{% url profile-detail comment.commenter_profile.user.username %}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
+            <a href="{% url "profile-detail" comment.commenter_profile.user.username %}" class="url" title="{{ comment.commenter_profile.user.get_full_name }}">
             {% if comment.commenter_profile.user.get_full_name %}
                 {{ comment.commenter_profile.user.get_full_name }}
             {% else %}
@@ -29,7 +29,7 @@
                 <a href="#comment-{{ comment.pk }}" class="posted" title="{{ comment.local_date_created }}">
                     {{ comment.local_date_created|date:"d F Y" }}</a>
                 {% if comment.commenter_profile.user.username == user.username %}
-                · <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>
+                · <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>
             {% endif %}
             </p>
         </div>

=== modified file 'loco_directory/templates/events/team_event_li.inc.html'
--- loco_directory/templates/events/team_event_li.inc.html	2011-03-16 18:35:53 +0000
+++ loco_directory/templates/events/team_event_li.inc.html	2016-08-05 03:04:29 +0000
@@ -1,5 +1,5 @@
     {% load i18n %}
     {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
     <li>
-        <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" }}
+        <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" }}
     </li> 

=== modified file 'loco_directory/templates/index.html'
--- loco_directory/templates/index.html	2013-03-30 22:07:37 +0000
+++ loco_directory/templates/index.html	2016-08-05 03:04:29 +0000
@@ -2,8 +2,8 @@
 {% load i18n %}
 
 {% block sub_nav_links %}
-<li><a class="sub-nav-item" href="{% url about_loco %}">{% trans "About Local Community (LoCo) Teams" %}</a></li>
-<li><a class="sub-nav-item" href="{% url using_locodir %}">{% trans "Using the LoCo Team Portal" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "about_loco" %}">{% trans "About Local Community (LoCo) Teams" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "using_locodir" %}">{% trans "Using the LoCo Team Portal" %}</a></li>
 {% endblock %}
 
 {% block extrahead %}{{block.super}}
@@ -29,27 +29,27 @@
 <h1 class="centered">{% trans "Ubuntu Local Community (LoCo) Team Portal" %}</h1>
     <ul id="continents">
         <li id="northamerica">
-        <a href="{% url team-list %}#North%20America">
+        <a href="{% url "team-list" %}#North%20America">
         </a>
         </li>
         <li id="southamerica">
-       	<a href="{% url team-list %}#South%20America">
+       	<a href="{% url "team-list" %}#South%20America">
         </a>
         </li>
         <li id="asia">
-        <a href="{% url team-list %}#Asia">
+        <a href="{% url "team-list" %}#Asia">
         </a>
         </li>
         <li id="australia">
-        <a href="{% url team-list %}#Australia/Oceania">
+        <a href="{% url "team-list" %}#Australia/Oceania">
         </a>
         </li>
         <li id="africa">
-        <a href="{% url team-list %}#Africa">
+        <a href="{% url "team-list" %}#Africa">
         </a>
         </li>
         <li id="europe">
-        <a href="{% url team-list %}#Europe">
+        <a href="{% url "team-list" %}#Europe">
         </a>
         </li>
     </ul>
@@ -72,11 +72,11 @@
             <h4 class="blog-entry-title"><a href="{{ article.get_absolute_url }}">{{ article.title }}</a></h4>
             <div class="blog-entry-author">
                 {% if article.source.team %}
-                    <a class="post-team" href="{% url team-detail article.source.team %}">{{ article.source.team.name }}</a>
+                    <a class="post-team" href="{% url "team-detail" article.source.team %}">{{ article.source.team.name }}</a>
                 {% endif %}
                 {% if article.source.user %}
                     {% if article.source.team %}, {% endif %}
-                    <a class="post-user" href="{% url profile-detail article.source.user.user.username %}">{{ article.source.user }}</a>
+                    <a class="post-user" href="{% url "profile-detail" article.source.user.user.username %}">{{ article.source.user }}</a>
                 {% endif %}
             </div>
             <div class="blog-entry-text">
@@ -90,7 +90,7 @@
 </section>
 <section class="span-4 last">
     <h2>{% if team_event_count %}{{ team_event_count }} {% endif %}{% trans "Upcoming Events" %}</h2>
-    <a href="{% url event-list %}"><img src="{{ MEDIA_URL }}img/home-map.png" /></a>
+    <a href="{% url "event-list" %}"><img src="{{ MEDIA_URL }}img/home-map.png" /></a>
     <h2>{% trans "Latest social messages" %}</h2>
     <div class="twidenash" id="locoteams"></div>
 </section>

=== modified file 'loco_directory/templates/lc_edit.html'
--- loco_directory/templates/lc_edit.html	2013-02-17 12:25:47 +0000
+++ loco_directory/templates/lc_edit.html	2016-08-05 03:04:29 +0000
@@ -9,8 +9,8 @@
 
 {% block sub_nav_links %}
     <li><a class="sub-nav-item" href="approved">{% trans "Approved Teams" %}</a></li>
-    {% if is_admin %}<li><a class="sub-nav-item" href="{% url lc_edit %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
-    {% 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 %}
+    {% if is_admin %}<li><a class="sub-nav-item" href="{% url "lc_edit" %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
+    {% 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 %}
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/loco_council.html'
--- loco_directory/templates/loco_council.html	2014-01-12 20:44:07 +0000
+++ loco_directory/templates/loco_council.html	2016-08-05 03:04:29 +0000
@@ -5,8 +5,8 @@
 
 {% block sub_nav_links %}
     <li><a class="sub-nav-item" href="approved">{% trans "Approved Teams" %}</a></li>
-    {% if is_admin %}<li><a class="sub-nav-item" href="{% url lc_edit %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
-    {% 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 %}
+    {% if is_admin %}<li><a class="sub-nav-item" href="{% url "lc_edit" %}" title="{% trans "Edit Details" %}">{% trans "Edit Details" %}</a></li>{% endif %}
+    {% 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 %}
 {% endblock %}
 
 {% block content %}
@@ -147,7 +147,7 @@
             <h3 class="title">{% trans "Members" %}</h3>
             <div class="team-admins">
             {% for member in members %}
-                    <a href="{% url profile-detail member.username %}">
+                    <a href="{% url "profile-detail" member.username %}">
                         <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">
                         <p>{{ member.get_profile.realname }}</p>
                     </a>

=== modified file 'loco_directory/templates/loco_setup.html'
--- loco_directory/templates/loco_setup.html	2012-06-15 21:30:31 +0000
+++ loco_directory/templates/loco_setup.html	2016-08-05 03:04:29 +0000
@@ -4,7 +4,7 @@
 {% block page_name %}{% trans "Setting up a LoCo Team" %}{% endblock %}
 
 {% block sub_nav_links %}
-<li><a class="sub-nav-item" href="{% url about_loco %}">{% trans "About Local Community (LoCo) Teams" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "about_loco" %}">{% trans "About Local Community (LoCo) Teams" %}</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/meetings/agenda_item_delete_confirm.html'
--- loco_directory/templates/meetings/agenda_item_delete_confirm.html	2012-12-26 17:23:50 +0000
+++ loco_directory/templates/meetings/agenda_item_delete_confirm.html	2016-08-05 03:04:29 +0000
@@ -5,7 +5,7 @@
 {% block page_name %}{% trans "Delete Agenda Item" %}{% endblock %}
 
 {% block sub_nav_links %}
-<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>
+<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>
 {% endblock %}
 
 {% block extrahead %}{{ block.super }}
@@ -24,7 +24,7 @@
                     <ol class="agenda-list">
                     {% loop %}
                         <li class="agenda-item">
-                            <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>
+                            <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>
                             - <a class="agenda-sig" target="launchpaduser" href="https://launchpad.net/~{{ item.owner.user.username}}">{{ item.owner.realname }}</a>
                             @ {{ item.created_date|date:"D, d N Y H:i T" }}
                         </li>

=== modified file 'loco_directory/templates/meetings/agenda_item_new.html'
--- loco_directory/templates/meetings/agenda_item_new.html	2013-03-31 12:32:27 +0000
+++ loco_directory/templates/meetings/agenda_item_new.html	2016-08-05 03:04:29 +0000
@@ -4,7 +4,7 @@
 {% block page_name %}{% trans "New Agenda Item" %}{% endblock %}
 
 {% block sub_nav_links %}
-<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>
+<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>
 {% endblock %}
 
 {% block extrahead %}{{ block.super }}

=== modified file 'loco_directory/templates/meetings/agenda_item_update.html'
--- loco_directory/templates/meetings/agenda_item_update.html	2013-04-14 23:00:20 +0000
+++ loco_directory/templates/meetings/agenda_item_update.html	2016-08-05 03:04:29 +0000
@@ -4,9 +4,9 @@
 {% block page_name %}{% trans "Update Agenda Item" %}{% endblock %}
 
 {% block sub_nav_links %}
-<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>
-<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>
-<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>
+<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>
+<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>
+<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>
 {% endblock %}
 
 {% block extrahead %}{{ block.super }}

=== modified file 'loco_directory/templates/meetings/meeting_history_list.html'
--- loco_directory/templates/meetings/meeting_history_list.html	2012-07-14 20:07:11 +0000
+++ loco_directory/templates/meetings/meeting_history_list.html	2016-08-05 03:04:29 +0000
@@ -9,7 +9,7 @@
 {% block page_name %}{% trans "Ubuntu Teams Meeting History" %}{% endblock %}
 
 {% block sub_nav_links %}
-<li><a class="sub-nav-item" href="{% url meeting-list %}">{% trans "Back to Meetings List" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "meeting-list" %}">{% trans "Back to Meetings List" %}</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/meetings/meeting_list.html'
--- loco_directory/templates/meetings/meeting_list.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/meetings/meeting_list.html	2016-08-05 03:04:29 +0000
@@ -4,8 +4,8 @@
 {% block page_name %}{% trans "Ubuntu Teams Meeting List" %}{% endblock %}
 
 {% block sub_nav_links %}
-<li><a class="sub-nav-item" href="{% url team-meeting-select %}">{% trans "Add Team Meeting" %}</a></li>
-<li><a class="sub-nav-item" href="{% url meeting-history-list %}">{% trans "Past Meetings" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "team-meeting-select" %}">{% trans "Add Team Meeting" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "meeting-history-list" %}">{% trans "Past Meetings" %}</a></li>
 {% endblock %}
 
 {% block content %}
@@ -13,7 +13,7 @@
 <section class="span-12">
 <h2>{% trans "Ubuntu Teams Meetings" %}
 {% if team_meeting_list %}
-<a class="teams_meeting_ical" href="{% url teams-meeting-list-ical %}">
+<a class="teams_meeting_ical" href="{% url "teams-meeting-list-ical" %}">
 <img src="/media/images/ical.png" title="{% trans "Team Meetings as ical" %}"/></a></h2>
 <p>{% trans "Select a team meeting below to see more information about it:" %}</p>
 

=== modified file 'loco_directory/templates/meetings/team_meeting_detail.html'
--- loco_directory/templates/meetings/team_meeting_detail.html	2013-11-24 13:57:29 +0000
+++ loco_directory/templates/meetings/team_meeting_detail.html	2016-08-05 03:04:29 +0000
@@ -5,7 +5,7 @@
 {% block extrahead %}{{ block.super }}
 <meta property="fb:app_id" content="127188230723188"/>
 <meta property="og:title" content="{{ team_meeting.name }}" />
-<meta property="og:url" content="http://loco.ubuntu.com{% url team-meeting-detail team_meeting.first_team.lp_name team_meeting.id %}"/>
+<meta property="og:url" content="http://loco.ubuntu.com{% url "team-meeting-detail" team_meeting.first_team.lp_name team_meeting.id %}"/>
 <meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
 <meta property="og:site_name" content="Loco Team Portal"/>
 <meta property="og:type" content="loco-team-portal:meeting"/>
@@ -15,12 +15,12 @@
 {% for team in team_meeting.teams.all %}<li><a class="sub-nav-item" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% endfor %}</li>
 {% if user.is_authenticated %}
   {% if user_is_team_member %}
-    <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>
-    <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>
-    <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>
+    <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>
+    <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>
+    <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>
   {% endif %}
 {% endif %}
-<li><a class="sub-nav-item" href="{% url meeting-ical team_meeting.first_team.lp_name team_meeting.id %}">{% trans "iCal Feed" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "meeting-ical" team_meeting.first_team.lp_name team_meeting.id %}">{% trans "iCal Feed" %}</a></li>
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html	2013-11-24 14:11:54 +0000
+++ loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html	2016-08-05 03:04:29 +0000
@@ -1,7 +1,7 @@
 {% load i18n markup %}
 {% load recurse %}
 {% if user_is_team_member %}
-    <a style="margin-bottom: 10px;" class="contact-button" href="{% url agenda-item-new team_meeting.id %}">{% trans 'Add Agenda Item' %}</a>
+    <a style="margin-bottom: 10px;" class="contact-button" href="{% url "agenda-item-new" team_meeting.id %}">{% trans 'Add Agenda Item' %}</a>
 {% endif %}
 
 {% if team_meeting.agenda %}
@@ -12,11 +12,11 @@
                 <div style="overflow: auto">
                     <div style="float: left; width: 615px">
                         {% if user_is_team_member %}
-                        <a class="agenda-title" title="{% trans 'Update Agenda Item:' %} {{ item.title }}" href="{% url agenda-item-update team_meeting.id item.id %}">{{ item.title }}</a>
+                        <a class="agenda-title" title="{% trans 'Update Agenda Item:' %} {{ item.title }}" href="{% url "agenda-item-update" team_meeting.id item.id %}">{{ item.title }}</a>
                         {% else %}
                         <span class="agenda-title" >{{ item.title }}</span>
                         {% endif %}
-                        ‒ <a class="agenda-sig" href="{% url profile-detail item.owner.user.username %}">{{ item.owner.realname }}</a>
+                        ‒ <a class="agenda-sig" href="{% url "profile-detail" item.owner.user.username %}">{{ item.owner.realname }}</a>
                         {% if item.description %}
                         <div class="agenda-description">{{ item.description|markdown:'safe' }}</div>
                         {% endif %}

=== modified file 'loco_directory/templates/meetings/team_meeting_detail_basic.inc.html'
--- loco_directory/templates/meetings/team_meeting_detail_basic.inc.html	2013-11-24 13:57:29 +0000
+++ loco_directory/templates/meetings/team_meeting_detail_basic.inc.html	2016-08-05 03:04:29 +0000
@@ -20,7 +20,7 @@
                 <span title="{% trans "Meeting Chair" %}" class="pictogram language"></span>
                 <span class="value ellipsis" style="width: 350px;">
                     {% if team_meeting.chair %}
-                        <a href="{% url profile-detail team_meeting.chair.user.username %}" >{{ team_meeting.chair }}</a>
+                        <a href="{% url "profile-detail" team_meeting.chair.user.username %}" >{{ team_meeting.chair }}</a>
                     {% else %}
                         {% trans "No Meeting Chair Assigned" %}
                     {% endif %}

=== modified file 'loco_directory/templates/meetings/team_meeting_li.inc.html'
--- loco_directory/templates/meetings/team_meeting_li.inc.html	2011-06-17 17:10:41 +0000
+++ loco_directory/templates/meetings/team_meeting_li.inc.html	2016-08-05 03:04:29 +0000
@@ -1,5 +1,5 @@
     {% load i18n %}
     {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
     <li>
-        <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" }}
+        <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" }}
     </li>

=== modified file 'loco_directory/templates/profiles/details.html'
--- loco_directory/templates/profiles/details.html	2013-04-04 21:45:50 +0000
+++ loco_directory/templates/profiles/details.html	2016-08-05 03:04:29 +0000
@@ -15,12 +15,12 @@
                         <img src="{{ team.mugshot_url }}" alt="{{ team.name }}" class="mugshot" />
                     </div>
                     <div class="profil-team-meeting-wrapper">
-                        <a href="{% url team-detail team_slug=team.lp_name %}" title="{{ team.name }}" class="link2">
+                        <a href="{% url "team-detail" team_slug=team.lp_name %}" title="{{ team.name }}" class="link2">
                             {{ team.name }}
                         </a>
                         <div style="float: right">
-                            <a href="{% url team-meeting-new team_slug=team.lp_name %}" title="{% trans "Schedule a meeting" %}" class="new">{% trans "Schedule a meeting" %}</a>
-                            <a href="{% url team-event-new team_slug=team.lp_name %}" title="{% trans "Create an event" %}" class="new">{% trans "Create an event" %}</a>
+                            <a href="{% url "team-meeting-new" team_slug=team.lp_name %}" title="{% trans "Schedule a meeting" %}" class="new">{% trans "Schedule a meeting" %}</a>
+                            <a href="{% url "team-event-new" team_slug=team.lp_name %}" title="{% trans "Create an event" %}" class="new">{% trans "Create an event" %}</a>
                         </div>
                         <h4 class="title">{% trans "Meetings" %}</h4>
                         <ul class="indent">

=== modified file 'loco_directory/templates/teams/merge_teams.html'
--- loco_directory/templates/teams/merge_teams.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/teams/merge_teams.html	2016-08-05 03:04:29 +0000
@@ -15,7 +15,7 @@
     {% if not team_object or not other_team_object %}
         <p>{% trans "You need two valid teams you want to merge with another." %}</p>
     {% else %}
-        <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>
+        <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>
     {% endif %}
 </section>
 </div>

=== modified file 'loco_directory/templates/teams/select_other_team.html'
--- loco_directory/templates/teams/select_other_team.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/teams/select_other_team.html	2016-08-05 03:04:29 +0000
@@ -20,7 +20,7 @@
                 <td width="100%" valign="top">
                     <ul id="main-content">
                         {% for team in other_teams %}
-                            <li><a href="{% url team-merge team_object.lp_name team.lp_name %}">{{ team.name }}</a></li>
+                            <li><a href="{% url "team-merge" team_object.lp_name team.lp_name %}">{{ team.name }}</a></li>
                         {% endfor %}
                     </ul>
                 </td>

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2013-11-17 05:32:01 +0000
+++ loco_directory/templates/teams/team_detail.html	2016-08-05 03:04:29 +0000
@@ -4,12 +4,12 @@
 {% block page_name %}{% trans team.name %}{% endblock %}
 
 {% block sub_nav_links %}
-    <li><a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url "team-list" %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
     {% 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 %}
-    {% 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 %}
-    {% 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 %}
-    {% 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 %}
-    {% 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 %}
+    {% 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 %}
+    {% 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 %}
+    {% 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 %}
+    {% 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 %}
 {% endblock %}
 
 
@@ -170,22 +170,22 @@
                     <h3 class="title">{% trans "Upcoming Events" %}</h3>
                     <div class="team-actions">
                         <span>
-                            <a href="{% url team-event-list team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
-                        </span>
-                        <span>
-                            <a href="{% url team-meeting-list team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
-                        </span>
-                        <span>
-                            <a href="{% url team-event-history team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
-                        </span>
-                        <span>
-                            <a href="{% url team-meeting-history team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
+                            <a href="{% url "team-event-list" team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
+                        </span>
+                        <span>
+                            <a href="{% url "team-meeting-list" team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
+                        </span>
+                        <span>
+                            <a href="{% url "team-event-history" team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
+                        </span>
+                        <span>
+                            <a href="{% url "team-meeting-history" team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
                         </span>
                         <span>
                             <a class="pictogram rss action" href="/feeds/teams/{{ team.lp_name }}/" title="{% trans "RSS Feed" %}"></a>
                         </span>
                         <span>
-                            <a class="pictogram ical action" href="{% url team-calendar team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
+                            <a class="pictogram ical action" href="{% url "team-calendar" team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
                         </span>
                     </div>
                 </div>
@@ -219,7 +219,7 @@
                     </h4>
                     <div class="blog-entry-author">
                         {% if article.source.user %}
-                        <a class="user" href="{% url profile-detail article.source.user.user.username %}">{{ article.source.user }}</a>
+                        <a class="user" href="{% url "profile-detail" article.source.user.user.username %}">{{ article.source.user }}</a>
                         {% endif %}
                     </div>
                     <div class="blog-entry-text">
@@ -262,12 +262,12 @@
             <div class="team-admins">
             {% for admin in team.admin_profiles.all %}
                 {% ifequal team.owner admin.user.username %}
-                    <a href="{% url profile-detail admin.user.username %}">
+                    <a href="{% url "profile-detail" admin.user.username %}">
                         <img alt="" class="photo fn" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot">
                         <p>{{ admin.realname }}</p>
                     </a>
                 {% else %}
-                    <a href="{% url profile-detail admin.user.username %}">
+                    <a href="{% url "profile-detail" admin.user.username %}">
                         <img alt="{{ admin.realname }}" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
                         <p>{{ admin.realname }}</p>
                     </a>
@@ -278,7 +278,7 @@
             <div class="team-admins">
                 {% if team.contact_profiles.all %}
                     {% for contact in team.contact_profiles.all %}
-                        <a href="{% url profile-detail contact.user.username %}">
+                        <a href="{% url "profile-detail" contact.user.username %}">
                         <img alt="{{ contact.realname }}" src="{% if contact.mugshot %}{{ contact.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
                         <p>{{ contact.realname }}</p>
                     </a>

=== modified file 'loco_directory/templates/teams/team_event_history.html'
--- loco_directory/templates/teams/team_event_history.html	2013-02-10 15:06:06 +0000
+++ loco_directory/templates/teams/team_event_history.html	2016-08-05 03:04:29 +0000
@@ -4,12 +4,12 @@
 {% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events History{% endblocktrans %}{% endblock %}
 
 {% block sub_nav_links %}
-    <li><a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url "team-list" %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
     {% 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 %}
-    {% 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 %}
-    {% 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 %}
-    {% 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 %}
-    {% 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 %}
+    {% 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 %}
+    {% 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 %}
+    {% 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 %}
+    {% 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 %}
 {% endblock %}
 
 
@@ -125,22 +125,22 @@
                     <h3 class="title">{% trans "Past Events" %}</h3>
                     <div class="team-actions">
                         <span>
-                            <a href="{% url team-event-list team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
-                        </span>
-                        <span>
-                            <a href="{% url team-meeting-list team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
-                        </span>
-                        <span>
-                            <a href="{% url team-event-history team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
-                        </span>
-                        <span>
-                            <a href="{% url team-meeting-history team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
+                            <a href="{% url "team-event-list" team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
+                        </span>
+                        <span>
+                            <a href="{% url "team-meeting-list" team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
+                        </span>
+                        <span>
+                            <a href="{% url "team-event-history" team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
+                        </span>
+                        <span>
+                            <a href="{% url "team-meeting-history" team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
                         </span>
                         <span>
                             <a class="pictogram rss action" href="/feeds/teams/{{ team.lp_name }}/" title="{% trans "RSS Feed" %}"></a>
                         </span>
                         <span>
-                            <a class="pictogram ical action" href="{% url team-calendar team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
+                            <a class="pictogram ical action" href="{% url "team-calendar" team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
                         </span>
                     </div>
                 </div>
@@ -187,12 +187,12 @@
             <div class="team-admins">
             {% for admin in team.admin_profiles.all %}
                 {% ifequal team.owner admin.user.username %}
-                    <a href="{% url profile-detail admin.user.username %}">
+                    <a href="{% url "profile-detail" admin.user.username %}">
                         <img alt="" class="photo fn" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot">
                         <p>{{ admin.realname }}</p>
                     </a>
                 {% else %}
-                    <a href="{% url profile-detail admin.user.username %}">
+                    <a href="{% url "profile-detail" admin.user.username %}">
                         <img alt="{{ admin.realname }}" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
                         <p>{{ admin.realname }}</p>
                     </a>
@@ -203,7 +203,7 @@
             <div class="team-admins">
                 {% if team.contact_profiles.all %}
                     {% for contact in team.contact_profiles.all %}
-                        <a href="{% url profile-detail contact.user.username %}">
+                        <a href="{% url "profile-detail" contact.user.username %}">
                         <img alt="{{ contact.realname }}" src="{% if contact.mugshot %}{{ contact.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
                         <p>{{ contact.realname }}</p>
                     </a>

=== modified file 'loco_directory/templates/teams/team_event_list.html'
--- loco_directory/templates/teams/team_event_list.html	2012-11-26 23:07:59 +0000
+++ loco_directory/templates/teams/team_event_list.html	2016-08-05 03:04:29 +0000
@@ -4,10 +4,10 @@
 {% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %}{% endblock %}
 
 {% block sub_nav_links %}
-<li><a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
-<li><a class="sub-nav-item" href="{% url team-event-history team_object.lp_name %}">{% trans "Past Events" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "team-detail" team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "team-event-history" team_object.lp_name %}">{% trans "Past Events" %}</a></li>
 <li><a class="sub-nav-item" href="/feeds/events/{{ team_object.lp_name }}" title="{% trans "Team Events (RSS)" %}">{% trans "Team Events (RSS)" %}</a></li>
-{% 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 %}
+{% 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 %}
 {% endblock %}
 
 
@@ -19,7 +19,7 @@
 <div class="row">
 <section class="span-12">
 <h1>{% blocktrans with team_object.name as teamname %}{{teamname}} Events List{% endblocktrans %}
-<a class="teams_event_ical" href="{% url team-event-list-ical team_object.lp_name %}">
+<a class="teams_event_ical" href="{% url "team-event-list-ical" team_object.lp_name %}">
 <img src="/media/images/ical32.png" title="ical"/></a></h1>
 
 {% if team_event_list %}

=== modified file 'loco_directory/templates/teams/team_meeting_history.html'
--- loco_directory/templates/teams/team_meeting_history.html	2013-02-10 15:06:06 +0000
+++ loco_directory/templates/teams/team_meeting_history.html	2016-08-05 03:04:29 +0000
@@ -4,12 +4,12 @@
 {% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Meetings History{% endblocktrans %}{% endblock %}
 
 {% block sub_nav_links %}
-    <li><a class="sub-nav-item" href="{% url team-list %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
+    <li><a class="sub-nav-item" href="{% url "team-list" %}" title="{% trans "Back to Teams List" %}">{% trans "Back to Teams List" %}</a></li>
     {% 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 %}
     {% 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 %}
-    {% 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 %}
-    {% 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 %}
-    {% 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 %}
+    {% 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 %}
+    {% 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 %}
+    {% 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 %}
 {% endblock %}
 
 {% block extrahead %}{{ block.super }}
@@ -124,22 +124,22 @@
                     <h3 class="title">{% trans "Past Meetings" %}</h3>
                     <div class="team-actions">
                         <span>
-                            <a href="{% url team-event-list team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
-                        </span>
-                        <span>
-                            <a href="{% url team-meeting-list team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
-                        </span>
-                        <span>
-                            <a href="{% url team-event-history team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
-                        </span>
-                        <span>
-                            <a href="{% url team-meeting-history team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
+                            <a href="{% url "team-event-list" team.lp_name %}" title="{% trans "All Events" %}">{% trans "All Events" %}</a>
+                        </span>
+                        <span>
+                            <a href="{% url "team-meeting-list" team.lp_name %}" title="{% trans "All Meetings" %}">{% trans "All Meetings" %}</a>
+                        </span>
+                        <span>
+                            <a href="{% url "team-event-history" team.lp_name %}" title="{% trans "Past Events" %}">{% trans "Past Events" %}</a>
+                        </span>
+                        <span>
+                            <a href="{% url "team-meeting-history" team.lp_name %}" title="{% trans "Past Meetings" %}">{% trans "Past Meetings" %}</a>
                         </span>
                         <span>
                             <a class="pictogram rss action" href="/feeds/teams/{{ team.lp_name }}/" title="{% trans "RSS Feed" %}"></a>
                         </span>
                         <span>
-                            <a class="pictogram ical action" href="{% url team-calendar team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
+                            <a class="pictogram ical action" href="{% url "team-calendar" team.lp_name %}" title="{% trans "iCal Feed" %}"></a>
                         </span>
                     </div>
                 </div>
@@ -186,12 +186,12 @@
             <div class="team-admins">
             {% for admin in team.admin_profiles.all %}
                 {% ifequal team.owner admin.user.username %}
-                    <a href="{% url profile-detail admin.user.username %}">
+                    <a href="{% url "profile-detail" admin.user.username %}">
                         <img alt="" class="photo fn" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot">
                         <p>{{ admin.realname }}</p>
                     </a>
                 {% else %}
-                    <a href="{% url profile-detail admin.user.username %}">
+                    <a href="{% url "profile-detail" admin.user.username %}">
                         <img alt="{{ admin.realname }}" src="{% if admin.mugshot %}{{ admin.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
                         <p>{{ admin.realname }}</p>
                     </a>
@@ -202,7 +202,7 @@
             <div class="team-admins">
                 {% if team.contact_profiles.all %}
                     {% for contact in team.contact_profiles.all %}
-                        <a href="{% url profile-detail contact.user.username %}">
+                        <a href="{% url "profile-detail" contact.user.username %}">
                         <img alt="{{ contact.realname }}" src="{% if contact.mugshot %}{{ contact.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}" class="mugshot" height="50" width="50">
                         <p>{{ contact.realname }}</p>
                     </a>

=== modified file 'loco_directory/templates/teams/team_meeting_list.html'
--- loco_directory/templates/teams/team_meeting_list.html	2012-11-26 23:07:59 +0000
+++ loco_directory/templates/teams/team_meeting_list.html	2016-08-05 03:04:29 +0000
@@ -4,8 +4,8 @@
 {% block page_name %}{% blocktrans with team_object.name as teamname %}{{teamname}} Meeting List{% endblocktrans %}{% endblock %}
 
 {% block sub_nav_links %}
-<li><a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
-<li><a class="sub-nav-item" href="{% url team-meeting-history team_object.lp_name %}">{% trans "Past Meetings" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "team-detail" team_object.lp_name %}">{% trans "Back to Team Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "team-meeting-history" team_object.lp_name %}">{% trans "Past Meetings" %}</a></li>
 <li><a class="sub-nav-item" href="/feeds/meetings/{{ team_object.lp_name }}" title="{% trans "Team Meetings (RSS)" %}">{% trans "Team Meetings (RSS)" %}</a></li>
 {% endblock %}
 
@@ -17,7 +17,7 @@
 <div class="row">
 <section class="span-12">
 <h1>{% blocktrans with team_object.name as teamname %}{{teamname}} Meeting List{% endblocktrans %}
-<a class="teams_meeting_ical" href="{% url team-meeting-list-ical team_object.lp_name %}">
+<a class="teams_meeting_ical" href="{% url "team-meeting-list-ical" team_object.lp_name %}">
 <img src="/media/images/ical32.png" title="ical"/></a></h1>
 
 {% if team_meeting_list %}

=== modified file 'loco_directory/templates/teams/team_reapprovals.html'
--- loco_directory/templates/teams/team_reapprovals.html	2013-11-17 05:32:01 +0000
+++ loco_directory/templates/teams/team_reapprovals.html	2016-08-05 03:04:29 +0000
@@ -44,7 +44,7 @@
                 <td width="100%" valign="top" class="col2_container">
                     <ul id="main-content">
                         {% for team in next_teams %}
-                            <li class="approved"><a href="{% url team-detail team.lp_name %}">{{ team.name }}</a>: {{ team.expires_date }}</li>
+                            <li class="approved"><a href="{% url "team-detail" team.lp_name %}">{{ team.name }}</a>: {{ team.expires_date }}</li>
                         {% endfor %}
                     </ul>
                 </td>
@@ -60,7 +60,7 @@
                 <td width="100%" valign="top" class="col2_container">
                     <ul id="main-content">
                         {% for team in later_teams %}
-                            <li class="approved"><a href="{% url team-detail team.lp_name %}">{{ team.name }}</a>: {{ team.expires_date }}</li>
+                            <li class="approved"><a href="{% url "team-detail" team.lp_name %}">{{ team.name }}</a>: {{ team.expires_date }}</li>
                         {% endfor %}
                     </ul>
                 </td>

=== modified file 'loco_directory/templates/venues/venue_detail.html'
--- loco_directory/templates/venues/venue_detail.html	2013-05-11 14:07:21 +0000
+++ loco_directory/templates/venues/venue_detail.html	2016-08-05 03:04:29 +0000
@@ -30,11 +30,11 @@
 <section class="span-6">
 
 {% block sub_nav_links %}
-<li><a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Back to Venues List" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "venue-list" %}" >{% trans "Back to Venues List" %}</a></li>
 {% if venue.country %}
-<li><a class="sub-nav-item" href="{% url venue-update venue.country.slug venue.id %}">{% trans "Edit Venue Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "venue-update" venue.country.slug venue.id %}">{% trans "Edit Venue Details" %}</a></li>
 {% else %}
-<li><a class="sub-nav-item" href="{% url venue-update 'no_country' venue.id %}">{% trans "Edit Venue Details" %}</a></li>
+<li><a class="sub-nav-item" href="{% url "venue-update" 'no_country' venue.id %}">{% trans "Edit Venue Details" %}</a></li>
 {% endif %}
 {% endblock %}
 

=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py	2013-10-30 00:31:14 +0000
+++ loco_directory/urls.py	2016-08-05 03:04:29 +0000
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 from django.conf import settings
 from django.contrib import admin
 import ubuntu_website
@@ -42,7 +42,7 @@
     url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'),
     url(r'^services/', include('services.urls')),
     url(r'^search/', 'common.views.site_search', name='site_search'),
-    url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}, name='feed_view'),
+    url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.Feed', {'feed_dict': feeds}, name='feed_view'),
     url(r'^', include('userprofiles.urls')),
 )
 

=== modified file 'loco_directory/userprofiles/models.py'
--- loco_directory/userprofiles/models.py	2012-12-09 15:08:12 +0000
+++ loco_directory/userprofiles/models.py	2016-08-05 03:04:29 +0000
@@ -23,9 +23,9 @@
     user = models.OneToOneField(auth_models.User)
     realname = models.CharField(_("Real Name"), max_length=150, blank=True)
     tz = models.CharField(verbose_name=_('Timezone'), max_length=32, default='UTC')
-    mugshot = models.URLField(verbose_name=_("Mugshot"), max_length=150, blank=True, verify_exists=False, null=True)
+    mugshot = models.URLField(verbose_name=_("Mugshot"), max_length=150, blank=True, null=True)
 
-    blog = models.URLField(verbose_name=_('Blog URL'), blank=True, null=True, verify_exists=False)
+    blog = models.URLField(verbose_name=_('Blog URL'), blank=True, null=True)
     twitter = models.CharField(verbose_name=_('Twitter ID'), max_length=32, blank=True, null=True)
     identica = models.CharField(verbose_name=_('Identi.ca ID'), max_length=32, blank=True, null=True)
     picasa = models.CharField(verbose_name=_('Picasa ID'), max_length=32, blank=True, null=True)

=== modified file 'loco_directory/userprofiles/urls.py'
--- loco_directory/userprofiles/urls.py	2013-03-11 21:49:37 +0000
+++ loco_directory/userprofiles/urls.py	2016-08-05 03:04:29 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('userprofiles.views',
     url(r'^(?P<username>[-+.\w]+)/$', 'profile_detail', name='profile-detail'),

=== modified file 'loco_directory/venues/models.py'
--- loco_directory/venues/models.py	2013-02-21 20:31:16 +0000
+++ loco_directory/venues/models.py	2016-08-05 03:04:29 +0000
@@ -33,7 +33,7 @@
     latitude = models.FloatField(help_text=_('Latitude in Degrees North'), null=True, blank=True)
     tz = models.CharField(max_length=32, verbose_name=_('Timezone'), default='UTC', choices=[(tz, tz) for tz in pytz.all_timezones], blank=False, null=False)
     venue_url = models.URLField(help_text=_('URL for the Venue Homepage'), verbose_name=_('URL of the Venue'),
-                                max_length=200, verify_exists=False, blank=True, null=True)
+                                max_length=200, blank=True, null=True)
     comment = models.TextField(help_text=_('Comment about the Venue'), blank=True, null=True)
 
     objects = VenueManager()

=== modified file 'loco_directory/venues/urls.py'
--- loco_directory/venues/urls.py	2013-02-21 20:31:16 +0000
+++ loco_directory/venues/urls.py	2016-08-05 03:04:29 +0000
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 urlpatterns = patterns('',
     #venues

=== modified file 'requirements/dev.txt'
--- requirements/dev.txt	2014-05-15 22:50:21 +0000
+++ requirements/dev.txt	2016-08-05 03:04:29 +0000
@@ -6,14 +6,14 @@
 #       include patches applied by the package maintainers.
 #
 
-Django==1.3.3
+Django==1.5
 South==0.7.3
-distribute==0.6.10
-django-openid-auth==0.4
+setuptools==25.1.4
+django-openid-auth==0.5
 python-openid==2.2.4
 pytz==2010b
 python-dateutil==1.5
-vobject==0.8.1c
+vobject==0.9.2
 simplejson==2.0.9
 feedparser
 python-gettext

=== modified file 'requirements/prod.txt'
--- requirements/prod.txt	2016-02-12 00:54:37 +0000
+++ requirements/prod.txt	2016-08-05 03:04:29 +0000
@@ -6,16 +6,16 @@
 #       include patches applied by the package maintainers.
 #
 
-Django==1.3.3
+Django==1.5
 South==0.7.3
-distribute==0.6.10
-django-openid-auth==0.4
+setuptools==25.1.4
+django-openid-auth==0.5
 # pyscopg is only needed for production like environments
 # psycopg2==2.0.13
 python-openid==2.2.4
 pytz==2010b
 python-dateutil==1.5
-vobject==0.8.2
+vobject==0.9.2
 simplejson==2.0.9
 feedparser
 python-gettext