altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Reverted some look-and-feel changes that came in with recent document metadata html and python refactoring, undoing fixes related to issues #1659 and #1663.

Browse source 
- Legacy-Id: 9817
This commit is contained in:
Henrik Levkowetz 2015-07-19 14:00:52 +00:00
parent 99a5ba4722
commit cb07aef61e
5 changed files with 76 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ietf/templates/doc/document_charter.html
View file

@ -31,7 +31,7 @@
<tr> <tr>
<th>Document</th> <th>Document</th>
<th> <th class="text-right">
{% if doc.get_state_slug != "approved" %} {% if doc.get_state_slug != "approved" %}
Proposed charter Proposed charter
{% else %} {% else %}
@ -49,8 +49,8 @@
</td> </td>
</tr> </tr>
<tr> <tr class="plain">
<td class="plain"></td> <td></td>
<th>Title</th> <th>Title</th>
<td class="edit"> <td class="edit">
{% if not snapshot and can_manage %} {% if not snapshot and can_manage %}
@ -60,15 +60,15 @@
<td>{{ doc.title }}</td> <td>{{ doc.title }}</td>
</tr> </tr>
<tr> <tr class="plain">
<td class="plain"></td> <td></td>
<th>Last updated</th> <th>Last updated</th>
<td class="edit"></td> <td class="edit"></td>
<td>{{ doc.time|date:"Y-m-d" }}</td> <td>{{ doc.time|date:"Y-m-d" }}</td>
</tr> </tr>
<tr> <tr class="plain">
<td class="plain"></td> <td></td>
<th><a href="/doc/help/state/charter/">State</a></th> <th><a href="/doc/help/state/charter/">State</a></th>
<td class="edit"> <td class="edit">
{% if not snapshot and can_manage %} {% if not snapshot and can_manage %}
@ -92,7 +92,7 @@
<tbody> <tbody>
<tr> <tr>
<th>WG</th> <th>WG</th>
<th>State</th> <th class="text-right">State</th>
<td class="edit"></td> <td class="edit"></td>
<td>{{ group.state.name }}</td> <td>{{ group.state.name }}</td>
</tr> </tr>
@ -101,7 +101,7 @@
<tbody> <tbody>
<tr> <tr>
<th>IESG</th> <th>IESG</th>
<th>Responsible AD</th> <th class="text-right">Responsible AD</th>
<td class="edit"> <td class="edit">
{% if can_manage %} {% if can_manage %}
{% doc_edit_button "charter_edit_ad" name=doc.name %} {% doc_edit_button "charter_edit_ad" name=doc.name %}
@ -113,8 +113,8 @@
</tr> </tr>
{% if not snapshot and chartering %} {% if not snapshot and chartering %}
<tr> <tr class="plain">
<td class="plain"></td> <td></td>
<th>Telechat date</th> <th>Telechat date</th>
<td class="edit"> <td class="edit">
{% if can_manage %} {% if can_manage %}
@ -135,8 +135,8 @@
</tr> </tr>
{% endif %} {% endif %}
<tr> <tr class="plain">
<td class="plain"></td> <td></td>
<th>Send notices to</th> <th>Send notices to</th>
<td class="edit"> <td class="edit">
{% if can_manage %} {% if can_manage %}

20
ietf/templates/doc/document_conflict_review.html
View file

