Merge lp:~daker/loco-team-portal/fix.lc-bugs into lp:loco-team-portal

[Adnane Belmadiaf]

Added the ability to add LC feed on LTP
Added the ability to add LC meetings on LTP
Added LC members on LTP

http://i.imgur.com/HD3TsbN.png

[lp:~daker/loco-team-portal/fix.lc-bugs]

612. By Adnane Belmadiaf on 2013-02-17

Fix edit url

=== modified file 'loco_directory/common/views.py'
--- loco_directory/common/views.py	2013-01-14 22:16:07 +0000
+++ loco_directory/common/views.py	2013-02-17 12:28:20 +0000
@@ -38,12 +38,6 @@
         RequestContext(request))
 
 
-def loco_council(request):
-    context = {}
-    return render_to_response('loco_council.html', context,
-        RequestContext(request))
-
-
 def about(request):
     context = {}
     return render_to_response('about.html', context,
 
=== modified file 'loco_directory/media/css/styles.css'
--- loco_directory/media/css/styles.css	2012-12-22 23:22:32 +0000
+++ loco_directory/media/css/styles.css	2013-02-17 12:28:20 +0000
@@ -1239,7 +1239,7 @@
     margin-bottom: 0px;
 }
 
-.blog-entry-text ol, ul {
+.blog-entry-text ol, .blog-entry-text ul {
     text-align:justify;
     font-size: 13px;
     line-height: 1.4;
@@ -1551,7 +1551,6 @@
     line-height: 15px;
 }
 
-
 .team:after { content: ","; }
 .link:after { content: ";"; }
 .calendar:after { content: "N"; }
@@ -1597,7 +1596,24 @@
     background: #FFE99A;
 }
 
-
 .copyright {
    font-size:  0.8em;
+}
+
+#lc {
+    padding: 15px;
+    border-top: 1px solid #E6E6E6;
+}
+
+#lc ul {
+    padding-left: 10px;
+    margin-bottom: 0;
+}
+
+#lc ul li {
+    font-size: 1em;
+}
+
+#lc ul li:last-child {
+    margin-bottom: 0;
 }
 \ No newline at end of file
 
=== modified file 'loco_directory/teams/forms.py'
--- loco_directory/teams/forms.py	2012-12-28 21:03:08 +0000
+++ loco_directory/teams/forms.py	2013-02-17 12:28:20 +0000
@@ -24,3 +24,13 @@
     class Meta(UpdateTeamForm.Meta):
         model = Team
         exclude = ('approved', 'expires_date', 'name', 'lp_name', 'admin_profiles', 'owner_profile', 'active', 'mugshot_url')
+
+
+class EditLoCoCouncilForm(UpdateTeamForm, RenderableMixin):
+    class Meta(UpdateTeamForm.Meta):
+        model = Team
+        exclude = ('approved_date', 'approved', 'expires_date', 'name',
+                   'lp_name', 'contact_profiles', 'admin_profiles',
+                   'owner_profile', 'active', 'override_name', 'mugshot_url',
+                   'languages', 'flickr_id', 'picasa_id', 'pixie_id',
+                   'microbloghashtag', 'countries', 'spr', 'city', 'provides_support')
 
