diff --git a/CHANGELOG.md b/CHANGELOG.md index d51293357..ec7790417 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - In the email notification, sent to admins on account creation, show the group of the user - More explanations in the setup script - Send pre-compressed assets to the browsers instead of the regular ones +- Links created using "medium editor" opens in new tabs - Fix a bug: subscriptions tab is selected by default in statistics, even if the module is disabled - Fix a bug: select all plans for slot restriction (through the dedicated button) also selects the disabled plans - Fix a bug: recurring availabilities are not restricted to subscribers diff --git a/app/frontend/templates/admin/plans/_form.html b/app/frontend/templates/admin/plans/_form.html index 7161b264e..8cfdcbcca 100644 --- a/app/frontend/templates/admin/plans/_form.html +++ b/app/frontend/templates/admin/plans/_form.html @@ -130,9 +130,13 @@
-
+
diff --git a/app/frontend/templates/admin/settings/about.html b/app/frontend/templates/admin/settings/about.html index 109f3d330..67a0c98ba 100644 --- a/app/frontend/templates/admin/settings/about.html +++ b/app/frontend/templates/admin/settings/about.html @@ -30,18 +30,27 @@
-
+
{{ 'app.admin.settings.drag_and_drop_to_insert_images' | translate }}
-
+
{{ 'app.admin.settings.shift_enter_to_force_carriage_return' | translate }} diff --git a/app/frontend/templates/admin/settings/general.html b/app/frontend/templates/admin/settings/general.html index 611235b51..ff9c0e9aa 100644 --- a/app/frontend/templates/admin/settings/general.html +++ b/app/frontend/templates/admin/settings/general.html @@ -48,52 +48,76 @@

{{ 'app.admin.settings.message_of_the_machine_booking_page' }}

-
+

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

-
+

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

-
+

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

-
+

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

-
+

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

-
+
diff --git a/app/frontend/templates/admin/settings/home_page.html b/app/frontend/templates/admin/settings/home_page.html index 40de310f7..4b4c858c1 100644 --- a/app/frontend/templates/admin/settings/home_page.html +++ b/app/frontend/templates/admin/settings/home_page.html @@ -14,8 +14,15 @@

{{ 'app.admin.settings.news_of_the_home_page' }}

-
+
+
{{ 'app.admin.settings.leave_it_empty_to_not_bring_up_any_news_on_the_home_page' | translate }}