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

[Adnane Belmadiaf]

Fixed "Teams Re-verifications" page

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

661. By Adnane Belmadiaf on 2013-10-30

Uncommited changes

[Michael Hall (mhall119)]

Looks good, tests all pass.

review: Approve

=== modified file 'loco_directory/media/css/styles.css'
--- loco_directory/media/css/styles.css	2013-09-04 22:35:30 +0000
+++ loco_directory/media/css/styles.css	2013-10-30 00:43:51 +0000
@@ -62,10 +62,12 @@
 
 li.approved {
     list-style-image: url(../img/approved.png);   /* Colorful Ubuntu Logo */
+    text-align: left;
 }
 
 li.unapproved {
     list-style-image: url(../img/unapproved.png); /* Grey Ubuntu Logo */
+    text-align: left;
 }
 
 .relative {

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2013-02-19 22:23:46 +0000
+++ loco_directory/teams/views.py	2013-10-30 00:43:51 +0000
@@ -22,6 +22,9 @@
 
 
 def reapprovals(request):
+    return redirect('/loco-council/verified/')
+
+def verified(request):
     teams = filter(lambda a: a.approved and a.expires_date != None,
                    Team.objects.all().order_by('expires_date', 'name'))
     today = datetime.date.today()

=== modified file 'loco_directory/templates/teams/team_reapprovals.html'
--- loco_directory/templates/teams/team_reapprovals.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/teams/team_reapprovals.html	2013-10-30 00:43:51 +0000
@@ -1,44 +1,44 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block page_name %}{% trans "Approved Ubuntu LoCo Teams" %}{% endblock %}
+{% block page_name %}{% trans "Verified Ubuntu LoCo Teams" %}{% endblock %}
 
 {% block extrahead %}{{ block.super }}{% endblock %}
 
 {% block content %}
 <div class="row">
 <section class="span-12">
-<h1>{% trans "Approved Ubuntu LoCo Teams" %}</h1>
+<h1>{% trans "Verified Ubuntu LoCo Teams" %}</h1>
 </section>
 </div>
 <div class="row">
-<section class="span-8">
+<section class="span-12">
     {% with '</a>' as end_link %}
     {% with '<a href="https://wiki.ubuntu.com/LoCoGettingApproved">' as approved_link %}
     {% with '<a href="https://wiki.ubuntu.com/LoCoFAQ">' as faq_link %}
     {% with '<a href="https://wiki.ubuntu.com/LoCoCouncil/LoCoTeamReApproval">' as reapprove_link %}
 
-    <h2>{% trans "Getting Your Team Approved" %}</h2>
+    <h2>{% trans "Getting Your Team Verified" %}</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>
+            <li>{% trans "Verified Teams - a verified 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>{% blocktrans %}For more information on getting approved, you can look at {{ approved_link }}getting your LoCo team approved{{ end_link }} and the {{ faq_link }}LoCo Team FAQs{{ end_link }} pages created by the LoCo Council.{% endblocktrans %}</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>{% blocktrans %}For more information on getting reapproved, the LoCo Council has created the {{ reapprove_link }}LoCo Team Reapproval{{ end_link }} page.{% endblocktrans %}</p>
+    <p>{% blocktrans %}For more information on getting verified, you can look at {{ approved_link }}getting your LoCo team approved{{ end_link }} and the {{ faq_link }}LoCo Team FAQs{{ end_link }} pages created by the LoCo Council.{% endblocktrans %}</p>
+    <h2>{% trans "Getting Your Team Verified" %}</h2>
+    <p>{% trans "Every two years each LoCo team must be verified. LoCo teams will be contacted by a member of the LoCo Council notifying the team that it is time for them to be Re-verified. The LoCo team then will need to create an application, much like the initial verification application showing that they have been active in the community in the past two years." %}</p>
+    <p>{% blocktrans %}For more information on getting verified, the LoCo Council has created the {{ reapprove_link }}LoCo Team Verification{{ end_link }} guidelines.{% endblocktrans %}</p>
     {% endwith %}
     {% endwith %}
     {% endwith %}
     {% endwith %}
 </section>
-<section class="span-4 last">
-    <h2>{% trans "Approved Teams:" %}</h2>
+<section class="span-12">
+    <h2>{% trans "Verified Teams:" %}</h2>
     <br />
     {% if next_teams %}
-        <h3>{% trans "Reapprovals in the next 6 months:" %}</h3>
+        <h3>{% trans "Re-Verifications in the next 6 months:" %}</h3>
         <table width="100%">
             <tr>
                 <td width="100%" valign="top" class="col2_container">
@@ -54,7 +54,7 @@
 
     {% if later_teams %}
         <br />
-        <h3>{% trans "Reapprovals later on:" %}</h3>
+        <h3>{% trans "Re-Verifications later on:" %}</h3>
         <table width="100%">
             <tr>
                 <td width="100%" valign="top" class="col2_container">

=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py	2013-02-16 18:50:41 +0000
+++ loco_directory/urls.py	2013-10-30 00:43:51 +0000
@@ -35,7 +35,9 @@
     url(r'^meetings/', include('meetings.urls')),
     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'^loco-council/approved/$', 'teams.views.reapprovals', name='reapprovals-old'),
+    url(r'^loco-council/verified/$', 'teams.views.verified', name='reapprovals'),
+
     url(r'^logout$', 'common.views.site_logout', name='logout'),
     url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'),
     url(r'^services/', include('services.urls')),