diff --git a/CHANGELOG.md b/CHANGELOG.md index f046e958b..d5c0a466b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,14 @@ - fix a bug: avoids crash if invoicing_profile has no address associated to it - improvement: improves how pay_zen transactions are matched with payment_schedule_items - improvement: improves rrule of pay_zen subscriptions +- improvement: better text contrast on customizable colors. Good for accessibility. +- Improvement: set the number of new attempts available in case the payment is rejected to 1 for PayZen ## v6.3.4 2023 November 23 - fix a bug: wrong amount when pay a reservation with payment schedule -- fix regresion on PaymentScheduleItemWorker from v6.3.2 +- fix a bug: regression on PaymentScheduleItemWorker from v6.3.2 +- fix a bug: event.pre_registration_end_date (was set to beginning_of_day instead of end_of_day) ## v6.3.3 2023 November 14 @@ -36,7 +39,7 @@ - Fix a bug: fix all failing tasks of rake task file chain.rake - Fix a bug: file_size_validator.rb was broken since ruby v3, see https://github.com/rails/rails/issues/41270 -- improvement: pre-registration event reservations ilimit places +- improvement: pre-registration event reservations limit places - improvement: add including_deleted_users param for open api users - decreases sidekiq concurrency from 25 to 5, 25 is too much and consumes memory for nothing - do not log Notifications#polling action anymore, by default, can be enable via env variable ENABLE_NOTIFICATIONS_POLLING_LOGGING=true @@ -59,7 +62,7 @@ ## v6.1.2 2023 October 2 -- Fix a bug: minor pb (exception raised) when bot hit api/projects#search without beeing authenticated +- Fix a bug: minor pb (exception raised) when bot hit api/projects#search without being authenticated - Fix a bug: minor pb (exception raised) when a bot or unauthenticated user hit api/auth_providers actions - Fix a bug: when calling .to_json on an "avoir", there was a bug because order_number delegates on invoice which can be nil, it was causing errors in notifications rendering - Fix a bug: when getting status of users/subscriptions export @@ -85,9 +88,9 @@ - Cancel payment schedule subscription after update the payment mean - admin can see reservations of a member - Fix a bug: unable to update card for payment schedule -- Fix a bug: user is_allow_contact is actived by default -- Fix a bug: unbale to export projects -- Fix a bug: unbale to update card bank of payment schedule +- Fix a bug: user is_allow_contact is active by default +- Fix a bug: unable to export projects +- Fix a bug: unable to update card bank of payment schedule - Feature: family compte for event - Feature: pre-registration event - [TODO DEPLOY] `rails db:seed` @@ -152,7 +155,7 @@ - Improved projects list filter - Fix a bug: unable to refresh machine/space/training calender after pay an reservation -- Fix a bug: Accouning Line in duplicate +- Fix a bug: Accounting Line in duplicate - Fix a bug: displays "my orders" link only if store module is active - [TODO DEPLOY] `rails fablab:setup:build_accounting_lines` @@ -161,7 +164,7 @@ - Fix a bug: OpenAPI accounting gateway_object_id missing error - Fix a bug: unable to modify the price of prepaid pack - Fix a bug: notification type missing -- Fix critical bug: Incorrect amount calculation when paying monthly subcription with a wallet for PayZen +- Fix critical bug: Incorrect amount calculation when paying monthly subscription with a wallet for PayZen ## v6.0.6 2023 May 4 @@ -252,7 +255,7 @@ - Ability to restrict machine availabilities per plan - Ability to configure a prior period for each reservation type to prevent booking (#440) - Admins cannot select the date when creating a refund invoice anymore -- Fix a bug: JS date is initalialized 1 day before in negative timezones (#445) +- Fix a bug: JS date is initialized 1 day before in negative timezones (#445) - Fix a bug: user's profile field gender is now marked as required - Fix a bug: logical sequence of invoices references is broken, when using the store module or the payments schedules - Fix a bug: refund invoices may generate duplicates in invoices references @@ -288,11 +291,11 @@ - OpenAPI reservation endpoint will return details for the reserved slots - Display info messages if the user cannot buy prepaid packs - Fix a bug: some OpenAPI endpoints struggle and expire with timeout -- Fix a bug: OpenAPI events endpoint documentation does not refect the returned data +- Fix a bug: OpenAPI events endpoint documentation does not reflect the returned data - Fix a bug: members can't change/cancel their reservations - Fix a bug: admin events view should default to the list tab - Fix a bug: event creation form should not allow setting multiple times the same price category -- Fix a bug: MAX_SIZE env varibles should not be quoted (#438) +- Fix a bug: MAX_SIZE env variables should not be quoted (#438) - Fix a bug: unable to add OIDC scopes without discovery - [BREAKING CHANGE] GET `open_api/v1/events` will necessarily be paginated - [BREAKING CHANGE] GET `open_api/v1/invoices` will necessarily be paginated @@ -331,7 +334,7 @@ - Automatically cancel trainings with insufficient attendees - Check SCSS syntax before saving home page style - Use Time instead of DateTime objects -- Fix a bug: missing statististics subtypes +- Fix a bug: missing statistics subtypes - Fix a bug: wrong times in admin/event monitoring - Fix a bug: daylight saving time is ignored and result in wrong dates and/or times when dealing around the DST day - Fix a bug: date shift in event creation/update @@ -366,7 +369,7 @@ - Fix a bug: invalid duration for machine/spaces reservations in statistics, when using slots of not 1 hour - Fix a bug: invalid month in date format - Fix a bug: do not show theme and age-range fields in event form if no options were set -- Fix a bug: do not show catgory select in plan form if no options were set +- Fix a bug: do not show category select in plan form if no options were set - Fix a bug: new setups doesn't log - [TODO DEPLOY] `rails db:seed` - [TODO DEPLOY] `rails fablab:es:build_stats` THEN `rails fablab:maintenance:regenerate_statistics[2014,1]` @@ -405,7 +408,7 @@ ## v5.6.3 2023 January 9 - Fix a bug: unable to build the docker image (yarn error extracting tar content of undefined failed) -- Fix a security issue: logged users but non-admins can access to analytics data throught the API +- Fix a security issue: logged users but non-admins can access to analytics data through the API ## v5.6.2 2023 January 9 @@ -447,7 +450,7 @@ - OpenAPI endpoint to fetch accounting data - Add reservation deadline parameter (#414) - Verify current password at server side when changing password -- Password strengh indicator +- Password strength indicator - Updated OpenAPI documentation - Updated OpenID Connect documentation - OpenAPI users endpoint offer ability to filter by created_after @@ -455,7 +458,7 @@ - Default accounting codes and labels if not set - Active serving static files from the `/public` folder by default from rails - Display custom error message if the PDF invoice is not found -- Report subsription mismatch with user's group +- Report subscription mismatch with user's group - Added sentry for error reporting - Report details of the due for invoices related to a payment schedule - Migrated plan/machine/space/event forms to react diff --git a/app/frontend/src/javascript/components/form/form-input.tsx b/app/frontend/src/javascript/components/form/form-input.tsx index 5a1aed014..493a11904 100644 --- a/app/frontend/src/javascript/components/form/form-input.tsx +++ b/app/frontend/src/javascript/components/form/form-input.tsx @@ -67,11 +67,10 @@ export const FormInput = ({ id, re return num; } if (type === 'date') { - const date: Date = new Date(value + 'T00:00:00'); - if (Number.isNaN(date) && nullable) { + if (Number.isNaN(value) && nullable) { return null; } - return date; + return value; } setCharacterCount(value?.length || 0); return value; diff --git a/app/frontend/src/javascript/components/supporting-documents/supporting-documents-types-list.tsx b/app/frontend/src/javascript/components/supporting-documents/supporting-documents-types-list.tsx index 31f71fc96..022839d04 100644 --- a/app/frontend/src/javascript/components/supporting-documents/supporting-documents-types-list.tsx +++ b/app/frontend/src/javascript/components/supporting-documents/supporting-documents-types-list.tsx @@ -204,13 +204,13 @@ const SupportingDocumentsTypesList: React.FC

