Merge lp:~cjohnston/loco-team-portal/bugfix-lp-612078 into lp:loco-team-portal

Proposed by Chris Johnston
Status: Rejected
Rejected by: Chris Johnston
Proposed branch: lp:~cjohnston/loco-team-portal/bugfix-lp-612078
Merge into: lp:loco-team-portal
Diff against target: 15 lines (+1/-4)
1 file modified
loco_directory/templates/teams/team_detail.html (+1/-4)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/bugfix-lp-612078
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+31460@code.launchpad.net

Description of the change

Removes space between Country, SPR, City

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

I feel like we should fix bug 601928 in the same go and make clear what countries of that description are and what city, SPR is. Maybe we need at least two entries.

Revision history for this message
Michael Hall (mhall119) wrote :

Since bug 601928 is now "Fix Committed", can we apply this one too?

Unmerged revisions

212. By Chris Johnston

Removes space between Country, SPR, City

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/templates/teams/team_detail.html'
2--- loco_directory/templates/teams/team_detail.html 2010-07-31 15:15:09 +0000
3+++ loco_directory/templates/teams/team_detail.html 2010-07-31 17:31:39 +0000
4@@ -26,10 +26,7 @@
5 <td class="form-item-value">
6 {% if team.countries.all %}
7 {% for country in team.countries.all %}
8- {{ country.name }}&nbsp;
9- {% endfor %}
10- {% if team.spr %}, {% trans team.spr %}{% endif %}
11- {% if team.city %}, {% trans team.city %}{% endif %}
12+ {{ country.name }}{% endfor %}{% if team.spr %}, {% trans team.spr %}{% endif %}{% if team.city %}, {% trans team.city %}{% endif %}
13 {% else %}
14 {% trans "None Specified" %}
15 {% endif %}

Subscribers

People subscribed via source and target branches