Skip to content

Commit cb07aef

Browse files
levkowetzlevkowetz
committed
Reverted some look-and-feel changes that came in with recent document metadata html and python refactoring, undoing fixes related to issues ietf-tools#1659 and ietf-tools#1663.
 - Legacy-Id: 9817
1 parent 99a5ba4 commit cb07aef

5 files changed

Lines changed: 76 additions & 76 deletions

File tree

‎ietf/templates/doc/document_charter.html‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<tr>
3333
<th>Document</th>
34-
<th>
34+
<th class="text-right">
3535
{% if doc.get_state_slug != "approved" %}
3636
Proposed charter
3737
{% else %}
@@ -49,8 +49,8 @@
4949
</td>
5050
</tr>
5151

52-
<tr>
53-
<td class="plain"></td>
52+
<tr class="plain">
53+
<td></td>
5454
<th>Title</th>
5555
<td class="edit">
5656
{% if not snapshot and can_manage %}
@@ -60,15 +60,15 @@
6060
<td>{{ doc.title }}</td>
6161
</tr>
6262

63-
<tr>
64-
<td class="plain"></td>
63+
<tr class="plain">
64+
<td></td>
6565
<th>Last updated</th>
6666
<td class="edit"></td>
6767
<td>{{ doc.time|date:"Y-m-d" }}</td>
6868
</tr>
6969

70-
<tr>
71-
<td class="plain"></td>
70+
<tr class="plain">
71+
<td></td>
7272
<th><a href="/doc/help/state/charter/">State</a></th>
7373
<td class="edit">
7474
{% if not snapshot and can_manage %}
@@ -92,7 +92,7 @@
9292
<tbody>
9393
<tr>
9494
<th>WG</th>
95-
<th>State</th>
95+
<th class="text-right">State</th>
9696
<td class="edit"></td>
9797
<td>{{ group.state.name }}</td>
9898
</tr>
@@ -101,7 +101,7 @@
101101
<tbody>
102102
<tr>
103103
<th>IESG</th>
104-
<th>Responsible AD</th>
104+
<th class="text-right">Responsible AD</th>
105105
<td class="edit">
106106
{% if can_manage %}
107107
{% doc_edit_button "charter_edit_ad" name=doc.name %}
@@ -113,8 +113,8 @@
113113
</tr>
114114

115115
{% if not snapshot and chartering %}
116-
<tr>
117-
<td class="plain"></td>
116+
<tr class="plain">
117+
<td></td>
118118
<th>Telechat date</th>
119119
<td class="edit">
120120
{% if can_manage %}
@@ -135,8 +135,8 @@
135135
</tr>
136136
{% endif %}
137137

138-
<tr>
139-
<td class="plain"></td>
138+
<tr class="plain">
139+
<td></td>
140140
<th>Send notices to</th>
141141
<td class="edit">
142142
{% if can_manage %}

‎ietf/templates/doc/document_conflict_review.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<tbody>
2727
<tr>
2828
<th>Document</th>
29-
<th>
29+
<th class="text-right">
3030
{% if doc.get_state_slug not in approved_states %}
3131
Proposed conflict review
3232
{% else %}
@@ -46,15 +46,15 @@
4646
</td>
4747
</tr>
4848

49-
<tr>
50-
<td class="plain"></td>
49+
<tr class="plain">
50+
<td></td>
5151
<th>Last updated</th>
5252
<td class="edit"></td>
5353
<td>{{ doc.time|date:"Y-m-d" }}</td>
5454
</tr>
5555

56-
<tr>
57-
<td class="plain"></td>
56+
<tr class="plain">
57+
<td></td>
5858
<th><a href="/doc/help/state/conflict-review/">State</a></th>
5959
<td class="edit">
6060
{% if not snapshot and user|has_role:"Area Director,Secretariat" %}
@@ -70,7 +70,7 @@
7070
<tbody>
7171
<tr>
7272
<th>IESG</th>
73-
<th>Shepherding AD</th>
73+
<th class="text-right">Shepherding AD</th>
7474
<td class="edit">
7575
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
7676
<a class="btn btn-default btn-xs pull-right" href="{% url "conflict_review_ad" name=doc.name %}">Edit</a>
@@ -82,8 +82,8 @@
8282
</tr>
8383

