Merge lp:~cjohnston/loco-team-portal/bug-611897 into lp:loco-team-portal

[Chris Johnston]

Adds getting approved and getting reapproved info to approved teams page.

=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2010-08-23 13:17:10 +0000
+++ loco_directory/locale/loco-directory.pot	2010-09-10 01:13:42 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-23 13:16+0000\n"
+"POT-Creation-Date: 2010-09-10 01:06+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -172,122 +172,122 @@
 "LoCo Council."
 msgstr ""
 
-#: events/views.py:315
+#: events/views.py:317
 msgid "Your registration has been saved."
 msgstr ""
 
-#: events/views.py:346
+#: events/views.py:350
 msgid "Comment saved."
 msgstr ""
 
-#: events/views.py:414
+#: events/views.py:418
 msgid "Global Event removed."
 msgstr ""
 
-#: events/views.py:420
+#: events/views.py:424
 msgid "You can not remove this global event. You are not on the LoCo Council."
 msgstr ""
 
-#: events/views.py:434
+#: events/views.py:438
 msgid "New Global Event created."
 msgstr ""
 
-#: events/views.py:445
+#: events/views.py:449
 msgid "You can not add a new global event. You are not on the LoCo Council."
 msgstr ""
 
-#: events/views.py:461
+#: events/views.py:465
 msgid "Global Event updated."
 msgstr ""
 
-#: events/views.py:472
+#: events/views.py:476
 msgid "You can not update this global event. You are not on the LoCo Council."
 msgstr ""
 
-#: teams/models.py:9
+#: teams/models.py:10
 msgid "Language"
 msgstr ""
 
-#: teams/models.py:10
+#: teams/models.py:11
 msgid "Language Code"
 msgstr ""
 
-#: teams/models.py:19
-msgid "Launchpad ID"
-msgstr ""
-
-#: teams/models.py:24 teams/models.py:42
+#: teams/models.py:20 teams/models.py:38
 msgid "Name"
 msgstr ""
 
-#: teams/models.py:68
+#: teams/models.py:64
 msgid "Launchpad Team ID"
 msgstr ""
 
-#: teams/models.py:69
+#: teams/models.py:65
 msgid "Team Name"
 msgstr ""
 
-#: teams/models.py:71
+#: teams/models.py:67
 msgid "State/Province/Region"
 msgstr ""
 
-#: teams/models.py:72
+#: teams/models.py:68
 msgid "City"
 msgstr ""
 
-#: teams/models.py:73
+#: teams/models.py:69
 msgid "Ubuntu Wiki Page"
 msgstr ""
 
-#: teams/models.py:74
+#: teams/models.py:70
 msgid "Website"
 msgstr ""
 
-#: teams/models.py:75
+#: teams/models.py:71
 msgid "Mailing List URL"
 msgstr ""
 
-#: teams/models.py:76
+#: teams/models.py:72
 msgid "Forums URL"
 msgstr ""
 
-#: teams/models.py:77
+#: teams/models.py:73
 msgid "Email Address"
 msgstr ""
 
-#: teams/models.py:78 templates/teams/team_detail.html:86
+#: teams/models.py:74 templates/teams/team_detail.html:125
 msgid "IRC Channel"
 msgstr ""
 
-#: teams/models.py:80
+#: teams/models.py:76
 msgid ""
 "IRC Channel name that is hosted on the freenode IRC network. Ex. #ubuntu-"
 "chicago"
 msgstr ""
 
-#: teams/models.py:82
+#: teams/models.py:78
 msgid "Provides local support"
 msgstr ""
 
-#: teams/models.py:84
+#: teams/models.py:80
 msgid "Approved Team"
 msgstr ""
 
-#: teams/models.py:85
+#: teams/models.py:81
 msgid "Date Approved"
 msgstr ""
 
+#: teams/models.py:82
+msgid "Date Expires"
+msgstr ""
+
 #: teams/models.py:86
-msgid "Date Expires"
+msgid "URL of mugshot"
 msgstr ""
 
-#: teams/models.py:87
-msgid "Launchpad Team Owner"
+#: teams/models.py:88
+msgid "Flickr User ID"
 msgstr ""
 
 #: teams/models.py:89
-msgid "URL of mugshot"
+msgid "To get your Flickr user id go to http://idgettr.com. Ex. 47353004@N03"
 msgstr ""
 
 #: teams/views.py:116
