From 5f40caf13aca2e242d5c62e27b20bc9de00892bb Mon Sep 17 00:00:00 2001 From: Martyn Dewar <249418+mdeuk@users.noreply.github.com> Date: Tue, 5 Sep 2023 16:33:15 +0100 Subject: [PATCH 1/2] Add initial translation Adds initial translation for data breach form (diolch, Helo Blod) --- .../help/report_a_data_breach.cy.html.erb | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 lib/views/help/report_a_data_breach.cy.html.erb diff --git a/lib/views/help/report_a_data_breach.cy.html.erb b/lib/views/help/report_a_data_breach.cy.html.erb new file mode 100644 index 00000000..a666c56a --- /dev/null +++ b/lib/views/help/report_a_data_breach.cy.html.erb @@ -0,0 +1,94 @@ +

Report a data breach

+ +<% @title = "Report a data breach" %> + +<%= render partial: 'sidebar' %> + +
+

Defnyddiwch y ffurflen hon i roi gwybod am dor diogelwch data

+ +

Os ydych yn credu eich bod wedi nodi achos o dor diogelwch data mewn + ymateb a ddarparwyd i gais a wnaed drwy WhatDoTheyKnow, defnyddiwch y + ffurflen hon i adrodd am y digwyddiad.

+ + <%= form_with model: @report, url: help_report_a_data_breach_handle_form_submission_path, html: { class: 'contact-form' } do |f| %> + + <%= foi_error_messages_for :report %> + +

+ <%= f.label :url, "Rhowch ddolen i'r cais neu'r atodiad sy'n cynnwys yr achos o dor diogelwch data." %> + + Fel arall, gallwch ddarparu cyfeiriad e-bost y cais, os yw'n hysbys. +
+
+ + <%= f.text_field :url %> +

+ +

+ <%= f.label :message, "Rhowch fanylion am yr achos hwn o dor diogelwch data" %> + <%= f.text_area :message, rows: 3 %> +

+ +

+ <%= f.check_box :special_category_or_criminal_offence_data, id: 'special_category_or_criminal_offence_data' %> + +

+ +

+ <%= f.label :contact_email, "Rhowch gyfeiriad e-bost y Swyddog Diogelu Data (os yw'n hysbys):" %> + <%= f.text_field :contact_email %> +

+ +

+ + <%= f.label :is_public_body_yes, class: 'form_inline' do %> + <%= f.radio_button :is_public_body, true %> + Ydw + <% end %> + <%= f.label :is_public_body, class: 'form_inline' do %> + <%= f.radio_button :is_public_body, false %> + Nac ydw + <% end %> +

+ +
+ <%= f.submit "Send" %> +
+ + <%= render partial: 'contact_form_privacy_notice' %> + <% end %> + +

+ Further information + # +

+ +

+ We take all incidents reported via this form extremely seriously, and aim to acknowledge and investigate all reports promptly. +

+

+ Special Category data and Criminal Offence data are defined by Section 10 of the Data Protection Act 2018. +

+

+ Special Category information includes personal data revealing racial or ethnic origin, political opinions, religious or philosophical beliefs, trade union membership, health, information about a person’s sex life or sexual orientation. +

+

+ Criminal Offence data includes the personal information of offenders or suspected offenders, relating to criminal convictions and offences, including the investigation of, or proceedings for, any offence or alleged offence. +

+

+ Please see the relevant ICO Guidance for more information: +

+

+ + + <%= render partial: 'history' %> + + +
From c4595866fe8d1f87d5e304d89bbc1c91636098f1 Mon Sep 17 00:00:00 2001 From: Martyn Dewar <249418+mdeuk@users.noreply.github.com> Date: Tue, 5 Sep 2023 16:46:43 +0100 Subject: [PATCH 2/2] Add link to data breach form (diolch, Helo Blod) --- lib/views/help/_contact_form.cy.html.erb | 250 +++++++++++++++-------- 1 file changed, 169 insertions(+), 81 deletions(-) diff --git a/lib/views/help/_contact_form.cy.html.erb b/lib/views/help/_contact_form.cy.html.erb index e096add9..ac896bb8 100644 --- a/lib/views/help/_contact_form.cy.html.erb +++ b/lib/views/help/_contact_form.cy.html.erb @@ -1,85 +1,173 @@ -<%= form_for :contact, - :url => help_contact_path + '#' + form_id, - :html => {:class => 'contact-form'} do |f| %> - -

