darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 00:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update TemplateAndFoldersSelectionForm fields

Browse Source 
Changes its StringFields to GovukTextInputFields.

Includes changes to templates that use this form
and associated tests.
This commit is contained in:
Pea Tyczynska
2020-08-05 11:57:00 +01:00
committed by Tom Byers
parent 3f7142b3e2
commit 1d2a73a1a4
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/forms.py
View File

@@ -2178,8 +2178,8 @@ class TemplateAndFoldersSelectionForm(Form):
required_for_ops('move-to-existing-folder'), required_for_ops('move-to-existing-folder'),
Optional() Optional()
]) ])
add_new_folder_name = StringField('Folder name', validators=[required_for_ops('add-new-folder')]) add_new_folder_name = GovukTextInputField('Folder name', validators=[required_for_ops('add-new-folder')])
move_to_new_folder_name = StringField('Folder name', validators=[required_for_ops('move-to-new-folder')]) move_to_new_folder_name = GovukTextInputField('Folder name', validators=[required_for_ops('move-to-new-folder')])
add_template_by_template_type = RadioFieldWithRequiredMessage('New template', validators=[ add_template_by_template_type = RadioFieldWithRequiredMessage('New template', validators=[
required_for_ops('add-new-template'), required_for_ops('add-new-template'),

4
app/templates/views/templates/_move_to.html
View File

@@ -16,7 +16,7 @@
<div id="move_to_new_folder_form"> <div id="move_to_new_folder_form">
<fieldset class="js-will-stick-at-bottom-when-scrolling"> <fieldset class="js-will-stick-at-bottom-when-scrolling">
<legend class="govuk-visually-hidden">Add to new folder</legend> <legend class="govuk-visually-hidden">Add to new folder</legend>
{{ textbox(templates_and_folders_form.move_to_new_folder_name, width='1-1') }} {{ templates_and_folders_form.move_to_new_folder_name(param_extensions={"classes": "govuk-!-width-full"}) }}
{{ page_footer('Add to new folder', button_name='operation', button_value='move-to-new-folder') }} {{ page_footer('Add to new folder', button_name='operation', button_value='move-to-new-folder') }}
</fieldset> </fieldset>
</div> </div>
@@ -24,7 +24,7 @@
<div id="add_new_folder_form"> <div id="add_new_folder_form">
<fieldset class="js-will-stick-at-bottom-when-scrolling"> <fieldset class="js-will-stick-at-bottom-when-scrolling">
<legend class="govuk-visually-hidden">Add new folder</legend> <legend class="govuk-visually-hidden">Add new folder</legend>
{{ textbox(templates_and_folders_form.add_new_folder_name, width='1-1') }} {{ templates_and_folders_form.add_new_folder_name(param_extensions={"classes": "govuk-!-width-full"}) }}
{{ page_footer('Add new folder', button_name='operation', button_value='add-new-folder') }} {{ page_footer('Add new folder', button_name='operation', button_value='add-new-folder') }}
</fieldset> </fieldset>
</div> </div>

12
tests/javascripts/templateFolderForm.test.js
View File

@@ -53,11 +53,11 @@ function setFixtures (hierarchy) {
<div id="move_to_new_folder_form"> <div id="move_to_new_folder_form">
<fieldset class="js-will-stick-at-bottom-when-scrolling"> <fieldset class="js-will-stick-at-bottom-when-scrolling">
<legend class="visuallyhidden">Add to new folder</legend> <legend class="visuallyhidden">Add to new folder</legend>
<div class="form-group"> <div class="govuk-form-group">
<label class="form-label" for="move_to_new_folder_name"> <label class="govuk-label" for="move_to_new_folder_name">
Folder name Folder name
</label> </label>
<input class="form-control form-control-1-1 " id="move_to_new_folder_name" name="move_to_new_folder_name" rows="8" type="text" value=""> <input class="govuk-input govuk-!-width-full" id="move_to_new_folder_name" name="move_to_new_folder_name" type="text">
</div> </div>
<div class="page-footer"> <div class="page-footer">
<button type="submit" class="govuk-button govuk-button--secondary govuk-!-margin-bottom-1" name="operation" value="move-to-new-folder">Add to new folder</button> <button type="submit" class="govuk-button govuk-button--secondary govuk-!-margin-bottom-1" name="operation" value="move-to-new-folder">Add to new folder</button>
@@ -67,11 +67,11 @@ function setFixtures (hierarchy) {
<div id="add_new_folder_form"> <div id="add_new_folder_form">
<fieldset class="js-will-stick-at-bottom-when-scrolling"> <fieldset class="js-will-stick-at-bottom-when-scrolling">
<legend class="visuallyhidden">Add new folder</legend> <legend class="visuallyhidden">Add new folder</legend>
<div class="form-group"> <div class="govuk-form-group">
<label class="form-label" for="add_new_folder_name"> <label class="govuk-label" for="add_new_folder_name">
Folder name Folder name
</label> </label>
<input class="form-control form-control-1-1 " id="add_new_folder_name" name="add_new_folder_name" rows="8" type="text" value=""> <input class="govuk-input govuk-!-width-full" id="add_new_folder_name" name="add_new_folder_name" type="text">
</div> </div>
<div class="page-footer"> <div class="page-footer">
<button type="submit" class="govuk-button page-footer__button" name="operation" value="add-new-folder">Add new folder</button> <button type="submit" class="govuk-button page-footer__button" name="operation" value="add-new-folder">Add new folder</button>