diff --git a/hypha/apply/determinations/templates/determinations/base_determination_form.html b/hypha/apply/determinations/templates/determinations/base_determination_form.html
index e5c6f53a5302111fb16c4e851607e458a5153584..f982f1223ac3e5b6e4b01b57644a5f1955d54ef1 100644
--- a/hypha/apply/determinations/templates/determinations/base_determination_form.html
+++ b/hypha/apply/determinations/templates/determinations/base_determination_form.html
@@ -45,9 +45,9 @@
{% endfor %}
{% block form_buttons %}
{% if form.draft_button_name %}
- <input class="button button--submit button--top-space button--white" type="submit" value="Save Draft" name="{{ form.draft_button_name }}" formnovalidate/>
+ <button class="button button--submit button--top-space button--white" type="submit" name="{{ form.draft_button_name }}" formnovalidate>Save Draft</button>
{% endif %}
- <input class="button button--submit button--top-space button--primary" type="submit" value="Send/Save" name="submit" />
+ <button class="button button--submit button--top-space button--primary" type="submit" name="submit">Send/Save</button>
{% endblock %}
</form>
{% for type, message in message_templates.items %}
diff --git a/hypha/apply/determinations/templates/determinations/batch_determination_form.html b/hypha/apply/determinations/templates/determinations/batch_determination_form.html
index cf908179898b137bc51f2dea7557e34765132bb3..8ed93ff2fa4f66dcf509589f5487a1b0885f58b4 100644
--- a/hypha/apply/determinations/templates/determinations/batch_determination_form.html
+++ b/hypha/apply/determinations/templates/determinations/batch_determination_form.html
@@ -34,9 +34,9 @@
{% endblock %}
{% block form_buttons %}
-<input data-fancybox data-src="#batch-send-determination" class="button button--submit button--top-space button--primary js-batch-determine-send" type="button" value="Send" />
+<button data-fancybox data-src="#batch-send-determination" class="button button--submit button--top-space button--primary js-batch-determine-send" type="button">Send</button>
{% include "determinations/includes/batch_determination_confirmation.html" with count=submissions.count %}
-<input type="submit" value="Submit" name="submit" style="display: none" />
+<input type="submit" value="Submit" name="submit" class="is-hidden" />
{% endblock %}
{% block extra_js %}
diff --git a/hypha/apply/funds/templates/funds/admin/parent_chooser.html b/hypha/apply/funds/templates/funds/admin/parent_chooser.html
index 4a07199572a5516f6d475f63aabaec7905680eb4..5bb8857fe0ed434507e51340e6130f6eb4fef522 100644
--- a/hypha/apply/funds/templates/funds/admin/parent_chooser.html
+++ b/hypha/apply/funds/templates/funds/admin/parent_chooser.html
@@ -17,7 +17,7 @@
<ul class="fields">
{% include "wagtailadmin/shared/field_as_li.html" with field=form.parent_page %}
<li>
- <input type="submit" class="button" value="{% trans 'Continue' %}">
+ <button type="submit" class="button">{% trans 'Continue' %}</button>
</li>
</ul>
</form>
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html b/hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html
index 89e8fc98e4dd60f90fe9611b65ad17057d040a5e..4785ffc263c279c9ff94b00f18fd5a7ce94bb778 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html
@@ -16,7 +16,7 @@
{% csrf_token %}
<p><strong>Are you sure you want to delete "{{ object }}"?</strong></p>
<p>All content related to this submission will also be deleted. This includes reviews, determinations and comments.</p>
- <input class="button button--warning button--submit button--top-space" type="submit"value="Confirm" />
+ <button class="button button--warning button--submit button--top-space" type="submit">Confirm</button>
</form>
</div>
</div>
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_form.html b/hypha/apply/funds/templates/funds/applicationsubmission_form.html
index 5580b435da1ba738c4533c0dd3aa8b83f629566f..a1ea6e2070d615b0de2b39cd077db0cab760693c 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_form.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_form.html
@@ -28,7 +28,7 @@
{% endif %}
{% endfor %}
{% for button_name, button_type, button_value in buttons %}
- <input class="button button--submit button--top-space button--{{ button_type }}" type="submit" name="{{ button_name }}" value="{{ button_value }}"{% if button_value == 'Save Draft' %} formnovalidate{% endif %}/>
+ <button class="button button--submit button--top-space button--{{ button_type }}" type="submit" name="{{ button_name }}" {% if button_value == 'Save Draft' %}formnovalidate{% endif %}>{{ button_value }}</button>
{% endfor %}
</form>
</div>
diff --git a/hypha/apply/funds/templates/funds/includes/delegated_form_base.html b/hypha/apply/funds/templates/funds/includes/delegated_form_base.html
index 5c310f693e23c5d14b4fd7c456de5082de01a1d3..ff7cf8a254ebf42fec38187aa5790cafa0772ae8 100644
--- a/hypha/apply/funds/templates/funds/includes/delegated_form_base.html
+++ b/hypha/apply/funds/templates/funds/includes/delegated_form_base.html
@@ -30,13 +30,13 @@
</button>
{% endif %}
- <input
+ <button
class="button button--{% if invert %}white{% elif value == 'Delete' %}warning{% else %}primary{% endif %} button--top-space"
id="{{ form.name }}-submit"
name="{{ form_prefix }}{{ form.name }}"
type="submit"
- form="{{ form.name }}"
- value="{{ value }}"
- >
+ form="{{ form.name }}">
+ {{ value }}
+ </button>
</form>
diff --git a/hypha/apply/funds/templates/funds/reminder_confirm_delete.html b/hypha/apply/funds/templates/funds/reminder_confirm_delete.html
index 9fca2cfbd7551535a160ac2c5052a22d2631023f..1ddc97aab032d121f15fd68582adda398a19c6ae 100644
--- a/hypha/apply/funds/templates/funds/reminder_confirm_delete.html
+++ b/hypha/apply/funds/templates/funds/reminder_confirm_delete.html
@@ -15,7 +15,7 @@
<form class="form" action="" method="post">
{% csrf_token %}
<p><strong>Are you sure you want to delete "{{ object }}"?</strong></p>
- <input class="button button--warning button--submit button--top-space" type="submit"value="Confirm" />
+ <button class="button button--warning button--submit button--top-space" type="submit">Confirm</button>
</form>
</div>
</div>
diff --git a/hypha/apply/funds/templates/funds/submission_sealed.html b/hypha/apply/funds/templates/funds/submission_sealed.html
index e85a5752f93f829f146394a6fb9713ac9080e600..c13ee21168dad800c662db593ec4dcf1ecd2affc 100644
--- a/hypha/apply/funds/templates/funds/submission_sealed.html
+++ b/hypha/apply/funds/templates/funds/submission_sealed.html
@@ -24,7 +24,7 @@
<p>As an admin you are allowed to access the application. However, this action will be recorded.</p>
<form method="post">
{% csrf_token %}
- <input class="button button--warning" type="submit" value="View application" />
+ <button class="button button--warning" type="submit">View application</button>
</form>
{% endif %}
</div>
diff --git a/hypha/apply/projects/templates/application_projects/includes/report_line.html b/hypha/apply/projects/templates/application_projects/includes/report_line.html
index 433d7ad94b2812f95afa98b43a313607e174b5d9..dbf0e2104974ecfa8ad274e8a074a4ea534020c2 100644
--- a/hypha/apply/projects/templates/application_projects/includes/report_line.html
+++ b/hypha/apply/projects/templates/application_projects/includes/report_line.html
@@ -36,7 +36,7 @@
<form action="{% url "apply:projects:reports:skip" pk=report.pk %}" method="post">
{% csrf_token %}
<div class="modal__buttons">
- <input type="submit" value="Continue" class="button button--primary button--submit"></input>
+ <button type="submit" class="button button--primary button--submit">Continue</button>
<button data-fancybox-close class="button button--submit button--white">Cancel</button>
</div>
</form>
diff --git a/hypha/apply/projects/templates/application_projects/includes/reports.html b/hypha/apply/projects/templates/application_projects/includes/reports.html
index 32b334d71326a8264f88070db92a4956428e7306..84aca5a80a5b2946f002f9e8d1338746e3f7f90d 100644
--- a/hypha/apply/projects/templates/application_projects/includes/reports.html
+++ b/hypha/apply/projects/templates/application_projects/includes/reports.html
@@ -82,7 +82,7 @@
{% if request.user.is_apply_staff %}
<form action="{% url "apply:projects:reports:skip" pk=report.pk %}" method="post">
{% csrf_token %}
- <input type="submit" value="Unskip" class="btn data-block__action-link"></input>
+ <button type="submit" class="btn data-block__action-link">Unskip</button>
</form>
{% endif %}
{% endif %}
diff --git a/hypha/apply/projects/templates/application_projects/paymentrequest_confirm_delete.html b/hypha/apply/projects/templates/application_projects/paymentrequest_confirm_delete.html
index d3907d95c8c673b7f77bde5cbe41056eaca946ed..57ada72916a457a7e648579664526e096291eecd 100644
--- a/hypha/apply/projects/templates/application_projects/paymentrequest_confirm_delete.html
+++ b/hypha/apply/projects/templates/application_projects/paymentrequest_confirm_delete.html
@@ -28,7 +28,7 @@
<div class="card card--solid">
<form method="post">{% csrf_token %}
<p>Are you sure you want to delete this payment request for {{ object.project.title }}?</p>
- <input class="button button--primary" type="submit" value="Confirm">
+ <button class="button button--primary" type="submit">Confirm</button>
</form>
</div>
diff --git a/hypha/apply/projects/templates/application_projects/paymentrequest_form.html b/hypha/apply/projects/templates/application_projects/paymentrequest_form.html
index c0b49835b25a1217083a498e88db0c0eb3ee2616..0e4600342c74260ef6274e89b9bb5ac40576048a 100644
--- a/hypha/apply/projects/templates/application_projects/paymentrequest_form.html
+++ b/hypha/apply/projects/templates/application_projects/paymentrequest_form.html
@@ -25,7 +25,7 @@
{{ field }}
{% endif %}
{% endfor %}
- <input class="button button--submit button--top-space button--primary" type="submit" name="save" value="Save" />
+ <button class="button button--submit button--top-space button--primary" type="submit" name="save">Save</button>
</form>
</div>
</div>
diff --git a/hypha/apply/projects/templates/application_projects/report_form.html b/hypha/apply/projects/templates/application_projects/report_form.html
index 13bea5019e6c8af82f7fff1a77b8295cf050be70..cf6e1c8ad7655f6e88d2722221b313bee6d3fcaa 100644
--- a/hypha/apply/projects/templates/application_projects/report_form.html
+++ b/hypha/apply/projects/templates/application_projects/report_form.html
@@ -42,8 +42,8 @@
<input type="submit" id="submit-report-form-submit" name="submit" class="is-hidden" />
<input type="submit" id="submit-report-form-save" name="save" class="is-hidden" />
- <input data-fancybox data-src="#save-report" class="button button--submit button--top-space button--white" type="button" value="Save" />
- <input data-fancybox data-src="#submit-report" class="button button--primary" type="button" value="Submit" />
+ <button data-fancybox data-src="#save-report" class="button button--submit button--top-space button--white" type="button">Save</button>
+ <button data-fancybox data-src="#submit-report" class="button button--primary" type="button">Submit</button>
<!-- Save report modal -->
<div class="modal" id="save-report">
diff --git a/hypha/apply/review/templates/review/review_confirm_delete.html b/hypha/apply/review/templates/review/review_confirm_delete.html
index 5084d5cc4c73b4938ac452d35fd1fcd340ea9777..f04048494ff616c520cbbc15ca77c4e3812a5d42 100644
--- a/hypha/apply/review/templates/review/review_confirm_delete.html
+++ b/hypha/apply/review/templates/review/review_confirm_delete.html
@@ -14,7 +14,7 @@
<form class="form" action="" method="post">
{% csrf_token %}
<p><strong>Are you sure you want to delete "{{ object }}"?</strong></p>
- <input class="button button--warning button--submit button--top-space" type="submit"value="Confirm" />
+ <button class="button button--warning button--submit button--top-space" type="submit">Confirm</button>
</form>
</div>
</div>
diff --git a/hypha/apply/review/templates/review/review_edit_form.html b/hypha/apply/review/templates/review/review_edit_form.html
index c027c4b2ca3c8a8c7fc2eb27ac64d85fe3ba37cc..06de916bfc0f939e3e7d944909f8160ee7e1f2e7 100644
--- a/hypha/apply/review/templates/review/review_edit_form.html
+++ b/hypha/apply/review/templates/review/review_edit_form.html
@@ -36,9 +36,9 @@
{% endif %}
{% endfor %}
{% if not object.id or object.is_draft %}
- <input class="button button--submit button--top-space button--white" type="submit" value="Save Draft" name="{{ form.draft_button_name }}" />
+ <button class="button button--submit button--top-space button--white" type="submit" name="{{ form.draft_button_name }}">Save Draft</button>
{% endif %}
- <input class="button button--submit button--top-space button--primary" type="submit" value="Submit" name="submit" />
+ <button class="button button--submit button--top-space button--primary" type="submit" name="submit">Submit</button>
</form>
</div>
{% endblock %}
diff --git a/hypha/public/news/templates/news/news_index.html b/hypha/public/news/templates/news/news_index.html
index e17f3ec58da453910cd02cc83121b090e1aba410..84c5c7ef6e8a080e4e1b1db831c6ccb9f97a1b2e 100644
--- a/hypha/public/news/templates/news/news_index.html
+++ b/hypha/public/news/templates/news/news_index.html
@@ -19,7 +19,7 @@
{% endfor %}
</select>
</div>
- <input class="link link--button link--button__stretch" type="submit" value="Filter">
+ <button class="link link--button link--button__stretch" type="submit">Filter</button>
</form>
{% if news %}
diff --git a/hypha/public/people/templates/people/person_index_page.html b/hypha/public/people/templates/people/person_index_page.html
index 20ecde4a55d9c0342c0727b733ed516de219a4de..6fd80c5cbcb87ba3a49674c35a1b0c62d88d9bf8 100644
--- a/hypha/public/people/templates/people/person_index_page.html
+++ b/hypha/public/people/templates/people/person_index_page.html
@@ -25,7 +25,7 @@
<label for="inactive"></label>
</div>
</div>
- <input class="link link--button link--button__stretch" type="submit" value="Filter">
+ <button class="link link--button link--button__stretch" type="submit">Filter</button>
</form>
<div class="wrapper wrapper--listings">
diff --git a/hypha/templates/password_required.html b/hypha/templates/password_required.html
index 810b6a4558b1112d88186ded81543b25d1c61ab8..719220833d1872913da9b882c1b58174ca4989e6 100644
--- a/hypha/templates/password_required.html
+++ b/hypha/templates/password_required.html
@@ -22,7 +22,7 @@
{% for field in form.hidden_fields %}
{{ field }}
{% endfor %}
- <input type="submit" value="Continue" />
+ <button type="submit">Continue</button>
</div>
</form>
{% endblock %}