Skip to content

Commit cfaf84f

Browse files
authored
refactor: Convert custom form template to bootstrap (ietf-tools#6763)
* refactor: Convert custom form template to bootstrap * refactor: Match form fields to old version
1 parent e9d44d4 commit cfaf84f

2 files changed

Lines changed: 10 additions & 23 deletions

File tree

ietf/meeting/forms.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright The IETF Trust 2016-2020, All Rights Reserved
1+
# Copyright The IETF Trust 2016-2023, All Rights Reserved
22
# -*- coding: utf-8 -*-
33

44

@@ -360,7 +360,13 @@ def save_agenda(self):
360360
class InterimAnnounceForm(forms.ModelForm):
361361
class Meta:
362362
model = Message
363-
fields = ('to', 'frm', 'cc', 'bcc', 'reply_to', 'subject', 'body')
363+
fields = ('to', 'cc', 'frm', 'subject', 'body')
364+
365+
def __init__(self, *args, **kwargs):
366+
super(InterimAnnounceForm, self).__init__(*args, **kwargs)
367+
self.fields['frm'].label='From'
368+
self.fields['frm'].widget.attrs['readonly'] = True
369+
self.fields['to'].widget.attrs['readonly'] = True
364370

365371
def save(self, *args, **kwargs):
366372
user = kwargs.pop('user')

ietf/templates/meeting/interim_send_announcement.html

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "base.html" %}
2-
{# Copyright The IETF Trust 2015, All Rights Reserved #}
2+
{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
33
{% load origin %}
44
{% load static django_bootstrap5 widget_tweaks %}
55
{% block title %}Announce Interim Meeting{% endblock %}
@@ -11,26 +11,7 @@
1111
<h1>Announce Interim Meeting</h1>
1212
<form method="post" class="my-3">
1313
{% csrf_token %}
14-
<div class="row mb-3">
15-
<label for="{{ form.to.id_for_label }}" class="col-md-2 fw-bold col-form-label">To</label>
16-
<div class="col-md-10">{% render_field form.to class="form-control" readonly="readonly" %}</div>
17-
</div>
18-
<div class="row mb-3">
19-
<label for="{{ form.cc.id_for_label }}" class="col-md-2 fw-bold col-form-label">Cc</label>
20-
<div class="col-md-10">{% render_field form.cc class="form-control" %}</div>
21-
</div>
22-
<div class="row mb-3">
23-
<label for="{{ form.frm.id_for_label }}" class="col-md-2 fw-bold col-form-label">From</label>
24-
<div class="col-md-10">{% render_field form.frm class="form-control" readonly="readonly" %}</div>
25-
</div>
26-
<div class="row mb-3">
27-
<label for="{{ form.subject.id_for_label }}" class="col-md-2 fw-bold col-form-label">Subject</label>
28-
<div class="col-md-10">{% render_field form.subject class="form-control" %}</div>
29-
</div>
30-
<div class="row mb-3">
31-
<label for="{{ form.body.id_for_label }}" class="col-md-2 fw-bold col-form-label">Body</label>
32-
<div class="col-md-10">{% render_field form.body class="form-control" %}</div>
33-
</div>
14+
{% bootstrap_form form layout="horizontal" %}
3415
<button class="btn btn-primary" type="submit" name="send">Send</button>
3516
<a class="btn btn-secondary float-end"
3617
href="{% url 'ietf.meeting.views.interim_request_details' number=meeting.number %}">

0 commit comments

Comments
 (0)