diff options
-rw-r--r-- | template.html | 16 | ||||
-rw-r--r-- | template.txt | 14 |
2 files changed, 23 insertions, 7 deletions
diff --git a/template.html b/template.html index 58c92e4..b67b935 100644 --- a/template.html +++ b/template.html @@ -54,7 +54,21 @@ hr { <py:if test="len(item.notes) > 0"> <li py:for="note in item.notes"> <i class="itemtype">${note.itemtype}</i>: - <span class="${note.itemtype}">${note.line}</span> + <py:choose> + <py:when test="note.itemtype == 'LINK'"> + <span class="${note.itemtype}"> + <a href="${note.url}"> + <py:choose> + <py:when test="note.line">${note.line}</py:when> + <py:otherwise>${note.url}</py:otherwise> + </py:choose> + </a> + </span> + </py:when> + <py:otherwise> + <span class="${note.itemtype}">${note.line}</span> + </py:otherwise> + </py:choose> <span class="details">(<a href='${meeting.logs}#${note.anchor}'>${note.nick}</a>, ${note.time})</span> </li> </py:if> diff --git a/template.txt b/template.txt index bf58057..565c2ee 100644 --- a/template.txt +++ b/template.txt @@ -10,8 +10,7 @@ ${meeting.title} ${heading} -Meeting started by ${meeting.owner} at ${time.start} ${time.timezone}. The full logs are -available at ${meeting.logs} . +${wrap("Meeting started by %s at %s %s. The full logs are available at %s ."%(meeting.owner, time.start, time.timezone, meeting.logs), 1)} @@ -19,16 +18,19 @@ Meeting summary --------------- {% for item in agenda %}\ -{% choose %}\ +{% choose %} {% when item.topic.nick %}${wrap("* %s (%s, %s)"%(item.topic.topic, item.topic.nick, item.topic.time), 1)}{% end %}\ {% otherwise %}${wrap("* %s"%(item.topic.topic), 1)}{% end %} {% end %}\ {% for note in item.notes %}\ -${wrap("* %s: %s (%s, %s)"%(note.itemtype, note.line, note.nick, note.time), 2)} +{% choose %}\ +{% when note.itemtype == 'LINK' %}${wrap("* %s: %s %s (%s, %s)"%(note.itemtype, note.url, note.line, note.nick, note.time), 2)}{% end %}\ +{% otherwise %}${wrap("* %s: %s (%s, %s)"%(note.itemtype, note.line, note.nick, note.time), 2)}{% end %} +{% end %}\ +{% end %}\ {% end %} -{%end%} -Meeting ended at ${time.end} ${time.timezone}. +${wrap("Meeting ended at %s %s."%(time.end, time.timezone), 1)} |