Commit graph

3195 commits

Author SHA1 Message Date
krichtof
8c5308b9dc
Merge pull request #5396 from betagouv/5395-relancer-expert
5395 instructeur : relance un expert pour une demande d'avis
2020-07-21 15:02:53 +02:00
Christophe Robillard
689a51588f translations for avis list view 2020-07-21 10:46:55 +02:00
Christophe Robillard
d9cb5c067f relance un expert 2020-07-20 16:26:16 +02:00
Christophe Robillard
bde8fe2c5d update wording for revoke 2020-07-20 16:08:35 +02:00
kara Diaby
06b90077d3 some fixes to new admin interface 2020-07-20 15:45:18 +02:00
clemkeirua
bc34905742 fix heading order by removing useless h4 2020-07-20 11:36:55 +02:00
Christophe Robillard
4476f00be2 fix active link menu for demarches 2020-07-20 11:26:19 +02:00
krichtof
0c95e41c6f
Merge pull request #5386 from betagouv/5138-revoque-avis-expert
[Revoque une demande d'avis à un expert](https://github.com/betagouv/demarches-simplifiees.fr/pull/5386)
2020-07-17 20:42:13 +02:00
kara Diaby
5e43559329 fix new admin interface regarding test links and previsualisation 2020-07-17 11:10:54 +02:00
Christophe Robillard
52e8f32e19 expert can only revoke avis claimed by him/her 2020-07-16 21:07:20 +02:00
Christophe Robillard
3ea34834a7 revoke expert avis 2020-07-16 21:05:11 +02:00
clemkeirua
889cdd6874 ajout des annotations privées 2020-07-16 18:13:51 +02:00
kara Diaby
b69bc11ae4 new design for procedure detail (admin) 2020-07-16 10:40:58 +02:00
kara Diaby
9dc542af09 Revert "Revert "Feat/5287 - New design for admin procedure detail""
This reverts commit cf5eb3f251.
2020-07-15 17:00:03 +02:00
Christophe Robillard
8111babdd6 user: revoque un invité sur un dossier 2020-07-14 18:25:31 +02:00
Kara Diaby
cf5eb3f251
Revert "Feat/5287 - New design for admin procedure detail" 2020-07-13 11:36:42 +02:00
kara Diaby
7f3b38cfee Merge admin dashboard to new design for procedure details 2020-07-09 12:18:22 +02:00
Christophe Robillard
dfc97d8d87 allège l'affichage des décisions rendues 2020-07-08 18:15:15 +02:00
Christophe Robillard
f0e0554da9 display instructeur_email who took decision only if email is present 2020-07-08 18:15:15 +02:00
Christophe Robillard
1253bb5994 store instructeur_email in traitement 2020-07-08 18:15:15 +02:00
Christophe Robillard
8f9d6d2871 show which instructeur took decision and when
and also replace "sans suite" by "classé sans suite"
2020-07-08 18:15:15 +02:00
Christophe Robillard
a072d35211 use traitement model
when a dossier is terminated (accepte, refuse or classe_sans_suite),
we store now `processed_at` and `motivation` in a traitement instance
2020-07-08 18:15:15 +02:00
clemkeirua
b440f41cd8 change link from to contact to FAQ on home 2020-07-08 16:22:55 +02:00
Judith
927a3b3efd fix all instructeur procedure_path into instructeur_procedure_path 2020-07-07 17:11:46 +02:00
Judith
060022df78 fix instructeur_mail_notifications 2020-07-07 17:11:46 +02:00
Judith
2adb854bf8 new_from_existing : added new route for 'Consulter' 2020-07-07 14:51:08 +00:00
Judith
9793128f61 'Services' routes moved under 'new_administrateur' scope and '/admn' added in their url 2020-07-07 14:08:01 +00:00
Judith
782706537d Changed the routes to pass all new design admin pages under
'new_administrateur' scope, except 'services'.
As a result, the url of these pages will all include '/admin'.
2020-07-07 14:08:01 +00:00
Pierre de La Morinerie
975d1648d5 dossier: fix PDF rendering of effectif_mensuel
The effectif_mensuel was a number, it needs to be converted explicitely
into a string.

As a bonus, `nil.to_s` is `""`, so we can remove the special case for
nil.
2020-07-06 11:41:25 +02:00
clemkeirua
ca74ae5a5e ajout d'une bannière de dépréciation pour IE11 2020-07-06 10:01:02 +02:00
maatinito
1c29e903da pdf dossier: better layout for etablissement fields 2020-07-02 13:53:36 +02:00
Myriam
0f542527fb Instructeur : add overview table with counts for files
- changement du design
- tableau visible seulement si plus d'une procédure
2020-07-02 09:02:49 +00:00
Myriam
a486fe9a2e Instructeur : add overview table with counts for files
nombre total de dossier :
- 'à suivre'
- 'suivi'
- 'traité'
- 'dossier'
- 'archivé'
2020-07-02 09:02:49 +00:00
Pierre de La Morinerie
b8f6545963
Revert "pdf dossier: better layout for etablissement fields" 2020-07-01 15:59:05 +02:00
bors[bot]
b135b5cfb0
Merge #5316
5316: fix missing aria-labels in footer r=Keirua a=Keirua

début du cleanup des exclusions d'accessibilité
(et bon candidat pour tester si bors fonctionne comme prévu)

Co-authored-by: clemkeirua <clement@keiruaprod.fr>
2020-07-01 09:28:02 +00:00
maatinito
bc8d88af73 pdf dossier: better layout for etablissement fields 2020-06-30 15:09:38 -10:00
Christophe Robillard
1d86f863d3 rename avis#all to avis#index 2020-06-30 09:17:27 +02:00
Christophe Robillard
bbec76d33b rename avis#index to avis#procedure 2020-06-30 09:17:27 +02:00
Christophe Robillard
8f2b09ae06 fix active_links in header 2020-06-30 09:17:27 +02:00
Christophe Robillard
63dd71aed4 display all avis for an expert 2020-06-30 09:17:27 +02:00
Christophe Robillard
29e2d3d7eb display all avis for a procedure for an expert 2020-06-30 09:17:27 +02:00
Christophe Robillard
c565c9c87b refactor sign_up_instructeur_avis_url 2020-06-30 09:17:27 +02:00
Christophe Robillard
4839506374 refactor instructeur_avis_url 2020-06-30 09:17:27 +02:00
Christophe Robillard
b0cfb2c02a refactor messagerie_instructeur_avis_url 2020-06-30 09:17:27 +02:00
Christophe Robillard
83fba55b29 refactor instruction_instructeur_avis_url 2020-06-30 09:17:27 +02:00
Christophe Robillard
72d27ffdb2 replace instructeur_avis_index url by instructeur_all_avis url 2020-06-30 09:17:27 +02:00
clemkeirua
1072bacb12 fix missing aria-labels in footer 2020-06-29 15:31:14 +02:00
kara Diaby
6b07cc0659 Move admin/assigns to the new UI like groupe_instructeurs 2020-06-29 14:44:28 +02:00
Pierre de La Morinerie
d25e173f11 attachment: disable Delete button during request
Prevent users from clicking the Delete button more than once.
2020-06-29 12:28:53 +00:00
Judith
73ee4d69ca usager/dossiers: the link to the dossier is present:
- in the 'N° de dossier' column for mouse users and screen reader users.
- in the 'Démarche' column for mouse users, screen reader users and keyboard users.
Also added a sr-only class for text which should be read by screen-readers but not visible or accessible to other users
2020-06-29 11:57:48 +00:00
Paul Chavard
97f91513c8 Store drop_down_list values as jsonb 2020-06-25 13:14:17 +02:00
Pierre de La Morinerie
84149218db dossier: refactor piece_justificative export helpers 2020-06-24 15:42:30 +02:00
Judith
235a406295 Spectral removed and replaced by Marianne-thin 2020-06-24 13:11:04 +00:00
Judith
b7fe9418fd adapting font size to fit previous size with LiberationSerif 2020-06-24 13:11:04 +00:00
Judith
c3a6f671c8 replaced LiberationSerif regular and bold by Marianne, italic by Spectral-Italic 2020-06-24 13:11:04 +00:00
clemkeirua
6b3631dbfe extract rendering condition 2020-06-24 14:11:58 +02:00
clemkeirua
5c39f22417 seuil d'affichages des checbox/radio à 5 elements 2020-06-24 12:18:56 +02:00
clemkeirua
342129c893 display small multiple selects as checkboxes 2020-06-24 12:18:56 +02:00
clemkeirua
22fc4c4195 display small selects as radio buttons 2020-06-24 12:18:56 +02:00
clemkeirua
53ecd48be2 set email autocomplete during registration
username is an invalid autocomplete attribute for input type=email, but email is not
2020-06-23 14:58:56 +00:00
clemkeirua
cca84a62ca meilleurs descriptions aria au signup 2020-06-23 14:58:56 +00:00
clemkeirua
58b110b88a invalid image width '-_- 2020-06-23 14:58:56 +00:00
Judith
af60b1dddc help_dropdown_procedure contains now a <button> and not a <div>, which makes it accessible for keyboard navigation 2020-06-18 11:17:39 +02:00
Judith
19e54a73b0 replacing ' with ’ in text 2020-06-16 14:39:27 +00:00
Judith
1b7a4574e8 headers : aria-label in print button 2020-06-16 14:39:27 +00:00
Judith
b02f1e4c34 fixed empty links in contact footer 2020-06-16 14:39:27 +00:00
Judith
ef242649c6 homogenization of the mandatory-explanation 2020-06-16 14:39:27 +00:00
Judith
b88dc6ec72 mandatory_explanation added in the description and changed PJ label_tag to :piece_jointe 2020-06-16 14:39:27 +00:00
jpoulvel
adaf0753b0
Merge branch 'dev' into instruct-filter-yes-no 2020-06-16 14:53:22 +02:00
Paul Chavard
0c16a9b1a6 Remove quartiers_prioritaires and parcelles_agricoles from the geo areas list 2020-06-10 17:26:09 +02:00
Paul Chavard
711a80746d Display geo areas descriptions 2020-06-10 17:26:09 +02:00
Judith
ad53dfa84d Instructeurs: Changed the filters from 'true/false' to 'oui/non' for yes_no type_de_champ 2020-06-10 15:50:41 +02:00
Paul Chavard
83baa58aa6 Add editing flag to geo areas list 2020-06-09 18:45:45 +02:00
Christophe Robillard
95cca8e0d5 affiche les chiffres clés des 3 derniers bilans 2020-06-09 17:51:54 +02:00
Christophe Robillard
75b24fbad5 suffixe les libellés par ':' 2020-06-09 17:01:03 +02:00
Christophe Robillard
81fa1d0e89 utilise un ordre plus logique pour identite entreprise
homogenise l'affichage des valeurs monétaires
elargit la colonne libellé
2020-06-09 16:59:57 +02:00
Paul Chavard
901b6e23a8 Remove legacy carto 2020-06-04 16:03:23 +02:00
Christophe Robillard
23cc618dda export bilans for avis 2020-06-04 15:31:16 +02:00
Christophe Robillard
cf9d6ccf34 export bilans in ods and xlsx 2020-06-04 15:31:16 +02:00
clemkeirua
f101658d1a add a h1 title to the page 2020-06-04 13:16:44 +00:00
clemkeirua
571875e0f3 replace invalid h3 2020-06-04 13:16:44 +00:00
clemkeirua
e6efddd886 remove redundant links 2020-06-04 13:02:35 +00:00
clemkeirua
abe0e321ac include the libelle with the redirection link 2020-06-04 13:02:35 +00:00
clemkeirua
32dd76dd77 clarification des éléments de création de compte 2020-06-04 12:34:19 +00:00
Christophe Robillard
75a268aed6 show some info from bilans 2020-06-04 12:33:33 +02:00
kara Diaby
f104567619 Add 2 cards style for MapEditor + optim import gpx kml 2020-06-02 13:24:29 +02:00
Pierre de La Morinerie
ab54b8a45e views: modernisation.gouv.fr -> numerique.gouv.fr
Fix #4161
2020-06-02 11:40:59 +02:00
Judith
d930124839 change procedure_auto_archive helper name and added a helper for 23 h 59 2020-05-28 13:22:02 +00:00
Judith
6b65ee8d15 mailers: display auto-archive date in notifications 2020-05-28 13:22:02 +00:00
Judith
38eb60f2ac views: display auto-archive date on procedure description 2020-05-28 13:22:02 +00:00
Judith
59346ee868 mailers: mention the auto_archive in notify_new_draft 2020-05-28 13:22:02 +00:00
Judith
e73086ee4c views: added the precision of the time zone for auto_archive
fix #5181
2020-05-28 13:22:02 +00:00
clemkeirua
87f1e63e1b ajout de precisions pour les emails non reçus 2020-05-26 15:46:51 +02:00
Keirua
0727f99ac8
reformulation d'un libelle de l'editeur de services
Co-authored-by: Pierre de La Morinerie <pierre.de_la_morinerie@beta.gouv.fr>
2020-05-26 15:28:27 +02:00
clemkeirua
21ad7055a2 precisions sur le caractère obligatoire des infos de service 2020-05-25 15:47:02 +02:00
Christophe Robillard
f40123fee1 display only etablissement infos
all the other infos are not yet available because the jobs which
retrieve it are performed later
2020-05-20 11:09:54 +02:00
Pierre de La Morinerie
c9820adbc4 urls: fix link to autosave FAQ article 2020-05-18 16:53:19 +02:00
Christophe Robillard
d4bb5d1f56 indique à l'usager les pièces ajoutées au dossier
- attestation sociale
- attestation fiscale
- bilans bdf
2020-05-18 16:01:13 +02:00
clemkeirua
22a518c921 ajout d'un bouton d'export des mails des demandeurs 2020-05-18 12:46:42 +00:00
clemkeirua
9454017dd9 afficher le nom du service en alt si possible 2020-05-18 14:17:21 +02:00
clemkeirua
a49581cbe9 replaced marianne logo for homepage 2020-05-14 14:08:05 +00:00
clemkeirua
1702903ffd ajout d'une alternative sur la marianne en header 2020-05-14 14:08:05 +00:00
clemkeirua
c5d2b4abd8 new logo in footer on home 2020-05-14 14:08:05 +00:00
Paul Chavard
d44df9cc2a Fix map apercu 2020-05-14 14:28:54 +02:00
clemkeirua
84888be255 clarification de l'archivage/suppression 2020-05-13 16:45:27 +02:00
Pierre de La Morinerie
b5f1d97629 app: disable Turbolinks
Fix #5039
2020-05-13 11:04:16 +02:00
Pierre de La Morinerie
82cf9e26e1 app: remove tooltips on the old design
- Tooltips are no longer used anywhere
- They cause an error on app initialisation

Fixes "TypeError: dataAttributes.hasOwnProperty is not a function" error
that we've been seeing recently on Sentry.
2020-05-11 17:26:29 +02:00
Christophe Robillard
aab4bb81ee return bilan bdf csv for expert 2020-05-11 13:05:50 +02:00
Christophe Robillard
cad8245540 fix bilans bdf link 2020-05-11 13:05:50 +02:00
Christophe Robillard
5a27629ee9 add effectifs in instructeur dossier pdf export 2020-05-06 18:01:01 +02:00
Paul Chavard
05e408225b Implement atomic operations on MapEditor 2020-05-06 16:46:14 +02:00
clemkeirua
088e08ff55 descriptions sur tous les types de champs 2020-05-05 20:50:39 +02:00
clemkeirua
f8519a6920 ajout des descriptions - cas general 2020-05-05 20:50:39 +02:00
clemkeirua
7065accf64 ajout du descriptif de procedure dans le pdf 2020-05-05 20:50:39 +02:00
Christophe Robillard
733e282e76 fix identite entreprise view 2020-04-30 16:53:33 +02:00
Christophe Robillard
22e2c2e133 render csv bidf bilans 2020-04-30 16:15:16 +02:00
Paul Chavard
843e033c38 Allow instructeurs to download a GeoJSON document for a given dossier 2020-04-30 15:49:43 +02:00
Paul Chavard
ef2d9e1138 Expose stable_id on champ 2020-04-30 15:49:31 +02:00
Christophe Robillard
59357f2100 show attestations sociales and fiscales only for instructeurs 2020-04-30 11:53:17 +02:00
Christophe Robillard
3ddb5a4cb4 store attestation fiscale and display 2020-04-30 11:39:54 +02:00
Paul Chavard
b516cbc179 Enable republish on démarches dépubliée 2020-04-29 18:04:35 +02:00
Christophe Robillard
158b4802ab store attestation sociale and display 2020-04-29 16:25:47 +02:00
Christophe Robillard
14ff18ca80 store specific api-entreprise token for a procedure 2020-04-28 15:17:11 +02:00
clemkeirua
1ac7ec2dca precision dans mail suppression dossier en construction 2020-04-28 12:42:00 +00:00
kara Diaby
9aea1fffee Migrate the map editor to mapbox-gl with react component 2020-04-27 11:30:32 +02:00
Pierre de La Morinerie
04cf174039 Revert "app: add a warning about the file upload"
This reverts commit 7f45c7d97b.
2020-04-23 18:31:59 +02:00
Pierre de La Morinerie
0845777fa0 Merge branch 'file-banner' into dev 2020-04-23 17:00:49 +02:00
Pierre de La Morinerie
7f45c7d97b app: add a warning about the file upload 2020-04-23 16:54:27 +02:00
Paul Chavard
9cb612bb3d Show area and length on champ carto selections utilisateur 2020-04-23 10:21:18 +02:00
Christophe Robillard
453adf3c74 instructeurs: affiche l'effectif moyen annuel n-1 2020-04-23 09:53:27 +02:00
Christophe Robillard
85d119fa4d n'affiche plus le code effectif 2020-04-23 09:53:27 +02:00
Christophe Robillard
a507359f5c précise source pour effectifs mensuels 2020-04-23 09:53:27 +02:00
Paul Chavard
f1b531911b Handle processed dossiers in deletion mailers 2020-04-22 15:39:10 +02:00
Christophe Robillard
149b98007f add effectif mensuel to graphql api 2020-04-21 21:13:07 +02:00
Christophe Robillard
db3ef195ad fetch and show effectif mensuel
- fetch and store effectif mensuel (at the creation of the dossier or
when updating a siret field

- show effectif mensuel only for instructeurs
2020-04-21 14:22:11 +02:00
Pierre de La Morinerie
52a491bde3 instructeur: improve description of unfiltered tab
The previous text was misleading: filters can be applied to this tab.
What it really does is present all dossiers regardless of their status.

Fix #5056
2020-04-20 11:34:57 +02:00
Paul Chavard
bc8217e030 Carte Editor sends FeatureCollection to the server 2020-04-16 18:29:19 +02:00
Paul Chavard
22604013d0 Expose multiple user selections on champ carte 2020-04-15 18:07:09 +02:00
Pierre de La Morinerie
9e76135b27 views: add identifiers to fooker links
In Sentry, when an `ActionController::InvalidAuthenticityToken` error
occurs, the breadcrumbs mention that before hitting the error, the user
clicked on one of those links.

Unfortunately we don't know which one. For debugging purposes, adding
classes to the links should allow us to see which links users are
navigating to.
2020-04-14 18:02:52 +02:00
clemkeirua
6df927a46f nom du demandeur dans user::dossiers#index si >=2 dossiers 2020-04-10 13:14:39 +02:00
Christophe Robillard
f683b850c3 Notifie instructeurs le souhaitant lors depot dossier
Notifie par mail uniquement les instructeurs qui le souhaitent à chaque dépôt de dossier
2020-04-09 15:02:05 +02:00
Christophe Robillard
ae18ff6627 Notifie tous les instructeurs lors dépôt dossier
- envoie un mail à tous les instructeurs d'une procédure après le dépôt
d'un nouveau dossier
2020-04-09 14:33:56 +02:00
Christophe Robillard
3ece41a614 homogénéise les majuscules en début de phrase 2020-04-09 14:17:07 +02:00
Christophe Robillard
969478b706 Envoie une notif aux followers_instructeurs le souhaitant
après chaque message déposé par l'usager
2020-04-09 14:17:07 +02:00
Christophe Robillard
415d5c765e envoie une notification à chaque follower_instructeur après un commentaire déposé 2020-04-09 14:17:07 +02:00
Paul Chavard
c83aaf69a6 Fix procedure.can_be_deleted_by_administrateur? check 2020-04-09 13:46:57 +02:00
Paul Chavard
61eaca928f remove WarnExpiringDossiersJob 2020-04-09 11:11:51 +02:00
kara Diaby
d18bc1c421 Improve the mapbox-gl support detection for older browsers 2020-04-09 11:01:20 +02:00
kara Diaby
56e9834389 Revert "Revert "Revert "Revert "feat/4893 - migrate the mapReader to mapbox-gl with react""""
This reverts commit 473ed00b6c.
2020-04-09 11:01:20 +02:00
clemkeirua
fbcf3de74c ajout du motif recherché dans l'écran de résultats 2020-04-09 09:42:31 +02:00
clemkeirua
9eafeac622 extract layouts/search_dossiers_form partial 2020-04-09 09:42:31 +02:00
clemkeirua
34188c432c refactor _new_header so that user and instructeur search share similar signature 2020-04-09 09:42:31 +02:00
Pierre de La Morinerie
72d003b62c javascript: fix missign argument to catch
Some browers complain about this.
2020-04-08 16:54:31 +02:00
kara Diaby
473ed00b6c Revert "Revert "Revert "feat/4893 - migrate the mapReader to mapbox-gl with react"""
This reverts commit fe0b3c2215.
2020-04-07 18:14:07 +02:00
kara Diaby
fe0b3c2215 Revert "Revert "feat/4893 - migrate the mapReader to mapbox-gl with react""
This reverts commit 3e21b78142.
2020-04-07 18:11:11 +02:00
Pierre de La Morinerie
3e21b78142
Revert "feat/4893 - migrate the mapReader to mapbox-gl with react" 2020-04-07 15:32:14 +02:00
Pierre de La Morinerie
dc6ff3b4ea mailers: in avis requests, replace the small CTA link by a large button
Fix #3402
2020-04-07 12:05:36 +02:00
Pierre de La Morinerie
52afb41bab js: fix errors on browsers not supporting window.scroll options
IE and Safari only know about `window.scroll(x, y)`, and not the form
with options.
2020-04-06 18:30:15 +02:00
Pierre de La Morinerie
ded65cfdb9 dossier: fix rendering of piece_justificative in repetition
In repetitions we can't render the piece_justificative champ in the way
we do for normal champs (which was already a bit hackish).

Instead we render the whole form partial – and then extract the champ
from the form. In this way, we're sure to render the champ as it
appears in the form, without any hacks to reproduce the form structure.
2020-04-06 11:50:31 +02:00
Christophe Robillard
4fcbfffec1 laisse afficher le message flash avec le fichier à télécharger 2020-04-06 10:12:00 +02:00
Pierre de La Morinerie
e166f89aa0 identite: remove the "*" for required labels
When all fields are required, it's better to say nothing.
2020-04-02 17:34:00 +02:00
Pierre de La Morinerie
7f629ffca1 identite: mark the radio buttons as actually required 2020-04-02 17:34:00 +02:00
kara Diaby
aa56cfd7a0 migrate map to mapbox-gl with a react component 2020-04-02 15:39:47 +02:00
Pierre de La Morinerie
c4f2e6cab0 credentials: add autocomplete attributes
Allow browsers to autofill more informations.

References:
- MDN: Autofill (https://developer.mozilla.org/fr/docs/Web/HTML/Attributs/autocomplete)
- Safari Password Autofill (https://developer.apple.com/documentation/security/password_autofill/enabling_password_autofill_on_an_html_input_element)
2020-04-02 12:07:42 +02:00
Paul Chavard
7ba4c513e6 Refactor notify near deletion mailers 2020-04-01 17:40:52 +02:00
Paul Chavard
e4ab2574ce Démarches discarded by administrateur can be reactivated in manager 2020-03-31 17:08:28 +02:00
Paul Chavard
da52ec30bd Undo discard dossiers and demarches from manager 2020-03-31 17:08:28 +02:00
Paul Chavard
876e05aed3 Discard demarches from manager 2020-03-31 17:08:28 +02:00
Pierre de La Morinerie
6417c0d2c0 dossiers: allow auto upload of attachments 2020-03-31 13:09:44 +02:00
Pierre de La Morinerie
ed5f2fa35f attestation: fix preview of logos
Turns out that assigning the params to the procedure calls `read` on the
images files. Calling `read` moves the seek offset to the end of the
file; which means that subsequent calls to `read` return an empty
string.

Fix the issue by calling `rewind` before attempting to `read` the file,
to ensure the seek offset is at the beginning of the file.

Fix #4958
2020-03-30 14:58:50 +02:00
clemkeirua
6a22ba7036 #4955 - ajout d'un bandeau d'informations coronavirus 2020-03-27 15:33:03 +01:00
Paul Chavard
c707a21f97 Rename delete_and_keep_track -> discard_and_keep_track 2020-03-26 14:23:23 +01:00
Paul Chavard
ec1cd989ab Show the reason on deleted dossiers 2020-03-25 16:57:03 +01:00
Pierre de La Morinerie
f895570b00 dossier: make the upload label a real label 2020-03-25 14:43:09 +01:00
clemkeirua
b4160e7554 added footer on static pages 2020-03-25 09:50:41 +00:00
clemkeirua
a34b45e4f4 make the 'male' field selected by default during identity creation 2020-03-25 09:50:41 +00:00
clemkeirua
1bdc0836a6 password length for screen reader on /users/sign_up
We use a placeholder (which is not made for this, but we have reasons to do that)
so using a visible labels or paragraph duplicates the information

I picked aria-describedby, which is not the ideal solution (it seems to be aria-labelledby) but which is the most widely supported

https://www.w3.org/WAI/tutorials/forms/instructions/#using-aria-describedby
2020-03-25 09:50:41 +00:00
Christophe Robillard
72783fd8fd replace status_badge partial by status_badge helper 2020-03-25 10:19:07 +01:00
Christophe Robillard
ba8cd8dde0 add explanation for deleted dossiers 2020-03-25 10:19:07 +01:00
Christophe Robillard
fcfa19a4aa add deleted dossiers title 2020-03-25 10:19:07 +01:00
Christophe Robillard
73d7ef4436 add space to deleted_dossier cells 2020-03-25 10:19:07 +01:00
Christophe Robillard
459153978d paginate deleted dossiers 2020-03-25 10:19:07 +01:00
Christophe Robillard
b4b92accf1 instructeur: show deleted dossiers for a procedure 2020-03-25 10:19:07 +01:00
maatinito
8ff34780d1 #4807 better wording 2020-03-24 16:46:24 -10:00
maatinito
f5c2dc03c5 #4807 better method/variable naming 2020-03-24 16:46:23 -10:00
Christian Lautier
e61c53f267 Fix #4807 48h before closing a procedure, notify users their draft is not submitted 2020-03-24 16:46:23 -10:00
clemkeirua
5896aedeeb added extension bouton to en_construction dossiers bound to expire 2020-03-24 18:10:51 +01:00
clemkeirua
6d02e6e9e8 replaced helper has_html_label? with inheritance 2020-03-24 16:54:36 +00:00
clemkeirua
2ecb9cd5a2 rename .label-not-label class into .form-label 2020-03-24 16:54:36 +00:00
clemkeirua
dc2b4598a5 remove orphaned label in identity screen 2020-03-24 16:54:35 +00:00
clemkeirua
5321f7c708 ajout de labels invisibles sur les champs d'invitation 2020-03-24 16:54:35 +00:00
clemkeirua
1a58dd69c2 replace html labels with h2 elements
Some elements should not be html labels, for example when they include sub-elements that contain labels (ex: a radio button that has a label on its own). Those are replaced with title elements
2020-03-24 16:54:35 +00:00
clemkeirua
62591623f4 ajout d'un label invisible pour le champ secondaire d'un menu déroulant lié 2020-03-24 16:54:35 +00:00
clemkeirua
26b20b719f ajout d'un label invisible sur le bouton 'mon compte' 2020-03-24 16:54:35 +00:00
clemkeirua
ce3e60190f add hidden label to 'Rechercher' in layout 2020-03-24 16:54:35 +00:00
clemkeirua
2e4f003ac8 ajout d'un fieldset sur le champ civilité 2020-03-24 16:54:35 +00:00
clemkeirua
6a24a9b84e ajout d'un fieldset sur les champs oui/non 2020-03-24 16:54:35 +00:00
kara Diaby
1f27652cd3 add files validations to models 2020-03-23 11:28:13 +01:00
Paul Chavard
cd0acb1344 Cleanup dossier mailers 2020-03-19 16:52:18 +01:00
simon lehericey
a10aa9602a do not link to deleted dossier 2020-03-18 15:25:02 +01:00
maatinito
ee3f5652f9 fix #4892 Allows cancelling declarative mode on procedure 2020-03-18 12:07:40 +01:00
Christophe Robillard
8e7f210216 affiche infos entreprise uniquement si diffusable
le champ de type siret affiche les infos d'une entreprise dont les infos sont diffusables uniquement aux instructeurs
2020-03-17 15:57:02 +00:00
Christophe Robillard
c21dd3b830 affiche infos d'un usager entreprise uniquement si diffusable
pour un usager de type entreprise qui a choisi de ne pas diffuser publiquement ses infos,
elles sont affichées uniquement aux instructeurs
2020-03-17 15:57:02 +00:00
kara Diaby
395af2fbb0 instructors : receive daily emails for declarative folders 2020-03-17 15:54:50 +01:00
clemkeirua
debc6628d8 generation d'un fichier pdf bien nommé
La route ne contient pas '.pdf' dans l'url, mais le controller génère un fichier pdf du nom de la procédure et lance le téléchargement immédiatement
2020-03-17 15:00:03 +01:00
clemkeirua
76488ec758 ajout de l'adresse du service où envoyer le dossier 2020-03-17 15:00:03 +01:00
clemkeirua
ca7f81b6ed add a feature-flip for procedure PDF export 2020-03-17 15:00:03 +01:00
clemkeirua
90a0879d71 ajout du bouton pour telecharger un pdf vide 2020-03-17 15:00:03 +01:00
clemkeirua
8c44133fd1 ajout de l'intitule des procedures en haut de page 2020-03-17 15:00:03 +01:00
clemkeirua
269881db12 generation d'un pdf vide à partir d'une procedure 2020-03-17 15:00:01 +01:00
Paul Chavard
ae2cfdd44e Update browser gem
`modern?` method was removed in version 4
2020-03-17 11:25:20 +01:00
clemkeirua
2eda3b193c fix missing procedure in AdministrationMailer#dossier_expiration_summary 2020-03-05 09:27:19 +00:00
maatinito
9b9eeb7476 #4808 procedure closing date starts now at midnight instead of 00h00 in the morning 2020-03-05 10:15:47 +01:00
maatinito
cbf95c6d86 Better wording for declarative procedure 2020-03-04 08:30:38 -10:00
Christophe Robillard
924702699f highlight routing criteria label when updated 2020-03-04 14:56:59 +01:00
kara Diaby
b32ed88f9b add attachment when instructor asking for a review 2020-03-04 13:35:29 +00:00
Paul Chavard
bebefbdffc Fix template interpolation in reaffecter_dossiers 2020-03-04 10:56:14 +01:00
kara Diaby
4a70a7fcc8 remove email_notifications_enabled column because of the new daily_email_notifications_enabled 2020-02-27 11:09:19 +01:00
Christophe Robillard
e0f4957dfd notify instructeur after groupe_instructeur changed 2020-02-26 11:25:07 +01:00
kara Diaby
6102ba6039 Do not permit to upload a GIF file via javascript 2020-02-25 23:33:15 +01:00
Pierre de La Morinerie
6664965961 mailers: add procedure context to the confirmation link
This allows to redirect the user to the procedure they signed up for
even when the browser session is not available (like if they changed
of browser).

Fix #4738
2020-02-25 11:45:36 +00:00
Paul Chavard
ee1a930693
Update app/views/instructeurs/procedures/stats.html.haml
Co-Authored-By: Pierre de La Morinerie <kemenaran@gmail.com>
2020-02-25 09:12:58 +01:00
Paul Chavard
662ef451a9
Update app/views/stats/index.html.haml
Co-Authored-By: Pierre de La Morinerie <kemenaran@gmail.com>
2020-02-25 09:12:48 +01:00
Paul Chavard
d8eb3ebb94 Load chartkick and highcharts only on stat pages 2020-02-25 09:07:07 +01:00
Pierre de La Morinerie
d49217bd72 procedure: improve wording for declarative procedures 2020-02-24 16:48:07 +00:00
Pierre de La Morinerie
cdf48bcfa6 procedure: add a default label to the declarative prompt 2020-02-24 16:48:07 +00:00
Pierre de La Morinerie
480765aa17 procedure: use smaller headers in the edit form 2020-02-24 16:48:07 +00:00
clemkeirua
14a2be00e2 4806 - ajout de precisions sur l'export CSV 2020-02-24 14:45:01 +01:00
Paul Chavard
b7051da278 Remove old export code 2020-02-19 18:19:17 +01:00
Christophe Robillard
32d1ebe565 add administrateur from manager 2020-02-19 15:17:36 +01:00
Paul Chavard
e931c0800d Remove notify_unhide_to_user and notify_undelete_to_user mailers 2020-02-18 17:56:52 +01:00
Paul Chavard
318baf316e Add notify_en_construction_near_deletion mailer 2020-02-18 17:18:14 +01:00
Paul Chavard
8c77d91e9f Add notify_automatic_deletion_to_administration mailer 2020-02-18 17:18:06 +01:00
Paul Chavard
4e116f06a6 Add notify_automatic_deletion_to_user mailer 2020-02-18 17:15:32 +01:00
kara Diaby
d8223bafa8 Add thousand separator on tabs instructors general view 2020-02-18 15:33:57 +01:00
kara Diaby
9287188904 Fix the thousand separator in order to copy/paste without space 2020-02-17 11:31:12 +01:00
Paul Chavard
1ce1c1e6d0 use discard 2020-02-13 12:31:59 +01:00
Pierre de La Morinerie
838133477e form: don't display index if the libelle already starts with a number 2020-02-13 11:21:30 +01:00
Pierre de La Morinerie
f8ed7ec051 form: display index of section in header 2020-02-13 11:18:46 +01:00
Pierre de La Morinerie
e746d90016 mailers: add a link to the procedure when the account already exists 2020-02-12 13:24:52 +00:00
kara Diaby
0b8a59d5e9 Add the possibility to disable weekly email notifications (instructeur) && rename the column email_notifications_enabled to daily_email_notification_enabled 2020-02-12 13:02:31 +00:00
Pierre de La Morinerie
e3ba2ed96c Revert "form: add number to section headers"
This reverts commit f42977e40a.
2020-02-12 13:54:44 +01:00
Pierre de La Morinerie
66112eb14e dossier: add a link to the incident post-mortem 2020-02-12 11:49:33 +01:00
Pierre de La Morinerie
d4574bade1 dossier: add a custom message for the dossier owner 2020-02-12 11:49:33 +01:00
Pierre de La Morinerie
7ba76c6658 dossier: add a notice when some attachments of the dossier were lost
On the 22/01/2020, a technical error on the demarches-simplifees.fr
instance made us delete some files attached to some dossiers.

This PR adds a warning when browsing a dossier containing attachments
that were deleted.
2020-02-12 11:49:33 +01:00
Paul Chavard
f0ea96772d Only invite experts to dossiers instructeur have access to 2020-02-11 17:38:57 +01:00
Paul Chavard
8a514e0713 Fix avis linked dossiers invitation checkbox
fix #4678
2020-02-11 17:38:57 +01:00
Pierre de La Morinerie
1531b69f5a form: make the radio button larger and hoverable
As a bonus, the implementation of vertical radio buttons is now closer
from the default horizontal one.
2020-02-11 17:36:50 +01:00
Pierre de La Morinerie
f42977e40a form: add number to section headers 2020-02-11 17:36:50 +01:00
Pierre de La Morinerie
2b47013798 form: improve the appearance of the repetitions header 2020-02-11 17:36:50 +01:00
Pierre de La Morinerie
005ff4bed5 form: fix the bottom margin of the siret element 2020-02-11 17:36:50 +01:00
Pierre de La Morinerie
2532091302 form: improve wording of repetition blocks controls 2020-02-11 17:36:50 +01:00
Pierre de La Morinerie
7b57a806e9 support: hint about the suggestions board on feature-upvote 2020-02-11 15:35:42 +01:00
simon lehericey
90113f1a22 Remove Rempli column for type de champ 2020-02-11 13:35:55 +00:00
simon lehericey
4f317e84d1 Iterate over type_de_champ in repetition type_de_champ 2020-02-11 13:35:55 +00:00
simon lehericey
a62e9fe6d2 Extract type de champ line 2020-02-11 13:35:55 +00:00
Pierre de La Morinerie
52ea019ba9 app: replace remaining references of DINSIC by DINUM
Fix #4488
2020-02-10 17:46:20 +00:00
Pierre de La Morinerie
123819f5d2 sign_in: remove the hint about password length 2020-02-10 11:07:08 +00:00
kara Diaby
805da59b99 add thousand separators to numbers (instructors page and pdf file) 2020-02-10 09:32:37 +01:00
Pierre de La Morinerie
c16409819b mailers: fix some missing unbreakable space in emails 2020-02-04 17:09:25 +01:00
Christophe Robillard
cef776ff9e admin: fix add administrateur to a procedure 2020-02-04 16:21:42 +01:00
Christophe Robillard
f8309c45a6 admin: order by user email 2020-02-04 16:21:42 +01:00
Christophe Robillard
2bb161c3cb admin: alias Administrateur.email 2020-02-04 16:21:42 +01:00
Christophe Robillard
c137917396 fix typo 2020-02-04 16:07:01 +01:00
Christophe Robillard
5a46effcbc remove useless condition to admin that can be deleted
administrateur can be deleted only if he/she has a procedure where
he/she is the only admin
2020-02-04 16:07:01 +01:00
Christophe Robillard
cee4c5b8fb Revert "Revert "4127 fix superadmin supprime compte usager""
This reverts commit 751f24f7bb.
2020-02-04 16:07:01 +01:00
Paul Chavard
5afe158c89 Tweak a bit timeout values for export polling 2020-02-03 15:56:10 +01:00
Paul Chavard
08400cdd4c Poll for export readiness updates 2020-01-29 22:52:03 +01:00
clemkeirua
5f65665b07 added a method for modifying a user email 2020-01-28 16:15:46 +01:00
Pierre de La Morinerie
6eaf0f7804 dossiers: fix the sticky bar on IE 11
This allows IE 11 users to see the draft autosave indicator.

The layout on IE 11 is still buggy though - but it's better than
nothing.
2020-01-28 15:20:30 +01:00
Pierre de La Morinerie
eb9388d59f dossier: ensure the routing dropdown must be selected
A blank routing dropdown nullify the groupe_instructeur – which
also removes the link between the dossier and the procedure.

Fix #4717
2020-01-28 14:58:34 +01:00
Pierre de La Morinerie
751f24f7bb
Revert "4127 fix superadmin supprime compte usager" 2020-01-21 18:57:54 +01:00
Pierre de La Morinerie
a63c3dbfc4
app: improve wording of the strike banner
Make it clearer that the strike affects only the DS staff.
2020-01-21 16:49:55 +01:00
Christophe Robillard
d9570eedc6 empêche suppression d'un user qui est instructeur 2020-01-21 15:05:33 +01:00
Christophe Robillard
a6d007dbd3 supprime un instructeur 2020-01-21 15:05:33 +01:00
Christophe Robillard
d4de5769ee empêche la suppression d'un user qui est admin 2020-01-21 15:05:33 +01:00
clemkeirua
fb87a87f47 code review changes 2020-01-20 16:15:02 +01:00
clemkeirua
794e95e6eb fix total count of groupe_instructeur 2020-01-20 16:15:02 +01:00
clemkeirua
12430a8068 ajout d'un écran intermediaire pour gérer la reaffectation des dossiers 2020-01-20 16:15:02 +01:00
clemkeirua
45c8c8ca21 an admin can delete a groupe-instructeur with 0 dossier 2020-01-20 16:15:02 +01:00
Paul Chavard
14295db9ad Revert "Revert "Merge pull request #4552 from tchak/champ-communes""
This reverts commit 4373cb22cb.
2020-01-14 18:46:07 +01:00
clemkeirua
1a1d4a9c29 coexistence de l'ancien comportement avec le nouveau 2020-01-14 09:30:08 +01:00
clemkeirua
8da1185a5d ajout des dates de changement de statut 2020-01-14 09:29:29 +01:00
clemkeirua
18e21f75c9 Retours de code review
- message_date_with_year systématique pour les messages
 - tous les commentaires sont affiché
 - gestion du champ 'Explication'
2020-01-14 09:29:29 +01:00
clemkeirua
cf385e326c infos usagers, entreprise et champ siret 2020-01-14 09:29:29 +01:00
clemkeirua
bc506bf693 ajout d'un lien d'export pdf usager 2020-01-14 09:29:29 +01:00
clemkeirua
b153b0e5e2 modification du lien d'export pdf instructeur 2020-01-14 09:29:29 +01:00
clemkeirua
85d4adbf8b ajout de l'export pdf pour instructeur 2020-01-14 09:29:29 +01:00
clemkeirua
4373cb22cb Revert "Merge pull request #4552 from tchak/champ-communes"
This reverts commit 4cec26f73a, reversing
changes made to 0ef25ef36c.
2020-01-13 16:26:27 +01:00
Christophe Robillard
696a058280 delete adminis with procs managed by other admins 2020-01-13 10:06:43 +01:00
Christophe Robillard
9a62d3fe0c delete a user 2020-01-13 10:06:43 +01:00
Paul Chavard
4bbd16576b Add champ communes 2020-01-07 11:52:51 +01:00
Paul Chavard
22aa2d4ee0 Make all location champs autocomplete 2020-01-07 11:52:51 +01:00
clemkeirua
4f604c8b0a put the strike banner behind a feature-flip 2020-01-06 15:25:43 +01:00
Pierre de La Morinerie
a5f2c84cbf sign_up: fix suggestions error when navigating away
When navigating away from the page, the field receives the 'focusout'
event – but stops to be present in the DOM.

Thus we need to check that the DOM element is actually present.
2019-12-19 17:45:14 +01:00
simon lehericey
60538c9c28 Controller use new export model 2019-12-18 13:13:15 +01:00
simon lehericey
745086cbb5 Simplify view 2019-12-18 13:13:15 +01:00
simon lehericey
278659dcb3 fix footer without tel 2019-12-12 15:57:47 +01:00
simon lehericey
301653bb89 Only display email form if the user is not instructeur 2019-12-11 17:18:21 +01:00
Pierre de La Morinerie
ef76af5546 app: add a site-wide banner for the national strike 2019-12-04 17:32:04 +01:00
Paul Chavard
2f060fc30a Add depubliee state to procedures 2019-12-04 16:52:41 +01:00
Pierre de La Morinerie
7f2d5f6248 app: unify pre-maintenance banner with other site-wide banners 2019-12-04 15:29:15 +01:00
Pierre de La Morinerie
704ac64f63 stylesheet: move all browser banner styles into site-banner.scss 2019-12-04 15:25:37 +01:00
Paul Chavard
e5f582d644 Afficher la description du champ répétable
fix #4579
2019-12-04 14:28:31 +01:00
Paul Chavard
e429c79eb1 Allow administrators to set themselves démarches as déclaratives 2019-12-04 12:30:26 +01:00
Christophe Robillard
e35dcad5ae rend le téléphone obligatoire côté client 2019-12-04 05:34:43 +01:00
Christophe Robillard
77b647fe25 N'affiche pas un telephone inexistant d'un service 2019-12-04 05:34:43 +01:00
Christophe Robillard
6eb36482bc rend lisible l'explication d'un contact valide 2019-12-04 05:34:43 +01:00
Christophe Robillard
8ee6657f1e rend le champ telephone optionnel côté client 2019-12-04 05:34:43 +01:00
Christophe Robillard
4e7c779116 refuse les numéros de tel invalides
rend facultatif les numéros de téléphone
2019-12-04 05:34:43 +01:00
Christophe Robillard
b60aff8468 explique en détail l'importance de renseigner des info de contact valides 2019-12-04 05:34:43 +01:00
Christophe Robillard
0b518844dc explique pourquoi un tel valide est important 2019-12-04 05:34:43 +01:00
simon lehericey
006e426a11 Work on deletion mail 2019-12-03 17:18:53 +01:00
simon lehericey
6391f7ff9c Work on notify_near_deletion mailer 2019-12-03 17:18:53 +01:00
Pierre de La Morinerie
3212dfddca app: allow hiding the browser banner for one week 2019-12-03 16:09:18 +01:00
Pierre de La Morinerie
299f9df375 app: on the old design, move the deprecation banner to a better location
Otherwise it hides the "Change role" controls.
2019-12-03 16:02:08 +01:00
Pierre de La Morinerie
2b934610a0 app: improve the browser deprecation banner appearance 2019-12-03 16:02:08 +01:00
clemkeirua
8b1535e462 ajout de pagination au sommet de la liste des dossiers 2019-12-03 14:55:43 +01:00
Pierre de La Morinerie
5928a16b37 Amélioration de la mise en page 2019-12-03 14:06:12 +01:00
clemkeirua
8cab6ae19f retours divers 2019-12-03 14:06:12 +01:00
clemkeirua
fdec2e04c3 la boite de suggestion d'email est en dessous du champ email 2019-12-03 14:06:11 +01:00
clemkeirua
0bfdb2d5da fermeture et acceptation de la suggestion d'email 2019-12-03 14:06:11 +01:00
Christophe Robillard
3db2d44fc0 affiche un warning pour l'email qqsoit l'email 2019-12-03 14:06:11 +01:00
clemkeirua
9e44af70b5 minor typo in textareas 2019-12-03 10:13:16 +01:00
clemkeirua
233c93bb7c move p outside of label 2019-12-03 10:07:04 +01:00
clemkeirua
d712cc7a35 move ul outside of p 2019-12-03 10:07:04 +01:00
clemkeirua
9ae1a3c2d3 add missing alt 2019-12-03 10:07:04 +01:00
Paul Chavard
7b947feae4 Rename demarche archivée to demarche close 2019-11-28 15:07:16 +01:00
Paul Chavard
2cf415dc41 Simplify React components loader 2019-11-28 14:45:40 +01:00
Paul Chavard
c1c8ab7ac6 Disable transition from publiée to brouillon 2019-11-28 14:17:47 +01:00
benjaminhenkel
09d0c8d8a4 Correction d'une petite faute 2019-11-27 16:13:17 +00:00
simon lehericey
71051441d6 only one h1 2019-11-27 12:59:08 +00:00
simon lehericey
38d433b53d Add some role 2019-11-27 12:59:08 +00:00
simon lehericey
07112f2e15 Remove alt on decorative image 2019-11-27 12:59:08 +00:00
simon lehericey
2f47495173 Use h1 tag for .hero-tagline 2019-11-27 12:59:08 +00:00
simon lehericey
d4f256b735 Use text instead of image for logo
- "it is good design practice to use actual text that is styled with CSS rather than image-based text presentation" (https://www.w3.org/WAI/tutorials/images/textual)

- mm markup que https://www.gov.uk/ et que https://www.w3.org/WAI/tutorials/images/decorative/#decorative-image-as-part-of-a-text-link
2019-11-27 12:59:08 +00:00
Pierre de La Morinerie
b78134c691 specs: make the routing feature test more robust
- Use human-readable form labels
- Always wait for the result of the previous action to be loaded before
  starting another action
2019-11-21 18:29:45 +01:00
simon lehericey
054181a16f Champ Repetition has no label, thus it's displayed as a section 2019-11-21 15:34:59 +01:00
simon lehericey
2162522814 ul should have li childs 2019-11-21 15:34:59 +01:00
simon lehericey
bc85e9b7ec Use aria-describedby to link notice and input again
https://www.w3.org/WAI/tutorials/forms/instructions/#using-aria-describedby
2019-11-21 15:34:59 +01:00
simon lehericey
84b125d272 p cannot be included in label
The main problem come from
%label{for: input_id}
  #{champ.libelle}
  %span.notice= string_to_html(champ.description)
%input

where string_to_html contains p tags

The proposed solution is
%label #{champ.libelle}
%p.notice
%input

It should be iso in the graphic sense.
2019-11-21 15:34:59 +01:00
simon lehericey
d5da7916e5 Placeholder not allowed in date input 2019-11-21 15:34:59 +01:00
simon lehericey
f45ede7f44 href should not contain space 2019-11-21 15:34:59 +01:00
Pierre de La Morinerie
bff7892ba8 dossiers: autosave drafts 2019-11-21 14:00:06 +01:00
Paul Chavard
0c6705f7fd Drop old export service 2019-11-21 10:25:40 +01:00
Christophe Robillard
b42f21264e permet le suivi auto après envoi instructeur
Close #4163
2019-11-20 16:41:30 +01:00
Pierre de La Morinerie
8b8a96abda dossiers: save draft by default (instead of submitting)
Make the default behavior of `update_brouillon` be to update the draft,
instead of submitting the dossier.

This makes all requests made to `update_brouillon` without specifying
an extra `submit_draft` parameter to just save the draft. It will make
autosaving the draft easier and safer.
2019-11-20 11:24:31 +01:00
Pierre de La Morinerie
03a7bc3d5a dossiers: give the edit form an unique id 2019-11-20 11:24:31 +01:00
simon lehericey
59d5cd7abc fix label > div by label > span 2019-11-19 15:14:06 +01:00
simon lehericey
45ff1fd697 Change span by div to fix Element p not allowed as child of element span 2019-11-19 15:14:06 +01:00