altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [9813] from rjsparks@nostrum.com:

Browse source 
Add navigation to the new secretariat agenda tools. Change the buttons at the top of the agenda.html page to links.
 - Legacy-Id: 9825
Note: SVN reference [9813] has been migrated to Git commit 2b7f7dec52
This commit is contained in:
Henrik Levkowetz 2015-07-20 13:13:09 +00:00
parent f9bca1b6cc 2b7f7dec52
commit 83bef1d160
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/meeting/views.py
View file

@ -618,7 +618,7 @@ def week_view(request, num=None):
return render_to_response(template,
{"timeslots":timeslots,"render_types":["Session","Other","Break","Plenary"]}, context_instance=RequestContext(request))
@role_required('Secretariat')
@role_required('Area Director','Secretariat','IAB')
def room_view(request, num=None):
meeting = get_meeting(num)

17
ietf/templates/meeting/agenda.html
View file

@ -41,14 +41,21 @@
<b>Note:</b> IETF agendas are subject to change, up to and during a meeting.
</p>
<p class="noprint buttonlist">
<p class="noprint ">
{% if "-utc" in request.path %}
<a class="btn btn-default" href="/meeting/agenda">Agenda in local timezone</a>
<a href="{% url 'ietf.meeting.views.agenda' num=schedule.meeting.number %}">Agenda in local timezone</a>,
{% else %}
<a class="btn btn-default" href="/meeting/agenda-utc">Agenda in UTC timezone</a>
{% comment %}<a href="{% url 'ietf.meeting.views.agenda' base='agenda-utc' %}">Agenda in UTC timezone</a>,{% endcomment %}
<a href="/meeting/agenda-utc">Agenda in UTC timezone</a>,
{% endif %}
<a href="{% url 'ietf.meeting.views.agenda' num=schedule.meeting.number ext='.txt' %}">Plaintext agenda</a>,
<a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/">Tools-style agenda</a>
{% if user|has_role:"Secretariat,Area Director,IAB" %}
,
<a href="{% url 'ietf.meeting.views.agenda_by_room' num=schedule.meeting.number%}">List by Room</a>,
<a href="{% url 'ietf.meeting.views.agenda_by_type' num=schedule.meeting.number%}">List by Type</a>,
<a href="{% url 'ietf.meeting.views.room_view' num=schedule.meeting.number%}">Room Grid</a>
{% endif %}
<a class="btn btn-default" href="/meeting/{{schedule.meeting.number}}/agenda.txt">Plaintext agenda</a>
<a class="btn btn-default" href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/">Tools-style agenda</a>
</p>
{# cache this part for 5 minutes -- it takes 3-6 seconds to generate #}