Chris Johnston has proposed merging lp:~chrisjohnston/loco-directory/bugfix-lp-622680 into lp:loco-directory.
Requested reviews: loco-directory-dev (loco-directory-dev) Related bugs: #622680 Make Global Event pages more closely match team event pages https://bugs.launchpad.net/bugs/622680 Makes the global event looks like the team event page -- https://code.launchpad.net/~chrisjohnston/loco-directory/bugfix-lp-622680/+merge/33379 Your team loco-directory-dev is requested to review the proposed merge of lp:~chrisjohnston/loco-directory/bugfix-lp-622680 into lp:loco-directory.
=== modified file 'loco_directory/locale/loco-directory.pot' --- loco_directory/locale/loco-directory.pot 2010-08-23 08:20:57 +0000 +++ loco_directory/locale/loco-directory.pot 2010-08-23 13:21:42 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-23 08:20+0000\n" +"POT-Creation-Date: 2010-08-23 13:16+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" @@ -625,7 +625,7 @@ msgid "Team Events as ical" msgstr "" -#: templates/index.html:76 templates/events/global_event_detail.inc.html:11 +#: templates/index.html:76 templates/events/global_event_detail.inc.html:30 msgid "Microblogging" msgstr "" @@ -855,46 +855,45 @@ msgid "Delete Event" msgstr "" -#: templates/events/global_event_detail.inc.html:20 +#: templates/events/global_event_detail.inc.html:14 +#: templates/events/team_event_detail.inc.html:14 +msgid "Details" +msgstr "" + +#: templates/events/global_event_detail.inc.html:22 #, python-format msgid "Participating Team Events (%(team_count)s)" msgstr "" -#: templates/events/global_event_detail_attending_teamevents.inc.html:11 -#: templates/events/global_event_detail_attending_teamevents.inc.html:27 -#: templates/events/global_event_detail_attending_teamevents.inc.html:41 +#: templates/events/global_event_detail_attending_teamevents.inc.html:10 +#: templates/events/global_event_detail_attending_teamevents.inc.html:25 +#: templates/events/global_event_detail_attending_teamevents.inc.html:38 msgid "More Information about Team Event" msgstr "" -#: templates/events/global_event_detail_attending_teamevents.inc.html:21 +#: templates/events/global_event_detail_attending_teamevents.inc.html:19 msgid "Events in countries without continents" msgstr "" -#: templates/events/global_event_detail_attending_teamevents.inc.html:37 +#: templates/events/global_event_detail_attending_teamevents.inc.html:34 msgid "Events without venue" msgstr "" #: templates/events/global_event_detail_basic.inc.html:6 -msgid "Date begin:" -msgstr "" - -#: templates/events/global_event_detail_basic.inc.html:12 -msgid "Date end:" -msgstr "" - -#: templates/events/global_event_detail_basic.inc.html:18 -msgid "Description:" -msgstr "" - -#: templates/events/global_event_detail_basic.inc.html:24 -msgid "Announce:" -msgstr "" - -#: templates/events/global_event_detail_basic.inc.html:30 +#: templates/events/team_event_detail_basic.inc.html:6 +msgid "When:" +msgstr "" + +#: templates/events/global_event_detail_basic.inc.html:19 +#: templates/events/team_event_detail_basic.inc.html:33 +msgid "Announcement:" +msgstr "" + +#: templates/events/global_event_detail_basic.inc.html:26 msgid "Microblog Hashtag:" msgstr "" -#: templates/events/global_event_detail_basic.inc.html:45 +#: templates/events/global_event_detail_basic.inc.html:40 msgid "Pictag:" msgstr "" @@ -963,10 +962,6 @@ msgid "iCal Feed" msgstr "" -#: templates/events/team_event_detail.inc.html:14 -msgid "Details" -msgstr "" - #: templates/events/team_event_detail.inc.html:19 #: templates/events/team_event_detail_attendees.inc.html:24 msgid "Attendees" @@ -997,10 +992,6 @@ msgid "Registration Status" msgstr "" -#: templates/events/team_event_detail_basic.inc.html:6 -msgid "When:" -msgstr "" - #: templates/events/team_event_detail_basic.inc.html:19 msgid "Where:" msgstr "" @@ -1019,10 +1010,6 @@ msgid "Get more information about this team" msgstr "" -#: 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 "" === modified file 'loco_directory/templates/events/global_event_detail.inc.html' --- loco_directory/templates/events/global_event_detail.inc.html 2010-08-20 02:49:29 +0000 +++ loco_directory/templates/events/global_event_detail.inc.html 2010-08-23 13:21:42 +0000 @@ -1,25 +1,33 @@ {% load i18n %} -<article class="minor-content"> - -<h2>{{global_event_object.name}}</h2> -{% include "events/global_event_detail_basic.inc.html" %} -</article> - -{% if global_event_object.microbloghashtag %} -<article class="minor-content alone"> - -<h2>{% trans "Microblogging" %} #{{global_event_object.microbloghashtag}}</h2> -<p><script src="{{MEDIA_URL}}js/twidenash.js?{{global_event_object.microbloghashtag}}"></script></p> -</article> -{% endif %} +<article class="main-content"> + <h2>{{global_event_object.name}}</h2> + {% if global_event_object.description %} + <table id="global-event-basic"> + <tr> + <td class="form-item-value">{{ global_event_object.description|linebreaksbr }}</td> + </tr> + </table> + {% endif %} +</article> + +<article class="main-content"> + <h3>{% trans "Details" %}</h3> + {% include "events/global_event_detail_basic.inc.html" %} +</article> <hr class="divide" /> {% if global_event_object.teamevent_set.all %} -<article id="global-event-attending" class="main-content alone"> -<h2>{% blocktrans with global_event_object.teamevent_set.all.count as team_count %}Participating Team Events ({{team_count}}){% endblocktrans %}</h2> -<br /> -{% include "events/global_event_detail_attending_teamevents.inc.html" %} -</article> + <article id="global-event-attending" class="minor-content"> + <h2>{% blocktrans with global_event_object.teamevent_set.all.count as team_count %}Participating Team Events ({{team_count}}){% endblocktrans %}</h2> + <br /> + {% include "events/global_event_detail_attending_teamevents.inc.html" %} + </article> {% endif %} +{% if global_event_object.microbloghashtag %} + <article class="minor-content alone"> + <h2>{% trans "Microblogging" %} #{{global_event_object.microbloghashtag}}</h2> + <p><script src="{{MEDIA_URL}}js/twidenash.js?{{global_event_object.microbloghashtag}}"></script></p> + </article> +{% endif %} === modified file 'loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html' --- loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-08-18 13:38:25 +0000 +++ loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-08-23 13:21:42 +0000 @@ -1,49 +1,45 @@ {% load i18n %} {% if global_event_object.teamevent_set.all %} -{% for continent in continents %} - <h3>{{ continent.name }}</h3> - {% for country in countries %}{% for cont in country.continents.all %}{% ifequal cont continent %} - <h4>{{ country.name }}</h4> + {% for continent in continents %} + <h3>{{ continent.name }}</h3> + {% for country in countries %}{% for cont in country.continents.all %}{% ifequal cont continent %} + <h4>{{ country.name }}</h4> + <ul> + {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %} + <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}"> + <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> + </li> + {% endifequal %}{% endfor %} + </ul> + <br class="clear" /> + {% endifequal %}{% endfor %}{% endfor %} + {% endfor %} + + {% if countries_without_continents %} + <h3>{% trans "Events in countries without continents" %}</h3> + {% for country in countries_without_continents %} + <h4>{{ country.name }}</h4> + <ul> + {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %} + <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}</li>"> + <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> + </li> + {% endifequal %}{% endfor %} + </ul> + <br class="clear" /> + {% endfor %} + {% endif %} + + {% if events_without_venue %} + <h3>{% trans "Events without venue" %}</h3> <ul> - {{colcycle.reset}} - {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %} - <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %} {{colcycle.next}}"> - <a title="{% trans "More Information about Team Event" %}" - href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> - </li> - {% endifequal %}{% endfor %} - </ul> - <br class="clear" /> - {% endifequal %}{% endfor %}{% endfor %} -{% endfor %} - -{% if countries_without_continents %} - <h3>{% trans "Events in countries without continents" %}</h3> - {% for country in countries_without_continents %} - <h4>{{ country.name }}</h4> - <ul>{{colcycle.reset}} - {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %} - <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %} {{colcycle.next}}"> - <a title="{% trans "More Information about Team Event" %}" - href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> - </li> - {% endifequal %}{% endfor %} - </ul> - <br class="clear" /> - {% endfor %} -{% endif %} - -{% if events_without_venue %} - <h3>{% trans "Events without venue" %}</h3> - <ul>{{colcycle.reset}} - {% for team_event in events_without_venue %} - <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %} {{colcycle.next}}"> - <a title="{% trans "More Information about Team Event" %}" - href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> - </li> - {% endfor %} - </ul> - <br class="clear" /> -{% endif %} + {% for team_event in events_without_venue %} + <li class="{% if team_event.is_past %}approved{% else %}unapproved{% endif %}"> + <a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a> + </li> + {% endfor %} + </ul> + <br class="clear" /> + {% endif %} {% endif %} === modified file 'loco_directory/templates/events/global_event_detail_basic.inc.html' --- loco_directory/templates/events/global_event_detail_basic.inc.html 2010-06-18 02:48:47 +0000 +++ loco_directory/templates/events/global_event_detail_basic.inc.html 2010-08-23 13:21:42 +0000 @@ -1,62 +1,54 @@ {% load i18n %} {% if global_event_object %} -<table id="global-event-basic"> - {% if global_event_object.date_begin %} - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Date begin:" %}</label></th> - <td class="form-item-value">{{global_event_object.date_begin|date:"r" }}</td> - </tr> - {% endif %} - {% if global_event_object.date_end %} - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Date end:" %}</label></th> - <td class="form-item-value">{{ global_event_object.date_end|date:"r" }}</td> - </tr> - {% endif %} - {% if global_event_object.description %} - <tr> - <th class="form-item-label" scope="row" valign="top"><label>{% trans "Description:" %}</label></th> - <td class="form-item-value">{{ global_event_object.description|linebreaksbr }}</td> - </tr> - {% endif %} - {% if global_event_object.announce %} - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Announce:" %}</label></th> - <td class="form-item-value"><a href="{{ global_event_object.announce }}">{{global_event_object.announce }}</a></td> - </tr> - {% endif %} - {% if global_event_object.microbloghashtag %} - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Microblog Hashtag:" %}</label></th> - <td class="form-item-value">{{ global_event_object.microbloghashtag }} - <a href="http://identi.ca/tag/{{ global_event_object.microbloghashtag }}"> - <img src="/media/img/identica.ico" - alt="{{ global_event_object.microbloghashtag }} on Identi.ca" /> - </a> - <a href="http://twitter.com/#search?q=%23{{ global_event_object.microbloghashtag }}"> - <img src="/media/img/twitter.ico" - alt="{{ global_event_object.microbloghashtag }} on Twitter" /> - </a> - </td> - </tr> - {% endif %} - {% if global_event_object.pictag %} - <tr> - <th class="form-item-label" scope="row"><label>{% trans "Pictag:" %}</label></th> - <td class="form-item-value">{{ global_event_object.pictag }} - <a href="http://www.flickr.com/search/?w=all&q={{ global_event_object.pictag }}&m=tags"> - <img src="/media/img/flickr.ico" - alt="{{ global_event_object.pictag }} on Flickr" /> - </a> - <a href="http://picasaweb.google.com/lh/view?tags=%22{{ global_event_object.pictag }}%22&psc=G#"> - <img src="/media/img/picasa.ico" - alt="{{ global_event_object.pictag }} on Picasa" /> - </a> - </td> - - </tr> - {% endif %} - -</table> + <table id="global-event-basic"> + {% if global_event_object.date_begin %} + <tr> + <th class="form-item-label" scope="row"><label>{% trans "When:" %}</label></th> + <td class="form-item-value"> + {% ifequal global_event_object.date_begin|date global_event_object.date_end|date %} + {{ global_event_object.date_begin|date:"D, d N Y H:i" }} - {{ global_event_object.date_end|date:"H:i O" }} + {% else %} + {{ global_event_object.date_begin|date:"D, d N Y H:i" }} - {{ global_event_object.date_end|date:"D, d N Y H:i O" }} + {% endifequal %} + </td> + </tr> + {% endif %} + + {% if global_event_object.announce %} + <tr> + <th class="form-item-label" scope="row"><label>{% trans "Announcement:" %}</label></th> + <td class="form-item-value"><a href="{{ global_event_object.announce }}">{{global_event_object.announce }}</a></td> + </tr> + {% endif %} + + {% if global_event_object.microbloghashtag %} + <tr> + <th class="form-item-label" scope="row"><label>{% trans "Microblog Hashtag:" %}</label></th> + <td class="form-item-value">{{ global_event_object.microbloghashtag }} + <a href="http://identi.ca/tag/{{ global_event_object.microbloghashtag }}"> + <img src="/media/img/identica.ico" alt="{{ global_event_object.microbloghashtag }} on Identi.ca" /> + </a> + <a href="http://twitter.com/#search?q=%23{{ global_event_object.microbloghashtag }}"> + <img src="/media/img/twitter.ico" alt="{{ global_event_object.microbloghashtag }} on Twitter" /> + </a> + </td> + </tr> + {% endif %} + + {% if global_event_object.pictag %} + <tr> + <th class="form-item-label" scope="row"><label>{% trans "Pictag:" %}</label></th> + <td class="form-item-value">{{ global_event_object.pictag }} + <a href="http://www.flickr.com/search/?w=all&q={{ global_event_object.pictag }}&m=tags"> + <img src="/media/img/flickr.ico" alt="{{ global_event_object.pictag }} on Flickr" /> + </a> + <a href="http://picasaweb.google.com/lh/view?tags=%22{{ global_event_object.pictag }}%22&psc=G#"> + <img src="/media/img/picasa.ico" alt="{{ global_event_object.pictag }} on Picasa" /> + </a> + </td> + </tr> + {% endif %} + + </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
