From 5bdf1ea88bfde6dfc73a070b05aa8fc6e737901a Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Wed, 27 May 2015 21:48:06 +0000
Subject: [PATCH] Add meeting_id and agenda_url support

If the YAML input file contains meeting_id, link to the eavesdrop logs
for the meeting.

If the YAML input file contains agenda_url, link to the agenda for the
meeting.

Change-Id: I9fa8ddc3366e30aab3b84541d511926cf1871e7d
Depends-On: I7395a92f447aee943da54aa0439dd0c683da176a
---
 README.rst                      | 3 +++
 meetingindex.jinja              | 6 ++++++
 meetings/oslo-team-meeting.yaml | 2 ++
 test-requirements.txt           | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 66810314..d98ebdd6 100644
--- a/README.rst
+++ b/README.rst
@@ -16,6 +16,9 @@ YAML Meeting File Format
 Each meeting consists of:
 
 * ``project``: the name of the project
+* ``meeting_id``: the name given to the ``#startmeeting`` meetbot command
+* ``agenda_url`` the URL to the page with the agenda for the meeting,
+  usually in the wiki
 * ``schedule``: a list of schedule each consisting of
 
   * ``time``: time string in UTC
diff --git a/meetingindex.jinja b/meetingindex.jinja
index 2bf9ac85..791fa612 100644
--- a/meetingindex.jinja
+++ b/meetingindex.jinja
@@ -44,6 +44,12 @@ in #{{ schedule.irc }}</li>
 {% endfor %}
 <li>Chair (to contact for more information): {{ meeting.chair }}</li>
 <li>{{ meeting.description|urlize }}</li>
+{% if meeting.extras.meeting_id %}
+<li><a href="http://eavesdrop.openstack.org/meetings/{{meeting.extras.meeting_id}}/">Logs from past meetings</a>
+{% endif %}
+{% if meeting.extras.agenda_url %}
+<li><a href="{{meeting.extras.agenda_url}}/">Agenda</a>
+{% endif %}
 </ul>
 
 {% endfor %}
diff --git a/meetings/oslo-team-meeting.yaml b/meetings/oslo-team-meeting.yaml
index 35573369..1e758312 100644
--- a/meetings/oslo-team-meeting.yaml
+++ b/meetings/oslo-team-meeting.yaml
@@ -1,4 +1,6 @@
 project:  Oslo Team Meeting
+meeting_id: oslo
+agenda_url: https://wiki.openstack.org/wiki/Meetings/Oslo
 schedule:
   - time:       '1600'
     day:        Monday
diff --git a/test-requirements.txt b/test-requirements.txt
index 627b24da..f1956543 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1 @@
-yaml2ical>=0.3.0
+yaml2ical>=0.4.0