8484
{% if not snapshot %}
85-
<tr>
86-
<td class="plain"></td>
85+
<tr class="plain">
86+
<td></td>
8787
<th>Telechat date</th>
8888
<td class="edit">
8989
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
@@ -105,8 +105,8 @@
105105
</tr>
106106
{% endif %}
107107

108-
<tr>
109-
<td class="plain"></td>
108+
<tr class="plain">
109+
<td></td>
110110
<th>Send notices to</th>
111111
<td class="edit">
112112
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}

‎ietf/templates/doc/document_draft.html‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<tbody>
4242
<tr>
4343
<th>Document</th>
44-
<th>Type</th>
44+
<th class="text-right">Type</th>
4545
<td class="edit"></td>
4646
<td>
4747
{% if doc.get_state_slug == "rfc" %}
@@ -63,8 +63,8 @@
6363
</td>
6464
</tr>
6565

66-
<tr>
67-
<th class="plain"></th>
66+
<tr class="plain">
67+
<th></th>
6868
<th>Last updated</th>
6969
<td class="edit"></td>
7070
<td>
@@ -76,8 +76,8 @@
7676
</tr>
7777

7878
{% if replaces or can_edit_stream_info %}
79-
<tr>
80-
<th class="plain"></th>
79+
<tr class="plain">
80+
<th></th>
8181
<th>Replaces</th>
8282
<td class="edit">
8383
{% if can_edit_stream_info %}
@@ -91,8 +91,8 @@
9191
{% endif %}
9292

9393
{% if replaced_by %}
94-
<tr>
95-
<th class="plain"></th>
94+
<tr class="plain">
95+
<th></th>
9696
<th>Replaced by</th>
9797
<td class="edit"></td>
9898
<td>
@@ -101,8 +101,8 @@
101101
</tr>
102102
{% endif %}
103103

104-
<tr>
105-
<th class="plain"></th>
104+
<tr class="plain">
105+
<th></th>
106106
<th>Stream</th>
107107
<td class="edit">
108108
{% if can_change_stream %}
@@ -115,8 +115,8 @@
115115
</tr>
116116

117117
{% if doc.get_state_slug != "rfc" %}
118-
<tr>
119-
<th class="plain"></th>
118+
<tr class="plain">
119+
<th></th>
120120
<th>Intended RFC status</th>
121121
<td class="edit">
122122
{% if can_edit or can_edit_stream_info %}
@@ -129,8 +129,8 @@
129129
</tr>
130130
{% endif %}
131131

132-
<tr>
133-
<th class="plain"></th>
132+
<tr class="plain">
133+
<th></th>
134134
<th>Formats</th>
135135
<td class="edit"></td>
136136
<td>
@@ -148,8 +148,8 @@
148148
</tr>
149149

150150
{% if conflict_reviews %}
151-
<tr>
152-
<th class="plain"></th>
151+
<tr class="plain">
152+
<th></th>
153153
<th>IETF conflict review</th>
154154
<td class="edit"></td>
155155
<td>{{ conflict_reviews|join:", "|urlize_ietf_docs }}</td>
@@ -161,7 +161,7 @@
161161
<tr>
162162
<th>Stream</th>
163163
{% if doc.stream %}
164-
<th>
164+
<th class="text-right">
165165
{% if doc.stream.slug != "legacy" %}
166166
<a href="{% url "ietf.help.views.state" doc=doc.type.slug type=doc.stream.slug %}">
167167
{% if doc.stream.slug == "ietf" %} WG {% else %} {{ doc.stream }} {% endif %} state
@@ -187,15 +187,15 @@
187187
{% endif %}
188188
</td>
189189
{% else %}
190-
<th>Stream state</th>
190+
<th class="text-right">Stream state</th>
191191
<td class="edit"></td>
192192
<td>(No stream defined)</td>
193193
{% endif %}
194194
</tr>
195195

196196
{% if consensus %}
197-
<tr>
198-
<th class="plain"></th>
197+
<tr class="plain">
198+
<th></th>
199199
<th>Consensus</th>
200200
<td class="edit">
201201
{% if can_edit or can_edit_stream_info %}
@@ -208,8 +208,8 @@
208208
</tr>
209209
{% endif %}
210210

