Skip to content

Commit 4255d7f

Browse files
pasieronenpasieronen
committed
HTML/CSS cleaning
 - Legacy-Id: 1946
1 parent 8b5ce04 commit 4255d7f

13 files changed

Lines changed: 91 additions & 130 deletions

‎ietf/templates/idrfc/base.html‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,17 @@
5858
<div style="background-color:#313163;color:white;font-size:150%;height:35px;">
5959
<img src="/images/ietflogo-blue-small.png" width="60" height="34" style="vertical-align:middle;padding-left:8px;" alt=""/><span style="color:white; padding-left:15px;font-weight:bold;letter-spacing:0.1em;">datatracker.ietf.org</span>
6060
</div>
61-
<div id="ietf-login" style="position:absolute;top:8px;right:10px;">
62-
{% if user.is_authenticated %}
61+
62+
<div id="ietf-login">{% if user.is_authenticated %}
6363
{{ user }}
6464
{% else %}
6565
<a href="/accounts/login/?next={{request.path|urlencode}}">Sign In</a>
66-
{% endif %}
67-
</div>
66+
{% endif %}</div>
6867

6968
<table style="margin-left:8px;margin-top:8px;" width="98%;">
7069
<tr valign="top">
7170
<td style="width:130px;padding-right:8px;">
72-
<div class="leftmenu" style="margin-top:4px;">
71+
<div class="ietf-navbar">
7372
{% include "idrfc/base_leftmenu.html" %}
7473
</div>
7574
</td>
@@ -98,7 +97,7 @@
9897
{% block content_end %}
9998
{% endblock %}
10099
</div>
101-
<div id="db-extras"></div>
100+
<div id="ietf-extras"></div>
102101
</td></tr></table>
103102
{% include "debug.html" %}
104103
</body></html>

‎ietf/templates/idrfc/base_leftmenu.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<li><a href="/doc/ad/{{user.get_profile.person.first_name|lower}}.{{user.get_profile.person.last_name|lower}}/">My Documents</a></li>
4141
<li><a href="/iesg/agenda/documents/">Next Telechat</a></li>
4242
<li><a href="/iesg/discusses/">Discusses</a></li>
43-
</li>
4443
<li class="sect">Working Groups</li>
4544
{% else %}
4645
<li class="sect first">Working Groups</li>

‎ietf/templates/idrfc/by_ad.html‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% extends "idrfc/base.html" %}
22
{% comment %}
3-
Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
3+
Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
44
All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
55

66
Redistribution and use in source and binary forms, with or without
@@ -33,18 +33,14 @@
3333
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3434
{% endcomment %}
3535

36-
37-
{% block title %}Internet-Drafts and RFCs for {{ ad_name }}
38-
{% endblock %}
36+
{% block title %}Internet-Drafts and RFCs for {{ ad_name }}{% endblock %}
3937

4038
{% block content %}
39+
<h1>Internet-Drafts and RFCs for {{ ad_name }}</h1>
4140

42-
<h1 style="margin-top:0;">Internet-Drafts and RFCs for {{ ad_name }}</h1>
43-
44-
<div id="search_results" class="search_results">
4541
{% regroup docs by view_sort_group as grouped_docs %}
4642

47-
<table>
43+
<table class="ietf-table ietf-doctable">
4844
<tr><th class="doc">Document</th><th class="title">Title</th><th class="date">Date</th><th class="status" colspan="2">Status</th><th class="ad">Area Director</th></tr>
4945
{% for doc_group in grouped_docs %}
5046
<tr class="header"><td colspan="6">{{doc_group.grouper}}s</td></tr>
@@ -55,7 +51,4 @@ <h1 style="margin-top:0;">Internet-Drafts and RFCs for {{ ad_name }}</h1>
5551

5652
{% endfor %}
5753
</table>
58-
59-
</div>
60-
61-
{% endblock %}
54+
{% endblock content %}

‎ietf/templates/idrfc/doc_ballot.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@
3232
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3333
{% endcomment %}
3434
{% load ietf_filters %}
35-
<table class="ballotTable"><tr valign="top"><td class="left">
35+
<table class="ietf-ballot"><tr valign="top"><td class="left">
3636

