Browse Source

Location name label (#734)

* Location name label

* Just page title
pull/737/head
baarkerlounger 2 years ago committed by GitHub
parent
commit
35ab874626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      Gemfile.lock
  2. 2
      app/views/locations/edit.html.erb
  3. 2
      app/views/locations/new.html.erb
  4. 4
      spec/features/schemes_spec.rb
  5. 58
      yarn.lock

6
Gemfile.lock

@ -82,7 +82,7 @@ GEM
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
ast (2.4.2) ast (2.4.2)
aws-eventstream (1.2.0) aws-eventstream (1.2.0)
aws-partitions (1.603.0) aws-partitions (1.604.0)
aws-sdk-core (3.131.2) aws-sdk-core (3.131.2)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0) aws-partitions (~> 1, >= 1.525.0)
@ -168,7 +168,7 @@ GEM
ffi (1.15.5) ffi (1.15.5)
globalid (1.0.0) globalid (1.0.0)
activesupport (>= 5.0) activesupport (>= 5.0)
govuk-components (3.1.3) govuk-components (3.1.4)
actionpack (>= 6.1) actionpack (>= 6.1)
activemodel (>= 6.1) activemodel (>= 6.1)
html-attributes-utils (~> 0.9, >= 0.9.2) html-attributes-utils (~> 0.9, >= 0.9.2)
@ -187,7 +187,7 @@ GEM
html-attributes-utils (0.9.2) html-attributes-utils (0.9.2)
activesupport (>= 6.1.4.4) activesupport (>= 6.1.4.4)
html_tokenizer (0.0.7) html_tokenizer (0.0.7)
i18n (1.10.0) i18n (1.11.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
iniparse (1.5.0) iniparse (1.5.0)
jmespath (1.6.1) jmespath (1.6.1)

2
app/views/locations/edit.html.erb

@ -20,7 +20,7 @@
width: 5 %> width: 5 %>
<%= f.govuk_text_field :name, <%= f.govuk_text_field :name,
label: { text: "Name (optional)", size: "m" }, label: { text: "Location name (optional)", size: "m" },
hint: { text: "This is how you refer to this location within your organisation" } %> hint: { text: "This is how you refer to this location within your organisation" } %>
<%= f.govuk_number_field :units, <%= f.govuk_number_field :units,

2
app/views/locations/new.html.erb

@ -20,7 +20,7 @@
width: 5 %> width: 5 %>
<%= f.govuk_text_field :name, <%= f.govuk_text_field :name,
label: { text: "Name (optional)", size: "m" }, label: { text: "Location name (optional)", size: "m" },
hint: { text: "This is how you refer to this location within your organisation" } %> hint: { text: "This is how you refer to this location within your organisation" } %>
<%= f.govuk_number_field :units, <%= f.govuk_number_field :units,

4
spec/features/schemes_spec.rb

@ -400,7 +400,7 @@ RSpec.describe "Schemes scheme Features" do
context "when I add location to the scheme" do context "when I add location to the scheme" do
before do before do
fill_in "Postcode", with: "SW1P 4DF" fill_in "Postcode", with: "SW1P 4DF"
fill_in "Name (optional)", with: "Some name" fill_in "Location name (optional)", with: "Some name"
fill_in "Total number of units at this location", with: 1 fill_in "Total number of units at this location", with: 1
choose "Self-contained house" choose "Self-contained house"
choose "location-wheelchair-adaptation-no-field" choose "location-wheelchair-adaptation-no-field"
@ -433,7 +433,7 @@ RSpec.describe "Schemes scheme Features" do
before do before do
click_link "Add a location" click_link "Add a location"
fill_in "Postcode", with: "XX1 1XX" fill_in "Postcode", with: "XX1 1XX"
fill_in "Name (optional)", with: "Other name" fill_in "Location name (optional)", with: "Other name"
fill_in "Total number of units at this location", with: 2 fill_in "Total number of units at this location", with: 2
choose "Self-contained house" choose "Self-contained house"
choose "location-wheelchair-adaptation-no-field" choose "location-wheelchair-adaptation-no-field"

58
yarn.lock

@ -979,9 +979,9 @@
to-fast-properties "^2.0.0" to-fast-properties "^2.0.0"
"@csstools/selector-specificity@^2.0.1": "@csstools/selector-specificity@^2.0.1":
version "2.0.1" version "2.0.2"
resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.1.tgz#b6b8d81780b9a9f6459f4bfe9226ac6aefaefe87" resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36"
integrity sha512-aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA== integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==
"@discoveryjs/json-ext@^0.5.0": "@discoveryjs/json-ext@^0.5.0":
version "0.5.7" version "0.5.7"
@ -1845,7 +1845,7 @@ browser-sync@^2.27.9:
ua-parser-js "1.0.2" ua-parser-js "1.0.2"
yargs "^17.3.1" yargs "^17.3.1"
browserslist@^4.14.5, browserslist@^4.20.2, browserslist@^4.21.0: browserslist@^4.14.5, browserslist@^4.20.2, browserslist@^4.21.1:
version "4.21.1" version "4.21.1"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.1.tgz#c9b9b0a54c7607e8dc3e01a0d311727188011a00" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.1.tgz#c9b9b0a54c7607e8dc3e01a0d311727188011a00"
integrity sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ== integrity sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ==
@ -1915,9 +1915,9 @@ camelcase@^5.3.1:
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
caniuse-lite@^1.0.30001359: caniuse-lite@^1.0.30001359:
version "1.0.30001363" version "1.0.30001365"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001363.tgz#26bec2d606924ba318235944e1193304ea7c4f15" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001365.tgz#72c2c3863b1a545cfd3d9953535bd2ee17568158"
integrity sha512-HpQhpzTGGPVMnCjIomjt+jvyUu8vNFo3TaDiZ/RcoTrlOq/5+tC8zHdsbgFB6MxmaY+jCpsH09aD80Bb4Ow3Sg== integrity sha512-VDQZ8OtpuIPMBA4YYvZXECtXbddMCUFJk1qu8Mqxfm/SZJNSr1cy4IuLCOL7RJ/YASrvJcYg1Zh+UEUQ5m6z8Q==
chalk@^1.1.3: chalk@^1.1.3:
version "1.1.3" version "1.1.3"
@ -2133,17 +2133,17 @@ copy-webpack-plugin@^10.2.4:
serialize-javascript "^6.0.0" serialize-javascript "^6.0.0"
core-js-compat@^3.21.0, core-js-compat@^3.22.1: core-js-compat@^3.21.0, core-js-compat@^3.22.1:
version "3.23.3" version "3.23.4"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.23.3.tgz#7d8503185be76bb6d8d592c291a4457a8e440aa9" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.23.4.tgz#56ad4a352884317a15f6b04548ff7139d23b917f"
integrity sha512-WSzUs2h2vvmKsacLHNTdpyOC9k43AEhcGoFlVgCY4L7aw98oSBKtPL6vD0/TqZjRWRQYdDSLkzZIni4Crbbiqw== integrity sha512-RkSRPe+JYEoflcsuxJWaiMPhnZoFS51FcIxm53k4KzhISCBTmaGlto9dTIrYuk0hnJc3G6pKufAKepHnBq6B6Q==
dependencies: dependencies:
browserslist "^4.21.0" browserslist "^4.21.1"
semver "7.0.0" semver "7.0.0"
core-js@^3.21.1, core-js@^3.4.0: core-js@^3.21.1, core-js@^3.4.0:
version "3.23.3" version "3.23.4"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.3.tgz#3b977612b15da6da0c9cc4aec487e8d24f371112" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.4.tgz#92d640faa7f48b90bbd5da239986602cfc402aa6"
integrity sha512-oAKwkj9xcWNBAvGbT//WiCdOMpb9XQG92/Fe3ABFM/R16BsHgePG00mFOgKf7IsCtfj8tA1kHtf/VwErhriz5Q== integrity sha512-vjsKqRc1RyAJC3Ye2kYqgfdThb3zYnx9CrqoCcjMOENMtQPC7ZViBvlDxwYU/2z2NI/IPuiXw5mT4hWhddqjzQ==
cors@~2.8.5: cors@~2.8.5:
version "2.8.5" version "2.8.5"
@ -2384,9 +2384,9 @@ ejs@^3.1.6:
jake "^10.8.5" jake "^10.8.5"
electron-to-chromium@^1.4.172: electron-to-chromium@^1.4.172:
version "1.4.184" version "1.4.186"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.184.tgz#381d4d111fc82d3376ed690dfb621e675f9078a9" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.186.tgz#a811bba15f0868d3f4164b0f4ede8adc8773831b"
integrity sha512-IADi390FRdvxWfVX3hjzfTDNVHiTqVo9ar53/7em/SfhUG9YcjVhyQecY/XwmBHRKden/wFud7RWOUH7+7LFng== integrity sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==
element-closest@^2.0.2: element-closest@^2.0.2:
version "2.0.2" version "2.0.2"
@ -3822,9 +3822,9 @@ linkify-it@^3.0.1:
uc.micro "^1.0.1" uc.micro "^1.0.1"
liquidjs@^9.36.1: liquidjs@^9.36.1:
version "9.38.0" version "9.39.0"
resolved "https://registry.yarnpkg.com/liquidjs/-/liquidjs-9.38.0.tgz#0fb4d380007ecde00d8c43c5fd5535d6189b7778" resolved "https://registry.yarnpkg.com/liquidjs/-/liquidjs-9.39.0.tgz#0ee685118d397354556c35f558c3e5d3ecddc12c"
integrity sha512-LDGPbOfc8L9LG7ZSG0NueTcCe0AZzJAIa0BjYgMnCR+4VO0yS+AnOZjx0WOih8mtLRNSIYo9fik5exY6Cf4TOQ== integrity sha512-WmsBwFlvhHrMtrlSjVR58kAYjZT/0QVO5sqw4zs9mpGQdf3xTon388WbWwOwyCoTtKzXwedbvWtq2M2wnozr0g==
list-to-array@^1.1.0: list-to-array@^1.1.0:
version "1.1.0" version "1.1.0"
@ -3942,9 +3942,9 @@ lru-cache@^6.0.0:
yallist "^4.0.0" yallist "^4.0.0"
luxon@^2.1.1, luxon@^2.3.2: luxon@^2.1.1, luxon@^2.3.2:
version "2.4.0" version "2.5.0"
resolved "https://registry.yarnpkg.com/luxon/-/luxon-2.4.0.tgz#9435806545bb32d4234dab766ab8a3d54847a765" resolved "https://registry.yarnpkg.com/luxon/-/luxon-2.5.0.tgz#098090f67d690b247e83c090267a60b1aa8ea96c"
integrity sha512-w+NAwWOUL5hO0SgwOHsMBAmZ15SoknmQXhSO0hIbJCAmPKSsGeK8MlmhYh2w6Iib38IxN2M+/ooXWLbeis7GuA== integrity sha512-IDkEPB80Rb6gCAU+FEib0t4FeJ4uVOuX1CQ9GsvU3O+JAGIgu0J7sf1OarXKaKDygTZIoJyU6YdZzTFRu+YR0A==
magic-string@^0.25.7: magic-string@^0.25.7:
version "0.25.9" version "0.25.9"
@ -4225,9 +4225,9 @@ neo-async@^2.6.0, neo-async@^2.6.2:
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
node-releases@^2.0.5: node-releases@^2.0.5:
version "2.0.5" version "2.0.6"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q== integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
nopt@^5.0.0: nopt@^5.0.0:
version "5.0.0" version "5.0.0"
@ -5571,9 +5571,9 @@ stylelint-config-standard@^25.0.0:
stylelint-config-recommended "^7.0.0" stylelint-config-recommended "^7.0.0"
stylelint-scss@^4.0.0: stylelint-scss@^4.0.0:
version "4.2.0" version "4.3.0"
resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.2.0.tgz#e25fd390ee38a7e89fcfaec2a8f9dce2ec6ddee8" resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.3.0.tgz#638800faf823db11fff60d537c81051fe74c90fa"
integrity sha512-HHHMVKJJ5RM9pPIbgJ/XA67h9H0407G68Rm69H4fzFbFkyDMcTV1Byep3qdze5+fJ3c0U7mJrbj6S0Fg072uZA== integrity sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==
dependencies: dependencies:
lodash "^4.17.21" lodash "^4.17.21"
postcss-media-query-parser "^0.2.3" postcss-media-query-parser "^0.2.3"

Loading…
Cancel
Save