{t('app.admin.settings.account.supporting_documents_types_list.supporting_documents_type_info')}

- {t('app.admin.settings.account.supporting_documents_types_list.create_groups')} + {t('app.admin.settings.account.supporting_documents_types_list.create_groups')}

{t('app.admin.settings.account.supporting_documents_types_list.supporting_documents_type_title')}

- {t('app.admin.settings.account.supporting_documents_types_list.add_type')} + {t('app.admin.settings.account.supporting_documents_types_list.add_type')}

{t('app.admin.settings.account.supporting_documents_types_list.supporting_documents_type_title')}

- {t('app.admin.settings.account.supporting_documents_types_list.add_type')} + {t('app.admin.settings.account.supporting_documents_types_list.add_type')}
li { > a { padding: 13px 17px; font-weight: 600; - color: white; - - &:hover, - &:focus, &.active { - //background-color: $red-light; - color: white; - } + color: var(--main-text-color); &.active { border-left: 3px solid; - - // #870003; - } } } diff --git a/app/frontend/src/stylesheets/modules/base/fab-button.scss b/app/frontend/src/stylesheets/modules/base/fab-button.scss index a447f64f8..55c71c06c 100644 --- a/app/frontend/src/stylesheets/modules/base/fab-button.scss +++ b/app/frontend/src/stylesheets/modules/base/fab-button.scss @@ -1,9 +1,9 @@ .fab-button { min-height: 38px; - margin-bottom: 0; padding: 6px 12px; display: inline-flex; align-items: center; + gap: 0 4px; border: 1px solid #c9c9c9; border-radius: 4px; background-color: #fbfbfb; @@ -35,12 +35,11 @@ } - &[disabled] { - color: #3a3a3a; - } - + &[disabled], &[disabled]:hover { - color: #3a3a3a; + color: inherit; + opacity: 0.65; + cursor: not-allowed; } &--icon { @@ -60,12 +59,15 @@ border-color: $color; background-color: $color; color: $textColor; - opacity: 0.75; + opacity: 0.65; } } &.is-info { @include colorVariant(var(--information), var(--gray-soft-lightest)); } + &.is-alert { + @include colorVariant(var(--alert), var(--gray-soft-lightest)); + } &.is-secondary { @include colorVariant(var(--secondary), var(--secondary-text-color)); } @@ -75,4 +77,25 @@ &.is-main { @include colorVariant(var(--main), var(--main-text-color)); } + + // sizes + &.button-full { + width: 100%; + justify-content: center; + } + + &.button-xs { + min-height: auto; + padding: 2px 4px; + font-size: 12px; + } + &.button-s { + min-height: auto; + padding: 4px 8px; + font-size: 14px; + } } + +label.fab-button { + margin-bottom: 0; +} \ No newline at end of file diff --git a/app/frontend/src/stylesheets/modules/supporting-documents/supporting-documents-types-list.scss b/app/frontend/src/stylesheets/modules/supporting-documents/supporting-documents-types-list.scss index 30837f400..1cf2ef120 100644 --- a/app/frontend/src/stylesheets/modules/supporting-documents/supporting-documents-types-list.scss +++ b/app/frontend/src/stylesheets/modules/supporting-documents/supporting-documents-types-list.scss @@ -29,9 +29,6 @@ margin-top: 15px; margin-right: 20px; max-width: 200px; - background-color: var(--secondary-dark); - border-color: var(--secondary-dark); - color: var(--secondary-text-color); } } } @@ -49,9 +46,6 @@ .fab-button { margin-top: 15px; margin-right: 20px; - background-color: var(--secondary-dark); - border-color: var(--secondary-dark); - color: var(--secondary-text-color); } } diff --git a/app/frontend/templates/admin/admins/new.html b/app/frontend/templates/admin/admins/new.html index 3d661d2bf..d3ef7837d 100644 --- a/app/frontend/templates/admin/admins/new.html +++ b/app/frontend/templates/admin/admins/new.html @@ -25,7 +25,7 @@
- +
diff --git a/app/frontend/templates/admin/authentications/index.html b/app/frontend/templates/admin/authentications/index.html index d9f542266..d98ece61d 100644 --- a/app/frontend/templates/admin/authentications/index.html +++ b/app/frontend/templates/admin/authentications/index.html @@ -7,7 +7,7 @@
- + diff --git a/app/frontend/templates/admin/calendar/calendar.html b/app/frontend/templates/admin/calendar/calendar.html index 4bf33cb26..3b7b0b84f 100644 --- a/app/frontend/templates/admin/calendar/calendar.html +++ b/app/frontend/templates/admin/calendar/calendar.html @@ -93,7 +93,7 @@ {{ 'app.admin.calendar.deleted_user' }} - {{ r.start_at | amDateFormat:'LLL' }} - {{ r.end_at | amDateFormat:'LT' }} - {{r.reservable.name}} - +
{{ 'app.admin.calendar.without_reservation' }}
@@ -109,7 +109,7 @@
  • {{m.name}} - +
@@ -126,7 +126,7 @@
  • {{::plan.base_name}} - +
diff --git a/app/frontend/templates/admin/calendar/eventModal.html b/app/frontend/templates/admin/calendar/eventModal.html index aebabf13a..0f7d3c551 100644 --- a/app/frontend/templates/admin/calendar/eventModal.html +++ b/app/frontend/templates/admin/calendar/eventModal.html @@ -246,12 +246,12 @@
- - - + + +
- - - + + +
diff --git a/app/frontend/templates/admin/calendar/icalendar.html b/app/frontend/templates/admin/calendar/icalendar.html index edd60ecfe..cee1881e1 100644 --- a/app/frontend/templates/admin/calendar/icalendar.html +++ b/app/frontend/templates/admin/calendar/icalendar.html @@ -86,7 +86,7 @@ switch-animate="true"/>
-
diff --git a/app/frontend/templates/admin/coupons/edit.html b/app/frontend/templates/admin/coupons/edit.html index e7e4597a0..98e78c427 100644 --- a/app/frontend/templates/admin/coupons/edit.html +++ b/app/frontend/templates/admin/coupons/edit.html @@ -31,7 +31,7 @@
- +
diff --git a/app/frontend/templates/admin/coupons/new.html b/app/frontend/templates/admin/coupons/new.html index f4f198cef..9f0019aa2 100644 --- a/app/frontend/templates/admin/coupons/new.html +++ b/app/frontend/templates/admin/coupons/new.html @@ -23,7 +23,7 @@
- +
diff --git a/app/frontend/templates/admin/events/filters.html b/app/frontend/templates/admin/events/filters.html index dd3974b74..4974d8f19 100644 --- a/app/frontend/templates/admin/events/filters.html +++ b/app/frontend/templates/admin/events/filters.html @@ -1,7 +1,7 @@

{{ 'app.admin.events.categories' }}

{{ 'app.admin.events.at_least_one_category_is_required' }}

- +
@@ -19,10 +19,10 @@
- -
@@ -40,7 +40,7 @@

{{ 'app.admin.events.themes' }}

- + @@ -58,10 +58,10 @@
- -
@@ -79,7 +79,7 @@

{{ 'app.admin.events.age_ranges' }}

- + @@ -97,10 +97,10 @@
- -
diff --git a/app/frontend/templates/admin/events/index.html b/app/frontend/templates/admin/events/index.html index 26f303ed7..8afb3f5dd 100644 --- a/app/frontend/templates/admin/events/index.html +++ b/app/frontend/templates/admin/events/index.html @@ -13,7 +13,7 @@
- {{ 'app.admin.events.add_an_event' }} + {{ 'app.admin.events.add_an_event' }}
diff --git a/app/frontend/templates/admin/events/monitoring.html b/app/frontend/templates/admin/events/monitoring.html index ed4aa9d61..37f671a08 100644 --- a/app/frontend/templates/admin/events/monitoring.html +++ b/app/frontend/templates/admin/events/monitoring.html @@ -79,6 +79,6 @@
- {{ 'app.admin.events.load_the_next_events' }} + {{ 'app.admin.events.load_the_next_events' }}
diff --git a/app/frontend/templates/admin/events/prices.html b/app/frontend/templates/admin/events/prices.html index bcf00aca2..1c2baaa3d 100644 --- a/app/frontend/templates/admin/events/prices.html +++ b/app/frontend/templates/admin/events/prices.html @@ -1,7 +1,7 @@

{{ 'app.admin.events.prices_categories' }}

- + diff --git a/app/frontend/templates/admin/events/reservations.html b/app/frontend/templates/admin/events/reservations.html index 2c677caae..2b3cab01f 100644 --- a/app/frontend/templates/admin/events/reservations.html +++ b/app/frontend/templates/admin/events/reservations.html @@ -85,7 +85,7 @@

{{ 'app.admin.event_reservations.no_reservations_for_now' }}

- +
diff --git a/app/frontend/templates/admin/groups/index.html b/app/frontend/templates/admin/groups/index.html index 2bb4fa8aa..9c943b93e 100644 --- a/app/frontend/templates/admin/groups/index.html +++ b/app/frontend/templates/admin/groups/index.html @@ -1,7 +1,6 @@
-
@@ -30,10 +29,10 @@
- -
diff --git a/app/frontend/templates/admin/invoices/accountingExportModal.html b/app/frontend/templates/admin/invoices/accountingExportModal.html index 4d6f97523..c67cc5eee 100644 --- a/app/frontend/templates/admin/invoices/accountingExportModal.html +++ b/app/frontend/templates/admin/invoices/accountingExportModal.html @@ -95,7 +95,7 @@ - + - + diff --git a/app/frontend/templates/admin/invoices/avoirModal.html b/app/frontend/templates/admin/invoices/avoirModal.html index f49217f39..5de448199 100644 --- a/app/frontend/templates/admin/invoices/avoirModal.html +++ b/app/frontend/templates/admin/invoices/avoirModal.html @@ -38,6 +38,6 @@
- - + +
diff --git a/app/frontend/templates/admin/invoices/closePeriodModal.html b/app/frontend/templates/admin/invoices/closePeriodModal.html index ebc9ca54c..50af814b7 100644 --- a/app/frontend/templates/admin/invoices/closePeriodModal.html +++ b/app/frontend/templates/admin/invoices/closePeriodModal.html @@ -76,6 +76,6 @@
- - + +
diff --git a/app/frontend/templates/admin/invoices/list.html b/app/frontend/templates/admin/invoices/list.html index 0ba0b00ef..cbaac2cbc 100644 --- a/app/frontend/templates/admin/invoices/list.html +++ b/app/frontend/templates/admin/invoices/list.html @@ -83,7 +83,7 @@
- +

{{ 'app.admin.invoices.no_invoices_for_now' }}

diff --git a/app/frontend/templates/admin/invoices/settings/editCode.html b/app/frontend/templates/admin/invoices/settings/editCode.html index 3ac4e5d2e..6a481647e 100644 --- a/app/frontend/templates/admin/invoices/settings/editCode.html +++ b/app/frontend/templates/admin/invoices/settings/editCode.html @@ -21,7 +21,7 @@
- - + +
diff --git a/app/frontend/templates/admin/invoices/settings/editNumber.html b/app/frontend/templates/admin/invoices/settings/editNumber.html index c37d107f3..db9c04a0c 100644 --- a/app/frontend/templates/admin/invoices/settings/editNumber.html +++ b/app/frontend/templates/admin/invoices/settings/editNumber.html @@ -25,7 +25,7 @@
- - + +
diff --git a/app/frontend/templates/admin/invoices/settings/editReference.html b/app/frontend/templates/admin/invoices/settings/editReference.html index 9985cab17..580ac2ef5 100644 --- a/app/frontend/templates/admin/invoices/settings/editReference.html +++ b/app/frontend/templates/admin/invoices/settings/editReference.html @@ -29,7 +29,7 @@
- - + +
diff --git a/app/frontend/templates/admin/invoices/settings/stripeKeys.html b/app/frontend/templates/admin/invoices/settings/stripeKeys.html index a468239f9..aa87c8ece 100644 --- a/app/frontend/templates/admin/invoices/settings/stripeKeys.html +++ b/app/frontend/templates/admin/invoices/settings/stripeKeys.html @@ -42,7 +42,7 @@
- - + +
diff --git a/app/frontend/templates/admin/managers/new.html b/app/frontend/templates/admin/managers/new.html index 716e38922..d654b14e5 100644 --- a/app/frontend/templates/admin/managers/new.html +++ b/app/frontend/templates/admin/managers/new.html @@ -25,7 +25,7 @@
- +
diff --git a/app/frontend/templates/admin/members/administrators.html b/app/frontend/templates/admin/members/administrators.html index a714e15dd..ad8c43625 100644 --- a/app/frontend/templates/admin/members/administrators.html +++ b/app/frontend/templates/admin/members/administrators.html @@ -7,7 +7,7 @@
- diff --git a/app/frontend/templates/admin/members/edit.html b/app/frontend/templates/admin/members/edit.html index a8fc34365..ff91767bd 100644 --- a/app/frontend/templates/admin/members/edit.html +++ b/app/frontend/templates/admin/members/edit.html @@ -280,7 +280,7 @@
- +

{{ 'app.admin.members_edit.cannot_credit_own_wallet' }} diff --git a/app/frontend/templates/admin/members/import.html b/app/frontend/templates/admin/members/import.html index b72a77154..c18eacc5b 100644 --- a/app/frontend/templates/admin/members/import.html +++ b/app/frontend/templates/admin/members/import.html @@ -163,7 +163,7 @@

- +
diff --git a/app/frontend/templates/admin/members/managers.html b/app/frontend/templates/admin/members/managers.html index 8cb73451c..282f4a902 100644 --- a/app/frontend/templates/admin/members/managers.html +++ b/app/frontend/templates/admin/members/managers.html @@ -11,7 +11,7 @@
- diff --git a/app/frontend/templates/admin/members/members.html b/app/frontend/templates/admin/members/members.html index 22fe77590..e02f954a8 100644 --- a/app/frontend/templates/admin/members/members.html +++ b/app/frontend/templates/admin/members/members.html @@ -19,7 +19,7 @@
-
@@ -40,6 +40,6 @@
- +
diff --git a/app/frontend/templates/admin/members/partners.html b/app/frontend/templates/admin/members/partners.html index a01401ce0..e844c52f5 100644 --- a/app/frontend/templates/admin/members/partners.html +++ b/app/frontend/templates/admin/members/partners.html @@ -11,7 +11,7 @@
- + diff --git a/app/frontend/templates/admin/open_api_clients/index.html.erb b/app/frontend/templates/admin/open_api_clients/index.html.erb index b9ea45aed..71ddd37ae 100644 --- a/app/frontend/templates/admin/open_api_clients/index.html.erb +++ b/app/frontend/templates/admin/open_api_clients/index.html.erb @@ -15,7 +15,7 @@
- +   {{ 'app.admin.open_api_clients.api_documentation' }}  @@ -36,15 +36,15 @@
- +
- - + +
diff --git a/app/frontend/templates/admin/pricing/coupons.html b/app/frontend/templates/admin/pricing/coupons.html index b1118e4cb..ab076fb30 100644 --- a/app/frontend/templates/admin/pricing/coupons.html +++ b/app/frontend/templates/admin/pricing/coupons.html @@ -1,7 +1,7 @@

{{ 'app.admin.pricing.list_of_the_coupons' }}

- @@ -44,5 +44,5 @@
- +
diff --git a/app/frontend/templates/admin/pricing/credits.html b/app/frontend/templates/admin/pricing/credits.html index b4e0c193b..794ded221 100644 --- a/app/frontend/templates/admin/pricing/credits.html +++ b/app/frontend/templates/admin/pricing/credits.html @@ -27,15 +27,15 @@
- -
-
@@ -48,7 +48,7 @@

{{ 'app.admin.pricing.machines' }}

- +
@@ -79,18 +79,18 @@
- -
- -
@@ -103,7 +103,7 @@

{{ 'app.admin.pricing.spaces' }}

- +
@@ -133,18 +133,18 @@
- -
- -
diff --git a/app/frontend/templates/admin/pricing/sendCoupon.html b/app/frontend/templates/admin/pricing/sendCoupon.html index 83e63e536..f3e37a681 100644 --- a/app/frontend/templates/admin/pricing/sendCoupon.html +++ b/app/frontend/templates/admin/pricing/sendCoupon.html @@ -25,6 +25,6 @@
- - + +
diff --git a/app/frontend/templates/admin/pricing/subscriptions.html b/app/frontend/templates/admin/pricing/subscriptions.html index 100db083e..a15d43f62 100644 --- a/app/frontend/templates/admin/pricing/subscriptions.html +++ b/app/frontend/templates/admin/pricing/subscriptions.html @@ -6,7 +6,7 @@
- diff --git a/app/frontend/templates/admin/projects/index.html b/app/frontend/templates/admin/projects/index.html index c1cf88997..84b46ccdd 100644 --- a/app/frontend/templates/admin/projects/index.html +++ b/app/frontend/templates/admin/projects/index.html @@ -12,7 +12,7 @@
- {{ 'app.admin.projects.manage_abuses' }} + {{ 'app.admin.projects.manage_abuses' }}
diff --git a/app/frontend/templates/admin/projects/licences.html b/app/frontend/templates/admin/projects/licences.html index e60a0b6fe..a248b0491 100644 --- a/app/frontend/templates/admin/projects/licences.html +++ b/app/frontend/templates/admin/projects/licences.html @@ -1,4 +1,4 @@ - + @@ -23,18 +23,18 @@
- -
- -
diff --git a/app/frontend/templates/admin/projects/materials.html b/app/frontend/templates/admin/projects/materials.html index f74b94113..b61f8378c 100644 --- a/app/frontend/templates/admin/projects/materials.html +++ b/app/frontend/templates/admin/projects/materials.html @@ -1,4 +1,4 @@ - + @@ -17,18 +17,18 @@
- -
- -
diff --git a/app/frontend/templates/admin/projects/project_categories.html b/app/frontend/templates/admin/projects/project_categories.html index 37881502e..077fabd2a 100644 --- a/app/frontend/templates/admin/projects/project_categories.html +++ b/app/frontend/templates/admin/projects/project_categories.html @@ -1,4 +1,4 @@ - + @@ -16,18 +16,18 @@
- -
- -
diff --git a/app/frontend/templates/admin/projects/settings.html b/app/frontend/templates/admin/projects/settings.html index a192e5f89..0cd7b06e0 100644 --- a/app/frontend/templates/admin/projects/settings.html +++ b/app/frontend/templates/admin/projects/settings.html @@ -56,7 +56,7 @@ - + diff --git a/app/frontend/templates/admin/projects/themes.html b/app/frontend/templates/admin/projects/themes.html index d56998fdb..a0de16f7c 100644 --- a/app/frontend/templates/admin/projects/themes.html +++ b/app/frontend/templates/admin/projects/themes.html @@ -1,4 +1,4 @@ - + @@ -17,18 +17,18 @@
- -
- -
diff --git a/app/frontend/templates/admin/settings/about.html b/app/frontend/templates/admin/settings/about.html index b40671d23..cbf4fc131 100644 --- a/app/frontend/templates/admin/settings/about.html +++ b/app/frontend/templates/admin/settings/about.html @@ -23,7 +23,7 @@

{{ 'app.admin.settings.shift_enter_to_force_carriage_return' | translate }} - +
@@ -41,7 +41,7 @@ {{ 'app.admin.settings.drag_and_drop_to_insert_images' | translate }} (max. 1200px) - +
{{ 'app.admin.settings.shift_enter_to_force_carriage_return' | translate }} - +

{{ 'app.admin.settings.about_follow_us' }}

diff --git a/app/frontend/templates/admin/settings/analyticsModal.html b/app/frontend/templates/admin/settings/analyticsModal.html index 0236e545e..ac4d68d75 100644 --- a/app/frontend/templates/admin/settings/analyticsModal.html +++ b/app/frontend/templates/admin/settings/analyticsModal.html @@ -30,5 +30,5 @@
- +
diff --git a/app/frontend/templates/admin/settings/general.html b/app/frontend/templates/admin/settings/general.html index eb73cec2d..83bd64e34 100644 --- a/app/frontend/templates/admin/settings/general.html +++ b/app/frontend/templates/admin/settings/general.html @@ -31,7 +31,7 @@ {{ 'app.admin.settings.general.neutral' | translate }} {{ 'app.admin.settings.general.eg' | translate }} {{ 'app.admin.settings.general.the_team' | translate }} {{ 'app.admin.settings.general.neutral_preposition' }} {{allSettings.fablab_name}} - + @@ -57,7 +57,7 @@ }'> - +

{{ 'app.admin.settings.warning_message_of_the_training_booking_page'}}

@@ -70,7 +70,7 @@ }'>
- +

{{ 'app.admin.settings.information_message_of_the_training_reservation_page'}}

@@ -83,7 +83,7 @@ }'>
- +