3737
{% if doc_ballot_edit_button %}
3838
{% if user|in_group:"Area_Director,Secretariat" %}
39-
<div style="margin-top:8px; margin-bottom:8px;" nostyle="position:absolute;right:0px;">
39+
<div style="margin-top:8px; margin-bottom:8px;">
4040
<span id="doc_ballot_button" class="yui-button yui-link-button"><span class="first-child">
4141
<a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=open_ballot&amp;id_document_tag={% if info.is_rfc %}{{doc.rfc_number}}{% else %}{{doc.tracker_id}}{% endif %}">Edit position</a>
4242
</span></span></div>
4343
{% endif %}{# user in_group #}
4444
{% endif %}
4545

46-
<p><span class="square" style="background:#c00000;"></span><b>Discuss</b><br/>
46+
<p style="margin-top:1em;"><span class="square" style="background:#c00000;"></span><b>Discuss</b><br/>
4747
{% with ballot.get_discuss as positions %}{% include "idrfc/doc_ballot_list.html" %}{% endwith %}</p>
4848

4949
<p><span class="square" style="background:#80ff80;"></span><b>Yes</b><br/>

‎ietf/templates/idrfc/doc_ballot_list.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% for p in positions %}
2-
{% if p.is_old_ad %}[{%endif%}{{p.ad_name}}{% if p.is_old_ad %}]{%endif%} {% if p.has_text %}<img src="/images/comment.png" width="14" height="12" style="novertical-align:middle;" alt="*"/>{% endif %} <br/>
2+
{% if p.is_old_ad %}[{%endif%}{{p.ad_name}}{% if p.is_old_ad %}]{%endif%}{% if p.has_text %}&nbsp;<img src="/images/comment.png" width="14" height="12" style="novertical-align:middle;" alt="*"/>{% endif %}<br/>
33
{% if p.old_positions %}<span class="was">(was {{p.old_positions|join:", "}})</span><br/>{%endif%}
44
{% empty %}
55
<i>none</i>

‎ietf/templates/idrfc/doc_history.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,35 +33,35 @@
3333
{% endcomment %}
3434

3535
{% load ietf_filters %}
36-
<table class="ietfTable">
37-
<tr><th class="comment_date">Date</th><th class="comment_version">Version</th><th class="comment_by">By</th><th class="comment_text">Text</th></tr>
36+
<table class="ietf-table">
37+
<tr><th class="comment_date">Date</th><th>Version</th><th>By</th><th>Text</th></tr>
3838

3939
{% for c in history %}
4040
<tr class="{% cycle oddrow,evenrow %}">
4141
<td class="comment_date">{{ c.date|date:"Y-m-d" }}</td>
4242

4343
{% if c.is_rev %}
44-
<td class="comment_version">{{ c.revision }}</td>
45-
<td class="comment_by">(System)</td>
46-
<td class="comment_text">New version available: <a href="http://tools.ietf.org/id/{{c.draft_name}}-{{c.revision}}.txt">{{c.draft_name}}-{{c.revision}}</a> {% ifnotequal c.revision "00" %}(<a href="http://tools.ietf.org/rfcdiff?url2={{c.draft_name}}-{{c.revision}}">diff from -{{c.revision|add:"-1"|stringformat:"02d"}}</a>){% endifnotequal %}</td>
44+
<td>{{ c.revision }}</td>
45+
<td>(System)</td>
46+
<td>New version available: <a href="http://tools.ietf.org/id/{{c.draft_name}}-{{c.revision}}.txt">{{c.draft_name}}-{{c.revision}}</a> {% ifnotequal c.revision "00" %}(<a href="http://tools.ietf.org/rfcdiff?url2={{c.draft_name}}-{{c.revision}}">diff from -{{c.revision|add:"-1"|stringformat:"02d"}}</a>){% endifnotequal %}</td>
4747
{% endif %}
4848

4949
{% if c.is_text %}
50-
<td class="comment_version">&nbsp;</td>
51-
<td class="comment_by">(System)</td>
52-
<td class="comment_text">{{ c.text }}</td>
50+
<td>&nbsp;</td>
51+
<td>(System)</td>
52+
<td>{{ c.text }}</td>
5353
{% endif %}
5454

5555
{% if c.is_com %}
56-
<td class="comment_version">{{ c.comment.version }}</td>
57-
<td class="comment_by">{{ c.info.by|escape }}</td>
58-
<td class="comment_text">{% if c.comment.ballot %}
56+
<td>{{ c.comment.version }}</td>
57+
<td>{{ c.info.by|escape }}</td>
58+
<td>{% if c.comment.ballot %}
5959
[Ballot {{ c.comment.get_ballot_display }}]<br />
6060
{% endif %}
6161
{% if c.info.snipped %}
62-
<div class="commentSnippet" id="commentS{{forloop.counter}}">{{ c.info.textSnippet|safe }}</div>
63-
<span class="commentToggle" onclick="toggleComment({{forloop.counter}})" id="commentT{{forloop.counter}}">[show all]</span>
64-
<div class="commentFull" id="commentF{{forloop.counter}}" style="display:none;">
62+
<div id="commentS{{forloop.counter}}">{{ c.info.textSnippet|safe }}</div>
63+
<span class="comment_toggle" onclick="toggleComment({{forloop.counter}})" id="commentT{{forloop.counter}}">[show all]</span>
64+
<div id="commentF{{forloop.counter}}" style="display:none;">
6565
{{c.info.text|fill:"80"|format_textarea|safe}}
6666
</div>
6767
{% else %}