@@ -307,12 +307,12 @@
 msgstr ""
 
 #: templates/404.html:4 templates/500.html:4 templates/about.html:4
-#: templates/about_loco.html:4 templates/base.html:4
+#: templates/about_loco.html:4 templates/base.html:4 templates/irc_chat.html:4
 #: templates/loco_council.html:4 templates/using_locodir.html:4
 #: templates/events/event_history_list.html:4
 #: templates/events/event_list.html:4
 #: templates/events/global_event_delete_confirm.html:4
-#: templates/events/global_event_detail.html:9
+#: templates/events/global_event_detail.html:8
 #: templates/events/global_event_new.html:4
 #: templates/events/global_event_update.html:4
 #: templates/events/team_event_comment_new.html:4
@@ -535,52 +535,57 @@
 "LoCo project."
 msgstr ""
 
-#: templates/base.html:6 templates/base.html.py:58
+#: templates/base.html:6 templates/base.html.py:60
 msgid "LoCo Team Directory"
 msgstr ""
 
-#: templates/base.html:13
+#: templates/base.html:14
 msgid "Show All Teams"
 msgstr ""
 
-#: templates/base.html:13 templates/using_locodir.html:16
+#: templates/base.html:14 templates/using_locodir.html:16
 #: templates/events/team_event_list.inc.html:8
 msgid "Teams"
 msgstr ""
 
-#: templates/base.html:14
+#: templates/base.html:15
 msgid "Show All Events"
 msgstr ""
 
-#: templates/base.html:14 templates/using_locodir.html:21
+#: templates/base.html:15 templates/using_locodir.html:21
 msgid "Events"
 msgstr ""
 
-#: templates/base.html:15
+#: templates/base.html:16
 msgid "LoCo Council"
 msgstr ""
 
-#: templates/base.html:16
+#: templates/base.html:17
 msgid "About LoCo Teams"
 msgstr ""
 
-#: templates/base.html:16
+#: templates/base.html:17
 msgid "About LoCos"
 msgstr ""
 
-#: templates/base.html:18
+#: templates/base.html:18 templates/irc_chat.html:4
+#: templates/irc_chat.html.py:12
+msgid "IRC Chat"
+msgstr ""
+
+#: templates/base.html:20
 msgid "Log Out"
 msgstr ""
 
-#: templates/base.html:20
+#: templates/base.html:22
 msgid "Log In"
 msgstr ""
 
-#: templates/base.html:43
+#: templates/base.html:45
 msgid "Logged in as"
 msgstr ""
 
-#: templates/base.html:57
+#: templates/base.html:59
 msgid "About the LoCo Team Directory Project"
 msgstr ""
 
@@ -589,43 +594,43 @@
 msgid "Using the LoCo Team Directory"
 msgstr ""
 
-#: templates/index.html:17
+#: templates/index.html:18
 msgid "Ubuntu Local Community (LoCo) Team Directory"
 msgstr ""
 
-#: templates/index.html:46
+#: templates/index.html:47
 msgid "Click on your continent to find teams near you."
 msgstr ""
 
-#: templates/index.html:53
+#: templates/index.html:54
 msgid "Show all Events"
 msgstr ""
 
-#: templates/index.html:53 templates/teams/team_event_history.html:8
+#: templates/index.html:54 templates/teams/team_event_history.html:8
 msgid "Upcoming Events"
 msgstr ""
 
-#: templates/index.html:56
+#: templates/index.html:57
 msgid "Global Events"
 msgstr ""
 
-#: templates/index.html:58 templates/events/event_list.html:29
+#: templates/index.html:59 templates/events/event_list.html:29
 msgid "Global Events as ical"
 msgstr ""
 
-#: templates/index.html:60 templates/events/event_list.html:31
+#: templates/index.html:61 templates/events/event_list.html:31
 msgid "Select a global event below to see more information about it:"
 msgstr ""
 
-#: templates/index.html:69
+#: templates/index.html:70
 msgid "Upcoming Team Events"
 msgstr ""
 
-#: templates/index.html:71 templates/events/event_list.html:46
+#: templates/index.html:72 templates/events/event_list.html:46
 msgid "Team Events as ical"
 msgstr ""
 
-#: templates/index.html:76 templates/events/global_event_detail.inc.html:30
+#: templates/index.html:77 templates/events/global_event_detail.inc.html:117
 msgid "Microblogging"
 msgstr ""
 