- <%= f.check_box :understand, :required => true %> -

+

<%= @title %>

+

Pwy hoffech gysylltu â nhw?

+ +
+ +

+ -

- <% if not @user %> -

- - <%= f.text_field :name, :size => 20, :required => true %> - (Neu <%= link_to "fewngofnodwch", - signin_url( - :r => request.fullpath + '#' + form_id) %>) - <%= f.text_field :name, :size => 20 %> -

- -

- - <%= f.text_field :email, :size => 20 %> -

- <% end %> - -

- - <%= f.text_field :subject, - :size => 50, - :required => true, - :class => "message-subject" %> -

- -

-

+ + +
+
    +
  • + Ewch yma i wneud + cais, yn gyhoeddus, am wybodaeth gan awdurdodau cyhoeddus + yn y DU. +
    • +
  • + Os oes angen i chi drafod materion personol gyda chyngor y DU, + dylech + find wyf nhw ar GOV.UK. +
    • +
  • + Os ydych yn cael trafferth cael y gwasanaeth mae arnoch ei angen + o gorff llywodraeth yna gall swyddfa eich AS yn aml + helpu. Gallwch ysgrifen + at eich AS ar WriteToThem.com. +
    • +
+
+ +

+ - <%= f.text_area :message, :rows => 10, :cols => 60, :required => true %> -

- -

- <%= f.label :comment, 'Peidiwch â llenwi’r yn y maes hwn' %> - <%= f.text_field :comment %> -

- - <% if !@last_request.nil? %> -

- - <%=request_link(@last_request) %> - <%= submit_tag "remove", :name => 'remove' %> -

- <% end %> - <% if !@last_body.nil? %> -

- - <%=public_body_link(@last_body) %> - <%= submit_tag "remove", :name => 'remove' %> -

- <% end %> - - <% if @recaptcha_required %> - <%= recaptcha_tags %>
- <% end %> - -
- - <%= hidden_field_tag(:current_form, form_id) %> - <%= hidden_field_tag(:submitted_contact_form, 1) %> - <%= submit_tag "Anfon neges i dîm WhatDoTheyKnow", :data => { :disable_with => "Anfon…" } %> +

+ + +
+ +
+ + +

+ +

+ + checked<% end %>> +
+
    +
  • + Cysylltwch yn uniongyrchol â'r tîm sy'n rhedeg WhatDoTheyKnow: + + <%= foi_error_messages_for :contact %> + + <%= render :partial => "help/contact_form", + :locals => { :form_id => 'writing-help' } %> +
    • +
+
+ +

+ +

+ + checked<% end %>> +
+
    +
  • + Defnyddiwch y ffurflen hon os oes gennych ddiddordeb mewn gwirfoddoli ar gyfer + WhatDoTheyKnow +
    • +
  • + Os hoffech fwy o wybodaeth am ba wirfoddoli, gweld + <%= link_to _("ein tudalen cymryd rhan"), help_volunteers_path %>. +
    • +
  • + <%= foi_error_messages_for :contact %> + + <%= render :partial => "help/contact_volunteer_form", + :locals => { :form_id => 'wdtk-volunteer' } %> +
    • +
+
+ +

+ +

+ + checked<% end %>> +
+
    +
  • + Rydym yn awyddus i ddeall eich pryderon, a byddwn yn gweithredu yn + unol + <%= link_to "â'n gweithdrefn ar drin gwybodaeth bersonol a ryddhawyd yn ddamweiniol", help_how_path(anchor: 'accidentally_released') %>. +
    • + +
  • + Er mwyn caniatáu i ni helpu'n gyflymach, defnyddiwch ein ffurflen + <%= link_to 'adrodd am dor diogelwch data', help_report_a_data_breach_path %> + form. +
    • +
+
+ +

+ +

+ + checked<% end %>> +
+
    +
  • + Yn gyntaf, rhowch gynnig ar wirio our + tudalennau cymorth helaeth, sy'n cynnwys ateb i'r rhan fwyaf + materion a chwestiynau sydd gennych. +
    • +
  • + Os nad yw eich problem yn dod o dan ein tudalennau cymorth, gallwch + gysylltu'n uniongyrchol â'r tîm sy'n rhedeg WhatDoTheyKnow: + + <%= foi_error_messages_for :contact %> + + <%= render :partial => "help/contact_form", + :locals => { :form_id => 'wdtk' } %> +
    • +
- <%= render :partial => "contact_form_privacy_notice" %> -<% end %> +
+