=== added file 'loco_directory/teams/management/commands/lcupdate.py'
--- loco_directory/teams/management/commands/lcupdate.py	1970-01-01 00:00:00 +0000
+++ loco_directory/teams/management/commands/lcupdate.py	2013-02-17 12:28:20 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+#!/usr/bin/python
+
+from django.core.management.base import NoArgsCommand
+from django.contrib.auth.models import Group, User
+
+from common import launchpad
+from userprofiles.models import create_userprofile
+
+import sys
+import logging
+st_handler = logging.StreamHandler(sys.stderr)
+formatter = logging.Formatter("[%(asctime)s] - %(levelname)s - %(module)s - %(message)s")
+st_handler.setFormatter(formatter)
+
+log = logging.getLogger(__name__)
+log.addHandler(st_handler)
+log.setLevel(logging.DEBUG)
+
+
+class Command(NoArgsCommand):
+    help = "Pull the LoCo Council members and add them to the DB."
+
+    def handle_noargs(self, **options):
+        lp = launchpad.lp_login()
+        if not lp:
+            sys.exit(1)
+        g = Group.objects.get(name='ubuntu-lococouncil')
+        users = g.user_set.all()
+        log.debug("Removing all members.")
+        for u in users:
+            g.user_set.remove(u)
+        lc_members = lp.people["ubuntu-lococouncil"].members
+        for member in lc_members:
+            try:
+                user = User.objects.get(username=member.name)
+                create_userprofile(sender=User, instance=user, need_update=True)
+                log.debug("Adding member %s." % user)
+                g.user_set.add(user)
+            except User.DoesNotExist:
+                log.debug("User %s doesn't exist" % member.name)
 
=== modified file 'loco_directory/teams/management/commands/lpupdate.py'
--- loco_directory/teams/management/commands/lpupdate.py	2013-02-03 22:47:01 +0000
+++ loco_directory/teams/management/commands/lpupdate.py	2013-02-17 12:28:20 +0000
@@ -11,6 +11,15 @@
 from datetime import datetime
 import sys
 
+import logging
+st_handler = logging.StreamHandler(sys.stderr)
+formatter = logging.Formatter("[%(asctime)s] - %(levelname)s - %(module)s - %(message)s")
+st_handler.setFormatter(formatter)
+
+log = logging.getLogger(__name__)
+log.addHandler(st_handler)
+log.setLevel(logging.DEBUG)
+
 
 def create_admin_dict(admins):
     admin_dict = {}
@@ -69,7 +78,7 @@
         lp = launchpad.lp_login()
         if not lp:
             sys.exit(1)
-        TEAM_BLACKLIST = (u"ubuntu-lococouncil", u"ubuntu-games-merged")
+        TEAM_BLACKLIST = (u"ubuntu-games-merged")
 
         existing_locos = models.Team.objects.all()
         existing_groups = Group.objects.all()
@@ -80,12 +89,14 @@
                 team = models.Team(lp_name=l.name, name=l.display_name,
                                    owner_profile=create_profile(get_team_owner(l).name))
                 team.save()
+                log.debug("Created team %s" % team.name)
             else:
                 team = filter(lambda a: a.lp_name == l.name, existing_locos)[0]
                 team.name = l.display_name
                 team.owner_profile = create_profile(get_team_owner(l).name)
                 if not len(team.contact_profiles.all()):
                     team.contact_profiles.add(team.owner_profile)
+                log.debug("Updated team %s" % team.name)
             update_admins(team, l, lp)
 
             if not existing_groups or l.name not in [g.name for g in existing_groups]:
 
=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py	2012-12-25 22:00:46 +0000
+++ loco_directory/teams/models.py	2013-02-17 12:28:20 +0000
@@ -159,4 +159,4 @@
 
 
 def teams_without_country():
-    return Team.objects.filter(countries__isnull=True)
+    return Team.objects.filter(countries__isnull=True).exclude(lp_name="ubuntu-lococouncil")
 
=== modified file 'loco_directory/teams/urls.py'
--- loco_directory/teams/urls.py	2012-11-18 22:02:56 +0000
+++ loco_directory/teams/urls.py	2013-02-17 12:28:20 +0000
@@ -2,7 +2,6 @@
 
 urlpatterns = patterns('',
     url(r'^$', 'teams.views.team_list', name='team-list'),
-    #url(r'^me$', 'teams.views.my_teams', name='my-teams'),
     url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/edit$', 'teams.views.team_edit', name='team-edit'),
     url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/merge/(?P<other_team_slug>[a-zA-Z0-9\-\.\+?]+)/$', 'teams.views.team_merge', name='team-merge'),
     url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/merge', 'teams.views.select_other_team', name='select-other-team'),
 
=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2013-02-10 14:59:16 +0000
+++ loco_directory/teams/views.py	2013-02-17 12:28:20 +0000
@@ -1,19 +1,17 @@
 # -*- coding: utf-8 -*-
+from django import http
 from django.template import RequestContext
 from django.utils.translation import ugettext
 from django.core import serializers
-
+from django.contrib.auth.models import User
 from django.shortcuts import render_to_response, redirect, get_object_or_404
 from django.contrib.auth.decorators import login_required
-
-from django import http
+from django.http import Http404
 
 from common.utils import simple_iterator
 from common import launchpad
-
 from teams.models import Continent, Team, countries_without_continent, countries_without_continent_have_teams, teams_without_country
 from teams.utils import merge_teams
-
 from events.models import TeamEvent
 from meetings.models import TeamMeeting
 from articles.models import Article
@@ -44,6 +42,57 @@
                 context, RequestContext(request))
 
 
