Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/bug-637283 into lp:loco-directory.
Requested reviews: loco-directory-dev (loco-directory-dev) Related bugs: #637283 If no Contacts are set, show None Set https://bugs.launchpad.net/bugs/637283 #637336 Team Details page has text: Loco Contacts(s) https://bugs.launchpad.net/bugs/637336 -- https://code.launchpad.net/~chrisjohnston/loco-directory/bug-637283/+merge/35305 Your team loco-directory-dev is requested to review the proposed merge of lp:~chrisjohnston/loco-directory/bug-637283 into lp:loco-directory.
=== modified file 'loco_directory/locale/loco-directory.pot' --- loco_directory/locale/loco-directory.pot 2010-09-11 20:07:35 +0000 +++ loco_directory/locale/loco-directory.pot 2010-09-13 16:52:45 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-11 20:06+0000\n" +"POT-Creation-Date: 2010-09-13 16:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <em...@address>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -260,7 +260,7 @@ msgid "Email Address" msgstr "" -#: teams/models.py:74 templates/teams/team_detail.html:125 +#: teams/models.py:74 templates/teams/team_detail.html:132 msgid "IRC Channel" msgstr "" @@ -825,7 +825,7 @@ msgid "Add Team Event" msgstr "" -#: templates/events/event_list.html:14 templates/teams/team_detail.html:143 +#: templates/events/event_list.html:14 templates/teams/team_detail.html:150 #: templates/teams/team_event_list.html:8 msgid "Past Events" msgstr "" @@ -992,7 +992,7 @@ msgstr "" #: templates/events/team_event_detail.html:17 -#: templates/teams/team_detail.html:145 +#: templates/teams/team_detail.html:152 msgid "iCal Feed" msgstr "" @@ -1146,7 +1146,7 @@ msgstr "" #: templates/teams/team_detail.html:72 templates/teams/team_detail.html:82 -#: templates/teams/team_detail.html:156 +#: templates/teams/team_detail.html:164 msgid "None Specified" msgstr "" @@ -1154,68 +1154,72 @@ msgid "Languages:" msgstr "" -#: templates/teams/team_detail.html:89 +#: templates/teams/team_detail.html:88 msgid "Approval Date:" msgstr "" -#: templates/teams/team_detail.html:95 +#: templates/teams/team_detail.html:94 msgid "Expires Date:" msgstr "" -#: templates/teams/team_detail.html:100 +#: templates/teams/team_detail.html:99 msgid "Local Support:" msgstr "" -#: templates/teams/team_detail.html:104 +#: templates/teams/team_detail.html:103 msgid "Team Admin(s):" msgstr "" -#: templates/teams/team_detail.html:112 -msgid "Loco Contacts(s):" -msgstr "" - -#: templates/teams/team_detail.html:119 +#: templates/teams/team_detail.html:114 +msgid "Team Contact(s):" +msgstr "" + +#: templates/teams/team_detail.html:121 +msgid "No LoCo Team contacts are set." +msgstr "" + +#: templates/teams/team_detail.html:126 msgid "Resources:" msgstr "" -#: templates/teams/team_detail.html:122 +#: templates/teams/team_detail.html:129 msgid "Team Wiki" msgstr "" -#: templates/teams/team_detail.html:128 +#: templates/teams/team_detail.html:135 msgid "Team Mailing List" msgstr "" -#: templates/teams/team_detail.html:131 +#: templates/teams/team_detail.html:138 msgid "Team Forums" msgstr "" -#: templates/teams/team_detail.html:134 +#: templates/teams/team_detail.html:141 msgid "Team Website" msgstr "" -#: templates/teams/team_detail.html:139 +#: templates/teams/team_detail.html:146 msgid "Upcoming Events:" msgstr "" -#: templates/teams/team_detail.html:142 +#: templates/teams/team_detail.html:149 msgid "All Events" msgstr "" -#: templates/teams/team_detail.html:144 +#: templates/teams/team_detail.html:151 msgid "RSS Feed" msgstr "" -#: templates/teams/team_detail.html:152 +#: templates/teams/team_detail.html:159 #, python-format msgid "%(start_date)s in %(city)s" msgstr "" -#: templates/teams/team_detail.html:152 +#: templates/teams/team_detail.html:159 msgid "on: " msgstr "" -#: templates/teams/team_detail.html:169 +#: templates/teams/team_detail.html:177 msgid "Photos from" msgstr "" === modified file 'loco_directory/templates/teams/team_detail.html' --- loco_directory/templates/teams/team_detail.html 2010-09-09 21:07:01 +0000 +++ loco_directory/templates/teams/team_detail.html 2010-09-13 16:52:45 +0000 @@ -60,117 +60,123 @@ {% block content %} <article class="minor-content alone"> -<h2><a href="https://launchpad.net/~{{ team.lp_name }}">{{ 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 %} - {% else %} - {% trans "None Specified" %} - {% endif %} - </td> - </tr> - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Languages:" %}</label></th> - <td class="form-item-value"> - {% if team.languages.all %} - {% for language in team.languages.all %}{% if not forloop.first %}, {% endif %}{{ language.name }}{% endfor %} - {% else %} - {% trans "None Specified" %} - {% endif %} - </td> - </tr> - + <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 %} + {% else %} + {% trans "None Specified" %} + {% endif %} + </td> + </tr> + <tr> + <th class="form-item-label" scope="row"><label>{% trans "Languages:" %}</label></th> + <td class="form-item-value"> + {% if team.languages.all %} + {% for language in team.languages.all %}{% if not forloop.first %}, {% endif %}{{ language.name }}{% endfor %} + {% else %} + {% trans "None Specified" %} + {% endif %} + </td> + </tr> {% if team.approved_date %} - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Approval Date:" %}</label></th> - <td class="form-item-value">{{ team.approved_date }}</td> - </tr> + <tr> + <th class="form-item-label" scope="row"><label>{% trans "Approval Date:" %}</label></th> + <td class="form-item-value">{{ team.approved_date }}</td> + </tr> {% endif %} {% if team.approved %} - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Expires Date:" %}</label></th> - <td class="form-item-value">{{ team.expires_date }}</td> - </tr> + <tr> + <th class="form-item-label" scope="row"><label>{% trans "Expires Date:" %}</label></th> + <td class="form-item-value">{{ team.expires_date }}</td> + </tr> {% endif %} <tr> - <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 "Team Admin(s):" %}</label></th> - <td class="form-item-value">{% for admin in team.admin_profiles.all %} - {% 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> - <th class="form-item-label" scope="row"><label>{% trans "Loco Contacts(s):" %}</label></th> - <td class="form-item-value">{% for contact in team.contact_profiles.all %} - <a href="https://launchpad.net/~{{ contact.user.username }}">{{ contact.realname }}</a>{% if not forloop.last %},{% endif %} - {% endfor %}</td> - </tr> - - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Resources:" %}</label></th> - <td class="form-item-value"> - {% if team.wiki_url %} - <a href="{{ team.wiki_url }}"><img class="resource" src="/media/images/team/wiki.png" alt="{% trans "Team Wiki" %}" title="{% trans "Team Wiki" %}"/></a> - {% endif %} - {% if team.irc_chan %} - <a href="http://webchat.freenode.net/?channels={{ team.irc_chan }}"><img class="resource" src="/media/images/team/irc.png" alt="{% trans "IRC Channel" %} ({{ team.irc_chan }})" title="{% trans "IRC Channel" %} ({{ team.irc_chan }})"/></a> - {% endif %} - {% if team.ml_url %} - <a href="{{ team.ml_url }}"><img class="resource" src="/media/images/team/list.png" alt="{% trans "Team Mailing List" %}" title="{% trans "Team Mailing List" %}"/></a> - {% endif %} - {% if team.forum_url %} - <a href="{{ team.forum_url }}"><img class="resource" src="/media/images/team/forum.png" alt="{% trans "Team Forums" %}" title="{% trans "Team Forums" %}"/></a> - {% endif %} - {% if team.web_url %} - <a href="{{ team.web_url }}"><img class="resource" src="/media/images/team/website.png" alt="{% trans "Team Website" %}" title="{% trans "Team Website" %}"/></a> - {% endif %} - </td> - </tr> - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Upcoming Events:" %}</label></th> - <td class="form-item-value"> - <ul class="team-event-nav"> - <li style="font-size:0.98em"><a href="{% url team-event-list team.lp_name %}">{% trans "All Events" %}</a></li> - <li style="font-size:0.98em"><a href="{% url team-event-history team.lp_name %}">{% trans "Past Events" %}</a></li> - <li style="font-size:0.98em"><a href="{% url team-events-rss team.lp_name %}">{% trans "RSS Feed" %}</a></li> - <li style="font-size:0.98em"><a href="{% url team-event-list-ical team.lp_name %}">{% trans "iCal Feed" %}</a></li> - </ul> - {% if team.teamevent_set.next_5_events %} - <ul> - {% for team_event in team.teamevent_set.next_5_events %} - {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %} - <li> - <a title="{% if team_event.venue %}{% blocktrans with team_event.date_begin|date:"M d" as start_date and team_event.venue.city as city %}{{start_date}} in {{city}}{% endblocktrans %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}} - </li> + <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 "Team Admin(s):" %}</label></th> + <td class="form-item-value"> + {% for admin in team.admin_profiles.all %} + {% 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> + <th class="form-item-label" scope="row"><label>{% trans "Team Contact(s):" %}</label></th> + <td class="form-item-value"> + {% if team.contact_profiles %} + {% for contact in team.contact_profiles.all %} + <a href="https://launchpad.net/~{{ contact.user.username }}">{{ contact.realname }}</a>{% if not forloop.last %},{% endif %} {% endfor %} - </ul> - {% else %}{% trans "None Specified" %}{% endif %} - </td> - </tr> - - </table> + {% else %} + <p>{% trans "No LoCo Team contacts are set." %}</p> + {% endif %} + </td> + </tr> + <tr> + <th class="form-item-label" scope="row"><label>{% trans "Resources:" %}</label></th> + <td class="form-item-value"> + {% if team.wiki_url %} + <a href="{{ team.wiki_url }}"><img class="resource" src="/media/images/team/wiki.png" alt="{% trans "Team Wiki" %}" title="{% trans "Team Wiki" %}" /></a> + {% endif %} + {% if team.irc_chan %} + <a href="http://webchat.freenode.net/?channels={{ team.irc_chan }}"><img class="resource" src="/media/images/team/irc.png" alt="{% trans "IRC Channel" %} ({{ team.irc_chan }})" title="{% trans "IRC Channel" %} ({{ team.irc_chan }})" /></a> + {% endif %} + {% if team.ml_url %} + <a href="{{ team.ml_url }}"><img class="resource" src="/media/images/team/list.png" alt="{% trans "Team Mailing List" %}" title="{% trans "Team Mailing List" %}" /></a> + {% endif %} + {% if team.forum_url %} + <a href="{{ team.forum_url }}"><img class="resource" src="/media/images/team/forum.png" alt="{% trans "Team Forums" %}" title="{% trans "Team Forums" %}" /></a> + {% endif %} + {% if team.web_url %} + <a href="{{ team.web_url }}"><img class="resource" src="/media/images/team/website.png" alt="{% trans "Team Website" %}" title="{% trans "Team Website" %}" /></a> + {% endif %} + </td> + </tr> + <tr> + <th class="form-item-label" scope="row"><label>{% trans "Upcoming Events:" %}</label></th> + <td class="form-item-value"> + <ul class="team-event-nav"> + <li style="font-size:0.98em"><a href="{% url team-event-list team.lp_name %}">{% trans "All Events" %}</a></li> + <li style="font-size:0.98em"><a href="{% url team-event-history team.lp_name %}">{% trans "Past Events" %}</a></li> + <li style="font-size:0.98em"><a href="{% url team-events-rss team.lp_name %}">{% trans "RSS Feed" %}</a></li> + <li style="font-size:0.98em"><a href="{% url team-event-list-ical team.lp_name %}">{% trans "iCal Feed" %}</a></li> + </ul> + {% if team.teamevent_set.next_5_events %} + <ul> + {% for team_event in team.teamevent_set.next_5_events %} + {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %} + <li> + <a title="{% if team_event.venue %}{% blocktrans with team_event.date_begin|date:"M d" as start_date and team_event.venue.city as city %}{{start_date}} in {{city}}{% endblocktrans %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on: " %}{{ team_event.date_begin|date}} + </li> + {% endfor %} + </ul> + {% else %} + {% trans "None Specified" %} + {% endif %} + </td> + </tr> + </table> </article> <article class="minor-content"> -<img id="locobranding" src="{{ team.mugshot_url }}" alt="" title="{{ team.name }}"/> + <img id="locobranding" src="{{ team.mugshot_url }}" alt="" title="{{ team.name }}" /> </article> {% if team.flickr_id %} <article class="minor-content alone" style="width:95%;"> -<h2>{% trans "Photos from" %} {{ team.name }}</a></h2> -<div style="width:100%;" id="flickr"> </div> + <h2>{% trans "Photos from" %} {{ team.name }}</a></h2> + <div style="width:100%;" id="flickr"> </div> </article> {% endif %} - - {% endblock %}
_______________________________________________ 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