{{ 'app.admin.settings.message_of_the_subscriptions_page' }}

@@ -95,7 +95,7 @@ "targetBlank": true }'>
- +

{{ 'app.admin.settings.message_of_the_events_page' }}

@@ -107,7 +107,7 @@ "targetBlank": true }'>
- +

{{ 'app.admin.settings.message_of_the_spaces_page' }}

@@ -119,7 +119,7 @@ "targetBlank": true }'>
- + @@ -154,7 +154,7 @@ - +
@@ -178,7 +178,7 @@
- + @@ -219,7 +219,7 @@ - +
@@ -245,7 +245,7 @@
- +
@@ -271,7 +271,7 @@
- + @@ -288,7 +288,7 @@
- +
@@ -304,7 +304,7 @@
- +
@@ -334,7 +334,7 @@ {{ 'app.admin.settings.background_picture_recommendation' }} - + diff --git a/app/frontend/templates/admin/settings/home_page.html b/app/frontend/templates/admin/settings/home_page.html index dfa3073af..2cfbc93fb 100644 --- a/app/frontend/templates/admin/settings/home_page.html +++ b/app/frontend/templates/admin/settings/home_page.html @@ -3,12 +3,12 @@

{{ 'app.admin.settings.customize_home_page' }}

- + - +
@@ -24,7 +24,7 @@ }'>
{{ 'app.admin.settings.leave_it_empty_to_not_bring_up_any_news_on_the_home_page' | translate }} - +
{{ 'app.admin.settings.home_css_notice_html' }}

