Skip to content

Commit 7ea7ea0

Browse files
levkowetzlevkowetz
committed
Whitespace changes only. Reindented and reformatted a template.
 - Legacy-Id: 17747
1 parent 9d72b65 commit 7ea7ea0

1 file changed

Lines changed: 123 additions & 123 deletions

File tree

‎ietf/templates/meeting/session_details_panel.html‎

Lines changed: 123 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
{% for session in sessions %}
44
{% with item=session.official_timeslotassignment %}
5-
<h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1 %}Session {{ forloop.counter }} : {% endif %}
6-
{% for time in session.times %}{% if not forloop.first %}, {% endif %} {{time|dateformat:"l Y-m-d H:i T"}} {% if time.tzinfo.zone != "UTC" %}<span class="small">({{time|utc|dateformat:"H:i T"}})</span>{% endif %}{% endfor %}
7-
{% if session.cancelled %}<small class="label label-warning">CANCELLED</small>{% else %}{{ session.status }}{% endif %}
8-
{% if session.name %} : {{ session.name }}{% endif %}
5+
<h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1 %}Session {{ forloop.counter }} : {% endif %}
6+
{% for time in session.times %}{% if not forloop.first %}, {% endif %} {{time|dateformat:"l Y-m-d H:i T"}} {% if time.tzinfo.zone != "UTC" %}<span class="small">({{time|utc|dateformat:"H:i T"}})</span>{% endif %}{% endfor %}
7+
{% if session.cancelled %}<small class="label label-warning">CANCELLED</small>{% else %}{{ session.status }}{% endif %}
8+
{% if session.name %} : {{ session.name }}{% endif %}
99
{% if not session.cancelled %}
1010
<span class="regular pull-right">
1111
{% if meeting.type.slug == 'interim' %}
@@ -20,139 +20,139 @@ <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1
2020
<a title="icalendar entry for {{acronym}} session {{ forloop.counter }}" href="{% url 'ietf.meeting.views.ical_agenda' num=meeting.number session_id=session.id %}"><span class="fa fa-fw fa-calendar-o"></span> </a>
2121
{% endif %}
2222
</span>
23-
{% endif %}
24-
</h2>
25-
{% if session.agenda_note %}<h3>{{session.agenda_note}}</h3>{% endif %}
23+
{% endif %}
24+
</h2>
25+
{% if session.agenda_note %}<h3>{{session.agenda_note}}</h3>{% endif %}
2626

27-
{% if can_manage_materials %}
28-
{% if session.current_status == 'sched' or session.current_status == 'schedw' %}
29-
<div class="buttonlist">
30-
{% if can_view_request %}
31-
<a class="btn btn-default" href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">Meeting Details</a>
27+
{% if can_manage_materials %}
28+
{% if session.current_status == 'sched' or session.current_status == 'schedw' %}
29+
<div class="buttonlist">
30+
{% if can_view_request %}
31+
<a class="btn btn-default" href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">Meeting Details</a>
32+
{% endif %}
33+
</div>
34+
{% if not session.type_counter.agenda %}
35+
<span class="label label-warning">This session does not yet have an agenda</span>
3236
{% endif %}
33-
</div>
34-
{% if not session.type_counter.agenda %}
35-
<span class="label label-warning">This session does not yet have an agenda</span>
3637
{% endif %}
3738
{% endif %}
38-
{% endif %}
3939

