From 3b23ae46a796b1fa5a0d63cb2b18ddfc63f0bc56 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Wed, 22 Apr 2020 16:25:10 +0100 Subject: [PATCH] Remove all unused checkbox macros and imports --- .../stylesheets/components/message.scss | 12 ----- app/templates/components/checkbox.html | 46 ------------------- app/templates/views/invite-user.html | 1 - .../views/manage-users/permissions.html | 1 - .../views/platform-admin/_base_template.html | 1 - .../views/platform-admin/services.html | 1 - .../email-reply-to/_verify-updates.html | 1 - .../service-settings/email-reply-to/add.html | 1 - .../service-settings/email-reply-to/edit.html | 1 - .../email-reply-to/verify.html | 1 - .../service-settings/letter-contact/add.html | 1 - .../service-settings/letter-contact/edit.html | 1 - .../service-settings/sms-sender/add.html | 1 - .../service-settings/sms-sender/edit.html | 1 - app/templates/views/support/form.html | 1 - .../views/templates/_template_list.html | 1 - .../templates/manage-template-folder.html | 1 - app/templates/views/two-factor.html | 1 - 18 files changed, 74 deletions(-) delete mode 100644 app/templates/components/checkbox.html diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss index 14e02ebf7..c4dc7bff4 100644 --- a/app/assets/stylesheets/components/message.scss +++ b/app/assets/stylesheets/components/message.scss @@ -78,18 +78,6 @@ $message-type-bottom-spacing: govuk-spacing(4); &-item { - &-with-checkbox { - - position: relative; - padding-left: govuk-spacing(9); - - .multiple-choice { - position: absolute; - left: 0; - } - - } - &-hidden-by-default { display: none; } diff --git a/app/templates/components/checkbox.html b/app/templates/components/checkbox.html deleted file mode 100644 index 3647c4f1c..000000000 --- a/app/templates/components/checkbox.html +++ /dev/null @@ -1,46 +0,0 @@ -{% from "components/select-input.html" import select_nested, select %} - -{% macro checkbox( - field, - hint=False, - width='2-3' -) %} -
- {{ checkbox_input(field.id, field.name, field.data) }} - -
-{% endmacro %} - - -{% macro checkboxes_nested(field, child_map, hint=None, disable=[], option_hints={}, hide_legend=False, collapsible_opts={}, legend_style="text") %} - {{ select_nested(field, child_map, hint, disable, option_hints, hide_legend, collapsible_opts, legend_style, input="checkbox") }} -{% endmacro %} - - -{% macro checkboxes(field, hint=None, disable=[], option_hints={}, hide_legend=False, collapsible_opts={}) %} - {{ select(field, hint, disable, option_hints, hide_legend, collapsible_opts, input="checkbox") }} -{% endmacro %} - - -{% macro checkbox_input(id, name, data=None, value="y") %} - -{% endmacro %} - -{% macro unlabelled_checkbox(id, name, data=None, value="y") %} -
- {{ checkbox_input(id, name, data, value) }} - -
-{% endmacro %} diff --git a/app/templates/views/invite-user.html b/app/templates/views/invite-user.html index 6ffb0ba04..11ae6a050 100644 --- a/app/templates/views/invite-user.html +++ b/app/templates/views/invite-user.html @@ -1,5 +1,4 @@ {% extends "withnav_template.html" %} -{% from "components/checkbox.html" import checkbox %} {% from "components/textbox.html" import textbox %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} diff --git a/app/templates/views/manage-users/permissions.html b/app/templates/views/manage-users/permissions.html index 51169c37a..77189dcb0 100644 --- a/app/templates/views/manage-users/permissions.html +++ b/app/templates/views/manage-users/permissions.html @@ -1,4 +1,3 @@ -{% from "components/checkbox.html" import checkbox, checkboxes_nested %} {% from "components/radios.html" import radio, radios, conditional_radio_panel %} {{ form.permissions_field }} diff --git a/app/templates/views/platform-admin/_base_template.html b/app/templates/views/platform-admin/_base_template.html index 5d5c13743..c3dd1e1e1 100644 --- a/app/templates/views/platform-admin/_base_template.html +++ b/app/templates/views/platform-admin/_base_template.html @@ -1,6 +1,5 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} -{% from "components/checkbox.html" import checkbox %} {% from "components/page-footer.html" import page_footer %} diff --git a/app/templates/views/platform-admin/services.html b/app/templates/views/platform-admin/services.html index 3ca47f5b1..2329b077f 100644 --- a/app/templates/views/platform-admin/services.html +++ b/app/templates/views/platform-admin/services.html @@ -1,6 +1,5 @@ {% extends "views/platform-admin/_base_template.html" %} {% from "components/textbox.html" import textbox %} -{% from "components/checkbox.html" import checkbox %} {% from "components/page-footer.html" import page_footer %} {% from "components/big-number.html" import big_number, big_number_with_status %} {% from "components/message-count-label.html" import message_count_label %} diff --git a/app/templates/views/service-settings/email-reply-to/_verify-updates.html b/app/templates/views/service-settings/email-reply-to/_verify-updates.html index 75865062c..1a48fa1fc 100644 --- a/app/templates/views/service-settings/email-reply-to/_verify-updates.html +++ b/app/templates/views/service-settings/email-reply-to/_verify-updates.html @@ -1,6 +1,5 @@ {% from "components/banner.html" import banner, banner_wrapper %} {% from "components/textbox.html" import textbox %} -{% from "components/checkbox.html" import checkbox %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} {% from "components/button/macro.njk" import govukButton %} diff --git a/app/templates/views/service-settings/email-reply-to/add.html b/app/templates/views/service-settings/email-reply-to/add.html index 8e59b885c..a9b9774d6 100644 --- a/app/templates/views/service-settings/email-reply-to/add.html +++ b/app/templates/views/service-settings/email-reply-to/add.html @@ -1,6 +1,5 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} -{% from "components/checkbox.html" import checkbox %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} diff --git a/app/templates/views/service-settings/email-reply-to/edit.html b/app/templates/views/service-settings/email-reply-to/edit.html index 89fe7e20a..2d675fb1f 100644 --- a/app/templates/views/service-settings/email-reply-to/edit.html +++ b/app/templates/views/service-settings/email-reply-to/edit.html @@ -1,7 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/banner.html" import banner_wrapper %} {% from "components/textbox.html" import textbox %} -{% from "components/checkbox.html" import checkbox %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} diff --git a/app/templates/views/service-settings/email-reply-to/verify.html b/app/templates/views/service-settings/email-reply-to/verify.html index 00d4c8c10..407f693c5 100644 --- a/app/templates/views/service-settings/email-reply-to/verify.html +++ b/app/templates/views/service-settings/email-reply-to/verify.html @@ -1,6 +1,5 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} -{% from "components/checkbox.html" import checkbox %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} diff --git a/app/templates/views/service-settings/letter-contact/add.html b/app/templates/views/service-settings/letter-contact/add.html index 10ee5998b..ab1ba67b7 100644 --- a/app/templates/views/service-settings/letter-contact/add.html +++ b/app/templates/views/service-settings/letter-contact/add.html @@ -1,6 +1,5 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} -{% from "components/checkbox.html" import checkbox %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} diff --git a/app/templates/views/service-settings/letter-contact/edit.html b/app/templates/views/service-settings/letter-contact/edit.html index 4f2be6520..a4be56d40 100644 --- a/app/templates/views/service-settings/letter-contact/edit.html +++ b/app/templates/views/service-settings/letter-contact/edit.html @@ -1,6 +1,5 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} -{% from "components/checkbox.html" import checkbox %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} diff --git a/app/templates/views/service-settings/sms-sender/add.html b/app/templates/views/service-settings/sms-sender/add.html index ba1878a34..1bf80bacb 100644 --- a/app/templates/views/service-settings/sms-sender/add.html +++ b/app/templates/views/service-settings/sms-sender/add.html @@ -1,6 +1,5 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} -{% from "components/checkbox.html" import checkbox %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} diff --git a/app/templates/views/service-settings/sms-sender/edit.html b/app/templates/views/service-settings/sms-sender/edit.html index 6dd8cfa15..67889fcd2 100644 --- a/app/templates/views/service-settings/sms-sender/edit.html +++ b/app/templates/views/service-settings/sms-sender/edit.html @@ -1,7 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/banner.html" import banner_wrapper %} {% from "components/textbox.html" import textbox %} -{% from "components/checkbox.html" import checkbox %} {% from "components/page-header.html" import page_header %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} diff --git a/app/templates/views/support/form.html b/app/templates/views/support/form.html index 4c4098d6b..4909aa991 100644 --- a/app/templates/views/support/form.html +++ b/app/templates/views/support/form.html @@ -1,5 +1,4 @@ {% extends "withoutnav_template.html" %} -{% from "components/checkbox.html" import checkbox %} {% from "components/textbox.html" import textbox %} {% from "components/page-footer.html" import sticky_page_footer %} {% from "components/page-header.html" import page_header %} diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html index 42483d33a..2121a011e 100644 --- a/app/templates/views/templates/_template_list.html +++ b/app/templates/views/templates/_template_list.html @@ -1,4 +1,3 @@ -{% from "components/checkbox.html" import unlabelled_checkbox %} {% from "components/message-count-label.html" import folder_contents_count, message_count_label %} {% macro format_item_name(name) -%} diff --git a/app/templates/views/templates/manage-template-folder.html b/app/templates/views/templates/manage-template-folder.html index 6c817014b..cf8db4867 100644 --- a/app/templates/views/templates/manage-template-folder.html +++ b/app/templates/views/templates/manage-template-folder.html @@ -1,7 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/folder-path.html" import folder_path, page_title_folder_path %} {% from "components/textbox.html" import textbox %} -{% from "components/checkbox.html" import checkbox, checkboxes %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %} diff --git a/app/templates/views/two-factor.html b/app/templates/views/two-factor.html index 3980f2840..2adba56e2 100644 --- a/app/templates/views/two-factor.html +++ b/app/templates/views/two-factor.html @@ -1,6 +1,5 @@ {% extends "withoutnav_template.html" %} {% from "components/textbox.html" import textbox %} -{% from "components/checkbox.html" import checkbox %} {% from "components/page-footer.html" import page_footer %} {% from "components/form.html" import form_wrapper %}