- +
diff --git a/app/frontend/templates/admin/settings/newSelectOption.html b/app/frontend/templates/admin/settings/newSelectOption.html index 5be384d90..e9598fcfb 100644 --- a/app/frontend/templates/admin/settings/newSelectOption.html +++ b/app/frontend/templates/admin/settings/newSelectOption.html @@ -9,7 +9,7 @@
- - + +
diff --git a/app/frontend/templates/admin/settings/number.html b/app/frontend/templates/admin/settings/number.html index 833b8dbf1..c0dc68f77 100644 --- a/app/frontend/templates/admin/settings/number.html +++ b/app/frontend/templates/admin/settings/number.html @@ -11,5 +11,5 @@ {{ helperText | translate }} - + diff --git a/app/frontend/templates/admin/settings/privacy.html b/app/frontend/templates/admin/settings/privacy.html index da577abcc..16ae6ab32 100644 --- a/app/frontend/templates/admin/settings/privacy.html +++ b/app/frontend/templates/admin/settings/privacy.html @@ -15,7 +15,7 @@ {{ 'app.admin.settings.drag_and_drop_to_insert_images' | translate }} - +
- +
diff --git a/app/frontend/templates/admin/settings/reservations.html b/app/frontend/templates/admin/settings/reservations.html index 104e2458b..d3a59e504 100644 --- a/app/frontend/templates/admin/settings/reservations.html +++ b/app/frontend/templates/admin/settings/reservations.html @@ -11,14 +11,14 @@
- +