40-
{% if meeting.type.slug == 'interim' and session.remote_instructions %}
41-
<div>
42-
<b>Remote instructions:</b>
43-
{% if "https://ietf.webex.com" in session.agenda_note|first_url %}
44-
<a class=""
45-
href="{{ session.agenda_note|first_url }}"
46-
title="Webex session"><span class="fa fa-fw fa-phone"></span>
47-
</a>
48-
{% elif "https://ietf.webex.com" in session.remote_instructions|first_url %}
49-
<a class=""
50-
href="{{ session.remote_instructions|first_url }}"
51-
title="Webex session"><span class="fa fa-fw fa-phone"></span>
52-
</a>
53-
{% endif %}
54-
{{ session.remote_instructions }}
55-
</div>
56-
{% endif %}
40+
{% if meeting.type.slug == 'interim' and session.remote_instructions %}
41+
<div>
42+
<b>Remote instructions:</b>
43+
{% if "https://ietf.webex.com" in session.agenda_note|first_url %}
44+
<a class=""
45+
href="{{ session.agenda_note|first_url }}"
46+
title="Webex session"><span class="fa fa-fw fa-phone"></span>
47+
</a>
48+
{% elif "https://ietf.webex.com" in session.remote_instructions|first_url %}
49+
<a class=""
50+
href="{{ session.remote_instructions|first_url }}"
51+
title="Webex session"><span class="fa fa-fw fa-phone"></span>
52+
</a>
53+
{% endif %}
54+
{{ session.remote_instructions }}
55+
</div>
56+
{% endif %}
5757

