Michael Hall has proposed merging
lp:~doctormo/loco-directory/bugfix-lp-625100-2 into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
--
https://code.launchpad.net/~doctormo/loco-directory/bugfix-lp-625100-2/+merge/34000
Your team loco-directory-dev is requested to review the proposed merge of
lp:~doctormo/loco-directory/bugfix-lp-625100-2 into lp:loco-directory.
=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css 2010-08-27 07:21:09 +0000
+++ loco_directory/media/css/newstyle.css 2010-08-28 18:05:58 +0000
@@ -8,6 +8,9 @@
a:visited {
color: #b12a10;
}
+th.form-item-label {
+ vertical-align: top;
+}
label {
font-weight: bold;
white-space: nowrap;
=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html 2010-08-26 14:38:58 +0000
+++ loco_directory/templates/teams/team_detail.html 2010-08-28 18:05:58 +0000
@@ -18,16 +18,14 @@
{% block content %}
<article class="minor-content alone">
-<h2>{{ team.name }}</a></h2>
+<h2><a href="https://launchpad.net/~{{ team.lp_name }}">{{ team.name }}</a></h2>
<table>
<tr>
<th class="form-item-label" scope="row"><label>{% trans "Location:" %}</label></th>
<td class="form-item-value">
{% if team.countries.all %}
- {% for country in team.countries.all %}{% if not forloop.first %}, {% endif %}{{ country.name }}{% endfor %}
- {% if team.spr %}, {% trans team.spr %}{% endif %}
- {% if team.city %}, {% trans team.city %}{% endif %}
+ {% for country in team.countries.all %}{% if not forloop.first %}, {% endif %}{{ country.name }}{% endfor %}{% if team.spr %}, {% trans team.spr %}{% endif %}{% if team.city %}, {% trans team.city %}{% endif %}
{% else %}
{% trans "None Specified" %}
{% endif %}
@@ -43,15 +41,6 @@
{% endif %}
</td>
</tr>
- <tr>
- <th class="form-item-label" scope="row"><label>{% trans "Launchpad Page:" %}</label></th>
- <td class="form-item-value"><a href="https://launchpad.net/~{{ team.lp_name }}">{{ team.name }}</a></td>
- </tr>
-
- <tr>
- <th class="form-item-label" scope="row"><label>{% trans "Launchpad Team Owner:" %}</label></th>
- <td class="form-item-value"><a href="https://launchpad.net/~{{ team.owner_profile.user.username }}">{{ team.owner_profile.realname }}</a></td>
- </tr>
{% if team.approved_date %}
<tr>
@@ -66,13 +55,15 @@
</tr>
{% endif %}
<tr>
- <th class="form-item-label" scope="row"><label>{% trans "Provides Local Support:" %}</label></th>
+ <th class="form-item-label" scope="row"><label>{% trans "Local Support:" %}</label></th>
<td class="form-item-value">{% if team.provides_support %}Yes{% else %}No{% endif %}</td>
</tr>
<tr>
- <th class="form-item-label" scope="row"><label>{% trans "Launchpad Team Admin(s):" %}</label></th>
+ <th class="form-item-label" scope="row"><label>{% trans "Team Admin(s):" %}</label></th>
<td class="form-item-value">{% for admin in team.admin_profiles.all %}
- <a href="https://launchpad.net/~{{ admin.user.username }}">{{ admin.realname }}</a>{% if not forloop.last %},{% endif %}
+ {% ifequal team.owner admin.user.username %}
+ <strong><a href="https://launchpad.net/~{{ admin.user.username }}">{{ admin.realname }}</a></strong>{% else %}
+ <a href="https://launchpad.net/~{{ admin.user.username }}">{{ admin.realname }}</a>{% endifequal %}{% if not forloop.last %},{% endif %}
{% endfor %}</td>
</tr>
<tr>
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
