Skip to content

Commit 3e5f290

Browse files
pasieronenpasieronen
committed
Use new look for liaison statement pages
 - Legacy-Id: 2012
1 parent 2907cec commit 3e5f290

2 files changed

Lines changed: 70 additions & 78 deletions

File tree

‎ietf/templates/liaisons/liaisondetail_detail.html‎

Lines changed: 57 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,66 @@
1+
{% extends "idrfc/base.html" %}
12
{# Copyright The IETF Trust 2007, All Rights Reserved #}
2-
{# no template, this page has its own look. #}
33
{% load ietf_filters %}
4-
<html>
5-
<head><title>Liaison Statement Detail:
6-
{% include 'liaisons/liaison_title.html' %}</title>
7-
<style type="text/css">
4+
{% block title %}Liaison Statement: {% include 'liaisons/liaison_title.html' %}{% endblock %}
85

9-
a:link, a:visited {
10-
border-bottom:1px dotted #69f;
11-
color:blue;
12-
text-decoration:none;
13-
}
14-
a:visited {
15-
border-bottom:1px dotted #969;
16-
color:#939;
17-
}
18-
a:hover {
19-
border-bottom:1px dotted #f00;
20-
color:#f00;
21-
}
22-
</style>
23-
</head>
24-
<body topmargin='0' bottommargin='0' leftmargin='0' rightmargin='0' background='/images/back_dot.gif'>
25-
<table bgcolor="#F4F2F2" border=2 cellpadding=0 cellspacing=0 width='671' height="300" align='center'>
26-
<tr valign="top"><td>
27-
<table width="100%" height='100%' border=0 cellpadding=0 cellspacing=0 bgcolor="#FFFFFF">
28-
<tr valign="top"><td><img src="/images/liaison_title.gif" height="96" border="0"></td></tr>
29-
<tr valign="top"><td>
6+
{% block morecss %}
7+
.ietf-liaison-details tr { vertical-align:top; }
8+
{% endblock morecss %}
309

31-
<center><h3>
32-
{% include 'liaisons/liaison_title.html' %}
33-
</h3></center>
34-
{% if not object.by_secretariat %}
35-
<blockquote>
36-
<table cellspacing="3" bgcolor="cccc99" width="600">
37-
<tr>
38-
<td bgcolor="#efefef" width="25%">Submission Date: </td><td width="75%"><pre>{{ object.submitted_date }}</pre></td></tr>
39-
<tr>
40-
<td bgcolor="#efefef" width="25%">From: </td><td width="75%"><pre>{{ object.from_body|escape }} (<a href="mailto:{{ object.from_email|fix_ampersands }}">{{ object.person|escape }}</a>)</pre></td></tr>
41-
<tr>
42-
<td bgcolor="#efefef">To: </td><td><pre>{{ object.to_body|escape }} ({{ object.to_poc|parse_email_list|safe }})</pre></td></tr>
43-
<tr>
44-
<td bgcolor="#efefef">Cc:</td><td><pre>{{ object.cc1|parse_email_list|make_one_per_line|safe }}</pre></td></tr>
45-
<tr>
46-
<td bgcolor="#efefef">Response Contact:</td>
47-
<td>
48-
<pre>{{ object.response_contact|parse_email_list|make_one_per_line|safe }}</pre>
49-
</td></tr>
50-
<tr>
51-
<td bgcolor="#efefef">Technical Contact:</td>
52-
<td>
53-
<pre>{{ object.technical_contact|parse_email_list|make_one_per_line|safe }}</pre></td>
54-
</tr>
55-
<tr>
56-
<td bgcolor="#efefef">Purpose:</td><td><pre>{% if object.purpose_text %}{{ object.purpose_text }}{% else %}{{ object.purpose }}{% endif %}</pre></td></tr>
57-
<tr>
58-
<td bgcolor="#efefef">Deadline:</td><td><pre>{{ object.deadline_date }}</pre></td></tr>
59-
<tr>
60-
<td bgcolor="#efefef">Body:</td><td><pre>{{ object.body|wordwrap:"71"|escape }}</pre></td></tr>
61-
</table>
62-
</blockquote>
10+
{% block content %}
11+
<h1>Liaison Statement: {% include 'liaisons/liaison_title.html' %}</h1>
12+
13+
<table class="ietf-liaison-details">
14+
<tr>
15+
<td style="width:18ex;">Submission Date:</td><td>{{ object.submitted_date }}</td></tr>
16+
<tr>
17+
<td>From:</td><td>{{ object.from_body }} (<a href="mailto:{{ object.from_email|fix_ampersands }}">{{ object.person }}</a>)</td></tr>
18+
19+
<tr>
20+
<td>To:</td><td>
21+
{% if object.by_secretariat %}
22+
{% if object.submitter_email %}
23+
<a href="mailto:{{ object.submitter_email}}">{{ object.submitter_name }}</a>
24+
{% else %}
25+
{{ object.submitter_name }}
6326
{% endif %}
64-
<hr>
65-
<blockquote>
66-
<h3>Attached Document(s)</h3>
67-
{% if object.uploads_set.count %}
68-
<ul>
27+
{% else %}
28+
{{ object.to_body }} ({{ object.to_poc|parse_email_list|safe }})</td></tr>
29+
{% endif %}
30+
31+
{% if not object.by_secretariat %}
32+
33+
<tr>
34+
<td>Cc:</td><td>{{ object.cc1|parse_email_list|make_one_per_line|safe|linebreaksbr }}</td></tr>
35+
<tr>
36+
<td>Response Contact:</td>
37+
<td>
38+
{{ object.response_contact|parse_email_list|make_one_per_line|safe|linebreaksbr }}
39+
</td></tr>
40+
<tr>
41+
<td>Technical Contact:</td>
42+
<td>{{ object.technical_contact|parse_email_list|make_one_per_line|safe|linebreaksbr }}</td>
43+
</tr>
44+
<tr>
45+
<td>Purpose:</td><td>{% if object.purpose_text %}{{ object.purpose_text }}{% else %}{{ object.purpose }}{% endif %}</td></tr>
46+
<tr>
47+
<td>Deadline:</td><td>{{ object.deadline_date }}</td></tr>
48+
{% endif %}
49+
50+
<tr>
51+
<td>Attachments:</td>
52+
<td>
6953
{% for file in object.uploads_set.all %}
70-
<li><a href="https://datatracker.ietf.org/documents/LIAISON/file{{ file.file_id }}{{ file.file_extension }}">{{ file.file_title }}</a><br>
54+
<a href="https://datatracker.ietf.org/documents/LIAISON/file{{ file.file_id }}{{ file.file_extension }}">{{ file.file_title }}</a>{% if not forloop.last %}<br/>{% endif %}
55+
{% empty %}
56+
(none)
7157
{% endfor %}
72-
</ul>
73-
{% else %}
74-
NONE
58+
</td></tr>
59+
60+
{% if not object.by_secretariat and object.body %}
61+
<tr>
62+
<td>Body:</td><td><pre>{{ object.body|wordwrap:"71"|escape }}</pre></td></tr>
7563
{% endif %}
76-
</blockquote>
64+
</table>
7765

78-
</td></tr></table>
79-
</body>
80-
</html>
66+
{% endblock %}

‎ietf/templates/liaisons/liaisondetail_list.html‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1+
{% extends "idrfc/base.html" %}
12
{# Copyright The IETF Trust 2007, All Rights Reserved #}
2-
{% extends "base.html" %}
3+
{% block title %}Liaison Statements{% endblock %}
4+
5+
{% block pagehead %}
6+
<link rel="alternate" type="application/atom+xml" href="/feed/liaison/recent/" />
7+
{% endblock %}
8+
39
{% block content %}
410

5-
<center><h2>Liaison Statements</H2></center>
11+
<h1>Liaison Statements</h1>
612

7-
<table cellspacing="3">
8-
<tr><th>Date</th><th>Org</th><th>Token</th><th>Title</th></tr>
13+
<table class="ietf-table" width="100%">
14+
<tr><th width="9%">Date</th><th width="20%">From</th><th width="20%">To</th><th width="50%">Title</th></tr>
915

1016
{% for liaison in object_list %}
11-
<tr>
12-
<td nowrap>{{ liaison.submitted_date|date:"F Y" }}</td>
17+
<tr class="{% cycle oddrow,evenrow %}">
18+
<td style="white-space:nowrap;">{{ liaison.submitted_date|date:"Y-m-d" }}</td>
1319
<td>{{ liaison.from_body|escape }}</td>
1420
<td>
1521
{% if liaison.by_secretariat %}
@@ -25,7 +31,7 @@
2531
<td>
2632
{% if liaison.by_secretariat %}
2733
{% for file in liaison.uploads_set.all %}
28-
<a href="https://datatracker.ietf.org/documents/LIAISON/file{{ file.file_id }}{{ file.file_extension }}">{{ file.file_title|escape }}</a><br>
34+
<a href="https://datatracker.ietf.org/documents/LIAISON/file{{ file.file_id }}{{ file.file_extension }}">{{ file.file_title|escape }}</a><br/>
2935
{% endfor %}
3036
{% else %}
3137
<a href="{{ liaison.detail_id }}/">{{ liaison.title|escape }}</a>

0 commit comments

Comments
 (0)