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

[Chris Johnston]

Makes template and text changes to fix the /events/history/ page

[Daniel Holbach (dholbach)]

Good work!

review: Approve

=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2010-07-21 10:27:59 +0000
+++ loco_directory/locale/loco-directory.pot	2010-07-26 00:37:41 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-21 10:27+0000\n"
+"POT-Creation-Date: 2010-07-26 00:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -604,21 +604,23 @@
 msgstr ""
 
 #: templates/events/event_history_list.html:11
-#: templates/events/event_history_list.html:24
-#: templates/events/event_list.html:41 templates/teams/team_event_list.html:22
-msgid "Select a team event below to see more information about it:"
+msgid "Select a past global event below to see more information about it:"
 msgstr ""
 
 #: templates/events/event_history_list.html:16
-msgid "There has been no LoCo Global Events in the past :("
+msgid "There have been no LoCo Global Events in the past :("
 msgstr ""
 
-#: templates/events/event_history_list.html:22
+#: templates/events/event_history_list.html:23
 msgid "Ubuntu LoCo Team Events History"
 msgstr ""
 
-#: templates/events/event_history_list.html:29
-msgid "There has been no LoCo Team Events in the past :("
+#: templates/events/event_history_list.html:25
+msgid "Select a past team event below to see more information about it:"
+msgstr ""
+
+#: templates/events/event_history_list.html:30
+msgid "There have been no LoCo Team Events in the past :("
 msgstr ""
 
 #: templates/events/event_list.html:4
@@ -657,6 +659,10 @@
 msgid "Team Events as ical"
 msgstr ""
 
+#: templates/events/event_list.html:41 templates/teams/team_event_list.html:22
+msgid "Select a team event below to see more information about it:"
+msgstr ""
+
 #: templates/events/event_list.html:46
 msgid "There are currently no  LoCo Team Events :("
 msgstr ""

=== modified file 'loco_directory/templates/events/event_history_list.html'
--- loco_directory/templates/events/event_history_list.html	2009-12-26 10:00:19 +0000
+++ loco_directory/templates/events/event_history_list.html	2010-07-26 00:37:41 +0000
@@ -4,31 +4,31 @@
 {% block title %}{% trans "Ubuntu LoCo Events History" %}{% endblock %}
 
 {% block content %}
-<div class="mainpage">
-<h1>{% trans "Ubuntu LoCo Global Events History" %}</h1>
+<article class="main-content">
+<h2>{% trans "Ubuntu LoCo Global Events History" %}</h2>
 
 {% if global_event_list %}
-<p>{% trans "Select a team event below to see more information about it:" %}</p>
+<p>{% trans "Select a past global event below to see more information about it:" %}</p>
 
 {% include "events/global_event_list.inc.html" %}
 
 {% else %}
-<p>{% trans "There has been no LoCo Global Events in the past :(" %}</p>
+<p>{% trans "There have been no LoCo Global Events in the past :(" %}</p>
 {% endif %}
-
-
-
-
-<h1>{% trans "Ubuntu LoCo Team Events History" %}</h1>
+</article>
+
+<hr class="divide" />
+
+<article class="main-content">
+<h2>{% trans "Ubuntu LoCo Team Events History" %}</h2>
 {% if team_event_list %}
-<p>{% trans "Select a team event below to see more information about it:" %}</p>
+<p>{% trans "Select a past team event below to see more information about it:" %}</p>
 
 {% include "events/team_event_list.inc.html" %}
 
 {% else %}
-<p>{% trans "There has been no LoCo Team Events in the past :(" %}</p>
+<p>{% trans "There have been no LoCo Team Events in the past :(" %}</p>
 {% endif %}
 
-
-</div>
+</article>
 {% endblock %}