211-
<tr>
212-
<th class="plain"></th>
211+
<tr class="plain">
212+
<th></th>
213213
<th>Document shepherd</th>
214214
<td class="edit">
215215
{% if can_edit_stream_info %}
@@ -224,8 +224,8 @@
224224
</tr>
225225

226226
{% if shepherd_writeup or can_edit_shepherd_writeup %}
227-
<tr>
228-
<th class="plain"></th>
227+
<tr class="plain">
228+
<th></th>
229229
<th>Shepherd write-up</th>
230230
<td class="edit">
231231
{% if can_edit_shepherd_writeup %}
@@ -247,8 +247,8 @@
247247
{% endif %}
248248

249249
{% if published and started_iesg_process and published.time < started_iesg_process.time %}
250-
<tr>
251-
<th class="plain"></th>
250+
<tr class="plain">
251+
<th></th>
252252
<th colspan="3" class="warning">This information refers to IESG processing after the RFC was initially published:</th>
253253
</tr>
254254
{% endif %}
@@ -257,7 +257,7 @@
257257
<tbody>
258258
<tr>
259259
<th>IESG</th>
260-
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">IESG state</a></th>
260+
<th class="text-right"><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">IESG state</a></th>
261261
<td class="edit">
262262
{% if iesg_state and can_edit %}
263263
<a class="btn btn-default btn-xs" href="{% url "doc_change_state" name=doc.name %}">Edit</a>
@@ -268,8 +268,8 @@
268268
</td>
269269
</tr>
270270

271-
<tr>
272-
<th class="plain"></th>
271+
<tr class="plain">
272+
<th></th>
273273
<th>Telechat date</th>
274274
<td class="edit">
275275
{% if can_edit %}
@@ -294,8 +294,8 @@
294294
</td>
295295
</tr>
296296

297-
<tr>
298-
<th class="plain"></th>
297+
<tr class="plain">
298+
<th></th>
299299
<th>Responsible AD</th>
300300
<td class="edit">
301301
{% if can_edit %}
@@ -309,8 +309,8 @@
309309

310310
{% if iesg_state %}
311311
{% if doc.note or can_edit %}
312-
<tr>
313-
<th class="plain"></th>
312+
<tr class="plain">
313+
<th></th>
314314
<th>IESG note</th>
315315
<td class="edit">
316316
{% if can_edit %}
@@ -324,8 +324,8 @@
324324
{% endif %}
325325
{% endif %}
326326

327-
<tr>
328-
<th class="plain"></th>
327+
<tr class="plain">
328+
<th></th>
329329
<th>Send notices to</th>
330330
<td class="edit">
331331
{% if can_edit_notify %}
@@ -343,7 +343,7 @@
343343
<tbody>
344344
<tr>
345345
<th>IANA</th>
346-
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-review" %}">IANA review state</a></th>
346+
<th class="text-right"><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-review" %}">IANA review state</a></th>
347347
<td class="edit">
348348
{% if can_edit_iana_state %}
349349
<a class="btn btn-default btn-xs" href="{% url "doc_change_iana_state" name=doc.name state_type="iana-review" %}">Edit</a>
@@ -354,8 +354,8 @@
354354
</td>
355355
</tr>
356356

357-
<tr>
358-
<th class="plain"></th>
357+
<tr class="plain">
358+
<th></th>
359359
<th>IANA action state</th>
360360
<td class="edit">
361361
{% if can_edit_iana_state %}
@@ -370,11 +370,10 @@
370370
{% endif %}
371371

372372
<tbody>
373-
374373
{% if rfc_editor_state %}
375374
<tr>
376375
<th>RFC Editor</th>
377-
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="rfceditor" %}">RFC Editor state</a></th>
376+
<th class="text-right"><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="rfceditor" %}">RFC Editor state</a></th>
378377
<td class="edit"></td>
379378
<td><a href="https://www.rfc-editor.org/queue2.html#{{ doc.name }}">{{ rfc_editor_state }}</a></td>
380379
</tr>

0 commit comments

Comments
 (0)