‎ietf/templates/idrfc/doc_main.html‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,16 @@
3535

3636
{% load ietf_filters %}
3737
{% block morecss %}
38-
3938
#metabox { width: 99%; border:1px solid #cccccc; background:#edf5ff;margin-top:8px; padding:4px; margin-bottom:1em; }
4039
#metatable { border: 0; border-spacing: 0; }
4140
#metatable tr { vertical-align:top ;}
4241

43-
#commentLog { margin-bottom: 1.5ex; }
44-
.commentToggle { text-decoration: underline; color: blue; }
45-
42+
.comment_toggle { text-decoration: underline; color: blue; }
4643
.comment_date { white-space: nowrap; }
4744

4845
div.diffTool { border: 1px solid #cccccc; background: #edf5ff; padding: 8px 4px; margin: 8px 0;}
4946
.diffTool label { float:left; width:50px; }
5047

51-
table.ietfTable { border-collapse:collapse; border:1px solid #7f7f7f; }
52-
.ietfTable tr.evenrow { background-color: #EDF5FF; }
53-
.ietfTable tr.oddrow { background-color: white; }
54-
.ietfTable td { border-right: 1px solid #cbcbcb; padding:3px 6px; }
55-
.ietfTable th { color:white; background: #2647A0; text-align:left; padding:3px 6px; border-right: 1px solid #7f7f7f; }
56-
5748
.markup_draft pre {line-height: 1.2em; margin: 0; }
5849
.m_hdr, .m_ftr { color: #808080; }
5950
.m_ftr { border-bottom: 1px solid #a0a0a0; }
@@ -65,7 +56,7 @@
6556
{% endblock %}
6657

6758
{% block content %}
68-
<h1 style="margin-top:0;">{% block doc_h1 %}{% endblock %}</h1>
59+
<h1>{% block doc_h1 %}{% endblock %}</h1>
6960

7061
<div id="mytabs" class="yui-navset">
7162
<ul class="yui-nav">

‎ietf/templates/idrfc/search_main.html‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,16 @@
3333
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3434
{% endcomment %}
3535

36-
37-
{% block title %}Internet-Drafts and RFCs
38-
{% endblock %}
36+
{% block title %}Internet-Drafts and RFCs{% endblock %}
3937

4038
{% block content %}
41-
42-
<h1 style="margin-top:0;">Internet-Drafts and RFCs</h1>
39+
<h1>Internet-Drafts and RFCs</h1>
4340

4441
<div id="search_form_box">
4542
{% include "idrfc/search_form.html" %}
4643
</div>
4744

48-
<div id="search_results" class="search_results">
45+
<div id="search_results">
4946
{% if docs %}
5047
{% include "idrfc/search_results.html" %}
5148
{% endif %}

‎ietf/templates/idrfc/search_results.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
{% endif %}
3838
{% regroup docs by view_sort_group as grouped_docs %}
3939

40-
<table>
40+
<table class="ietf-table ietf-doctable">
4141
<tr><th class="doc">Document</th><th class="title">Title</th><th class="date">Date</th><th class="status" colspan="2">Status</th><th class="ad">Area Director</th></tr>
4242
{% for doc_group in grouped_docs %}
4343
<tr class="header"><td colspan="6">{{doc_group.grouper}}s</td></tr>

‎ietf/templates/iesg/agenda_documents.html‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@
3232
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
3333
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3434
{% endcomment %}
35-
3635
{% load ballot_icon %}
3736
{% load ietf_filters %}
3837

39-
{% block title %}Documents on Future IESG Telechat Agendas
40-
{% endblock %}
38+
{% block title %}Documents on Future IESG Telechat Agendas{% endblock %}
4139

4240
{% block morecss %}
4341
.agenda_docs tr.oddrow {background-color: #EDF5FF; }
@@ -47,12 +45,9 @@
4745
{% endblock %}
4846

4947
{% block content %}
48+
<h1>Documents on Future IESG Telechat Agendas</h1>
5049

51-
<h1 style="margin-top:0;">Documents on Future IESG Telechat Agendas</h1>
52-
53-
<div class="search_results agenda_docs">
54-
<table>
55-
50+
<table class="ietf-table ietf-doctable agenda_docs">
5651
{% for t in telechats %}
5752

5853
{% if not forloop.first %}
@@ -108,6 +103,4 @@ <h1 style="margin-top:0;">Documents on Future IESG Telechat Agendas</h1>
108103
{% endfor %}
109104

110105
</table>
111-
</div>
112-
113-
{% endblock %}
106+
{% endblock content %}

0 commit comments

Comments
 (0)