Skip to content

Commit a7838d8

Browse files
levkowetzlevkowetz
committed
Cleanup action: replaced screaming html id with non-screaming version;
replaced the noTable block construct with start/end table_content blocks in order to not have to open and close tables in different blocks, and not have empty tables lying about. - Legacy-Id: 6439
1 parent 6d28eb1 commit a7838d8

16 files changed

Lines changed: 52 additions & 47 deletions

‎ietf/templates/base.html‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
{% endif %}</div>
6666
{% endif %}
6767

68-
<div class="menu">
69-
<table style="margin-left:8px;margin-top:8px; width:98%;" id="IETF_MENUBAR"> <!-- width="98%;"> this was causing issues.-->
68+
{% block start_content_table %}
69+
<table style="margin-left:8px;margin-top:8px; width:98%;" id="ietf_menubar">
7070
<tr valign="top">
7171
<td style="width:130px;padding-right:8px;" class="noprint">
7272
<div class="ietf-navbar">
@@ -80,25 +80,18 @@
8080
<a href="http://tools.ietf.org/tools/ietfdb/newticket">Report a bug</a>
8181
</div>
8282
</td>
83-
</div><!-- shouldn't this end menu class? -->
84-
{% block noTable %} {% comment %} if we don't want a table we do this, make sure to close the tags inside. {% endcomment %}
85-
8683
<td>
87-
84+
{% endblock start_content_table %}
8885
{% if messages %}
8986
<ul class="messages">
9087
{% for message in messages %}
9188
<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
9289
{% endfor %}
9390
</ul>
9491
{% endif %}
95-
96-
9792
{% block content %}
9893
{% endblock %}
9994

100-
{% endblock %} {% comment %} Ends no table {% endcomment %}
101-
10295
<script type="text/javascript" src="/js/lib/jquery-1.8.2.min.js"></script>
10396
<script type="text/javascript" src="/js/yui/yui-20100305.js"></script>
10497
<script type="text/javascript">
@@ -114,9 +107,10 @@
114107
{% block js %}{% endblock %}
115108

116109
{% block content_end %}
117-
{% endblock %}
118-
</div>
110+
{% endblock %}
119111
<div id="ietf-extras"></div>
112+
{% block end_content_table %}
120113
</td></tr></table>
114+
{% endblock end_content_table %}
121115
{% include "debug.html" %}
122116
</body></html>

‎ietf/templates/base_leftmenu.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,3 @@
139139
<li><a href="http://www.iana.org/">IANA</a></li>
140140
<li><a href="http://www.irtf.org/">IRTF</a></li>
141141
</ul>
142-
<!-- end base_leftmenu -->

‎ietf/templates/meeting/agenda.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ <h1>IETF {{ meeting.number }} Meeting Agenda</h1>
113113
<div id='selector-{{wg.acronym}}' class="unselected" onclick="toggle(this)">{% if wg.state.name = "BOF" %}<i>{{wg.acronym}}</i>{% else %}{{wg.acronym}}{% endif %}</div>{% endfor %}
114114
</td>
115115
</tr>
116-
<tr><td align="center" colspan="{{area_list.count}}">
116+
<tr><td align="center" colspan="{{area_list|length}}">
117117
Also show:
118118
<input type="checkbox" class="include-checkbox" id="include-edu" onchange="toggle_special(this)"/>EDU &#8226;
119119
<input type="checkbox" class="include-checkbox" id="include-ietf" onchange="toggle_special(this)"/>IETF &#8226;
120120
<input type="checkbox" class="include-checkbox" id="include-tools" onchange="toggle_special(this)"/>Tools &#8226;
121121
<input type="checkbox" class="include-checkbox" id="include-iesg" onchange="toggle_special(this)"/>IESG &#8226;
122122
<input type="checkbox" class="include-checkbox" id="include-iab" onchange="toggle_special(this)"/>IAB
123123
<!-- </td></tr>
124-
<tr><td align="center" colspan="{{area_list.count}}">
124+
<tr><td align="center" colspan="{{area_list|length}}">
125125
-->
126126
<br/><i>Groups displayed in italics are BOFs</i></td></tr>
127127
</table>

‎ietf/templates/meeting/agenda_list.html‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@
3030
<script type='text/javascript' src='/js/agenda/agendas_edit.js'></script>
3131
{% endblock scripts %}
3232

33-
{% block noTable %}
34-
</tr></table></div>
33+
34+
{% block start_content_table %}{% endblock %}
35+
{% block end_content_table %}{% endblock %}
36+
37+
{% block content %}
3538
<div class="wrapper custom_text_stuff">
36-
<div style="ui-icon ui-icon-arrow-1-w" id="CLOSE_IETF_MENUBAR">
39+
<div style="ui-icon ui-icon-arrow-1-w" id="close_ietf_menubar">
3740
&lt;
3841
</div>
3942

@@ -87,5 +90,4 @@
8790
</div>
8891
</div>
8992

90-
<table><tr>
9193
{% endblock %}