{{ 'app.admin.settings.closing_time' }}

- +
@@ -269,7 +269,7 @@

{{ 'app.admin.settings.reservation_context_options' }}

- + @@ -299,18 +299,18 @@
- -
- -
diff --git a/app/frontend/templates/admin/settings/save_policy.html b/app/frontend/templates/admin/settings/save_policy.html index 5d608f5c7..fe7893425 100644 --- a/app/frontend/templates/admin/settings/save_policy.html +++ b/app/frontend/templates/admin/settings/save_policy.html @@ -6,7 +6,7 @@

{{ 'app.admin.settings.privacy.publish_will_notify' }}

- - - + + +
diff --git a/app/frontend/templates/admin/settings/select-multiple.html b/app/frontend/templates/admin/settings/select-multiple.html index 1a020aed7..bb868651b 100644 --- a/app/frontend/templates/admin/settings/select-multiple.html +++ b/app/frontend/templates/admin/settings/select-multiple.html @@ -13,5 +13,5 @@ - + diff --git a/app/frontend/templates/admin/settings/select.html b/app/frontend/templates/admin/settings/select.html index f17fa48b8..d469d36eb 100644 --- a/app/frontend/templates/admin/settings/select.html +++ b/app/frontend/templates/admin/settings/select.html @@ -12,5 +12,5 @@ - + diff --git a/app/frontend/templates/admin/settings/text.html b/app/frontend/templates/admin/settings/text.html index ffcb1966e..ddd51ebe5 100644 --- a/app/frontend/templates/admin/settings/text.html +++ b/app/frontend/templates/admin/settings/text.html @@ -17,5 +17,5 @@ ng-readonly="readOnly"> - + diff --git a/app/frontend/templates/admin/statistics/graphs.html b/app/frontend/templates/admin/statistics/graphs.html index 6bc3b9ac2..6f1f6561b 100644 --- a/app/frontend/templates/admin/statistics/graphs.html +++ b/app/frontend/templates/admin/statistics/graphs.html @@ -12,7 +12,7 @@
- {{ 'app.admin.stats_graphs.data' | translate }} + {{ 'app.admin.stats_graphs.data' | translate }}
diff --git a/app/frontend/templates/admin/statistics/index.html b/app/frontend/templates/admin/statistics/index.html index 7a85e3f04..75afdadfa 100644 --- a/app/frontend/templates/admin/statistics/index.html +++ b/app/frontend/templates/admin/statistics/index.html @@ -12,9 +12,9 @@
- + - {{ 'app.admin.statistics.evolution' | translate }} + {{ 'app.admin.statistics.evolution' | translate }}
@@ -299,7 +299,7 @@
- +
diff --git a/app/frontend/templates/admin/tags/index.html b/app/frontend/templates/admin/tags/index.html index ece11564c..910152fdd 100644 --- a/app/frontend/templates/admin/tags/index.html +++ b/app/frontend/templates/admin/tags/index.html @@ -1,4 +1,4 @@ - + @@ -16,18 +16,18 @@
- -
- -
diff --git a/app/frontend/templates/admin/trainings/modal_edit.html b/app/frontend/templates/admin/trainings/modal_edit.html index a4171f2f1..44db2caa6 100644 --- a/app/frontend/templates/admin/trainings/modal_edit.html +++ b/app/frontend/templates/admin/trainings/modal_edit.html @@ -10,5 +10,5 @@
- +
diff --git a/app/frontend/templates/admin/trainings/validTrainingModal.html b/app/frontend/templates/admin/trainings/validTrainingModal.html index 868fd45e9..08902c78f 100644 --- a/app/frontend/templates/admin/trainings/validTrainingModal.html +++ b/app/frontend/templates/admin/trainings/validTrainingModal.html @@ -16,6 +16,6 @@

