Skip to content

Commit e6238aa

Browse files
OleLaursenOleLaursen
committed
Facelift the relatively trivial meeting pages
 - Legacy-Id: 8942
1 parent fba359d commit e6238aa

9 files changed

Lines changed: 57 additions & 81 deletions

File tree

‎ietf/meeting/views.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,12 +369,11 @@ def agenda(request, num=None, name=None, base=None, ext=None):
369369
meeting = get_meeting(num)
370370
schedule = get_schedule(meeting, name)
371371
if schedule == None:
372-
return HttpResponse(render_to_string("meeting/no-"+base+ext,
373-
{'meeting':meeting }, RequestContext(request)), content_type=mimetype[ext])
372+
base = base.replace("-utc", "")
373+
return render(request, "meeting/no-"+base+ext, {'meeting':meeting }, content_type=mimetype[ext])
374374

375375
updated = meeting_updated(meeting)
376-
return HttpResponse(render_to_string("meeting/"+base+ext,
377-
{"schedule":schedule, "updated": updated}, RequestContext(request)), content_type=mimetype[ext])
376+
return render(request, "meeting/"+base+ext, {"schedule":schedule, "updated": updated}, content_type=mimetype[ext])
378377

379378
def read_agenda_file(num, doc):
380379
# XXXX FIXME: the path fragment in the code below should be moved to

‎ietf/templates/meeting/agenda.html‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,7 @@
3030
<div class="row">
3131
<div class="col-md-10">
3232

33-
<h1>
34-
IETF {{ schedule.meeting.number }} meeting agenda
35-
{% if "-utc" in request.path %}
36-
(UTC)
37-
{% endif %}
38-
<br>
39-
<small>
40-
{{ schedule.meeting.city }}, {{ schedule.meeting.date|date:"F j" }} -
41-
{% if schedule.meeting.date.month != schedule.meeting.end_date.month %}
42-
{{ schedule.meeting.end_date|date:"F " }}
43-
{% endif %}
44-
{{ schedule.meeting.end_date|date:"j, Y" }}
45-
</small>
46-
</h1>
33+
{% include "meeting/meeting_heading.html" with meeting=schedule.meeting %}
4734

4835
<p class="label label-info">Updated {{ updated|date:"Y-m-d \a\t G:i:s (T)" }}</p>
4936
<p></p>

‎ietf/templates/meeting/materials_upload_closed.html‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
{% extends "base.html" %}
2-
{# Copyright The IETF Trust 2007, All Rights Reserved #}
1+
{% extends "ietf.html" %}
2+
33
{% block title %}IETF {{ meeting_num }} Preliminary &amp; Interim Materials {% endblock %}
4+
45
{% block content %}
56
<h1>IETF {{ meeting_num }} Preliminary &amp; Interim Materials</h1>
67

7-
<p>Submission began {{ begin_date|date:"F j, Y" }}<br/>
8-
Submission cutoff date: {{ cut_off_date|date:"F j, Y" }}<br/>
9-
Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
8+
<p>
9+
Submission began {{ begin_date|date:"F j, Y" }}<br/>
10+
Submission cutoff date: {{ cut_off_date|date:"F j, Y" }}<br/>
11+
Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}
12+
</p>
13+
14+
<p>The IETF {{ meeting_num }} Preliminary &amp; Interim Materials page is now closed.</p>
1015

11-
<p>The IETF {{ meeting_num }} Preliminary &amp; Interim Materials page is now closed.<br/>
12-
<p>You should be able to access the final version of IETF {{ meeting_num }} Proceedings via the <a href="http://www.ietf.org/meeting/proceedings.html">IETF Online Proceedings page</a>.</p>
16+
<p>You should be able to access the final version of IETF {{ meeting_num }} Proceedings via the <a href="https://www.ietf.org/meeting/proceedings.html">IETF Online Proceedings page</a>.</p>
1317
{% endblock %}