‎ietf/templates/meeting/agenda_utc.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
{% block pagehead %}
7878
<script type="text/javascript" src='/js/agenda2.js'></script>
79-
<script type="text/javascript" src='/js/jquery-1.5.1.min.js'></script>
79+
<script type="text/javascript" src='/js/jquery-1.8.2.min.js'></script>
8080
<script type="text/javascript" src='/js/browsertime.js'></script>
8181
<script type="text/javascript" src='/js/weekview.js'></script>
8282
<script type="text/javascript" >
@@ -129,15 +129,15 @@ <h1>IETF {{ meeting.number }} Meeting Agenda</h1>
129129
<div id='selector-{{wg.acronym}}' class="unselected" onclick="toggle(this)">{% if wg.state.name = "BOF" %}<i>{{wg.acronym}}</i>{% else %}{{wg.acronym}}{% endif %}</div>{% endfor %}
130130
</td>
131131
</tr>
132-
<tr><td align="center" colspan="{{area_list.count}}">
132+
<tr><td align="center" colspan="{{area_list|length}}">
133133
Also show:
134134
<input type="checkbox" class="include-checkbox" id="include-edu" onchange="toggle_special(this)"/>EDU &#8226;
135135
<input type="checkbox" class="include-checkbox" id="include-ietf" onchange="toggle_special(this)"/>IETF &#8226;
136136
<input type="checkbox" class="include-checkbox" id="include-tools" onchange="toggle_special(this)"/>Tools &#8226;
137137
<input type="checkbox" class="include-checkbox" id="include-iesg" onchange="toggle_special(this)"/>IESG &#8226;
138138
<input type="checkbox" class="include-checkbox" id="include-iab" onchange="toggle_special(this)"/>IAB
139139
<!-- </td></tr>
140-
<tr><td align="center" colspan="{{area_list.count}}">
140+
<tr><td align="center" colspan="{{area_list|length}}">
141141
-->
142142
<br/><i>Groups displayed in italics are BOFs</i></td></tr>
143143
</table>

‎ietf/templates/meeting/landscape_edit.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,11 @@
117117
{% endblock scripts %}
118118

119119

120-
{% block noTable %}
121-
</tr></table></div>
120+
{% block start_content_table %}{% endblock %}
121+
{% block end_content_table %}{% endblock %}
122+
123+
{% block content %}
124+
122125
<div id="read_only">
123126
<p>
124127
You do not have write permission to agenda: {{schedule.name}}
@@ -157,7 +160,7 @@
157160
</select>
158161
</div>
159162
<div class="agenda_slot_title" >
160-
<div style="ui-icon ui-icon-arrow-1-w" id="CLOSE_IETF_MENUBAR">
163+
<div style="ui-icon ui-icon-arrow-1-w" id="close_ietf_menubar">
161164
&lt;
162165
</div>
163166
<b>Unassigned Events:</b>
@@ -365,6 +368,4 @@
365368
</p>
366369
</div>
367370

368-
<table><tr><td>
369-
370371
{% endblock %}

‎ietf/templates/meeting/private_agenda.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
{% block title %}IETF {{ meeting.number }} Meeting Agenda: {{ schedule.owner }} / {{ schedule.name }}{% endblock %}
1515
{% load agenda_custom_tags %}
1616

17-
{% block noTable %}
18-
</tr></table></div>
17+
{% block start_content_table %}{% endblock %}
18+
{% block end_content_table %}{% endblock %}
19+
20+
{% block content %}
21+
1922
<div id="read_only">
2023
<p>
2124
You can not have access this agenda. It belongs to {{ schedule.owner }}.
@@ -25,5 +28,5 @@
2528
</p>
2629
<div class="wrapper custom_text_stuff">
2730
</div>
28-
<table><tr><td>
31+
2932
{% endblock %}

‎ietf/templates/meeting/properties_edit.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@
3030
<script type='text/javascript' src='/js/agenda/agenda_properties_edit.js'></script>
3131
{% endblock scripts %}
3232

33-
{% block noTable %}
33+
{% block start_content_table %}{% endblock %}
34+
{% block end_content_table %}{% endblock %}
35+
36+
{% block content %}
3437
</tr></table></div>
3538
<div class="wrapper custom_text_stuff">
36-
<div style="ui-icon ui-icon-arrow-1-w" id="CLOSE_IETF_MENUBAR">
39+
<div style="ui-icon ui-icon-arrow-1-w" id="close_ietf_menubar">
3740
&lt;
3841
</div>
3942

@@ -79,5 +82,5 @@
7982
</div>
8083
</div>
8184

82-
<table><tr><td>
85+
8386
{% endblock %}

‎ietf/templates/meeting/requests.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ <h2><a name="{{session.group.parent.acronym}}">{{session.group.parent.acronym|up
4545
{%ifchanged%}
4646
<tr><td class="status" colspan="7"><!-- {{session.group.parent.id}} -->{{session.status}}</td></tr>
4747
{%endifchanged%}
48+
yes
4849
<tr class="{% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}">
4950
<th valign="top">{{session.group.acronym|upper}}</th>
5051
<td valign="top" align="center">{% if not session.requested_duration %}<i>{{session.status}}</i>{%else%} {{session.requested_duration|stringformat:"s"|slice:"0:4"}} {% endif %}</td>

‎ietf/templates/meeting/timeslot_edit.html‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,12 @@
7070
{% endblock scripts %}
7171

7272

73-
{% block noTable %}
74-
</tr></table></div>
73+
{% block start_content_table %}{% endblock %}
74+
{% block end_content_table %}{% endblock %}
75+
76+
{% block content %}
7577
<div class="wrapper custom_text_stuff">
76-
<div style="ui-icon ui-icon-arrow-1-w" id="CLOSE_IETF_MENUBAR">
78+
<div style="ui-icon ui-icon-arrow-1-w" id="close_ietf_menubar">
7779
&lt;
7880
</div>
7981

@@ -168,5 +170,5 @@
168170
<button onclick="TowTruck(this); return false;">Start TowTruck</button>
169171
{% endifnotequal %}
170172
{% endif %}
171-
<table><tr><td>
173+
172174
{% endblock %}

0 commit comments

Comments
 (0)