@ -26,7 +26,7 @@
<tbody> <tbody>
<tr> <tr>
<th>Document</th> <th>Document</th>
<th> <th class="text-right">
{% if doc.get_state_slug not in approved_states %} {% if doc.get_state_slug not in approved_states %}
Proposed conflict review Proposed conflict review
{% else %} {% else %}
@ -46,15 +46,15 @@
</td> </td>
</tr> </tr>
<tr> <tr class="plain">
<td class="plain"></td> <td></td>
<th>Last updated</th> <th>Last updated</th>
<td class="edit"></td> <td class="edit"></td>
<td>{{ doc.time|date:"Y-m-d" }}</td> <td>{{ doc.time|date:"Y-m-d" }}</td>
</tr> </tr>
<tr> <tr class="plain">
<td class="plain"></td> <td></td>
<th><a href="/doc/help/state/conflict-review/">State</a></th> <th><a href="/doc/help/state/conflict-review/">State</a></th>
<td class="edit"> <td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" %} {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
@ -70,7 +70,7 @@
<tbody> <tbody>
<tr> <tr>
<th>IESG</th> <th>IESG</th>
<th>Shepherding AD</th> <th class="text-right">Shepherding AD</th>
<td class="edit"> <td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
<a class="btn btn-default btn-xs pull-right" href="{% url "conflict_review_ad" name=doc.name %}">Edit</a> <a class="btn btn-default btn-xs pull-right" href="{% url "conflict_review_ad" name=doc.name %}">Edit</a>
@ -82,8 +82,8 @@
</tr> </tr>
{% if not snapshot %} {% if not snapshot %}
<tr> <tr class="plain">
<td class="plain"></td> <td></td>
<th>Telechat date</th> <th>Telechat date</th>
<td class="edit"> <td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
@ -105,8 +105,8 @@
</tr> </tr>
{% endif %} {% endif %}
<tr> <tr class="plain">
<td class="plain"></td> <td></td>
<th>Send notices to</th> <th>Send notices to</th>
<td class="edit"> <td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}

77
ietf/templates/doc/document_draft.html
View file

