From ddce997e12b1e4efc879bd7032942bb0281e1108 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 12 Jun 2019 15:34:03 +0200 Subject: [PATCH] display data collection purpose on each input field + fix notifications on deleted user --- app/assets/stylesheets/app.utilities.scss | 4 ++ .../templates/shared/_member_form.html.erb | 58 +++++++++---------- .../templates/shared/signupModal.html.erb | 22 +++---- ...otify_admin_slot_is_canceled.json.jbuilder | 2 +- ..._admin_subscription_canceled.json.jbuilder | 2 +- ..._admin_subscription_extended.json.jbuilder | 2 +- ...dmin_subscription_is_expired.json.jbuilder | 2 +- ...iption_will_expire_in_7_days.json.jbuilder | 2 +- ...ify_admin_user_group_changed.json.jbuilder | 4 +- .../_notify_admin_user_merged.json.jbuilder | 8 +-- ...dmin_user_wallet_is_credited.json.jbuilder | 4 +- ...y_admin_when_user_is_created.json.jbuilder | 4 +- ...tify_partner_subscribed_plan.json.jbuilder | 2 +- ...thor_when_collaborator_valid.json.jbuilder | 2 +- config/locales/app.logged.en.yml | 5 ++ config/locales/app.logged.es.yml | 5 ++ config/locales/app.logged.fr.yml | 5 ++ config/locales/app.logged.pt.yml | 5 ++ config/locales/app.public.en.yml | 5 ++ config/locales/app.public.es.yml | 9 ++- config/locales/app.public.fr.yml | 5 ++ config/locales/app.public.pt.yml | 9 ++- 22 files changed, 105 insertions(+), 61 deletions(-) diff --git a/app/assets/stylesheets/app.utilities.scss b/app/assets/stylesheets/app.utilities.scss index 69821a820..c00d31671 100644 --- a/app/assets/stylesheets/app.utilities.scss +++ b/app/assets/stylesheets/app.utilities.scss @@ -346,6 +346,10 @@ p, .widget p { vertical-align: super } +.help-cursor { + cursor: help; +} + @media screen and (min-width: $screen-lg-min) { .b-r-lg {border-right: 1px solid $border-color; } .hide-b-r-lg { border: none !important; } diff --git a/app/assets/templates/shared/_member_form.html.erb b/app/assets/templates/shared/_member_form.html.erb index c9649a271..03a11c2a8 100644 --- a/app/assets/templates/shared/_member_form.html.erb +++ b/app/assets/templates/shared/_member_form.html.erb @@ -57,7 +57,7 @@ ng-disabled="preventField['profile.gender'] && user.statistic_profile.gender && !userForm['user[statistic_profile_attributes][gender]'].$dirty"/> {{ 'woman' | translate }} - + {{ 'gender_is_required' }} @@ -65,7 +65,7 @@
- +
- +
- +
- +
- + @@ -186,7 +186,7 @@
- + @@ -203,7 +203,7 @@
- +
- + @@ -240,7 +240,7 @@
- +
- +
- +
- +