+def loco_council(request):
+
+    team = get_object_or_404(Team, lp_name="ubuntu-lococouncil")
+    articles = Article.objects.filter(source__team=team)[:5]
+    is_member = False
+    is_admin = False
+    if request.user.is_authenticated():
+        is_member = launchpad.is_team_member(request.user, team)
+        is_admin = launchpad.is_admin_or_owner(request.user.username, team) or launchpad.is_user_on_loco_council(request.user)
+    team_meeting_list = team.teammeeting_set.next_meetings()
+    members = User.objects.filter(groups__name='ubuntu-lococouncil')
+    context = {
+        'team': team,
+        'team_meeting_list': team_meeting_list,
+        'articles': articles,
+        'members': members,
+        'is_member': is_member,
+        'is_admin': is_admin,
+    }
+    return render_to_response('loco_council.html', context,
+        RequestContext(request))
+
+
+@login_required
+def loco_council_edit(request):
+    team_object = get_object_or_404(Team, lp_name="ubuntu-lococouncil")
+
+    #check if user has needed rights
+    is_on_lc = launchpad.is_user_on_loco_council(request.user)
+    if not is_on_lc:
+        request.user.message_set.create(message=ugettext('You are not allowed to make changes to the team details.'))
+        return redirect('/loco-council/')
+
+    if request.method == "POST":
+        form = forms.EditLoCoCouncilForm(data=request.POST, instance=team_object)
+
+        if form.is_valid():
+            form.save()
+            request.user.message_set.create(message=ugettext('Thanks, your team\'s details have been saved.'))
+            return redirect('/loco-council/')
+        else:
+            request.user.message_set.create(message=ugettext('Recent changes to your team\'s details could not be saved.'))
+    else:
+        form = forms.EditLoCoCouncilForm(instance=team_object)
+
+    return render_to_response('lc_edit.html',
+                    {'form': form,
+                     'team': team_object,
+                    }, RequestContext(request))
+
+
 def as_ical(objects, name):
     """Return any list events as an ical"""
     filename = "%s.ics" % name.replace(' ', '-').lower()
@@ -159,6 +208,8 @@
 
 
 def team_detail(request, team_slug):
+    if team_slug == 'ubuntu-lococouncil':
+        return redirect('/loco-council/')
     team_object = get_object_or_404(Team, lp_name=team_slug)
     articles = Article.objects.filter(source__team=team_object)[:5]
     is_member = False
@@ -198,7 +249,9 @@
 def team_merge(request, team_slug, other_team_slug):
     old_team = get_object_or_404(Team, lp_name=team_slug)
     new_team = get_object_or_404(Team, lp_name=other_team_slug)
-
+    if old_team == 'ubuntu-lococouncil' or new_team == 'ubuntu-lococouncil':
+        request.user.message_set.create(message=ugettext('You are not allowed to merge this team with another one.'))
+        return redirect('/')
     #check if user has needed rights
     is_admin = launchpad.is_admin_or_owner(request.user.username, old_team) and \
                launchpad.is_admin_or_owner(request.user.username, new_team)
@@ -220,6 +273,8 @@
 @login_required
 def team_edit(request, team_slug):
     #get team
