Skip to content

Commit 99f6c94

Browse files
pasieronenpasieronen
committed
Use new look for meeting materials page
 - Legacy-Id: 2010
1 parent 611e94a commit 99f6c94

5 files changed

Lines changed: 40 additions & 44 deletions

File tree

‎ietf/meeting/views.py‎

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

33
# Create your views here.
44
#import models
5-
from django.shortcuts import render_to_response as render, get_object_or_404
5+
from django.shortcuts import render_to_response, get_object_or_404
66
from ietf.proceedings.models import Meeting, MeetingTime, WgMeetingSession, MeetingVenue, IESGHistory, Proceeding, Switches
77
from django.views.generic.list_detail import object_list
88
from django.http import HttpResponseRedirect, HttpResponse, Http404
@@ -22,7 +22,7 @@ def show_html_materials(request, meeting_num=None):
2222
if settings.SERVER_MODE != 'production' and '_testoverride' in request.REQUEST:
2323
pass
2424
elif now > cor_cut_off_date:
25-
return render("meeting/list_closed.html",{'meeting_num':meeting_num,'begin_date':begin_date, 'cut_off_date':cut_off_date, 'cor_cut_off_date':cor_cut_off_date})
25+
return render_to_response("meeting/list_closed.html",{'meeting_num':meeting_num,'begin_date':begin_date, 'cut_off_date':cut_off_date, 'cor_cut_off_date':cor_cut_off_date}, context_instance=RequestContext(request))
2626
sub_began = 0
2727
if now > begin_date:
2828
sub_began = 1
@@ -96,10 +96,10 @@ def html_agenda(request, num=None):
9696
template = "meeting/m_agenda.html"
9797
else:
9898
template = "meeting/agenda.html"
99-
return render(template,
99+
return render_to_response(template,
100100
{"timeslots":timeslots, "update":update, "meeting":meeting, "venue":venue, "ads":ads,
101101
"plenaryw_agenda":plenaryw_agenda, "plenaryt_agenda":plenaryt_agenda, },
102-
RequestContext(request))
102+
context_instance=RequestContext(request))
103103

104104
def text_agenda(request, num=None):
105105
timeslots, update, meeting, venue, ads, plenaryw_agenda, plenaryt_agenda = agenda_info(num)

