Skip to content
This repository has been archived by the owner on Oct 28, 2024. It is now read-only.

Commit

Permalink
Fs 2539 free text forms (#147)
Browse files Browse the repository at this point in the history
* Change to text areas yo use free text field

* Change to test files

* removing if for deploy

* revert removal of action condition

* pushing version change

---------

Co-authored-by: adamdavies1 <[email protected]>
  • Loading branch information
adamdavies1 and adamdavies1 authored Apr 17, 2023
1 parent 55f8f10 commit e267e39
Show file tree
Hide file tree
Showing 33 changed files with 99 additions and 99 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dluhc-build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
]

env:
VERSION: "0.1.51" # Manually increment this version when pushing to main
VERSION: "0.1.52" # Manually increment this version when pushing to main
IMAGE_NAME_STUB: "digital-form-builder-dluhc-"
DOCKER_REGISTRY: ghcr.io
IMAGE_REPO_PATH: "ghcr.io/${{github.repository_owner}}"
Expand Down
6 changes: 3 additions & 3 deletions fsd_config/form_jsons/cof_r2/cy/buddion-cymunedol.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
"options": {
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym am y buddion hyn yn fanwl, ac eglurwch sut byddwch chi'n mesur y buddion y bydd yn eu creu i'r gymuned"
},
{
"name": "kYjJFy",
"options": {
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Eglurwch sut ydych yn bwriadu cynnal y buddion hyn dros gyfnod, a'u hehangu o bosibl."
},
{
Expand All @@ -45,7 +45,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym sut byddwch chi'n gwneud yn siŵr bod y gymuned gyfan yn elwa o'r ased",
"hint": "<span class=\"govuk-label govuk-label--s\">Dywedwch wrthym sut byddwch chi'n gwneud yn siŵr bod y gymuned gyfan yn elwa o'r ased</span>Er enghraifft, pobl nad ydynt wedi defnyddio'r ased yn y gorffennol"
}
Expand Down
2 changes: 1 addition & 1 deletion fsd_config/form_jsons/cof_r2/cy/cefnogaeth-leol.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch fwy wrthym am y gefnogaeth leol i'ch prosiect",
"hint": "<span class=\"govuk-label govuk-label--s\">Dywedwch fwy wrthym am y gefnogaeth leol i'ch prosiect</span>Gall hyn gynnwys:\n<ul class=\"govuk-list govuk-list--bullet govuk-caption-m govuk-!-padding-top-2\">\n<li>arolygon o'r gymuned</li>\n<li>cyfarfodydd neuadd tref rydych wedi'u cynnal</li>\n<li>nifer y gwirfoddolwyr amcangyfrifedig sydd gennych ar gyfer eich prosiect</li>\n<li>llythyr gan eich AS lleol</li>\n</ul>\n"
},
Expand Down
2 changes: 1 addition & 1 deletion fsd_config/form_jsons/cof_r2/cy/costau'r-prosiect.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{
"name": "WDDkVB",
"options": { "maxWords": "500" },
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Crynhowch eich llif arian ar gyfer rhedeg yr ased"
},
{
Expand Down
4 changes: 2 additions & 2 deletions fsd_config/form_jsons/cof_r2/cy/cymhwystra'r-prosiect.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Eglurwch sut y credwch y gellir darparu grant o'r gronfa hon gan gydymffurfio â'r Ddeddf Rheoli Cymorthdaliadau (2022)",
"hint": "<span class=\"govuk-label govuk-label--s\">Eglurwch sut y credwch y gellir darparu grant o'r gronfa hon gan gydymffurfio â'r Ddeddf Rheoli Cymorthdaliadau (2022)</span>Caiff hyn ei fesur gan y 7 egwyddor gyffredin a bennwyd yn Atodlen 1"
},
Expand Down Expand Up @@ -101,7 +101,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Eglurwch sut bydd eich prosiect yn cydymffurfio â rheolau cymorth gwladwriaethol",
"hint": "<span class=\"govuk-label govuk-label--s\">Eglurwch sut bydd eich prosiect yn cydymffurfio â rheolau cymorth gwladwriaethol</span>Gallwch gael mwy o wybodaeth ynglŷn â phryd y mae rheolau cymorth gwladwriaethol yn gymwys yng Ngogledd Iwerddon yng <a class=\"govuk-link\" href=\"https://www.gov.uk/government/publications/complying-with-the-uks-international-obligations-on-subsidy-control-guidance-for-public-authorities\">nghanllawiau'r llywodraeth</a>.\n\n"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym sut rydych wedi ystyried cynaliadwyedd amgylcheddol eich prosiect",
"hint": "<span class=\"govuk-label govuk-label--s\">Dywedwch wrthym sut rydych wedi ystyried cynaliadwyedd amgylcheddol eich prosiect</span>Gall hyn gynnwys:\n\n<ul class=\"govuk-list govuk-list--bullet govuk-caption-m govuk-!-padding-top-3\">\n<li>unrhyw ddulliau carbon isel neu ddi-garbon y byddwch yn eu defnyddio yn ystod adeiladu</li>\n<li>sut bydd yr ased yn cyd-fynd â mentrau Sero Net yn y dyfodol</li>\n<li>sut byddwch chi'n mesur ac yn lleihau effaith amgylcheddol yr ased</li>\n</ul>\n"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"options": {
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch y gweithgareddau neu wasanaethau wedi'u cynllunio a fydd yn cael eu cynnal yn yr ased"
},
{
Expand All @@ -29,7 +29,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch unrhyw beth a allai atal pobl rhag defnyddio'r ased neu gyfranogi yn y gwaith o redeg yr ased",
"hint": "<span class=\"govuk-label govuk-label--s\">Disgrifiwch unrhyw beth a allai atal pobl rhag defnyddio'r ased neu gyfranogi yn y gwaith o redeg yr ased</span>Er enghraifft, costau aelodaeth neu feini prawf cymhwysedd"
},
Expand All @@ -39,7 +39,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym sut byddwch chi'n gwneud eich prosiect yn hygyrch ac yn gynhwysol i bawb yn y gymuned",
"hint": "<span class=\"govuk-label govuk-label--s\">Dywedwch wrthym sut byddwch chi'n gwneud eich prosiect yn hygyrch ac yn gynhwysol i bawb yn y gymuned</span>Mae hyn yn cynnwys ystyried pobl â nodweddion gwarchodedig, anghenion mynediad ar gyfer pobl anabl, a gwneud y lle'n ddeniadol i bawb"
},
Expand All @@ -48,7 +48,7 @@
"options": {
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch sut bydd y prosiect yn dod â phobl ynghyd o bob cwr o'r gymuned"
}
],
Expand Down
6 changes: 3 additions & 3 deletions fsd_config/form_jsons/cof_r2/cy/cynrychiolaeth-gymunedol.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"hint": "<span class=\"govuk-label govuk-label--s\">Rhestrwch aelodau eich bwrdd</span>Cynhwyswch eu:\n<br> \n<ul class=\"govuk-list govuk-list--bullet govuk-caption-m govuk-!-padding-top-2\">\n<li>rôl</li>\n<li>prif gyfrifoldebau</li>\n</ul>\n<p>Gallwch ddefnyddio'ch cynllun busnes i ddarparu tystiolaeth i ategu'ch atebion.</p>\n\n",
"title": "Rhestrwch aelodau eich bwrdd"
},
Expand All @@ -30,7 +30,7 @@
"options": {
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym am eich strwythurau llywodraethu ac aelodaeth"
},
{
Expand All @@ -39,7 +39,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Eglurwch sut byddwch chi'n ystyried barn y gymuned wrth redeg yr ased",
"hint": "<span class=\"govuk-label govuk-label--s\">Eglurwch sut byddwch chi'n ystyried barn y gymuned wrth redeg yr ased</span>Cynhwyswch y modd y byddant yn cael eu cynnwys wrth wneud penderfyniadau, a sut byddwch chi'n mesur cefnogaeth gyhoeddus i'ch penderfyniadau"
}
Expand Down
6 changes: 3 additions & 3 deletions fsd_config/form_jsons/cof_r2/cy/defnydd-cymunedol.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@
{
"name": "kxgWTy",
"options": { "maxWords": "500" },
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Pwy yn y gymuned sy'n defnyddio'r ased, neu sydd wedi'i ddefnyddio yn y gorffennol, a phwy sy'n elwa ohono?"
},
{
"name": "GNhrIs",
"options": { "maxWords": "500" },
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym sut byddai colli'r ased yn effeithio ar bobl yn y gymuned, neu sut mae wedi effeithio arnynt yn barod"
},
{
"name": "qsZLjZ",
"options": { "maxWords": "500" },
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Pam bydd yr ased yn cael ei golli heb ymyrraeth gan y gymuned?"
}
],
Expand Down
2 changes: 1 addition & 1 deletion fsd_config/form_jsons/cof_r2/cy/dichonoldeb.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"hint": "<span class=\"govuk-label govuk-label--s\">Dywedwch wrthym am yr astudiaethau dichonoldeb rydych wedi'u cynnal ar gyfer eich prosiect</span>",
"title": "Dywedwch wrthym am yr astudiaethau dichonoldeb rydych wedi'u cynnal ar gyfer eich prosiect"
},
Expand Down
4 changes: 2 additions & 2 deletions fsd_config/form_jsons/cof_r2/cy/gwerth-i'r-gymuned.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym am eich cymuned leol yn gyffredinol",
"hint": "<span class=\"govuk-label govuk-label--s\">Dywedwch wrthym am eich cymuned leol yn gyffredinol</span>Mae hyn yn cynnwys manylion unrhyw anghenion sydd ganddi, a sut \nbydd eich prosiect yn mynd ati i gefnogi'r rhain.\n<p>Lle bo modd, cyfeiriwch at unrhyw ddata sydd gennych ar nodweddion \ngwarchodedig ac effeithiau ar gydraddoldeb.</p>"
},
Expand All @@ -30,7 +30,7 @@
"options": {
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch unrhyw heriau penodol mae eich cymuned yn eu hwynebu, a sut bydd yr ased yn mynd i'r afael â'r rhain"
}
],
Expand Down
8 changes: 4 additions & 4 deletions fsd_config/form_jsons/cof_r2/cy/gwybodaeth-am-y-prosiect.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch eich prosiect blaenorol",
"hint": "<span class=\"govuk-label govuk-label--s\">Disgrifiwch eich prosiect blaenorol</span>Cynhwyswch:\n<ul class=\"govuk-list govuk-list--bullet govuk-caption-m govuk-!-padding-top-2\">\n<li>enw'r prosiect</li>\n<li>trosolwg cyffredinol o'r prosiect</li>\n<li>y dyddiad y derbynioch gyllid</li>\n</ul>"
},
Expand Down Expand Up @@ -119,23 +119,23 @@
"options": {
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym sut mae'r ased yn cael ei ddefnyddio ar hyn o bryd, neu sut mae wedi'i ddefnyddio'n flaenorol, a pham mae'n bwysig i'r gymuned"
},
{
"name": "TlGjXb",
"options": {
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Eglurwch pam mae'r ased mewn perygl o gael ei golli i'r gymuned, neu pam mae eisoes wedi'i golli"
},
{
"name": "GCjCse",
"options": {
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Rhowch grynodeb byr o'ch prosiect, gan gynnwys beth rydych chi'n gobeithio ei gyflawni"
}
],
Expand Down
16 changes: 8 additions & 8 deletions fsd_config/form_jsons/cof_r2/cy/gwybodaeth-am-y-sefydliad.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
"options": {
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Beth yw prif ddiben eich sefydliad?",
"schema": {}
},
Expand All @@ -184,7 +184,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym am brif weithgareddau eich sefydliad",
"hint": "<label for=\"btTtIb\" class=\"govuk-body\">Gweithgarwch 1</label>",
"schema": {}
Expand All @@ -197,7 +197,7 @@
"optionalText": false,
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym am brif weithgareddau eich sefydliad - Gweithgarwch 2",
"hint": "<label for=\"SkocDi\" class=\"govuk-body\">Gweithgarwch 2 (dewisol)</label>",
"schema": {}
Expand All @@ -209,7 +209,7 @@
"maxWords": "500",
"required": false
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym am brif weithgareddau eich sefydliad - Gweithgarwch 3",
"hint": "<label for=\"CNeeiC\" class=\"govuk-body\">Gweithgarwch 3 (dewisol)</label>",
"schema": {}
Expand Down Expand Up @@ -267,7 +267,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch eich prosiectau blaenorol",
"hint": "<label for=\"wxCszQ\" class=\"govuk-body\">Prosiect 1</label>",
"schema": {}
Expand All @@ -279,7 +279,7 @@
"hideTitle": true,
"required": false
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch eich prosiectau blaenorol - Prosiect 2",
"hint": "<label for=\"QJFQgi\" class=\"govuk-body\">Prosiect 2 (dewisol)</label>",
"schema": {}
Expand All @@ -291,7 +291,7 @@
"hideTitle": true,
"required": false
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch eich prosiectau blaenorol - Prosiect 3",
"hint": "<label for=\"DGNWqE\" class=\"govuk-body\">Prosiect 3 (dewisol)</label>",
"schema": {}
Expand Down Expand Up @@ -685,7 +685,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym am eich partneriaeth a sut rydych chi'n bwriadu gweithio gyda'ch gilydd",
"schema": {},
"hint": "<span class=\"govuk-label govuk-label--s\">Dywedwch wrthym am eich partneriaeth a sut rydych chi'n bwriadu gweithio gyda'ch gilydd</span>Os ydych chi'n gweithio mewn partneriaeth â mwy nag un sefydliad, rhowch eu manylion yma"
Expand Down
6 changes: 3 additions & 3 deletions fsd_config/form_jsons/cof_r2/cy/gwybodaeth-am-yr-ased.json
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
"options": {
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch y broses werthu, neu delerau eich prydles os ydych wedi rhentu'r ased",
"hint": "<span class=\"govuk-label govuk-label--s\">Disgrifiwch y broses werthu, neu delerau eich prydles os ydych wedi rhentu'r ased</span>Er enghraifft, ocsiwn"
}
Expand All @@ -223,7 +223,7 @@
"options": {
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch y broses werthu ddisgwyliedig, neu delerau arfaethedig eich prydles os ydych chi'n rhentu'r ased",
"hint": "<span class=\"govuk-label govuk-label--s\">Disgrifiwch y broses werthu ddisgwyliedig, neu delerau arfaethedig eich prydles os ydych chi'n rhentu'r ased</span>Er enghraifft, ocsiwn"
},
Expand Down Expand Up @@ -457,7 +457,7 @@
"options": {
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch statws presennol y Trosglwyddiad Ased Cymunedol"
}
],
Expand Down
4 changes: 2 additions & 2 deletions fsd_config/form_jsons/cof_r2/cy/sgiliau-ac-adnoddau.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
"options": {
"maxWords": "500"
},
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch unrhyw brofiad sydd gennych gydag asedau cymunedol tebyg i'r un hwn"
}
],
Expand Down Expand Up @@ -141,7 +141,7 @@
"maxWords": "500",
"hideTitle": true
},
"type": "MultilineTextField",
"type": "FreeTextField",
"hint": "<span class=\"govuk-label govuk-label--s\">Dywedwch wrthym am y rolau y byddwch yn eu recriwtio</span><div>Dylai'r rhain fod yn swyddi a fydd yn eich helpu i reoli'r ased yn effeithiol yn ystod perchnogaeth gymunedol.</div>\n\n<div class=\"govuk-!-padding-top-3\">Cynhwyswch:</div>\n<ul class=\"govuk-list govuk-list--bullet govuk-caption-m govuk-!-padding-top-2\">\n<li>y rôl</li>\n<li>y prif gyfrifoldebau</li>\n</ul>\n\n<p>Gallwch ddefnyddio'ch cynllun busnes i ddarparu tystiolaeth i ategu'ch atebion.</p>",
"title": "Dywedwch wrthym am y rolau y byddwch yn eu recriwtio"
}
Expand Down
6 changes: 3 additions & 3 deletions fsd_config/form_jsons/cof_r2/cy/ymgysylltu-a'r-gymuned.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"name": "HJBgvw",
"options": { "maxWords": "500" },
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym sut rydych wedi ymgysylltu â'r gymuned ynglŷn â'ch bwriad i gymryd perchnogaeth o'r ased, ac eglurwch sut mae hyn wedi llywio cynlluniau eich prosiect"
},
{
Expand Down Expand Up @@ -45,7 +45,7 @@
{
"name": "NZKHOp",
"options": { "maxWords": "500" },
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Dywedwch wrthym sut mae eich prosiect yn cefnogi unrhyw gynlluniau lleol ehangach"
}
],
Expand All @@ -71,7 +71,7 @@
{
"name": "dpLyQh",
"options": { "maxWords": "500" },
"type": "MultilineTextField",
"type": "FreeTextField",
"title": "Disgrifiwch eich gweithgareddau codi arian"
}
],
Expand Down
Loading

0 comments on commit e267e39

Please sign in to comment.