@@ -634,7 +639,7 @@
 msgstr ""
 
 #: templates/loco_council.html:7
-msgid "Upcoming Reapprovals"
+msgid "Approved Teams"
 msgstr ""
 
 #: templates/loco_council.html:8
@@ -750,7 +755,7 @@
 msgstr ""
 
 #: templates/events/event_history_list.html:7
-#: templates/events/global_event_detail.html:12
+#: templates/events/global_event_detail.html:11
 #: templates/events/team_event_detail.html:7
 msgid "Back to Events List"
 msgstr ""
@@ -795,7 +800,7 @@
 msgid "Add Team Event"
 msgstr ""
 
-#: templates/events/event_list.html:14 templates/teams/team_detail.html:104
+#: templates/events/event_list.html:14 templates/teams/team_detail.html:143
 #: templates/teams/team_event_list.html:8
 msgid "Past Events"
 msgstr ""
@@ -840,31 +845,35 @@
 msgid "Cancel"
 msgstr ""
 
-#: templates/events/global_event_detail.html:14
+#: templates/events/global_event_detail.html:13
 msgid "Add Your Team's Event"
 msgstr ""
 
-#: templates/events/global_event_detail.html:17
+#: templates/events/global_event_detail.html:16
 #: templates/events/team_event_detail.html:11
 #: templates/teams/team_detail.html:9
 msgid "Edit Details"
 msgstr ""
 
-#: templates/events/global_event_detail.html:18
+#: templates/events/global_event_detail.html:17
 #: templates/events/team_event_detail.html:12
 msgid "Delete Event"
 msgstr ""
 
-#: templates/events/global_event_detail.inc.html:14
+#: templates/events/global_event_detail.inc.html:101
 #: templates/events/team_event_detail.inc.html:14
 msgid "Details"
 msgstr ""
 
-#: templates/events/global_event_detail.inc.html:22
+#: templates/events/global_event_detail.inc.html:109
 #, python-format
 msgid "Participating Team Events (%(team_count)s)"
 msgstr ""
 
+#: templates/events/global_event_detail.inc.html:124
+msgid "Photos of"
+msgstr ""
+
 #: templates/events/global_event_detail_attending_teamevents.inc.html:10
 #: templates/events/global_event_detail_attending_teamevents.inc.html:25
 #: templates/events/global_event_detail_attending_teamevents.inc.html:38
@@ -958,7 +967,7 @@
 msgstr ""
 
 #: templates/events/team_event_detail.html:17
-#: templates/teams/team_detail.html:106
+#: templates/teams/team_detail.html:145
 msgid "iCal Feed"
 msgstr ""
 
@@ -1107,88 +1116,88 @@
 msgid "Add New Event"
 msgstr ""
 
-#: templates/teams/team_detail.html:16 templates/teams/team_event_list.html:9
+#: templates/teams/team_detail.html:58 templates/teams/team_event_list.html:9
 msgid "Team Events (RSS)"
 msgstr ""
 
-#: templates/teams/team_detail.html:25
+#: templates/teams/team_detail.html:67
 msgid "Location:"
 msgstr ""
 
-#: templates/teams/team_detail.html:32 templates/teams/team_detail.html:42
-#: templates/teams/team_detail.html:117
+#: templates/teams/team_detail.html:72 templates/teams/team_detail.html:82
+#: templates/teams/team_detail.html:156
 msgid "None Specified"
 msgstr ""
 
-#: templates/teams/team_detail.html:37
+#: templates/teams/team_detail.html:77
 msgid "Languages:"
 msgstr ""
 
-#: templates/teams/team_detail.html:47
-msgid "Launchpad Page:"
-msgstr ""
-
-#: templates/teams/team_detail.html:52
-msgid "Launchpad Team Owner:"
-msgstr ""
-
-#: templates/teams/team_detail.html:58
+#: templates/teams/team_detail.html:89
 msgid "Approval Date:"
 msgstr ""
 
-#: templates/teams/team_detail.html:64
+#: templates/teams/team_detail.html:95
 msgid "Expires Date:"
 msgstr ""
 