‎ietf/templates/meeting/list.html‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1+
{% extends "idrfc/base.html" %}
12
{# Copyright The IETF Trust 2007, All Rights Reserved #}
2-
{% extends "base.html" %}
3-
{% block title %} IETF {{ meeting_num }} Preliminary & Interim Materials {% endblock %}
4-
{% block head %}
5-
<link rel="stylesheet" type="text/css" href="https://www.ietf.org/css/base.css" />
6-
{% endblock %}
7-
{% block css %}
8-
h2.divider { background:#2647A0; color:white; padding:0.5em 1em; };
9-
{% endblock %}
3+
{% block title %}IETF {{ meeting_num }} Preliminary &amp; Interim Materials{% endblock %}
4+
{% block morecss %}
5+
table.ietf-materials { width: 99%; border-bottom:1px solid #cbcbcb; nopadding: 0; margin: 0; vertical-align: top; border-collapse: collapse;}
6+
table.ietf-materials tr {vertical-align: top; }
7+
table.ietf-materials td { padding:0.5em 0; }
8+
{% endblock morecss %}
9+
1010
{% block content %}
11-
<h1 style="align:center">IETF {{ meeting_num }} Meeting Materials</h1>
11+
<h1>IETF {{ meeting_num }} Meeting Materials</h1>
12+
1213
{% if sub_began %}
1314
<p>Submission cutoff date: {{ cut_off_date|date:"F j, Y" }}<br/>
1415
Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
@@ -18,7 +19,7 @@ <h1 style="align:center">IETF {{ meeting_num }} Meeting Materials</h1>
1819

1920
{% regroup object_list|dictsort:"area" by area_name as areas %}
2021
{% for wgs in areas %}
21-
<h2 class="divider">{{ wgs.grouper }}</h2>
22+
<h2 class="ietf-divider">{{ wgs.grouper }}</h2>
2223
{% ifequal wgs.grouper "Plenary Sessions" %}
2324
{% for wg in wgs.list|dictsortreversed:"acronym" %}
2425
{% include "meeting/list_group.html" %}
@@ -29,35 +30,35 @@ <h2 class="divider">{{ wgs.grouper }}</h2>
2930
{% endfor %}
3031
{% endifequal %}
3132
{% endfor %}
32-
<!--- Training Sessions --->
33+
<!-- Training Sessions -->
3334
{% if training_list %}
34-
<h2 class="divider">Training</h2>
35+
<h2 class="ietf-divider">Training</h2>
3536
{% for wg in training_list|dictsort:"acronym" %}
3637

3738
<table cellpadding="0" cellspacing="0" border="0" width="99%" style="border-bottom:1px solid #cbcbcb;">
38-
<tr><a name="wg-{{ wg.acronym }}"></a>
39-
<td style="width:12em;"><b>{{ wg.acronym|upper }}{% ifequal wg.group_type_str "BOF" %} <font color="red">({{ wg.group_type_str }})</font> {% endifequal %}</b><br/>
39+
<tr>
40+
<td style="width:12em;"><a name="wg-{{ wg.acronym }}"></a><b>{{ wg.acronym|upper }}{% ifequal wg.group_type_str "BOF" %} <font color="red">({{ wg.group_type_str }})</font> {% endifequal %}</b><br/>
4041
{% for slide in wg.slides %}
4142
<a href="http://www3.ietf.org/proceedings/{{ slide.file_loc }}">{{ slide.slide_name|escape }}</a><br/>
4243
{% endfor %}
4344
</td></tr></table>
4445
{% endfor %}
4546
{% endif %}
46-
<!--- End of Training Sessions --->
47-
<!--- IRTF Sessions --->
47+
<!-- End of Training Sessions -->
48+
<!-- IRTF Sessions -->
4849
{% if irtf_list %}
49-
<h2 class="divider">IRTF</h2>
50+
<h2 class="ietf-divider">IRTF</h2>
5051
{% for wg in irtf_list|dictsort:"acronym_lower" %}
5152
{% include "meeting/list_group.html" %}
5253
{% endfor %}
5354
{% endif %}
54-
<!--- End of IRTF Sessions --->
55-
<!--- Interim Meetings --->
55+
<!-- End of IRTF Sessions -->
56+
<!-- Interim Meetings -->
5657
{% if interim_list %}
57-
<h2 class="divider">Interim Meetings</h2>
58+
<h2 class="ietf-divider">Interim Meetings</h2>
5859
{% for wg in interim_list|dictsort:"acronym" %}
5960
{% include "meeting/list_group.html" %}
6061
{% endfor %}
6162
{% endif %}
62-
<!--- End of Imterim Meetings --->
63+
<!-- End of Imterim Meetings -->
6364
{% endblock %}

‎ietf/templates/meeting/list_closed.html‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
1+
{% extends "idrfc/base.html" %}
12
{# Copyright The IETF Trust 2007, All Rights Reserved #}
2-
{% extends "base.html" %}
3-
{% block title %} IETF {{ meeting_num }} Preliminary & Interim Materials {% endblock %}
4-
{% block head %}
5-
<link rel="stylesheet" type="text/css" href="https://www.ietf.org/css/base.css" />
6-
{% endblock %}
3+
{% block title %}IETF {{ meeting_num }} Preliminary &amp; Interim Materials {% endblock %}
74
{% block content %}
8-
<center>
9-
<h2>IETF {{ meeting_num }} Preliminary & Interim Materials</h2>
10-
<h4>Submission began {{ begin_date|date:"F j, Y" }} </h4>
11-
<h4>Submission cutoff date: {{ cut_off_date|date:"F j, Y" }}</h4>
12-
<h4>Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }} </h4>
13-
</center>
14-
<br>
15-
<i>
16-
The IETF {{ meeting_num }} Preliminary & Interim Materials page is now closed.<br>
17-
You should be able to access the final version of IETF {{ meeting_num }} Proceedings via <a href="http://www.ietf.org/proceedings_directory.html">IETF Online Proceedings page</a>.<br>
18-
</i>
5+
<h1>IETF {{ meeting_num }} Preliminary &amp; Interim Materials</h1>
6+
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>
10+
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>
1913
{% endblock %}

‎ietf/templates/meeting/list_group.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<table cellpadding="0" cellspacing="0" border="0" width="99%" style="border-bottom:1px solid #cbcbcb;">
2-
<tr><a name="wg-{{ wg.acronym }}"></a>
3-
<td style="width:12em;"><b>{% ifequal wg.acronym "plenaryw" %}Wednesday<br/>Plenary{%else%}{% ifequal wg.acronym "plenaryt" %}Thursday<br/>Plenary{%else%}{{ wg.acronym|upper }}{%endifequal%}{%endifequal%}
1+
<table class="ietf-materials">
2+
<tr>
3+
<td style="width:12em;"><a name="wg-{{ wg.acronym }}"></a><b>{% ifequal wg.acronym "plenaryw" %}Wednesday<br/>Plenary{%else%}{% ifequal wg.acronym "plenaryt" %}Thursday<br/>Plenary{%else%}{{ wg.acronym|upper }}{%endifequal%}{%endifequal%}
44
{% ifequal wg.group_type_str "BOF" %} <font color="red">({{ wg.group_type_str }})</font> {% endifequal %}</b><br/>
55
</td>
66
<td>

‎static/css/base2.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,4 @@ table.ballot_icon td.ballot_icon_my { border: 3px outset black;}
114114

115115
.ietf-highlight-y { padding:0 2px;background:yellow;font-size:85%;}
116116
.ietf-highlight-r { padding:0 2px;background:#ffa0a0;font-size:85%;}
117+
.ietf-divider { background: #2647a0; color: white; font-size:116%; padding:0.5em 1em; }

0 commit comments

Comments
 (0)