@ -41,7 +41,7 @@
<tbody> <tbody>
<tr> <tr>
<th>Document</th> <th>Document</th>
<th>Type</th> <th class="text-right">Type</th>
<td class="edit"></td> <td class="edit"></td>
<td> <td>
{% if doc.get_state_slug == "rfc" %} {% if doc.get_state_slug == "rfc" %}
@ -63,8 +63,8 @@
</td> </td>
</tr> </tr>
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Last updated</th> <th>Last updated</th>
<td class="edit"></td> <td class="edit"></td>
<td> <td>
@ -76,8 +76,8 @@
</tr> </tr>
{% if replaces or can_edit_stream_info %} {% if replaces or can_edit_stream_info %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Replaces</th> <th>Replaces</th>
<td class="edit"> <td class="edit">
{% if can_edit_stream_info %} {% if can_edit_stream_info %}
@ -91,8 +91,8 @@
{% endif %} {% endif %}
{% if replaced_by %} {% if replaced_by %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Replaced by</th> <th>Replaced by</th>
<td class="edit"></td> <td class="edit"></td>
<td> <td>
@ -101,8 +101,8 @@
</tr> </tr>
{% endif %} {% endif %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Stream</th> <th>Stream</th>
<td class="edit"> <td class="edit">
{% if can_change_stream %} {% if can_change_stream %}
@ -115,8 +115,8 @@
</tr> </tr>
{% if doc.get_state_slug != "rfc" %} {% if doc.get_state_slug != "rfc" %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Intended RFC status</th> <th>Intended RFC status</th>
<td class="edit"> <td class="edit">
{% if can_edit or can_edit_stream_info %} {% if can_edit or can_edit_stream_info %}
@ -129,8 +129,8 @@
</tr> </tr>
{% endif %} {% endif %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Formats</th> <th>Formats</th>
<td class="edit"></td> <td class="edit"></td>
<td> <td>
@ -148,8 +148,8 @@
</tr> </tr>
{% if conflict_reviews %} {% if conflict_reviews %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>IETF conflict review</th> <th>IETF conflict review</th>
<td class="edit"></td> <td class="edit"></td>
<td>{{ conflict_reviews|join:", "|urlize_ietf_docs }}</td> <td>{{ conflict_reviews|join:", "|urlize_ietf_docs }}</td>
@ -161,7 +161,7 @@
<tr> <tr>
<th>Stream</th> <th>Stream</th>
{% if doc.stream %} {% if doc.stream %}
<th> <th class="text-right">
{% if doc.stream.slug != "legacy" %} {% if doc.stream.slug != "legacy" %}
<a href="{% url "ietf.help.views.state" doc=doc.type.slug type=doc.stream.slug %}"> <a href="{% url "ietf.help.views.state" doc=doc.type.slug type=doc.stream.slug %}">
{% if doc.stream.slug == "ietf" %} WG {% else %} {{ doc.stream }} {% endif %} state {% if doc.stream.slug == "ietf" %} WG {% else %} {{ doc.stream }} {% endif %} state
@ -187,15 +187,15 @@
{% endif %} {% endif %}
</td> </td>
{% else %} {% else %}
<th>Stream state</th> <th class="text-right">Stream state</th>
<td class="edit"></td> <td class="edit"></td>
<td>(No stream defined)</td> <td>(No stream defined)</td>
{% endif %} {% endif %}
</tr> </tr>
{% if consensus %} {% if consensus %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Consensus</th> <th>Consensus</th>
<td class="edit"> <td class="edit">
{% if can_edit or can_edit_stream_info %} {% if can_edit or can_edit_stream_info %}
@ -208,8 +208,8 @@
</tr> </tr>
{% endif %} {% endif %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Document shepherd</th> <th>Document shepherd</th>
<td class="edit"> <td class="edit">
{% if can_edit_stream_info %} {% if can_edit_stream_info %}
@ -224,8 +224,8 @@
</tr> </tr>
{% if shepherd_writeup or can_edit_shepherd_writeup %} {% if shepherd_writeup or can_edit_shepherd_writeup %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Shepherd write-up</th> <th>Shepherd write-up</th>
<td class="edit"> <td class="edit">
{% if can_edit_shepherd_writeup %} {% if can_edit_shepherd_writeup %}
@ -247,8 +247,8 @@
{% endif %} {% endif %}
{% if published and started_iesg_process and published.time < started_iesg_process.time %} {% if published and started_iesg_process and published.time < started_iesg_process.time %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th colspan="3" class="warning">This information refers to IESG processing after the RFC was initially published:</th> <th colspan="3" class="warning">This information refers to IESG processing after the RFC was initially published:</th>
</tr> </tr>
{% endif %} {% endif %}
@ -257,7 +257,7 @@
<tbody> <tbody>
<tr> <tr>
<th>IESG</th> <th>IESG</th>
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">IESG state</a></th> <th class="text-right"><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iesg" %}">IESG state</a></th>
<td class="edit"> <td class="edit">
{% if iesg_state and can_edit %} {% if iesg_state and can_edit %}
<a class="btn btn-default btn-xs" href="{% url "doc_change_state" name=doc.name %}">Edit</a> <a class="btn btn-default btn-xs" href="{% url "doc_change_state" name=doc.name %}">Edit</a>
@ -268,8 +268,8 @@
</td> </td>
</tr> </tr>
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Telechat date</th> <th>Telechat date</th>
<td class="edit"> <td class="edit">
{% if can_edit %} {% if can_edit %}
@ -294,8 +294,8 @@
</td> </td>
</tr> </tr>
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Responsible AD</th> <th>Responsible AD</th>
<td class="edit"> <td class="edit">
{% if can_edit %} {% if can_edit %}
@ -309,8 +309,8 @@
{% if iesg_state %} {% if iesg_state %}
{% if doc.note or can_edit %} {% if doc.note or can_edit %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>IESG note</th> <th>IESG note</th>
<td class="edit"> <td class="edit">
{% if can_edit %} {% if can_edit %}
@ -324,8 +324,8 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Send notices to</th> <th>Send notices to</th>
<td class="edit"> <td class="edit">
{% if can_edit_notify %} {% if can_edit_notify %}
@ -343,7 +343,7 @@
<tbody> <tbody>
<tr> <tr>
<th>IANA</th> <th>IANA</th>
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-review" %}">IANA review state</a></th> <th class="text-right"><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="iana-review" %}">IANA review state</a></th>
<td class="edit"> <td class="edit">
{% if can_edit_iana_state %} {% if can_edit_iana_state %}
<a class="btn btn-default btn-xs" href="{% url "doc_change_iana_state" name=doc.name state_type="iana-review" %}">Edit</a> <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 @@
</td> </td>
</tr> </tr>
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>IANA action state</th> <th>IANA action state</th>
<td class="edit"> <td class="edit">
{% if can_edit_iana_state %} {% if can_edit_iana_state %}
@ -370,11 +370,10 @@
{% endif %} {% endif %}
<tbody> <tbody>
{% if rfc_editor_state %} {% if rfc_editor_state %}
<tr> <tr>
<th>RFC Editor</th> <th>RFC Editor</th>
<th><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="rfceditor" %}">RFC Editor state</a></th> <th class="text-right"><a href="{% url "ietf.help.views.state" doc=doc.type.slug type="rfceditor" %}">RFC Editor state</a></th>
<td class="edit"></td> <td class="edit"></td>
<td><a href="https://www.rfc-editor.org/queue2.html#{{ doc.name }}">{{ rfc_editor_state }}</a></td> <td><a href="https://www.rfc-editor.org/queue2.html#{{ doc.name }}">{{ rfc_editor_state }}</a></td>
</tr> </tr>

24
ietf/templates/doc/document_status_change.html
View file

@ -26,7 +26,7 @@
<tbody> <tbody>
<tr> <tr>
<th>Document</th> <th>Document</th>
<th> <th class="text-right">
{% if doc.get_state_slug not in approved_states %} {% if doc.get_state_slug not in approved_states %}
Proposed status change Proposed status change
{% else %} {% else %}
@ -46,8 +46,8 @@
</td> </td>
</tr> </tr>
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Last updated</th> <th>Last updated</th>
<td class="edit"></td> <td class="edit"></td>
<td>{{ doc.time|date:"Y-m-d" }}</td> <td>{{ doc.time|date:"Y-m-d" }}</td>
@ -56,16 +56,16 @@
{% regroup sorted_relations by relationship.name as relation_groups %} {% regroup sorted_relations by relationship.name as relation_groups %}
{% for relation_group in relation_groups %} {% for relation_group in relation_groups %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>{{relation_group.grouper}}</th> <th>{{relation_group.grouper}}</th>
<td class="edit"></td> <td class="edit"></td>
<td>{% for rel in relation_group.list %}{{rel.target.document.canonical_name|upper|urlize_ietf_docs}}{% if not forloop.last %}, {% endif %}{% endfor %}</td> <td>{% for rel in relation_group.list %}{{rel.target.document.canonical_name|upper|urlize_ietf_docs}}{% if not forloop.last %}, {% endif %}{% endfor %}</td>
</tr> </tr>
{% endfor %} {% endfor %}
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th><a href="{% url "state_help" type="status-change" %}">State</a></th> <th><a href="{% url "state_help" type="status-change" %}">State</a></th>
<td class="edit"> <td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" %} {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
@ -81,7 +81,7 @@
<tbody> <tbody>
<tr> <tr>
<th>IESG</th> <th>IESG</th>
<th>Telechat date</th> <th class="text-right">Telechat date</th>
<td class="edit"> <td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
<a class="btn btn-default btn-xs pull-right" href="{% url "status_change_telechat_date" name=doc.name %}">Edit</a> <a class="btn btn-default btn-xs pull-right" href="{% url "status_change_telechat_date" name=doc.name %}">Edit</a>
@ -101,8 +101,8 @@
</td> </td>
</tr> </tr>
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Shepherding AD</th> <th>Shepherding AD</th>
<td class="edit"> <td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
@ -114,8 +114,8 @@
</td> </td>
</tr> </tr>
<tr> <tr class="plain">
<th class="plain"></th> <th></th>
<th>Send notices to</th> <th>Send notices to</th>
<td class="edit"> <td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %} {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}

5
static/css/ietf.css
View file

@ -391,8 +391,9 @@ footer {
} }
*/ */
tbody tr.plain td, tbody tr.plain th { border-top: 0px; }
table tbody td.plain, table tbody th.plain { border-top: 0; } tbody tr.plain th { text-align: right; width: 9em; }
tbody tr.plain:first-child th { text-align: left; width: 6em; }
td.ad div { border-bottom: solid #ccc 1px; } td.ad div { border-bottom: solid #ccc 1px; }