Merge lp:~cjohnston/loco-team-portal/696661 into lp:loco-team-portal

[Chris Johnston]

[Ronnie (ronnie.vd.c)]

On the team_edit page, there is still a "Date Expires"

review: Needs Fixing

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Ronnie (ronnie.vd.c)]

Approved : (line 94), Date Approved : (line 99), Reapproval Date : (line 103)
still need to be translated

review: Needs Fixing

[Chris Johnston (cjohnston)]

We have decided that translations will only be added on merges to avoid some conflicts.

=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py	2010-12-25 08:02:40 +0000
+++ loco_directory/teams/models.py	2011-01-10 01:00:10 +0000
@@ -85,7 +85,7 @@
                                            default=True)
     approved = models.BooleanField(_("Approved Team"), default=False)
     approved_date = models.DateField(_("Date Approved"), null=True, blank=True)
-    expires_date = models.DateField(_("Date Expires"), null=True, blank=True)
+    expires_date = models.DateField(_("Reapproval Date"), null=True, blank=True)
     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')

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2010-12-25 08:02:40 +0000
+++ loco_directory/templates/teams/team_detail.html	2011-01-10 01:00:10 +0000
@@ -146,7 +146,7 @@
         {% endif %}
         {% if team.approved %}
             <tr>
-                <th class="form-item-label" scope="row"><label>{% trans "Expires Date:" %}</label></th>
+                <th class="form-item-label" scope="row"><label>{% trans "Reapproval Date:" %}</label></th>
                 <td class="form-item-value">{{ team.expires_date }}</td>
             </tr>
         {% endif %}

=== modified file 'loco_directory/templates/teams/team_update.html'
--- loco_directory/templates/teams/team_update.html	2010-10-13 20:56:02 +0000
+++ loco_directory/templates/teams/team_update.html	2011-01-10 01:00:10 +0000
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %}{{ team.name }} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
+{% block title %}Update {{ team.name }} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 
 {% block extrahead %}{{block.super}}
 {{ form.media }}
@@ -16,43 +16,43 @@
 {% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a>
-<a class="sub-nav-item" href="/teams/{{ team.lp_name }}">{% trans "Back to Team Details" %}</a>
+    <a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a>
+    <a class="sub-nav-item" href="/teams/{{ team.lp_name }}">{% trans "Back to Team Details" %}</a>
 {% endblock %}
 
 {% block content %}
 
-  <article id="form" class="main-content">
-    {% if form.errors %}
-        <p style="color: red;">
-          {% trans  "Please correct the error" %}{{ form.errors|pluralize }} below.
-        </p>
-    {% endif %}
+    <article id="form" class="main-content">
+        {% 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">
-      <p>{% trans "Update the information below:" %}</p>
-      <div class="form"> 
-	    {{ form.as_template }}
-	    <div class="approved">
-		<div class="field"><label for="approved">Approved :</label></div>
-		<span class="extra">{% if team.approved %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}</span>
-	    </div>
-            {% if team.approved %}
-	    <div class="approved_date">
-		<div class="field"><label for="approved_date">Date Approved :</label></div>
-		<span class="extra">{{ team.approved_date }}</span>
-	    </div>
-	    <div class="expires_date">
-		<div class="field"><label for="expires_date">Date Expires :</label></div>
-		<span class="extra">{{ team.expires_date }}</span>
-	    </div>
-      	    {% endif %}
-	    <div> 
-		{% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
-		<input type="submit" name="submit" value="{% trans "Update Information Now!" %}" class="submit-button" /> 
-	    </div>
-    	</div>
-    </form>
-</article>
+        <form action="{{ request.path_info }}" method="POST">
+            <p>{% trans "Update the information below:" %}</p>
+            <div class="form"> 
+	            {{ form.as_template }}
+                <div class="approved">
+                    <div class="field"><label for="approved">Approved :</label></div>
+                    <span class="extra">{% if team.approved %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}</span>
+                </div>
+                {% if team.approved %}
+                    <div class="approved_date">
+                        <div class="field"><label for="approved_date">Date Approved :</label></div>
+                        <span class="extra">{{ team.approved_date }}</span>
+                    </div>
+                    <div class="expires_date">
+                        <div class="field"><label for="expires_date">Reapproval Date :</label></div>
+                        <span class="extra">{{ team.expires_date }}</span>
+                    </div>
+      	        {% endif %}
+                <div> 
+                    {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}		
+                    <input type="submit" name="submit" value="{% trans "Update Information Now!" %}" class="submit-button" /> 
+                </div>
+            </div>
+        </form>
+    </article>
 
 {% endblock %}