58-
<div class="panel panel-default">
59-
<div class="panel-heading">Agenda, Minutes, and Bluesheets</div>
60-
<div class="panel-body">
61-
<table class="table table-condensed table-striped">
62-
{% for pres in session.filtered_artifacts %}
63-
<tr>
64-
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
65-
<td>
66-
<a href="{{pres.document.get_href}}">{{pres.document.title}}</a>
67-
<a href="{{url}}">({{ pres.document.name }})</a>
68-
</td>
69-
{% if user|has_role:"Secretariat" or can_manage_materials %}
70-
<td class="col-md-2">
71-
{% if pres.document.type.slug == 'minutes' %}
72-
{% url 'ietf.meeting.views.upload_session_minutes' session_id=session.pk num=session.meeting.number as upload_url %}
73-
{% elif pres.document.type.slug == 'agenda' %}
74-
{% url 'ietf.meeting.views.upload_session_agenda' session_id=session.pk num=session.meeting.number as upload_url %}
75-
{% else %}
76-
{% url 'ietf.meeting.views.upload_session_bluesheets' session_id=session.pk num=session.meeting.number as upload_url %}
77-
{% endif %}
78-
{% if pres.document.type.slug != 'bluesheets' or user|has_role:"Secretariat" or meeting.type.slug == 'interim' and can_manage_materials %}
79-
<a class="btn btn-default btn-sm pull-right" href="{{upload_url}}">Upload Revision</a>
80-
{% endif %}
81-
</td>
82-
{% endif %}
83-
</tr>
84-
{% endfor %}
85-
</table>
86-
{% if can_manage_materials %}
87-
{% if not session.type_counter.agenda %}
88-
<a class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.upload_session_agenda' session_id=session.pk num=session.meeting.number %}">Upload Agenda</a>
58+
<div class="panel panel-default">
59+
<div class="panel-heading">Agenda, Minutes, and Bluesheets</div>
60+
<div class="panel-body">
61+
<table class="table table-condensed table-striped">
62+
{% for pres in session.filtered_artifacts %}
63+
<tr>
64+
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
65+
<td>
66+
<a href="{{pres.document.get_href}}">{{pres.document.title}}</a>
67+
<a href="{{url}}">({{ pres.document.name }})</a>
68+
</td>
69+
{% if user|has_role:"Secretariat" or can_manage_materials %}
70+
<td class="col-md-2">
71+
{% if pres.document.type.slug == 'minutes' %}
72+
{% url 'ietf.meeting.views.upload_session_minutes' session_id=session.pk num=session.meeting.number as upload_url %}
73+
{% elif pres.document.type.slug == 'agenda' %}
74+
{% url 'ietf.meeting.views.upload_session_agenda' session_id=session.pk num=session.meeting.number as upload_url %}
75+
{% else %}
76+
{% url 'ietf.meeting.views.upload_session_bluesheets' session_id=session.pk num=session.meeting.number as upload_url %}
77+
{% endif %}
78+
{% if pres.document.type.slug != 'bluesheets' or user|has_role:"Secretariat" or meeting.type.slug == 'interim' and can_manage_materials %}
79+
<a class="btn btn-default btn-sm pull-right" href="{{upload_url}}">Upload Revision</a>
80+
{% endif %}
81+
</td>
82+
{% endif %}
83+
</tr>
84+
{% endfor %}
85+
</table>
86+
{% if can_manage_materials %}
87+
{% if not session.type_counter.agenda %}
88+
<a class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.upload_session_agenda' session_id=session.pk num=session.meeting.number %}">Upload Agenda</a>
89+
{% endif %}
90+
{% if not session.type_counter.minutes %}
91+
<a class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.upload_session_minutes' session_id=session.pk num=session.meeting.number %}">Upload Minutes</a>
92+
{% endif %}
8993
{% endif %}
90-
{% if not session.type_counter.minutes %}
91-
<a class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.upload_session_minutes' session_id=session.pk num=session.meeting.number %}">Upload Minutes</a>
94+
{% if user|has_role:"Secretariat" and not session.type_counter.bluesheets or meeting.type.slug == 'interim' and can_manage_materials and not session.type_counter.bluesheets %}
95+
<a class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.upload_session_bluesheets' session_id=session.pk num=session.meeting.number %}">Upload Bluesheets</a>
9296
{% endif %}
93-
{% endif %}
94-
{% if user|has_role:"Secretariat" and not session.type_counter.bluesheets or meeting.type.slug == 'interim' and can_manage_materials and not session.type_counter.bluesheets %}
95-
<a class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.upload_session_bluesheets' session_id=session.pk num=session.meeting.number %}">Upload Bluesheets</a>
96-
{% endif %}
97+
</div>
9798
</div>
98-
</div>
99-
<div class="panel panel-default">
100-
<div class="panel-heading" data-toggle="tooltip" title="Drag and drop to reorder slides">Slides</div>
101-
<div class="panel-body">
102-
<table class="table table-condensed table-striped slides" id="slides_{{session.pk}}">
103-
<tbody session="{{session.pk}}" addToSession="{% url 'ietf.meeting.views.ajax_add_slides_to_session' session_id=session.pk num=session.meeting.number %}" removeFromSession="{% url 'ietf.meeting.views.ajax_remove_slides_from_session' session_id=session.pk num=session.meeting.number %}" reorderInSession="{% url 'ietf.meeting.views.ajax_reorder_slides_in_session' session_id=session.pk num=session.meeting.number %}">
104-
{% for pres in session.filtered_slides %}
105-
<tr name="{{pres.document.name}}">
106-
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
107-
<td>
108-
<a href="{{pres.document.get_href}}">{{pres.document.title}} </a>
109-
<a href="{{url}}">({{ pres.document.name }}) </a>
110-
</td>
111-
{% if can_manage_materials %}
112-
<td class="col-md-2">
113-
<a class="btn btn-default btn-sm pull-right" href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number name=pres.document.name %}">Upload Revision</a>
114-
<a class="btn btn-default btn-sm pull-right" href="{% url 'ietf.meeting.views.remove_sessionpresentation' session_id=session.pk num=session.meeting.number name=pres.document.name %}">Remove</a>
99+
<div class="panel panel-default">
100+
<div class="panel-heading" data-toggle="tooltip" title="Drag and drop to reorder slides">Slides</div>
101+
<div class="panel-body">
102+
<table class="table table-condensed table-striped slides" id="slides_{{session.pk}}">
103+
<tbody session="{{session.pk}}" addToSession="{% url 'ietf.meeting.views.ajax_add_slides_to_session' session_id=session.pk num=session.meeting.number %}" removeFromSession="{% url 'ietf.meeting.views.ajax_remove_slides_from_session' session_id=session.pk num=session.meeting.number %}" reorderInSession="{% url 'ietf.meeting.views.ajax_reorder_slides_in_session' session_id=session.pk num=session.meeting.number %}">
104+
{% for pres in session.filtered_slides %}
105+
<tr name="{{pres.document.name}}">
106+
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
107+
<td>
108+
<a href="{{pres.document.get_href}}">{{pres.document.title}} </a>
109+
<a href="{{url}}">({{ pres.document.name }}) </a>
115110
</td>
116-
{% endif %}
117-
</tr>
118-
{% endfor %}
119-
</tbody>
120-
</table>
111+
{% if can_manage_materials %}
112+
<td class="col-md-2">
113+
<a class="btn btn-default btn-sm pull-right" href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number name=pres.document.name %}">Upload Revision</a>
114+
<a class="btn btn-default btn-sm pull-right" href="{% url 'ietf.meeting.views.remove_sessionpresentation' session_id=session.pk num=session.meeting.number name=pres.document.name %}">Remove</a>
115+
</td>
116+
{% endif %}
117+
</tr>
118+
{% endfor %}
119+
</tbody>
120+
</table>
121+
{% if can_manage_materials %}
122+
<a id="uploadslides" class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number %}">Upload New Slides</a>
123+
{% elif request.user.is_authenticated and not session.is_material_submission_cutoff %}
124+
<a id="proposeslides" class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.propose_session_slides' session_id=session.pk num=session.meeting.number %}">Propose Slides</a>
125+
{% endif %}
126+
</div>
121127
{% if can_manage_materials %}
122-
<a id="uploadslides" class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number %}">Upload New Slides</a>
123-
{% elif request.user.is_authenticated and not session.is_material_submission_cutoff %}
124-
<a id="proposeslides" class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.propose_session_slides' session_id=session.pk num=session.meeting.number %}">Propose Slides</a>
128+
<div class="panel-footer small">Drag-and-drop to reorder slides</div>
125129
{% endif %}
126130
</div>
127-
{% if can_manage_materials %}
128-
<div class="panel-footer small">Drag-and-drop to reorder slides</div>
129-
{% endif %}
130-
</div>
131-
<div class="panel panel-default">
132-
<div class="panel-heading">Drafts
133-
</div>
134-
<div class="panel-body">
135-
<table class="table table-condensed table-striped">
136-
{% for pres in session.filtered_drafts %}
137-
<tr>
138-
<td>
139-
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
140-
<a href="{{url}}">{{pres.document.title}} ({{ pres.document.name }}) {% if pres.rev %}Version {{pres.rev}}{% endif %}</a>
141-
</td>
142-
{% if can_manage_materials %}
143-
<td class="col-md-2">
144-
<a class="btn btn-default btn-sm pull-right" href="{% url 'ietf.meeting.views.remove_sessionpresentation' session_id=session.pk num=session.meeting.number name=pres.document.name %}">Remove</a>
131+
<div class="panel panel-default">
132+
<div class="panel-heading">Drafts
133+
</div>
134+
<div class="panel-body">
135+
<table class="table table-condensed table-striped">
136+
{% for pres in session.filtered_drafts %}
137+
<tr>
138+
<td>
139+
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
140+
<a href="{{url}}">{{pres.document.title}} ({{ pres.document.name }}) {% if pres.rev %}Version {{pres.rev}}{% endif %}</a>
145141
</td>
146-
{% endif %}
147-
</tr>
148-
{% endfor %}
149-
</table>
150-
{% if can_manage_materials %}
151-
<a class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.add_session_drafts' session_id=session.pk num=session.meeting.number %}">
152-
Link additional drafts to session
153-
</a>
154-
{% endif %}
142+
{% if can_manage_materials %}
143+
<td class="col-md-2">
144+
<a class="btn btn-default btn-sm pull-right" href="{% url 'ietf.meeting.views.remove_sessionpresentation' session_id=session.pk num=session.meeting.number name=pres.document.name %}">Remove</a>
145+
</td>
146+
{% endif %}
147+
</tr>
148+
{% endfor %}
149+
</table>
150+
{% if can_manage_materials %}
151+
<a class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.add_session_drafts' session_id=session.pk num=session.meeting.number %}">
152+
Link additional drafts to session
153+
</a>
154+
{% endif %}
155+
</div>
155156
</div>
156-
</div>
157157
{% endwith %}
158158
{% endfor %}

0 commit comments

Comments
 (0)