‎ietf/templates/meeting/meeting_heading.html‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{# assumes meeting is in context #}
2+
<h1>
3+
IETF {{ meeting.number }} Meeting Agenda
4+
<br>
5+
<small>
6+
{{ meeting.city }}, {{ meeting.date|date:"F j" }} -
7+
{% if meeting.date.month != meeting.end_date.month %}
8+
{{ meeting.end_date|date:"F " }}
9+
{% endif %}
10+
{{ meeting.end_date|date:"j, Y" }}
11+
</small>
12+
</h1>

‎ietf/templates/meeting/no-agenda-utc.html‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎ietf/templates/meeting/no-agenda.html‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
{% extends "base.html" %}
2-
{% load ietf_filters %}
3-
{# Copyright The IETF Trust 2007, All Rights Reserved #}
4-
{% load humanize %}
1+
{% extends "ietf.html" %}
2+
53
{% block title %}IETF {{ meeting.number }} Meeting Agenda{% endblock %}
64

75
{% block content %}
8-
<h1>IETF {{ meeting.number }} Meeting Agenda</h1>
9-
10-
<p>{{ meeting.city }}, {{ meeting.date|date:"F j" }} &#8211; {% if meeting.date.month != meeting.end_date.month %}{{ meeting.end_date|date:"F " }}{% endif %}{{ meeting.end_date|date:"j, Y" }}<br />
11-
</p>
12-
13-
<h1>There is no Agenda available yet.</h1>
6+
{% include "meeting/meeting_heading.html" %}
147

8+
<div class="jumbotron">
9+
<p>There is no agenda available yet.</p>
10+
</div>
1511
{% endblock %}

‎ietf/templates/meeting/private_agenda.html‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,22 @@
1-
{% extends "base.html" %}
2-
{% load ietf_filters %}
3-
{# Copyright The IETF Trust 2007, All Rights Reserved #}
4-
{% load humanize %}
1+
{% extends "ietf.html" %}
2+
3+
{% block title %}IETF {{ meeting.number }} Meeting Agenda: {{ schedule.owner }} / {{ schedule.name }}{% endblock %}
54

65
{% block morecss %}
76
{% for area in area_list %}
87
.{{ area.upcase_acronym}}-scheme, .meeting_event th.{{ area.upcase_acronym}}-scheme, #{{ area.upcase_acronym }}-groups, #selector-{{ area.upcase_acronym }} { color:{{ area.fg_color }}; background-color: {{ area.bg_color }} }
98
{% endfor %}
109
{% endblock morecss %}
1110

12-
{% block title %}IETF {{ meeting.number }} Meeting Agenda: {{ schedule.owner }} / {{ schedule.name }}{% endblock %}
13-
{% load agenda_custom_tags %}
14-
1511
{% block start_content_table %}{% endblock %}
1612
{% block end_content_table %}{% endblock %}
1713

1814
{% block content %}
19-
2015
<div id="read_only">
21-
<p>
22-
You do not have access this agenda. It belongs to {{ schedule.owner }}.
23-
</p>
24-
<p>
25-
<a href="{% url "ietf.meeting.views.edit_agendas" meeting.number %}">List your meetings</a>.
26-
</p>
27-
<div class="wrapper custom_text_stuff">
28-
</div>
16+
<p>You do not have access this agenda. It belongs to {{ schedule.owner }}.</p>
2917

18+
<p><a href="{% url "ietf.meeting.views.edit_agendas" meeting.number %}">List your meetings</a>.</p>
19+
20+
<div class="wrapper custom_text_stuff"></div>
21+
</div>
3022
{% endblock %}

‎ietf/templates/meeting/session_details.html‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
{% extends "base.html" %}
1+
{% extends "ietf.html" %}
22

3-
{% block title %} {{meeting}} : {{acronym}} {% endblock %}
3+
{% block title %}{{ meeting }} : {{ acronym }}{% endblock %}
44

55
{% block morecss %}
66
.timeheader {font-size:120%;}
77
{% endblock %}
88

99
{% block content %}
10-
<h1> {{ meeting }} : {{ acronym }} : {{ time }} </h1>
10+
<h1>{{ meeting }} : {{ acronym }} : {{ time }} </h1>
11+
1112
{% if session.name %}
12-
<h2> {{session.name}} </h2>
13+
<h2>{{ session.name }}</h2>
1314
{% endif %}
1415

1516
{% if session.sessionpresentation_set.all.count %}
16-
<p>Materials:
17-
<ul>
18-
{% for pres in session.sessionpresentation_set.all %}
19-
<li><a href="{% url 'doc_view' name=pres.document.name rev=pres.rev%}">{{pres.document.name}}-{{pres.rev}}</a></li>
20-
{% endfor %}
21-
</ul>
22-
</p>
17+
<p>Materials:</p>
18+
19+
<ul>
20+
{% for pres in session.sessionpresentation_set.all %}
21+
<li><a href="{% url 'doc_view' name=pres.document.name rev=pres.rev%}">{{ pres.document.name }}-{{ pres.rev }}</a></li>
22+
{% endfor %}
23+
</ul>
2324
{% endif %}
2425

2526
{% endblock %}

‎ietf/templates/meeting/session_list.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
{% extends "base.html" %}
1+
{% extends "ietf.html" %}
22

3-
{% block title %} {{meeting}} : {{acronym}} {% endblock %}
3+
{% block title %}{{ meeting }} : {{ acronym }}{% endblock %}
44

55
{% block content %}
6-
<h1> {{ meeting }} : {{acronym}} </h1>
6+
<h1>{{ meeting }} : {{ acronym }}</h1>
77

88
<ul>
99
{% for session in sessions %}
10-
<li> <a href="{{forloop.counter}}">{{session}}</a></li>
10+
<li> <a href="{{ forloop.counter }}/">{{session}}</a></li>
1111
{% endfor %}
1212
</ul>
1313
{% endblock %}

0 commit comments

Comments
 (0)