Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/bugfix-lp-616544 into lp:loco-directory.
Requested reviews: loco-directory-dev (loco-directory-dev) Related bugs: #616544 Event Page is Ugly https://bugs.launchpad.net/bugs/616544 Redesigned UI for team events page -- https://code.launchpad.net/~chrisjohnston/loco-directory/bugfix-lp-616544/+merge/32792 Your team loco-directory-dev is requested to review the proposed merge of lp:~chrisjohnston/loco-directory/bugfix-lp-616544 into lp:loco-directory.
=== modified file 'loco_directory/locale/loco-directory.pot' --- loco_directory/locale/loco-directory.pot 2010-08-14 20:22:37 +0000 +++ loco_directory/locale/loco-directory.pot 2010-08-16 18:16:41 +0000 @@ -8,7 +8,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" +<<<<<<< TREE "POT-Creation-Date: 2010-08-14 20:22+0000\n" +======= +"POT-Creation-Date: 2010-08-16 18:14+0000\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <em...@address>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -132,7 +136,7 @@ msgstr "" #: events/models.py:164 -#: templates/events/team_event_detail_attendees.inc.html:13 +#: templates/events/team_event_detail_attendees.inc.html:26 msgid "Additional Guests" msgstr "" @@ -721,7 +725,6 @@ msgstr "" #: templates/events/global_event_detail.html:7 -#: templates/events/team_event_detail.html:7 msgid "Go back to Event list" msgstr "" @@ -730,7 +733,6 @@ msgstr "" #: templates/events/global_event_detail.html:12 -#: templates/events/team_event_detail.html:18 msgid "Edit details" msgstr "" @@ -744,22 +746,18 @@ msgstr "" #: templates/events/global_event_detail_basic.inc.html:6 -#: templates/events/team_event_detail_basic.inc.html:6 msgid "Date begin:" msgstr "" #: templates/events/global_event_detail_basic.inc.html:12 -#: templates/events/team_event_detail_basic.inc.html:12 msgid "Date end:" msgstr "" #: templates/events/global_event_detail_basic.inc.html:18 -#: templates/events/team_event_detail_basic.inc.html:25 msgid "Description:" msgstr "" #: templates/events/global_event_detail_basic.inc.html:24 -#: templates/events/team_event_detail_basic.inc.html:31 msgid "Announce:" msgstr "" @@ -815,6 +813,7 @@ #: templates/events/team_event_delete_confirm.html:4 #: templates/events/team_event_delete_confirm.html:15 +#: templates/events/team_event_detail.html:12 msgid "Delete Team Event" msgstr "" @@ -823,36 +822,30 @@ msgid "Do you really want to delete the Team Event: %(eventname)s?" msgstr "" +#: templates/events/team_event_detail.html:7 +msgid "Back to Events List" +msgstr "" + #: templates/events/team_event_detail.html:9 +#: templates/events/team_event_detail_comments.inc.html:7 msgid "Add Comment" msgstr "" -#: templates/events/team_event_detail.html:12 -msgid "Change your Registration Status" -msgstr "" - -#: templates/events/team_event_detail.html:14 -msgid "Register for this Event" -msgstr "" - -#: templates/events/team_event_detail.html:19 -msgid "Delete team event" -msgstr "" - -#: templates/events/team_event_detail.html:20 -msgid "Copy event" -msgstr "" - -#: templates/events/team_event_detail.inc.html:8 -msgid "Location Information" -msgstr "" - -#: templates/events/team_event_detail.inc.html:12 -msgid "No Venue has been selected for this event." +#: templates/events/team_event_detail.html:11 +msgid "Edit Details" +msgstr "" + +#: templates/events/team_event_detail.html:13 +msgid "Copy Event" +msgstr "" + +#: templates/events/team_event_detail.inc.html:14 +msgid "Details" msgstr "" #: templates/events/team_event_detail.inc.html:19 -msgid "Registered Attendees" +#: templates/events/team_event_detail_attendees.inc.html:24 +msgid "Attendees" msgstr "" #: templates/events/team_event_detail.inc.html:25 @@ -860,32 +853,54 @@ msgid "Event Comments (%(comment_count)s)" msgstr "" -#: templates/events/team_event_detail_attendees.inc.html:5 -msgid "Total confirmed attending:" -msgstr "" - -#: templates/events/team_event_detail_attendees.inc.html:7 -msgid "Total might be attending:" -msgstr "" - -#: templates/events/team_event_detail_attendees.inc.html:13 -msgid "Event Attendees" -msgstr "" - -#: templates/events/team_event_detail_attendees.inc.html:13 +#: templates/events/team_event_detail_attendees.inc.html:8 +msgid "Change your Registration Status" +msgstr "" + +#: templates/events/team_event_detail_attendees.inc.html:10 +msgid "Register for this Event" +msgstr "" + +#: templates/events/team_event_detail_attendees.inc.html:16 +msgid "Confirmed attending:" +msgstr "" + +#: templates/events/team_event_detail_attendees.inc.html:17 +msgid "Maybe be attending:" +msgstr "" + +#: templates/events/team_event_detail_attendees.inc.html:25 msgid "Registration Status" msgstr "" -#: templates/events/team_event_detail_basic.inc.html:18 +#: templates/events/team_event_detail_basic.inc.html:6 +msgid "When:" +msgstr "" + +#: templates/events/team_event_detail_basic.inc.html:19 +msgid "Where:" +msgstr "" + +#: templates/events/team_event_detail_basic.inc.html:20 +#: templates/venues/venue_list.html:36 templates/venues/venue_list.html:53 +#: templates/venues/venue_list.html:66 +msgid "show venue details" +msgstr "" + +#: templates/events/team_event_detail_basic.inc.html:26 msgid "Organizing Team(s):" msgstr "" -#: templates/events/team_event_detail_basic.inc.html:19 +#: templates/events/team_event_detail_basic.inc.html:27 msgid "Get more information about this team" msgstr "" -#: templates/events/team_event_detail_basic.inc.html:37 -msgid "This event is part of:" +#: templates/events/team_event_detail_basic.inc.html:33 +msgid "Announcement:" +msgstr "" + +#: templates/events/team_event_detail_basic.inc.html:40 +msgid "Global Event:" msgstr "" #: templates/events/team_event_detail_venue.inc.html:6 @@ -1188,11 +1203,6 @@ msgid "Select a Venue below to see more information about it:" msgstr "" -#: templates/venues/venue_list.html:36 templates/venues/venue_list.html:53 -#: templates/venues/venue_list.html:66 -msgid "show venue details" -msgstr "" - #: templates/venues/venue_list.html:46 msgid "Countries without Continent" msgstr "" === modified file 'loco_directory/templates/events/team_event_detail.html' --- loco_directory/templates/events/team_event_detail.html 2010-07-29 01:01:25 +0000 +++ loco_directory/templates/events/team_event_detail.html 2010-08-16 18:16:41 +0000 @@ -4,20 +4,13 @@ {% block title %}{% trans team_event_object.name %}{% endblock %} {% block sub_nav_links %} -<a class="sub-nav-item" href="{% url event-list %}">{% trans "Go back to Event list" %}</a> +<a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a> {% if user.is_authenticated %} <a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a> - -{% if user_is_attending %} -<a class="sub-nav-item" href="{% url team-event-register team_event_object.id %}">{% trans 'Change your Registration Status' %}</a> -{% else %} -<a class="sub-nav-item" href="{% url team-event-register team_event_object.id %}">{% trans 'Register for this Event' %}</a> -{% endif %} - {% if user_is_team_member %} -<a class="sub-nav-item" href="{% url team-event-update team_event_object.id %}">{% trans "Edit details" %}</a> -<a class="sub-nav-item" href="{% url team-event-delete team_event_object.id %}">{% trans "Delete team event" %}</a> -<a class="sub-nav-item" href="{% url team-event-copy team_event_object.id %}">{% trans "Copy event" %}</a> +<a class="sub-nav-item" href="{% url team-event-update team_event_object.id %}">{% trans "Edit Details" %}</a> +<a class="sub-nav-item" href="{% url team-event-delete team_event_object.id %}">{% trans "Delete Team Event" %}</a> +<a class="sub-nav-item" href="{% url team-event-copy team_event_object.id %}">{% trans "Copy Event" %}</a> {% endif %} {% endif %} === modified file 'loco_directory/templates/events/team_event_detail.inc.html' --- loco_directory/templates/events/team_event_detail.inc.html 2010-06-18 18:31:05 +0000 +++ loco_directory/templates/events/team_event_detail.inc.html 2010-08-16 18:16:41 +0000 @@ -1,29 +1,28 @@ {% load i18n %} -<article class="minor-content"> +<article class="main-content"> <h2>{{team_event_object.name}}</h2> + {% if team_event_object.description %} + <table id="team-event-basic"> + <tr> + <td class="form-item-value">{{ team_event_object.description|linebreaksbr }}</td> + </tr> + </table> + {% endif %} +</article> + +<article class="main-content"> + <h3>{% trans "Details" %}</h3> {% include "events/team_event_detail_basic.inc.html" %} </article> - -<article class="minor-content alone"> - <h2>{% trans "Location Information" %}</h2> - {% if team_event_object.venue %} - {% include "events/team_event_detail_venue.inc.html" %} - {% else %} - <p>{% trans "No Venue has been selected for this event." %}</p> - {% endif %} -</article> - -<hr class="divide" /> - -<article class="minor-content"> - <h2>{% trans "Registered Attendees" %}</h2> + +<article class="main-content"> + <h3>{% trans "Attendees" %}</h3> {% include "events/team_event_detail_attendees.inc.html" %} </article> - - {% if team_event_object.teameventcomment_set.all %} -<article class="minor-content alone"> - <h2>{% blocktrans with team_event_object.teameventcomment_set.all.count as comment_count %}Event Comments ({{ comment_count }}){% endblocktrans %}</h2> + +{% if team_event_object.teameventcomment_set.all %} +<article class="main-content"> + <h3>{% blocktrans with team_event_object.teameventcomment_set.all.count as comment_count %}Event Comments ({{ comment_count }}){% endblocktrans %}</h3> {% include "events/team_event_detail_comments.inc.html" %} </article> - {% endif %} - +{% endif %} === modified file 'loco_directory/templates/events/team_event_detail_attendees.inc.html' --- loco_directory/templates/events/team_event_detail_attendees.inc.html 2010-06-18 18:31:05 +0000 +++ loco_directory/templates/events/team_event_detail_attendees.inc.html 2010-08-16 18:16:41 +0000 @@ -1,19 +1,37 @@ {% load i18n %} + <table id="team-event-totals" class="data_table"> - -<tr> -<th class="form-item-label">{% trans 'Total confirmed attending:' %}</th><td class="form-item-value">{{ team_event_object.total_attending }}</td> - -<th class="form-item-label">{% trans 'Total might be attending:' %}</th><td class="form-item-value">{{ team_event_object.total_maybe_attending }}</td> -</tr> + <tr> + <td colspan="2"> + {% if user.is_authenticated %} + {% if user_is_attending %} + <a href="{% url team-event-register team_event_object.id %}">{% trans 'Change your Registration Status' %}</a> + {% else %} + <a href="{% url team-event-register team_event_object.id %}">{% trans 'Register for this Event' %}</a> + {% endif %} + {% endif %} + </td> + </tr> + <tr> + <th class="form-item-label">{% trans 'Confirmed attending:' %} {{ team_event_object.total_attending }}</th> + <th class="form-item-label">{% trans 'Maybe be attending:' %} {{ team_event_object.total_maybe_attending }}</th> + </tr> </table> {% if team_event_object.attendee_set.all %} <table id="team-event-attendees" class="data_table"> -<tr><th>{% trans "Event Attendees" %}</th><th>{% trans "Registration Status" %}</th><th>{% trans "Additional Guests" %}</th></tr> -{% for registration in team_event_object.attendee_set.all %} -<tr><td align="center">{{registration.attendee.username}}</td><td align="center">{{registration.get_promise_display}}</td><td align="center">{{registration.guests}}</td></tr> -{% endfor %} + <tr> + <th>{% trans "Attendees" %}</th> + <th>{% trans "Registration Status" %}</th> + <th>{% trans "Additional Guests" %}</th> + </tr> + {% for registration in team_event_object.attendee_set.all %} + <tr class="team_event_list_row {% cycle "odd" "even" %}"> + <td align="center">{{registration.attendee.username}}</td> + <td align="center">{{registration.get_promise_display}}</td> + <td align="center">{{registration.guests}}</td> + </tr> + {% endfor %} </table> {% endif %} === modified file 'loco_directory/templates/events/team_event_detail_basic.inc.html' --- loco_directory/templates/events/team_event_detail_basic.inc.html 2010-06-18 18:31:05 +0000 +++ loco_directory/templates/events/team_event_detail_basic.inc.html 2010-08-16 18:16:41 +0000 @@ -1,43 +1,45 @@ {% load i18n %} {% if team_event_object %} <table id="team-event-basic"> - {% if team_event_object.date_begin %} - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Date begin:" %}</label></th> - <td class="form-item-value">{{team_event_object.date_begin|date:"r" }}</td> - </tr> - {% endif %} - {% if team_event_object.date_end %} - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Date end:" %}</label></th> - <td class="form-item-value">{{ team_event_object.date_end|date:"r" }}</td> - </tr> - {% endif %} - {% if team_event_object.teams.all %} - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Organizing Team(s):" %}</label></th> - <td class="form-item-value">{% for team in team_event_object.teams.all %}<a title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %}</td> - </tr> - {% endif %} - - {% if team_event_object.description %} - <tr> - <th class="form-item-label" scope="row" valign="top"><label>{% trans "Description:" %}</label></th> - <td class="form-item-value">{{ team_event_object.description|linebreaksbr }}</td> - </tr> - {% endif %} - {% if team_event_object.announce %} - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Announce:" %}</label></th> - <td class="form-item-value"><a href="{{ team_event_object.announce }}">{{team_event_object.announce }}</a></td> - </tr> - {% endif %} - {% if team_event_object.global_event %} - <tr> - <th class="form-item-label" scope="row"><label>{% trans "This event is part of:" %}</label></th> - <td class="form-item-value"><a href="{{ team_event_object.global_event.get_absolute_url }}">{{team_event_object.global_event.name }}</a></td> - </tr> - {% endif %} - + {% if team_event_object.date_begin %} + <tr> + <th class="form-item-label" scope="row"><label>{% trans "When:" %}</label></th> + <td class="form-item-value"> + {% ifequal team_event_object.date_begin|date team_event_object.date_end|date %} + {{ team_event_object.date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.date_end|date:"H:i O" }} + {% else %} + {{ team_event_object.date_begin|date:"D, d N Y H:i" }} - {{ team_event_object.date_end|date:"D, d N Y H:i O" }} + {% endifequal %} + </td> + </tr> +{% endif %} + + {% if team_event_object.date_end %} + <tr> + <th class="form-item-label" scope="row"><label>{% trans "Where:" %}</label></th> + <td class="form-item-value"><a title="{% trans "show venue details" %}" href="{{ team_event_object.venue.get_absolute_url }}">{{ team_event_object.venue.name }}{% if team_event_object.venue.city %} in {{ team_event_object.venue.city }}{% endif %}</a></td> + </tr> + {% endif %} + + {% if team_event_object.teams.all %} + <tr> + <th class="form-item-label" scope="row"><label>{% trans "Organizing Team(s):" %}</label></th> + <td class="form-item-value">{% for team in team_event_object.teams.all %}<a title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %}</td> + </tr> + {% endif %} + + {% if team_event_object.announce %} + <tr> + <th class="form-item-label" scope="row"><label>{% trans "Announcement:" %}</label></th> + <td class="form-item-value"><a href="{{ team_event_object.announce }}">{{team_event_object.announce }}</a></td> + </tr> + {% endif %} + + {% if team_event_object.global_event %} + <tr> + <th class="form-item-label" scope="row"><label>{% trans "Global Event:" %}</label></th> + <td class="form-item-value"><a href="{{ team_event_object.global_event.get_absolute_url }}">{{team_event_object.global_event.name }}</a></td> + </tr> + {% endif %} </table> {% endif %} === modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html' --- loco_directory/templates/events/team_event_detail_comments.inc.html 2010-06-18 18:31:05 +0000 +++ loco_directory/templates/events/team_event_detail_comments.inc.html 2010-08-16 18:16:41 +0000 @@ -1,18 +1,25 @@ {% load i18n %} {% if team_event_object.teameventcomment_set.all %} <table id="team-event-comments"> + <tr> + <td colspan="2" class="form-item-value"> + {% if user.is_authenticated %} + <a href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a> + {% endif %} + </td> + </tr> {% regroup team_event_object.teameventcomment_set.all by date_created|date:"D d M Y" as comment_list %} {% for comment_date in comment_list %} - <tr> - <th class="form-item-label" scope="row" colspan=2><label>{{comment_date.grouper}}</label></th> - </tr> - {% for comment in comment_date.list %} - <tr> - <th class="form-item-label" scope="row"><label>{{comment.comment_by}}:</label></th> - <td class="form-item-value">{{comment.comment}}</td> - </tr> - {% endfor %} + <tr> + <th class="form-item-label" scope="row" colspan=2><label>{{comment_date.grouper}}</label></th> + </tr> + {% for comment in comment_date.list %} + <tr> + <th class="form-item-label" scope="row"><label>{{comment.comment_by}}:</label></th> + <td class="form-item-value">{{comment.comment}}</td> + </tr> + {% endfor %} {% endfor %} </table> {% endif %}
_______________________________________________ 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