+    if team_slug == 'ubuntu-lococouncil':
+        raise Http404
     team_object = get_object_or_404(Team, lp_name=team_slug)
 
     #check if user has needed rights
 
=== added file 'loco_directory/templates/lc_edit.html'
--- loco_directory/templates/lc_edit.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/lc_edit.html	2013-02-17 12:28:20 +0000
@@ -0,0 +1,37 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block page_name %}{% blocktrans with team.name as teamname %}Update {{teamname}}{% endblocktrans %}{% endblock %}
+
+{% block extrahead %}{{block.super}}
+{{ form.media }}
+{% endblock %}
+
+{% 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 %}
+{% endblock %}
+
+{% block content %}
+
+<div class="row">
+<section class="span-9">
+    <article id="form">
+        {% if form.errors %}
+            <p style="color: red;">
+                {% trans  "Please correct the error" %}{{ form.errors|pluralize }} below.
+            </p>
+        {% endif %}
+
+        <form action="{{ request.path_info }}" method="POST">{% csrf_token %}
+            <fieldset>
+                <h3>{% trans "Update the information below" %}</h3>
+                {{ form.as_template }}
+            </fieldset>
+            <input type="submit" name="submit" value="{% trans "Update Information Now!" %}" class="submit-button" />
+        </form>
+    </section>
+</div>
+
+{% endblock %}
 
=== modified file 'loco_directory/templates/loco_council.html'
--- loco_directory/templates/loco_council.html	2012-06-04 22:14:50 +0000
+++ loco_directory/templates/loco_council.html	2013-02-17 12:28:20 +0000
@@ -1,45 +1,159 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n teams_tags %}
 
 {% block page_name %}{% trans "Ubuntu LoCo Council" %}{% endblock %}
 
 {% 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 %}
 {% endblock %}
 
 {% block content %}
 <div class="row">
