LoCo Team Portal

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

  1. 696661
  2. Merge into 0.2
Proposed by Chris Johnston
Status: Superseded
Proposed branch: lp:~cjohnston/loco-team-portal/696661
Merge into: lp:loco-team-portal
Diff against target: 115 lines (+36/-36)
3 files modified
loco_directory/teams/models.py (+1/-1)
loco_directory/templates/teams/team_detail.html (+1/-1)
loco_directory/templates/teams/team_update.html (+34/-34)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/696661
Reviewer Review Type Date Requested Status
Ronnie (community) Needs Fixing
Chris Johnston Needs Resubmitting
Review via email: mp+45014@code.launchpad.net

This proposal has been superseded by a proposal from 2011-01-10.

To post a comment you must log in.
Revision history for this message
Ronnie (ronnie.vd.c) wrote :

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

review: Needs Fixing
lp:~cjohnston/loco-team-portal/696661 updated
354. By Chris Johnston

Fixes text

Revision history for this message
Chris Johnston (cjohnston) :
review: Needs Resubmitting
Revision history for this message
Ronnie (ronnie.vd.c) wrote :

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

review: Needs Fixing
Revision history for this message
Chris Johnston (cjohnston) wrote :

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

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 00:57:13 +0000
@@ -85,7 +85,7 @@
85 default=True)85 default=True)
86 approved = models.BooleanField(_("Approved Team"), default=False)86 approved = models.BooleanField(_("Approved Team"), default=False)
87 approved_date = models.DateField(_("Date Approved"), null=True, blank=True)87 approved_date = models.DateField(_("Date Approved"), null=True, blank=True)
88 expires_date = models.DateField(_("Date Expires"), null=True, blank=True)88 expires_date = models.DateField(_("Reapproval Date"), null=True, blank=True)
89 owner_profile = models.ForeignKey(UserProfile, related_name='owner', null=True)89 owner_profile = models.ForeignKey(UserProfile, related_name='owner', null=True)
90 admin_profiles = models.ManyToManyField(UserProfile, related_name='admins')90 admin_profiles = models.ManyToManyField(UserProfile, related_name='admins')
91 contact_profiles = models.ManyToManyField(UserProfile, related_name='contacts')91 contact_profiles = models.ManyToManyField(UserProfile, related_name='contacts')
9292
=== 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 00:57:13 +0000
@@ -146,7 +146,7 @@
146 {% endif %}146 {% endif %}
147 {% if team.approved %}147 {% if team.approved %}
148 <tr>148 <tr>
149 <th class="form-item-label" scope="row"><label>{% trans "Expires Date:" %}</label></th>149 <th class="form-item-label" scope="row"><label>{% trans "Reapproval Date:" %}</label></th>
150 <td class="form-item-value">{{ team.expires_date }}</td>150 <td class="form-item-value">{{ team.expires_date }}</td>
151 </tr>151 </tr>
152 {% endif %}152 {% endif %}
153153
=== 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 00:57:13 +0000
@@ -1,7 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load i18n %}2{% load i18n %}
33
4{% block title %}{{ team.name }} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}4{% block title %}Update {{ team.name }} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
55
6{% block extrahead %}{{block.super}}6{% block extrahead %}{{block.super}}
7{{ form.media }}7{{ form.media }}
@@ -16,43 +16,43 @@
16{% endblock %}16{% endblock %}
1717
18{% block sub_nav_links %}18{% block sub_nav_links %}
19<a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a>19 <a class="sub-nav-item" href="/teams">{% trans "Back to Teams List" %}</a>
20<a class="sub-nav-item" href="/teams/{{ team.lp_name }}">{% trans "Back to Team Details" %}</a>20 <a class="sub-nav-item" href="/teams/{{ team.lp_name }}">{% trans "Back to Team Details" %}</a>
21{% endblock %}21{% endblock %}
2222
23{% block content %}23{% block content %}
2424
25 <article id="form" class="main-content">25 <article id="form" class="main-content">
26 {% if form.errors %}26 {% if form.errors %}
27 <p style="color: red;">27 <p style="color: red;">
28 {% trans "Please correct the error" %}{{ form.errors|pluralize }} below.28 {% trans "Please correct the error" %}{{ form.errors|pluralize }} below.
29 </p>29 </p>
30 {% endif %}30 {% endif %}
3131
32 <form action="{{ request.path_info }}" method="POST">32 <form action="{{ request.path_info }}" method="POST">
33 <p>{% trans "Update the information below:" %}</p>33 <p>{% trans "Update the information below:" %}</p>
34 <div class="form"> 34 <div class="form">
35 {{ form.as_template }}35 {{ form.as_template }}
36 <div class="approved">36 <div class="approved">
37 <div class="field"><label for="approved">Approved :</label></div>37 <div class="field"><label for="approved">Approved :</label></div>
38 <span class="extra">{% if team.approved %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}</span>38 <span class="extra">{% if team.approved %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}</span>
39 </div>39 </div>
40 {% if team.approved %}40 {% if team.approved %}
41 <div class="approved_date">41 <div class="approved_date">
42 <div class="field"><label for="approved_date">Date Approved :</label></div>42 <div class="field"><label for="approved_date">Date Approved :</label></div>
43 <span class="extra">{{ team.approved_date }}</span>43 <span class="extra">{{ team.approved_date }}</span>
44 </div>44 </div>
45 <div class="expires_date">45 <div class="expires_date">
46 <div class="field"><label for="expires_date">Date Expires :</label></div>46 <div class="field"><label for="expires_date">Reapproval Date :</label></div>
47 <span class="extra">{{ team.expires_date }}</span>47 <span class="extra">{{ team.expires_date }}</span>
48 </div>48 </div>
49 {% endif %}49 {% endif %}
50 <div> 50 <div>
51 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} 51 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}
52 <input type="submit" name="submit" value="{% trans "Update Information Now!" %}" class="submit-button" /> 52 <input type="submit" name="submit" value="{% trans "Update Information Now!" %}" class="submit-button" />
53 </div>53 </div>
54 </div>54 </div>
55 </form>55 </form>
56</article>56 </article>
5757
58{% endblock %}58{% endblock %}

Subscribers

People subscribed via source and target branches