{{ 'app.admin.trainings.no_reservation' }}

- - + +
diff --git a/app/frontend/templates/admin/versions/upgradeModal.html b/app/frontend/templates/admin/versions/upgradeModal.html index 6bc7343e6..1f033f973 100644 --- a/app/frontend/templates/admin/versions/upgradeModal.html +++ b/app/frontend/templates/admin/versions/upgradeModal.html @@ -15,5 +15,5 @@

- +
diff --git a/app/frontend/templates/dashboard/projects.html b/app/frontend/templates/dashboard/projects.html index 8621f7808..7a0fce689 100644 --- a/app/frontend/templates/dashboard/projects.html +++ b/app/frontend/templates/dashboard/projects.html @@ -10,7 +10,7 @@
- {{ 'app.logged.dashboard.projects.add_a_project' }} + {{ 'app.logged.dashboard.projects.add_a_project' }}
{{ 'app.logged.dashboard.projects.you_dont_have_any_projects' }}
@@ -20,7 +20,7 @@ {{project.author_id == currentUser.id ? 'app.logged.dashboard.projects.author' : 'app.logged.dashboard.projects.collaborator' | translate}} {{ 'app.logged.dashboard.projects.rough_draft' }}
- {{ 'app.shared.buttons.consult' }} + {{ 'app.shared.buttons.consult' }}
diff --git a/app/frontend/templates/dashboard/settings.html b/app/frontend/templates/dashboard/settings.html index 5d7e3da3c..6eee1e415 100644 --- a/app/frontend/templates/dashboard/settings.html +++ b/app/frontend/templates/dashboard/settings.html @@ -31,7 +31,7 @@
-
{{ 'app.logged.dashboard.settings.no_subscriptions' | translate }}
{{ 'app.logged.dashboard.settings.i_want_to_subscribe' }}
+
{{ 'app.logged.dashboard.settings.no_subscriptions' | translate }}
{{ 'app.logged.dashboard.settings.i_want_to_subscribe' }}
@@ -70,10 +70,10 @@
{{ 'app.logged.dashboard.settings.cookies_accepted' }}
{{ 'app.logged.dashboard.settings.cookies_declined' }}
{{ 'app.logged.dashboard.settings.cookies_unset' }}
- +
- +
@@ -94,13 +94,13 @@
- + {{ 'app.logged.dashboard.settings.change_my_data' | translate }}

