DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3255 from betagouv/fix-send-button

Browse source 
Messagerie : corrige l'affichage du bouton "Envoyer" sur mobile
This commit is contained in:
Pierre de La Morinerie 2019-01-07 16:35:45 +01:00 committed by GitHub
commit d9acc47562
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/new_design/flex.scss
View file

@ -24,4 +24,8 @@
&.justify-start { &.justify-start {
justify-content: flex-start; justify-content: flex-start;
} }
&.wrap {
flex-wrap: wrap;
}
} }

4
app/views/shared/dossiers/messages/_form.html.haml
View file

@ -1,6 +1,6 @@
= form_for(commentaire, url: form_url, html: { class: 'form' }) do |f| = form_for(commentaire, url: form_url, html: { class: 'form' }) do |f|
= f.text_area :body, rows: 5, placeholder: 'Répondre ici', required: true, class: 'message-textarea' = f.text_area :body, rows: 5, placeholder: 'Répondre ici', required: true, class: 'message-textarea'
.flex.justify-between .flex.justify-between.wrap
%div %div
= f.file_field :file, id: :file, accept: commentaire.file.accept_extension_list = f.file_field :file, id: :file, accept: commentaire.file.accept_extension_list
%label{ for: :file } %label{ for: :file }
@ -8,4 +8,4 @@
(taille max : 20 Mo) (taille max : 20 Mo)
%div %div
= f.submit 'Envoyer', class: 'button primary send', data: { disable: true } = f.submit 'Envoyer le message', class: 'button primary send', data: { disable: true }

2
spec/features/new_user/dossier_shared_examples.rb
View file

@ -31,7 +31,7 @@ RSpec.shared_examples 'the user can send messages to the instructeur' do
expect(page).to have_content(commentaire.body) expect(page).to have_content(commentaire.body)
fill_in 'commentaire_body', with: message_body fill_in 'commentaire_body', with: message_body
click_on 'Envoyer' click_on 'Envoyer le message'
expect(page).to have_current_path(messagerie_dossier_path(dossier)) expect(page).to have_current_path(messagerie_dossier_path(dossier))
expect(page).to have_content('Message envoyé') expect(page).to have_content('Message envoyé')