Le formulaire de demande d'informations est plus complet

This commit is contained in:
echarp 2014-06-30 00:52:45 +02:00
parent 87fa8365eb
commit c30a74af25
5 changed files with 31 additions and 8 deletions

View File

@ -16,4 +16,4 @@
.actions= f.submit t('.sign_in') .actions= f.submit t('.sign_in')
= render "devise/shared/links" = render 'devise/shared/links'

View File

@ -8,7 +8,7 @@
= link_to lug.name, lug.url = link_to lug.name, lug.url
(#{lug.department}) (#{lug.department})
%h1 Actions %h1=t '.actions'
= link_to t('.add_to_calendar'), root_url = link_to t('.add_to_calendar'), root_url
%h2 %h2

View File

@ -46,15 +46,15 @@
=t '.france' =t '.france'
%li %li
= link_to 'http://www.agendadulibre.qc.ca' do = link_to 'http://www.agendadulibre.qc.ca' do
= image_tag 'france.png', alt: "#{t '.flag' } #{t '.quebec'}" = image_tag 'quebec.png', alt: "#{t '.flag' } #{t '.quebec'}"
=t '.quebec' =t '.quebec'
%li %li
= link_to 'http://www.agendadulibre.be' do = link_to 'http://www.agendadulibre.be' do
= image_tag 'france.png', alt: "#{t '.flag' } #{t '.belgique'}" = image_tag 'belgique.png', alt: "#{t '.flag' } #{t '.belgique'}"
=t '.belgique' =t '.belgique'
%li %li
= link_to 'http://www.agendadulibre.ch' do = link_to 'http://www.agendadulibre.ch' do
= image_tag 'france.png', alt: "#{t '.flag' } #{t '.suisse'}" = image_tag 'suisse.png', alt: "#{t '.flag' } #{t '.suisse'}"
=t '.suisse' =t '.suisse'
= render 'layouts/flash', flash: flash if flash.present? = render 'layouts/flash', flash: flash if flash.present?

View File

@ -1,14 +1,33 @@
= form_for [:moderation, @note] do |f| = form_for [:moderation, @note] do |f|
= hidden_field_tag :envoiParMail, params[:envoiParMail]
- if @note.errors.any? - if @note.errors.any?
#error_explanation #error_explanation
%h2= "#{pluralize(@note.errors.count, "error")} prohibited this note from being saved:" %h2= "#{pluralize(@note.errors.count, "error")} prohibited this note from being saved:"
%ul %ul
- @note.errors.full_messages.each do |msg| - @note.errors.full_messages.each do |msg|
%li= msg %li= msg
- if params[:envoiParMail]
= hidden_field_tag :envoiParMail, params[:envoiParMail]
%h2=t '.title'
%p=t 'title', scope: [:note_mailer, :create]
%p=t 'body', scope: [:note_mailer, :create], subject: @note.event.title, contents: @note.contents
.field .field
%p.label= f.label Note.human_attribute_name :contents %p.label= f.label Note.human_attribute_name :contents
= f.text_area :contents, cols: 70, rows: 10 = f.text_area :contents, cols: 70, rows: 10
- if params[:envoiParMail]
:markdown
#{t 'edit_link', scope: [:note_mailer, :create]}
#{ edit_moderation_url @note.event}
#{t 'signature', scope: [:note_mailer, :create]}
.actions
= f.submit t('.save')
- else
.actions .actions
= f.submit t('save') = f.submit t('save')

View File

@ -121,6 +121,7 @@ fr:
dateAndPlace: Date et lieu dateAndPlace: Date et lieu
description: Description description: Description
infos: Informations infos: Informations
actions: Actions
new: new:
title: Soumettre un évènement title: Soumettre un évènement
create: create:
@ -189,6 +190,9 @@ fr:
title: Ajout d'une note de modération title: Ajout d'une note de modération
create: create:
ok: La note a bien été ajoutée, merci! ok: La note a bien été ajoutée, merci!
form:
title: Rédaction du message
save: Envoyer
maps: maps:
index: index:
title: Carte des évènements title: Carte des évènements