{{ 'app.logged.dashboard.settings.once_your_data_are_up_to_date_' | translate }} {{ 'app.logged.dashboard.settings._click_on_the_synchronization_button_opposite_' }} {{ 'app.logged.dashboard.settings.or' | translate}} {{ 'app.logged.dashboard.settings._disconnect_then_reconnect_' }} {{ 'app.logged.dashboard.settings._for_your_changes_to_take_effect' | translate }}

- + {{ 'app.logged.dashboard.settings.sync_my_profile' | translate }}
diff --git a/app/frontend/templates/events/index.html b/app/frontend/templates/events/index.html index 24108fab1..072ab9208 100644 --- a/app/frontend/templates/events/index.html +++ b/app/frontend/templates/events/index.html @@ -13,7 +13,7 @@
- {{ 'app.public.events_list.add_an_event' }} + {{ 'app.public.events_list.add_an_event' }}
@@ -69,7 +69,7 @@
- {{ 'app.public.events_list.load_the_next_events' }} + {{ 'app.public.events_list.load_the_next_events' }}
diff --git a/app/frontend/templates/events/show.html b/app/frontend/templates/events/show.html index b25834565..5703e3add 100644 --- a/app/frontend/templates/events/show.html +++ b/app/frontend/templates/events/show.html @@ -17,8 +17,8 @@
- {{ 'app.shared.buttons.edit' | translate }} - + {{ 'app.shared.buttons.edit' | translate }} +
@@ -250,7 +250,7 @@ {{ 'app.public.events_show.thanks_for_coming' }} {{ 'app.public.events_show.view_event_list' }} - @@ -266,11 +266,11 @@
- +
- +
diff --git a/app/frontend/templates/home/members.html b/app/frontend/templates/home/members.html index e39df627d..876828a00 100644 --- a/app/frontend/templates/home/members.html +++ b/app/frontend/templates/home/members.html @@ -18,10 +18,10 @@
- +
- +
diff --git a/app/frontend/templates/machines/show.html b/app/frontend/templates/machines/show.html index a56e8f9c9..31c75e0d9 100644 --- a/app/frontend/templates/machines/show.html +++ b/app/frontend/templates/machines/show.html @@ -16,7 +16,7 @@
- {{ 'app.shared.buttons.edit' | translate }} - + {{ 'app.shared.buttons.edit' | translate }} +
diff --git a/app/frontend/templates/members/index.html b/app/frontend/templates/members/index.html index 0acbcbc2e..0f193771e 100644 --- a/app/frontend/templates/members/index.html +++ b/app/frontend/templates/members/index.html @@ -40,7 +40,7 @@ 		{{ member.email }}
-
@@ -49,7 +49,7 @@
- +

{{ 'app.logged.members.no_members_for_now' }}