-#: templates/teams/team_detail.html:69
-msgid "Provides Local Support:"
-msgstr ""
-
-#: templates/teams/team_detail.html:73
-msgid "Launchpad Team Admin(s):"
-msgstr ""
-
-#: templates/teams/team_detail.html:80
+#: templates/teams/team_detail.html:100
+msgid "Local Support:"
+msgstr ""
+
+#: templates/teams/team_detail.html:104
+msgid "Team Admin(s):"
+msgstr ""
+
+#: templates/teams/team_detail.html:112
+msgid "Loco Contacts(s):"
+msgstr ""
+
+#: templates/teams/team_detail.html:119
 msgid "Resources:"
 msgstr ""
 
-#: templates/teams/team_detail.html:83
+#: templates/teams/team_detail.html:122
 msgid "Team Wiki"
 msgstr ""
 
-#: templates/teams/team_detail.html:89
+#: templates/teams/team_detail.html:128
 msgid "Team Mailing List"
 msgstr ""
 
-#: templates/teams/team_detail.html:92
+#: templates/teams/team_detail.html:131
 msgid "Team Forums"
 msgstr ""
 
-#: templates/teams/team_detail.html:95
+#: templates/teams/team_detail.html:134
 msgid "Team Website"
 msgstr ""
 
-#: templates/teams/team_detail.html:100
+#: templates/teams/team_detail.html:139
 msgid "Upcoming Events:"
 msgstr ""
 
-#: templates/teams/team_detail.html:103
+#: templates/teams/team_detail.html:142
 msgid "All Events"
 msgstr ""
 
-#: templates/teams/team_detail.html:105
+#: templates/teams/team_detail.html:144
 msgid "RSS Feed"
 msgstr ""
 
-#: templates/teams/team_detail.html:113
+#: templates/teams/team_detail.html:152
 #, python-format
 msgid "%(start_date)s in %(city)s"
 msgstr ""
 
-#: templates/teams/team_detail.html:113
+#: templates/teams/team_detail.html:152
 msgid "on: "
 msgstr ""
 
+#: templates/teams/team_detail.html:169
+msgid "Photos from"
+msgstr ""
+
 #: templates/teams/team_event_history.html:4
 #: templates/teams/team_event_history.html:15
 #, python-format
@@ -1220,40 +1229,110 @@
 msgid "Ubuntu LoCo Teams List"
 msgstr ""
 
-#: templates/teams/team_list.html:28 templates/teams/team_list.html.py:41
-#: templates/teams/team_list.html:53
+#: templates/teams/team_list.html:28 templates/teams/team_list.html.py:43
+#: templates/teams/team_list.html:57
 #, python-format
 msgid "%(teamname)s approved"
 msgstr ""
 
-#: templates/teams/team_list.html:28 templates/teams/team_list.html.py:41
-#: templates/teams/team_list.html:53
+#: templates/teams/team_list.html:28 templates/teams/team_list.html.py:43
+#: templates/teams/team_list.html:57
 #, python-format
 msgid "%(teamname)s not approved"
 msgstr ""
 
-#: templates/teams/team_list.html:35
+#: templates/teams/team_list.html:37
 msgid "Countries without continent"
 msgstr ""
 
-#: templates/teams/team_list.html:49
+#: templates/teams/team_list.html:53
 msgid "Teams without country"
 msgstr ""
 
 #: templates/teams/team_reapprovals.html:4
 #: templates/teams/team_reapprovals.html:12
-msgid "Ubuntu LoCo Team Approvals List"
+msgid "Approved Ubuntu LoCo Teams"
 msgstr ""
 
 #: templates/teams/team_reapprovals.html:17
-msgid "Reapprovals in the next 6 months"
-msgstr ""
-
-#: templates/teams/team_reapprovals.html:34
-msgid "Reapprovals later on"
+msgid "Getting Your Team Approved"
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:18
+msgid "Ubuntu LoCo teams fall into two approximate categories:"
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:20
+msgid ""
+"New Teams - these are teams that are in the process of getting started and "
+"have not yet been officially approved as an Ubuntu LoCo team."
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:21
+msgid ""
+"Approved Teams - an approved team is a team that is up and running, has each "
+"of the required resources in operation and the team is working well."
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:24
+msgid "For more information on getting approved, you can look at"
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:24
+msgid "getting your LoCo team approved"
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:24
+msgid "and the"
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:24
+msgid "LoCo Team FAQs"
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:24
+msgid "pages created by the LoCo Council."
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:25
+msgid "Getting Your Team Reapproved"
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:26
+msgid ""
+"Every two years each LoCo team must be reapproved. LoCo teams will be "
+"contacted by a member of the LoCo Council notifying the team that it is time "
+"for them to be reapproved. The LoCo team then will need to create an "
+"application, much like the initial approval application showing that they "
+"have been active in the community in the past two years."
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:27
+msgid ""
+"For more information on getting reapproved, the LoCo Council has created the"
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:27
+msgid "LoCo Team Reapproval"
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:27
+msgid "page."
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:32
+msgid "Approved Teams:"
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:35
+msgid "Reapprovals in the next 6 months:"
 msgstr ""
 
 #: templates/teams/team_reapprovals.html:51
