Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ietf/templates/nomcom/eligible.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
{% load django_bootstrap5 textfilters person_filters %}
{% load static %}
{% block subtitle %}- Eligible People{% endblock %}
{% block pagehead %}
<link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
{% endblock %}
{% block nomcom_content %}
{% origin %}
<h2>Eligible People for {{ nomcom.group }}</h2>
Expand Down Expand Up @@ -41,7 +38,4 @@ <h2>Eligible People for {{ nomcom.group }}</h2>
{% endif %}
</table>
}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}
32 changes: 14 additions & 18 deletions ietf/templates/nomcom/list_positions.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,24 @@ <h2 class="mb-3">Positions in {{ nomcom.group }}</h2>
<thead>
<tr>
{% if nomcom.group.state_id == 'active' %}
<th scope="colgroup" colspan="3">
<i class="bi bi-check"></i>
<th scope="col">
</th>
<th scope="col"></th>
{% endif %}
<th scope="col" data-sort="position">
Position
</th>
<th scope="col" data-sort="iesg">
<th class="text-center" scope="col" data-sort="iesg">
IESG
</th>
<th scope="col" data-sort="open">
<th class="text-center" scope="col" data-sort="open">
Open
</th>
<th scope="col" data-sort="accept_nom">
<th class="text-center" scope="col" data-sort="accept_nom">
Accepting Nominations
</th>
<th scope="col" data-sort="accept_fb">
<th class="text-center" scope="col" data-sort="accept_fb">
Accepting Feedback
</th>
</tr>
Expand All @@ -58,13 +59,11 @@ <h2 class="mb-3">Positions in {{ nomcom.group }}</h2>
aria-label="position.name"
name="selected">
</td>
<td class="edit">
<td class="text-nowrap">
<a class="btn btn-primary btn-sm"
href="{% url 'ietf.nomcom.views.edit_position' year position.id %}">
Edit
</a>
</td>
<td class="remove">
<a class="btn btn-danger btn-sm"
href="{% url 'ietf.nomcom.views.remove_position' year position.id %}">
Remove
Expand All @@ -74,16 +73,16 @@ <h2 class="mb-3">Positions in {{ nomcom.group }}</h2>
<td>
{{ position.name }}
</td>
<td>
<td class="text-center">
{{ position.is_iesg_position|yesno:"✓," }}
</td>
<td>
<td class="text-center">
{{ position.is_open|yesno:"✓," }}
</td>
<td>
<td class="text-center">
{{ position.accepting_nominations|yesno:"✓," }}
</td>
<td>
<td class="text-center">
{{ position.accepting_feedback|yesno:"✓," }}
</td>
</tr>
Expand Down Expand Up @@ -117,7 +116,7 @@ <h2 class="mb-3">Positions in {{ nomcom.group }}</h2>
<option value="unset_accept_nom">
Is Accepting Nominations: No
</option>
<option value="set_accept_bf">
<option value="set_accept_fb">
Is Accepting Feedback: Yes
</option>
<option value="unset_accept_fb">
Expand All @@ -135,7 +134,4 @@ <h2 class="mb-3">Positions in {{ nomcom.group }}</h2>
There are no positions defined.
</p>
{% endif %}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}
{% endblock %}
6 changes: 5 additions & 1 deletion ietf/templates/nomcom/nomcom_private_base.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load origin static %}
{% load nomcom_tags %}
{% load ietf_filters %}
{% block pagehead %}
<link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
{% endblock %}
{% block title %}
NomCom {{ year }} Private
{% block subtitle %}{% endblock %}
Expand Down Expand Up @@ -153,6 +156,7 @@ <h1>
{% endwith %}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
<script>
// Javascript to enable link to tab
var url=document.location.toString();
Expand Down
8 changes: 6 additions & 2 deletions ietf/templates/nomcom/nomcom_public_base.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2015, All Rights Reserved #}
{% load origin %}
{% load origin static %}
{% load nomcom_tags %}
{% load ietf_filters %}
{% block pagehead %}
<link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
{% endblock %}
{% block title %}
NomCom {{ year }}
{% block subtitle %}{% endblock %}
Expand Down Expand Up @@ -67,6 +70,7 @@ <h1>
{% endwith %}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
<script>
$(document)
.ready(function () {
Expand All @@ -83,4 +87,4 @@ <h1>
});
});
</script>
{% endblock %}
{% endblock %}
6 changes: 0 additions & 6 deletions ietf/templates/nomcom/private_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
{# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
{% load origin static %}
{% block subtitle %}- Administration{% endblock %}
{% block pagehead %}
<link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
{% endblock %}
{% block nomcom_content %}
{% origin %}
<h2 class="mt-3">Nomination status</h2>
Expand Down Expand Up @@ -251,7 +248,4 @@ <h2 class="mt-3">
{% endif %}
{% endif %}
{% endif %}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}
8 changes: 1 addition & 7 deletions ietf/templates/nomcom/view_feedback.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
{% load origin static %}
{% load nomcom_tags %}
{% block subtitle %}- View feedback{% endblock %}
{% block pagehead %}
<link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
{% endblock %}
{% block nomcom_content %}
{% origin %}
<h2 class="mt-3">Feedback related to nominees</h2>
Expand Down Expand Up @@ -113,7 +110,4 @@ <h2 class="mt-5" id="misc">Feedback not related to Nominees</h2>
</tbody>
</table>
{% endif %}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}
{% endblock %}
6 changes: 0 additions & 6 deletions ietf/templates/nomcom/volunteers.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
{% load django_bootstrap5 textfilters person_filters ietf_filters%}
{% load static %}
{% block subtitle %}- Volunteers{% endblock %}
{% block pagehead %}
<link rel="stylesheet" href="{% static "ietf/css/list.css" %}">
{% endblock %}
{% block nomcom_content %}
{% origin %}
<h2>Volunteers for {{ nomcom.group }}</h2>
Expand Down Expand Up @@ -46,7 +43,4 @@ <h3 class="mt-3">{{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}<
</tbody>
</table>
{% endfor %}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}