Merge branch 'demarches-simplifiees:main' into poc-self_hosted_runners
This commit is contained in:
commit
5f8ae0ae8a
6 changed files with 12 additions and 14 deletions
1
Gemfile
1
Gemfile
|
@ -110,7 +110,6 @@ group :test do
|
|||
gem 'shoulda-matchers', require: false
|
||||
gem 'timecop'
|
||||
gem 'vcr'
|
||||
gem 'webdrivers'
|
||||
gem 'webmock'
|
||||
end
|
||||
|
||||
|
|
|
@ -425,7 +425,7 @@ GEM
|
|||
rake
|
||||
mini_magick (4.11.0)
|
||||
mini_mime (1.1.2)
|
||||
mini_portile2 (2.8.2)
|
||||
mini_portile2 (2.8.4)
|
||||
minitest (5.18.1)
|
||||
msgpack (1.4.2)
|
||||
multi_json (1.15.0)
|
||||
|
@ -770,10 +770,6 @@ GEM
|
|||
activemodel (>= 6.0.0)
|
||||
bindex (>= 0.4.0)
|
||||
railties (>= 6.0.0)
|
||||
webdrivers (5.2.0)
|
||||
nokogiri (~> 1.6)
|
||||
rubyzip (>= 1.3.0)
|
||||
selenium-webdriver (~> 4.0)
|
||||
webfinger (1.2.0)
|
||||
activesupport
|
||||
httpclient (>= 2.4)
|
||||
|
@ -933,7 +929,6 @@ DEPENDENCIES
|
|||
vite_rails
|
||||
warden
|
||||
web-console
|
||||
webdrivers
|
||||
webmock
|
||||
zipline
|
||||
zxcvbn-ruby
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.autosave.autosave-state-idle{ data: { controller: 'autosave-status' } }
|
||||
%p.autosave-explanation.fr-text--sm
|
||||
%p.autosave-explanation.fr-text--sm.fr-mb-0
|
||||
%span.autosave-explanation-text
|
||||
- if annotation?
|
||||
= t('.annotations.explanation')
|
||||
|
@ -10,7 +10,7 @@
|
|||
- if !annotation?
|
||||
= link_to t('.more_information'), t("links.common.faq.autosave_url"), class: 'autosave-more-infos fr-link fr-link--sm', **external_link_attributes
|
||||
|
||||
%p.autosave-status.succeeded
|
||||
%p.autosave-status.succeeded.fr-mb-0
|
||||
%span.autosave-icon.icon.accept
|
||||
%span.autosave-label
|
||||
- if annotation?
|
||||
|
@ -22,7 +22,7 @@
|
|||
- if !annotation?
|
||||
= link_to t('.more_information'), t("links.common.faq.autosave_url"), class: 'autosave-more-infos fr-link fr-link--sm', **external_link_attributes
|
||||
|
||||
%p.autosave-status.failed
|
||||
%p.autosave-status.failed.fr-mb-0
|
||||
%span.autosave-icon ⚠️
|
||||
%span.autosave-label
|
||||
- if annotation?
|
||||
|
|
|
@ -3,4 +3,4 @@ en:
|
|||
submit: Submit the file
|
||||
submit_changes: Submit file changes
|
||||
submitting: Submitting…
|
||||
invite_notice: You are invited to make amendments to this file but only the owner themselves can submit it.
|
||||
invite_notice: You are invited to make amendments to this file but <strong>only the owner themselves can submit it</strong>.
|
||||
|
|
|
@ -3,4 +3,4 @@ fr:
|
|||
submit: Déposer le dossier
|
||||
submit_changes: Déposer les modifications
|
||||
submitting: Envoi en cours…
|
||||
invite_notice: En tant qu’invité, vous pouvez remplir ce formulaire – mais le titulaire du dossier doit le déposer lui-même.
|
||||
invite_notice: En tant qu’invité, vous pouvez remplir ce formulaire – mais <strong>le titulaire du dossier doit le déposer lui-même</strong>.
|
||||
|
|
|
@ -9,8 +9,12 @@
|
|||
|
||||
|
||||
- if @dossier.brouillon? && !owner?
|
||||
.send-notice.invite-cannot-submit
|
||||
= t('.invite_notice')
|
||||
.fr-pb-2w.invite-cannot-submit
|
||||
= render ::Dsfr::AlertComponent.new(state: :info, title: nil, size: :sm, heading_level: :p, extra_class_names:'') do |c|
|
||||
- c.body do
|
||||
%p.fr-pb-0= t('.invite_notice').html_safe
|
||||
|
||||
|
||||
|
||||
- if !annotation?
|
||||
= render partial: "shared/dossiers/submit_is_over", locals: { dossier: @dossier }
|
||||
|
|
Loading…
Reference in a new issue