+msgid "Reapprovals later on:"
+msgstr ""
+
+#: templates/teams/team_reapprovals.html:66
 msgid ""
 "There are currently no approved teams in the Ubuntu LoCo Team Directory. :("
 msgstr ""
@@ -1278,11 +1357,11 @@
 msgid "Update Information Now!"
 msgstr ""
 
-#: templates/venues/venue_detail.html:15
+#: templates/venues/venue_detail.html:14
 msgid "Back to Venues List"
 msgstr ""
 
-#: templates/venues/venue_detail.html:17
+#: templates/venues/venue_detail.html:16
 msgid "Edit Venue Details"
 msgstr ""
 
@@ -1326,18 +1405,62 @@
 msgid "There are currently no LoCo Venues :("
 msgstr ""
 
-#: templates/venues/venue_update.html:4 templates/venues/venue_update.html:36
+#: templates/venues/venue_update.html:4 templates/venues/venue_update.html:35
 msgid "Update Venue"
 msgstr ""
 
-#: templates/venues/venue_update.html:4 templates/venues/venue_update.html:36
+#: templates/venues/venue_update.html:4 templates/venues/venue_update.html:35
 msgid "New Venue"
 msgstr ""
 
-#: templates/venues/venue_update.html:45
+#: templates/venues/venue_update.html:44
 msgid "Select venue position"
 msgstr ""
 
+#: userprofiles/models.py:10
+msgid "Real Name"
+msgstr ""
+
+#: userprofiles/models.py:11
+msgid "Timezone"
+msgstr ""
+
+#: userprofiles/models.py:13
+msgid "Blog URL"
+msgstr ""
+
+#: userprofiles/models.py:14
+msgid "Twitter ID"
+msgstr ""
+
+#: userprofiles/models.py:15
+msgid "Identi.ca ID"
+msgstr ""
+
+#: userprofiles/models.py:16
+msgid "Picasa ID"
+msgstr ""
+
+#: userprofiles/models.py:17
+msgid "Flickr ID"
+msgstr ""
+
+#: userprofiles/models.py:18
+msgid "Facebook ID"
+msgstr ""
+
+#: userprofiles/models.py:19
+msgid "IRC Nick"
+msgstr ""
+
+#: userprofiles/models.py:20
+msgid "AOL IM Nick"
+msgstr ""
+
+#: userprofiles/models.py:21
+msgid "XMPP IM Nick"
+msgstr ""
+
 #: venues/forms.py:9
 msgid "Please use a descriptive name for the venue."
 msgstr ""
 