diff --git a/app/frontend/templates/members/show.html b/app/frontend/templates/members/show.html index c538d76f5..5b30f7d03 100644 --- a/app/frontend/templates/members/show.html +++ b/app/frontend/templates/members/show.html @@ -15,7 +15,7 @@
- {{ 'app.logged.members_show.members_list' }} + {{ 'app.logged.members_show.members_list' }}
diff --git a/app/frontend/templates/profile/_token.html b/app/frontend/templates/profile/_token.html index 2c9b5a166..42b5bbe99 100644 --- a/app/frontend/templates/profile/_token.html +++ b/app/frontend/templates/profile/_token.html @@ -23,7 +23,7 @@
diff --git a/app/frontend/templates/projects/_form.html b/app/frontend/templates/projects/_form.html index 714219cb9..5456aae15 100644 --- a/app/frontend/templates/projects/_form.html +++ b/app/frontend/templates/projects/_form.html @@ -30,11 +30,11 @@ {{ 'app.shared.project.illustration_recommendation' }}
- {{ 'app.shared.project.add_an_illustration' | translate }} {{ 'app.shared.buttons.change' }} + {{ 'app.shared.project.add_an_illustration' | translate }} {{ 'app.shared.buttons.change' }} - {{ 'app.shared.buttons.delete' }} + {{ 'app.shared.buttons.delete' }}
@@ -64,7 +64,7 @@ - {{ 'app.shared.project.add_a_new_file' | translate }} + {{ 'app.shared.project.add_a_new_file' | translate }} @@ -84,7 +84,7 @@
-
- {{ 'app.shared.buttons.browse' | translate }} {{ 'app.shared.buttons.change' }} + {{ 'app.shared.buttons.browse' | translate }} {{ 'app.shared.buttons.change' }} - {{ 'app.shared.buttons.delete' }} + {{ 'app.shared.buttons.delete' }}
- {{ 'app.shared.project.delete_the_step' | translate }} + {{ 'app.shared.project.delete_the_step' | translate }}
- + {{ 'app.shared.project.add_a_new_step' }} @@ -149,12 +149,12 @@
-
{{ 'app.shared.project.publish_your_project' }}
+
{{ 'app.shared.project.publish_your_project' }}
{{ 'app.shared.project.or' }}
diff --git a/app/frontend/templates/projects/edit.html b/app/frontend/templates/projects/edit.html index dd14a9b70..8b9db5ae1 100644 --- a/app/frontend/templates/projects/edit.html +++ b/app/frontend/templates/projects/edit.html @@ -18,9 +18,9 @@
- -
{{ 'app.logged.projects_edit.publish' }}
+
{{ 'app.logged.projects_edit.publish' }}
diff --git a/app/frontend/templates/projects/index.html b/app/frontend/templates/projects/index.html index b2bde70ed..1fd2dca66 100644 --- a/app/frontend/templates/projects/index.html +++ b/app/frontend/templates/projects/index.html @@ -13,7 +13,7 @@
- {{ 'app.public.projects_list.add_a_project' }} + {{ 'app.public.projects_list.add_a_project' }}
@@ -42,7 +42,7 @@
- +
@@ -108,7 +108,7 @@
- + {{ 'app.public.projects_list.download_archive' | translate }}
diff --git a/app/frontend/templates/projects/show.html b/app/frontend/templates/projects/show.html index d9c59ce2f..ba8d332ad 100644 --- a/app/frontend/templates/projects/show.html +++ b/app/frontend/templates/projects/show.html @@ -16,8 +16,8 @@
- {{ 'app.shared.buttons.edit' | translate }} - + {{ 'app.shared.buttons.edit' | translate }} +
diff --git a/app/frontend/templates/shared/ConfirmationNewModal.html b/app/frontend/templates/shared/ConfirmationNewModal.html index e183e6928..c2eefd77b 100644 --- a/app/frontend/templates/shared/ConfirmationNewModal.html +++ b/app/frontend/templates/shared/ConfirmationNewModal.html @@ -27,7 +27,7 @@
- +
diff --git a/app/frontend/templates/shared/_cart.html b/app/frontend/templates/shared/_cart.html index 488bf509a..cb1d98827 100644 --- a/app/frontend/templates/shared/_cart.html +++ b/app/frontend/templates/shared/_cart.html @@ -57,7 +57,7 @@
- +
{{ 'app.shared.cart.remove_this_slot' }}
@@ -68,7 +68,7 @@

{{ 'app.shared.cart.to_benefit_from_attractive_prices' }}

-
+

{{ 'app.shared.cart.or' }}

@@ -103,7 +103,7 @@
- +
diff --git a/app/frontend/templates/shared/_partner_new_modal.html b/app/frontend/templates/shared/_partner_new_modal.html index 3cc9f036f..af5656b77 100644 --- a/app/frontend/templates/shared/_partner_new_modal.html +++ b/app/frontend/templates/shared/_partner_new_modal.html @@ -1,35 +1,35 @@
-

{{ 'app.shared.plan.new_partner' }}

+

{{ 'app.admin.partner_modal.title' }}

- +
- {{ 'app.shared.plan.first_name_is_required' }} + {{ 'app.admin.partner_modal.field_is_required' }}
- +
- {{ 'app.shared.plan.surname_is_required' }} + {{ 'app.admin.partner_modal.field_is_required' }}
- +
- {{ 'app.shared.plan.email_address_is_required' }} + {{ 'app.admin.partner_modal.field_is_required' }}
- - + +
diff --git a/app/frontend/templates/shared/confirm_modify_slot_modal.html b/app/frontend/templates/shared/confirm_modify_slot_modal.html index c5ffd6555..b6987fa43 100644 --- a/app/frontend/templates/shared/confirm_modify_slot_modal.html +++ b/app/frontend/templates/shared/confirm_modify_slot_modal.html @@ -8,7 +8,7 @@

{{object.start | amDateFormat: 'LL'}} : {{object.start | amDateFormat:'LT'}} - {{object.end | amDateFormat:'LT'}}

- - - + + +
diff --git a/app/frontend/templates/shared/deviseModal.html b/app/frontend/templates/shared/deviseModal.html index b439b683f..bd3364903 100644 --- a/app/frontend/templates/shared/deviseModal.html +++ b/app/frontend/templates/shared/deviseModal.html @@ -57,7 +57,7 @@
- +

diff --git a/app/frontend/templates/shared/header.html.erb b/app/frontend/templates/shared/header.html.erb index f2c5edcea..368b839d9 100644 --- a/app/frontend/templates/shared/header.html.erb +++ b/app/frontend/templates/shared/header.html.erb @@ -15,11 +15,11 @@