Merge lp:~jose/loco-team-portal/approved-to-verified into lp:loco-team-portal

[José Antonio Rey]

Changed 'approved' to 'verified' in various teams pages, updated links to verification links.

Changed some pages to display 'verification', 'verificated' or 're-verification' instead of 'approval', 'approved' or 'reapproval'. Also, updated some wiki links in as the pages were non-existant.

[Adnane Belmadiaf (daker)]

+1

review: Approve

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2013-03-30 22:25:01 +0000
+++ loco_directory/templates/teams/team_detail.html	2013-11-17 05:34:45 +0000
@@ -142,7 +142,7 @@
                         </div>
                         {% if team.approved %}
                         <div id="loco-support">
-                            <span title="{% trans "Reapproval Date" %}" class="pictogram calendar"></span>
+                            <span title="{% trans "Re-verification Date" %}" class="pictogram calendar"></span>
                             <span class="value ellipsis medium-ellipsis">
                                 {% if team.approved %}
                                     {{ team.expires_date }}
 
=== modified file 'loco_directory/templates/teams/team_reapprovals.html'
--- loco_directory/templates/teams/team_reapprovals.html	2013-10-30 00:31:14 +0000
+++ loco_directory/templates/teams/team_reapprovals.html	2013-11-17 05:34:45 +0000
@@ -14,9 +14,9 @@
 <div class="row">
 <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/LoCoCouncil/TeamVerificationGuidelines">' 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 %}
+    {% with '<a href="https://wiki.ubuntu.com/LoCoCouncil/TeamVerificationGuidelines#Re-Verification">' as reapprove_link %}
 
     <h2>{% trans "Getting Your Team Verified" %}</h2>
     <p>{% trans "Ubuntu LoCo teams fall into two approximate categories:" %}
@@ -69,7 +69,7 @@
     {% endif %}
 
     {% if not next_teams and not later_teams %}
-        <p>{% trans "There are currently no approved teams in the Ubuntu LoCo Team Portal. :(" %}</p>
+        <p>{% trans "There are currently no verified teams in the Ubuntu LoCo Team Portal. :(" %}</p>
     {% endif %}
 </section>
 </div>
 
=== modified file 'loco_directory/templates/teams/team_update.html'
--- loco_directory/templates/teams/team_update.html	2013-02-18 21:27:39 +0000
+++ loco_directory/templates/teams/team_update.html	2013-11-17 05:34:45 +0000
@@ -28,16 +28,16 @@
                     <fieldset>
                         <h3>{% trans "Static information" %}</h3>
                         <div class="approved">
-                            <span>Approved :</span>
+                            <span>Verified :</span>
                             <span>{% if team.approved %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}</span>
                         </div>
                         {% if team.approved %}
                             <div class="approved_date">
-                                <span>Date Approved :</span>
+                                <span>Date Verified :</span>
                                 <span>{{ team.approved_date }}</span>
                             </div>
                             <div class="expires_date">
-                                <span>Reapproval Date :</span>
+                                <span>Re-verification Date :</span>
                                 <span>{{ team.expires_date }}</span>
                             </div>
                         {% endif %}