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

fix: Fix "Is Accepting Feedback: yes" action for NomCom (#6467)

Browse source 
Fixes #6466

While I'm here, apply list styling more consistently across NomCom pages.
This commit is contained in:
Lars Eggert 2023-10-12 14:15:14 +03:00 committed by GitHub
parent 16f9e0e974
commit 0f6b403904
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/templates/nomcom/eligible.html
View file

@ -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>
@ -41,7 +38,4 @@
{% endif %}
</table>
}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}

32
ietf/templates/nomcom/list_positions.html
View file

@ -24,23 +24,24 @@
<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>
@ -58,13 +59,11 @@
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
@ -74,16 +73,16 @@
<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>
@ -117,7 +116,7 @@
<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">
@ -135,7 +134,4 @@
There are no positions defined.
</p>
{% endif %}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}
{% endblock %}

6
ietf/templates/nomcom/nomcom_private_base.html
View file

@ -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 %}
@ -153,6 +156,7 @@
{% endwith %}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
<script>
// Javascript to enable link to tab
var url=document.location.toString();

8
ietf/templates/nomcom/nomcom_public_base.html
View file

@ -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 %}
@ -67,6 +70,7 @@
{% endwith %}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
<script>
$(document)
.ready(function () {
@ -83,4 +87,4 @@
});
});
</script>
{% endblock %}
{% endblock %}

6
ietf/templates/nomcom/private_index.html
View file

@ -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>
@ -251,7 +248,4 @@
{% endif %}
{% endif %}
{% endif %}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}

8
ietf/templates/nomcom/view_feedback.html
View file

@ -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>
@ -113,7 +110,4 @@
</tbody>
</table>
{% endif %}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}
{% endblock %}

6
ietf/templates/nomcom/volunteers.html
View file

@ -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>
@ -46,7 +43,4 @@
</tbody>
</table>
{% endfor %}
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}