-    <section class="span-12">
-    <h1>{% trans "Ubuntu LoCo Council" %}</h1>
-        <p>
-            {% trans "The Ubuntu LoCo Council is comprised of elected, dedicated members of the Ubuntu Community. They have diverse backgrounds, but have a firm understanding of what makes up successful LoCos. The LoCo Council was set up to govern Ubuntu LoCo teams, and utilizing their past experiences, provide guidance and help when needed to these teams and lead them by example." %}
-        </p>
-        <p>
-            {% trans "The LoCo Council governs the LoCo community, make decisions on resource allocation, deals with conflict resolution and make decisions about where the project should move forward." %}
-        </p>
-        <p>
-            {% trans "The LoCo Council governs the LoCo Community; responsibilities include but are not limited to the following:" %}
-            <ul>
-                <li>{% trans "To provide independent guidance for the LoCo Community." %}</li>
-                <li>{% trans "To maintain quality of governance in the LoCo community." %}</li>
-                <li>{% trans "To assess and re-assess teams for approved state." %}</li>
-                <li>{% trans "To provide input and feedback to other Ubuntu governance boards regarding the needs and achievements of the LoCo  community." %}</li>
-                <li>{% trans "To act as an independent, objective, third party to resolve conflict in teams by acting as mediator for a group or individuals." %}</li>
-                <li>{% trans "To govern key LoCo  resources such as mailing lists and key web properties. ie. if you log a Request Ticket regarding your LoCo and don't hear anything after 2 weeks contact us." %}</li>
-                <li>{% trans "Influencing and recommending how LoCo  resources are allocated." %}</li>
-                <li>{% trans "Influencing the direction and goals of the Ubuntu Project and greater LoCo Team effort." %}</li>
-                <li>{% trans "To motivate and encourage LoCos to be the best they can." %}</li>
-            </ul>
-        </p>
-        <p>
-            {% trans "You can reach the council via email at loco-council at lists.ubuntu.com." %}
-        </p>
-        <p>
-            {% with '<a href="https://wiki.ubuntu.com/LoCoCouncil/Agenda">' as url_lcagenda %}
-            {% with '</a>' as link_end %}
-                {% blocktrans %}The LoCo Council holds regular meetings in #ubuntu-meeting on freenode. To find out when the next meeting is view the {{ url_lcagenda }}Meeting Agenda{{ link_end }} wiki page.{% endblocktrans %}
-            {% endwith %}
-            {% endwith %}
-        </p>
-    </section></div>
+    <section class="span-9">
+        <div class="box_content">
+            <div class="pagelet">
+                <div id="locobranding">
+                    <img src="{{ MEDIA_URL }}images/cof_orange_hex1.png" alt="{{ team.name }}" title="{{ team.name }}" />
+                </div>
+                <div id="loco-name">
+                    <h2>{% trans "Ubuntu LoCo Council" %}</h2>
+                    <div style="display:block;">
+                        <div id="loco-location">
+                            <span title="{% trans "Resources" %}" class="pictogram ml"></span>
+                            <span class="value ellipsis small-ellipsis">
+                                {% if team.web_url %}
+                                <a href="{{ team.web_url }}" title="{% trans "Website" %}" target="_blank">
+                                    {% trans "Website" %}
+                                </a>
+                                {% endif %}
+                                {% if team.web_url and team.wiki_url %} / {% endif %}
+                                {% if team.wiki_url %}
+                                <a href="{{ team.wiki_url }}" title="{% trans "Wiki" %}" target="_blank">
+                                    {% trans "Wiki" %}
+                                </a>
+                                {% endif %}
+                            </span>
+                        </div>
+
+
+                        <div id="loco-support">
+                            <span class="pictogram forums" title="{% trans "Support" %}"></span>
+                            <span class="value ellipsis">
+                                {% if team.ml_url %}
+                                <a href="{{ team.ml_url }}" title="{% trans "Mailing List" %}" target="_blank">
+                                    {% trans "Mailing List" %}
+                                </a>
+                                {% endif %} /
+                                {% if team.forum_url  %}
+                                <a href="{{ team.forum_url }}" title="{% trans "Forums" %}" target="_blank">
+                                    {% trans "Forums" %}
+                                </a>
+                                {% endif %} /
+                                {% if team.irc_chan %}
+                                <a href="http://webchat.freenode.net/?channels={{ team.irc_chan }}&prompt=1&uio=OT10cnVlJjEwPXRydWUmMTE9MjM218&nick={% if user.is_authenticated %}{{ user.username|irc }}{% else %}locodir-user{% endif %}" title="{% trans "IRC" %}" target="_blank">
+                                    {% trans "IRC" %}
+                                </a>
+                                {% endif %}
+                            </span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="events-meetings-wrapper">
+                <div style="overflow: auto;">
+                    <h3 class="title">{% trans "Upcoming Meetings" %}</h3>
+                </div>
+                {% if team_meeting_list %}
+                    {% for meeting in team_meeting_list %}
+                    <a href="{{ meeting.get_absolute_url }}" title="{% if meeting.venue %}{% else %}{{meeting.date_begin|date:"M d"}}{% endif %}" class="event-meetings">
+                        <span class="title">{{ meeting.name }}</span>
+                        <small>{{ meeting.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ meeting.local_date_begin|date:"H:i T" }}</small>
+                        <p>{{ meeting.description }}</p>
+                    </a>
+                    {% endfor %}
+                {% else %}
+                    <div class="no-results">
+                    {% trans "There are currently no upcoming meetings." %}
+                    </div>
+                {% endif %}
+                <div id="lc" style="padding: 15px;">
+                    <p>
+                        {% trans "The Ubuntu LoCo Council is comprised of elected, dedicated members of the Ubuntu Community. They have diverse backgrounds, but have a firm understanding of what makes up successful LoCos. The LoCo Council was set up to govern Ubuntu LoCo teams, and utilizing their past experiences, provide guidance and help when needed to these teams and lead them by example." %}
+                    </p>
+                    <p>
+                        {% trans "The LoCo Council governs the LoCo community, make decisions on resource allocation, deals with conflict resolution and make decisions about where the project should move forward." %}
+                    </p>
+                    <p>
+                        {% trans "The LoCo Council governs the LoCo Community; responsibilities include but are not limited to the following:" %}
+                        <ul>
+                            <li>{% trans "To provide independent guidance for the LoCo Community." %}</li>
+                            <li>{% trans "To maintain quality of governance in the LoCo community." %}</li>
+                            <li>{% trans "To assess and re-assess teams for approved state." %}</li>
+                            <li>{% trans "To provide input and feedback to other Ubuntu governance boards regarding the needs and achievements of the LoCo  community." %}</li>
+                            <li>{% trans "To act as an independent, objective, third party to resolve conflict in teams by acting as mediator for a group or individuals." %}</li>
+                            <li>{% trans "To govern key LoCo  resources such as mailing lists and key web properties. ie. if you log a Request Ticket regarding your LoCo and don't hear anything after 2 weeks contact us." %}</li>
+                            <li>{% trans "Influencing and recommending how LoCo  resources are allocated." %}</li>
+                            <li>{% trans "Influencing the direction and goals of the Ubuntu Project and greater LoCo Team effort." %}</li>
+                            <li>{% trans "To motivate and encourage LoCos to be the best they can." %}</li>
+                        </ul>
+                    </p>
+                    <p>
+                        {% trans "You can reach the council via email at loco-council at lists.ubuntu.com." %}
+                    </p>
+                    <p>
+                        {% with '<a href="https://wiki.ubuntu.com/LoCoCouncil/Agenda">' as url_lcagenda %}
+                        {% with '</a>' as link_end %}
+                            {% blocktrans %}The LoCo Council holds regular meetings in #ubuntu-meeting on freenode. To find out when the next meeting is view the {{ url_lcagenda }}Meeting Agenda{{ link_end }} wiki page.{% endblocktrans %}
+                        {% endwith %}
+                        {% endwith %}
+                    </p>
+                </div>
+            </div>
+
+            {% if articles %}
+            <div class="team-planet-wrapper">
+                <div style="overflow: auto;">
+                    <h3 class="title">{% trans "Planet Feed" %}</h3>
+                </div>
+                {% for article in articles %}
+                <article class="team-blog-entry">
+                    {% if article.source.user %}
+                        <img class="blog-entry-image" src="{{ article.source.user.mugshot }}" />
+                    {% endif %}
+                    <h4 class="blog-entry-title">
+                        <a href="{{ article.get_absolute_url }}" title="{{ article.title }}">{{ article.title }}</a>
+                    </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>
+                        {% endif %}
+                    </div>
+                    <div class="blog-entry-text">
+                        <p>{{ article.content|safe|striptags|truncatewords_html:100 }}</p>
+                        <p class="more">
+                            <a href="{{ article.get_absolute_url }}" title="{{ article.title }}">{% trans 'Read More' %} ›</a>
+                        </p>
+                    </div>
+                </article>
+                {% endfor %}
+            </div>
+            {% endif %}
+        </div>
+    </section>
+    <section class="span-3 box_content last">
+        <div class="sidebar-inner">
+            <h3 class="title">{% trans "Members" %}</h3>
+            <div class="team-admins">
+            {% for member in members %}
+                    <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>
+            {% endfor %}
+            </div>
+        </div>
+    </section>
+</div>
 {% endblock %}
 
=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py	2012-12-26 16:20:13 +0000
+++ loco_directory/urls.py	2013-02-17 12:28:20 +0000
@@ -33,7 +33,8 @@
     url(r'^events/venues/', include('venues.urls')),
     url(r'^events/', include('events.urls')),
     url(r'^meetings/', include('meetings.urls')),
-    url(r'^loco-council/$', 'common.views.loco_council', name='loco_council'),
+    url(r'^loco-council/$', 'teams.views.loco_council', name='loco_council'),
+    url(r'^loco-council/edit$', 'teams.views.loco_council_edit', name='lc_edit'),
     url(r'^loco-council/approved$', 'teams.views.reapprovals', name='reapprovals'),
     url(r'^logout$', 'common.views.site_logout', name='logout'),
     url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'),