=== modified file 'loco_directory/templates/loco_council.html'
--- loco_directory/templates/loco_council.html	2010-08-21 00:51:54 +0000
+++ loco_directory/templates/loco_council.html	2010-09-10 01:13:42 +0000
@@ -4,7 +4,7 @@
 {% block title %} {% trans "Ubuntu LoCo Council" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="reapprovals">{% trans "Upcoming Reapprovals" %}</a>
+<a class="sub-nav-item" href="approved">{% trans "Approved Teams" %}</a>
 <a class="sub-nav-item" href="https://wiki.ubuntu.com/LoCoCouncil/Agenda">{% trans "Meeting Agenda" %}</a>
 {% endblock %}
 {% block search %}{% endblock %}
 
=== modified file 'loco_directory/templates/teams/team_reapprovals.html'
--- loco_directory/templates/teams/team_reapprovals.html	2010-08-20 13:05:47 +0000
+++ loco_directory/templates/teams/team_reapprovals.html	2010-09-10 01:13:42 +0000
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Ubuntu LoCo Team Approvals List" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
+{% block title %}{% trans "Approved Ubuntu LoCo Teams" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 {% block extrahead %}{{ block.super }}
 <link rel="stylesheet" type="text/css" href="/media/css/newstyle.css" />
 {% endblock %}
@@ -9,47 +9,62 @@
 
 {% block content %}
 
-<h1>{% trans "Ubuntu LoCo Team Approvals List" %}</h1>
+<h1>{% trans "Approved Ubuntu LoCo Teams" %}</h1>
+
 <hr class="divide" />
 
-{% if next_teams %}
-<article class="minor-content">
-<h2>{% trans "Reapprovals in the next 6 months" %}</h2>
-<table width="100%">
-<tr>
-<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>
-{% endfor %}
-</ul>
-</td>
-</tr>
-</table>
-</article>
-{% endif %}
-
-{% if later_teams %}
-<article class="minor-content">
-<h2>{% trans "Reapprovals later on" %}</h2>
-<table width="100%">
-<tr>
-<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>
-{% endfor %}
-</ul>
-</td>
-</tr>
-</table>
-</article>
-{% endif %}
-
-{% if not next_teams and not later_teams %}
-<article class="main-content">
-<p>{% trans "There are currently no approved teams in the Ubuntu LoCo Team Directory. :(" %}</p>
-</article>
-{% endif %}
+<article class="minor-content">
+    <h2>{% trans "Getting Your Team Approved" %}</h2>
+    <p>{% trans "Ubuntu LoCo teams fall into two approximate categories:" %}
+        <ul>
+            <li>{% trans "New Teams - these are teams that are in the process of getting started and have not yet been officially approved as an Ubuntu LoCo team." %}</li>
+            <li>{% trans "Approved Teams - an approved team is a team that is up and running, has each of the required resources in operation and the team is working well." %}</li>
+        </ul>
+    </p>
+    <p>{% trans "For more information on getting approved, you can look at" %} <a href="https://wiki.ubuntu.com/LoCoGettingApproved">{% trans "getting your LoCo team approved" %}</a> {% trans "and the" %} <a href="https://wiki.ubuntu.com/LoCoFAQ">{% trans "LoCo Team FAQs" %}</a> {% trans "pages created by the LoCo Council." %}</p>
+    <h2>{% trans "Getting Your Team Reapproved" %}</h2>
+    <p>{% trans "Every two years each LoCo team must be reapproved. LoCo teams will be contacted by a member of the LoCo Council notifying the team that it is time for them to be reapproved. The LoCo team then will need to create an application, much like the initial approval application showing that they have been active in the community in the past two years." %}</p>
+    <p>{% trans "For more information on getting reapproved, the LoCo Council has created the" %} <a href="https://wiki.ubuntu.com/LoCoCouncil/LoCoTeamReApproval">{% trans "LoCo Team Reapproval" %}</a> {% trans "page." %}</p>
+</article>
+
+
+<article class="minor-content alone">
+    <h2>{% trans "Approved Teams:" %}</h2>
+    <br />
+    {% if next_teams %}
+        <h3>{% trans "Reapprovals in the next 6 months:" %}</h3>
+        <table width="100%">
+            <tr>
+                <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>
+                        {% endfor %}
+                    </ul>
+                </td>
+            </tr>
+        </table>
+    {% endif %}
+
+    {% if later_teams %}
+        <br />
+        <h3>{% trans "Reapprovals later on:" %}</h3>
+        <table width="100%">
+            <tr>
+                <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>
+                        {% endfor %}
+                    </ul>
+                </td>
+            </tr>
+        </table>
+    {% endif %}
+
+    {% if not next_teams and not later_teams %}
+        <p>{% trans "There are currently no approved teams in the Ubuntu LoCo Team Directory. :(" %}</p>
+    {% endif %}
+</article>
 
 {% endblock %}
 
=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py	2010-08-26 00:00:52 +0000
+++ loco_directory/urls.py	2010-09-10 01:13:42 +0000
@@ -19,7 +19,7 @@
     url(r'^events/venues/', include('venues.urls')),
     url(r'^events/', include('events.urls')),
     url(r'^loco-council/$', 'common.views.loco_council', name='loco_council'),
-    url(r'^loco-council/reapprovals$', 'teams.views.reapprovals', name='reapprovals'),
+    url(r'^loco-council/approved$', 'teams.views.reapprovals', name='reapprovals'),
     url(r'^logout$', 'common.views.site_logout'),
     url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'),
     url(r'^services/', include('services.urls')),