From ab3ac05aa3eaacfc2823f1bcc0ae0845f57f9fb1 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 3 Mar 2021 15:33:03 +0100 Subject: [PATCH 01/21] Allow inserting hyperlinks in customized info messages --- CHANGELOG.md | 3 +++ app/frontend/templates/admin/settings/general.html | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee6a8d9bc..3ece307cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog Fab-manager +## Next release +- Allow inserting hyperlinks in customized info messages + ## v4.7.3 2021 March 03 - Improved the setup script - Fix a bug: unable to install a new instance with an external reverse proxy diff --git a/app/frontend/templates/admin/settings/general.html b/app/frontend/templates/admin/settings/general.html index d2cbefa19..23c61d3c8 100644 --- a/app/frontend/templates/admin/settings/general.html +++ b/app/frontend/templates/admin/settings/general.html @@ -49,7 +49,7 @@

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

@@ -58,7 +58,7 @@

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

@@ -67,7 +67,7 @@

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

@@ -76,7 +76,7 @@

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

@@ -84,7 +84,7 @@

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

@@ -92,7 +92,7 @@

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

From a74c5d4c95810236f6329032e51f1cecb614b281 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 3 Mar 2021 17:21:06 +0100 Subject: [PATCH 02/21] WIP: plan description --- app/controllers/api/plans_controller.rb | 2 +- .../src/javascript/components/plan-card.tsx | 9 ++++++++- .../src/stylesheets/app.components.scss | 18 ++++++++++++++++++ app/frontend/templates/admin/plans/_form.html | 11 +++++++++++ config/locales/app.shared.en.yml | 2 ++ config/locales/app.shared.fr.yml | 2 ++ 6 files changed, 42 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/plans_controller.rb b/app/controllers/api/plans_controller.rb index e0d1769de..7e15e5015 100644 --- a/app/controllers/api/plans_controller.rb +++ b/app/controllers/api/plans_controller.rb @@ -68,7 +68,7 @@ class API::PlansController < API::ApiController @parameters = @parameters.require(:plan) .permit(:base_name, :type, :group_id, :amount, :interval, :interval_count, :is_rolling, - :training_credit_nb, :ui_weight, :disabled, :monthly_payment, + :training_credit_nb, :ui_weight, :disabled, :monthly_payment, :description, plan_file_attributes: %i[id attachment _destroy], prices_attributes: %i[id amount]) end diff --git a/app/frontend/src/javascript/components/plan-card.tsx b/app/frontend/src/javascript/components/plan-card.tsx index e6a1beb26..2d9134063 100644 --- a/app/frontend/src/javascript/components/plan-card.tsx +++ b/app/frontend/src/javascript/components/plan-card.tsx @@ -71,6 +71,12 @@ const PlanCard: React.FC = ({ plan, userId, subscribedPlanId, ope const hasAttachment = (): boolean => { return !!plan.plan_file_url; } + /** + * Check if the plan has a description + */ + const hasDescription = (): boolean => { + return !!plan.description; + } /** * Check if the plan is allowing a monthly payment schedule */ @@ -100,6 +106,8 @@ const PlanCard: React.FC = ({ plan, userId, subscribedPlanId, ope
}
+ {hasDescription() &&
} + {hasAttachment() && { t('app.public.plans.more_information') }} {canSubscribeForMe() &&
{!hasSubscribedToThisPlan() &&
} - {hasAttachment() && { t('app.public.plans.more_information') }}
); } diff --git a/app/frontend/src/stylesheets/app.components.scss b/app/frontend/src/stylesheets/app.components.scss index 7c1a082e4..1db1463d1 100644 --- a/app/frontend/src/stylesheets/app.components.scss +++ b/app/frontend/src/stylesheets/app.components.scss @@ -269,6 +269,7 @@ .pricing-panel { border: 1px solid $border-color; + height: 391px; &:first-child { border-right: none; @@ -347,6 +348,11 @@ } } + .plan-description { + max-height: 5.2em; + overflow: hidden; + } + .cta-button { margin: 20px 0; @@ -800,3 +806,15 @@ input[type=date].form-control { margin-left: 1em; } } + +.medium-editor-input { + display: table-cell; + border: 1px solid #c0c0c0; + border-radius: 0.2em; + padding: 0.5em; + width: 100%; + + p { + margin-bottom: 0; + } +} diff --git a/app/frontend/templates/admin/plans/_form.html b/app/frontend/templates/admin/plans/_form.html index b40c91a02..32f25f48b 100644 --- a/app/frontend/templates/admin/plans/_form.html +++ b/app/frontend/templates/admin/plans/_form.html @@ -127,6 +127,17 @@ {{ 'app.shared.plan.monthly_payment_info' }}
+
+ +
+
+
+
+ +
+ diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index e39eec1ed..4ebb8e270 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -192,6 +192,8 @@ en: otherwise_it_will_begin_as_soon_as_it_is_bought: "Otherwise, it will begin as soon as it is bought." monthly_payment: "Monthly payment?" monthly_payment_info: "If monthly payment is enabled, the members will be able to choose between a one-time payment or a payment schedule staged each months." + description: "Description" + type_a_short_description: "Type a short description" information_sheet: "Information sheet" attach_an_information_sheet: "Attach an information sheet" notified_partner: "Notified partner" diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index a320d6d5c..a81baae2e 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -192,6 +192,8 @@ fr: otherwise_it_will_begin_as_soon_as_it_is_bought: "Dans le cas contraire, il prendra effet dès sa date d'achat." monthly_payment: "Paiement mensuel ?" monthly_payment_info: "Si le paiement mensuel est activé, les membres pourront choisir entre un paiement unique ou un échéancier de paiement échelonné chaque mois." + description: "Description" + type_a_short_description: "Saisir une courte description" information_sheet: "Fiche descriptive" attach_an_information_sheet: "Joindre une fiche descriptive" notified_partner: "Partenaire notifié" From 021c019ba45e95752cc8ccb91549f13f89db17d2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 09:57:11 +0100 Subject: [PATCH 03/21] fix rename service during setup --- setup/setup.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/setup/setup.sh b/setup/setup.sh index e5fd65074..142d2e6ae 100755 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -66,6 +66,7 @@ read_email() config() { + SERVICE="fabmanager" echo 'We recommend nginx to serve the application over the network (internet). You can use your own solution or let this script install and configure nginx for Fab-manager.' read -rp 'Do you want install nginx? (Y/n) ' NGINX Date: Mon, 8 Mar 2021 12:08:17 +0100 Subject: [PATCH 04/21] [bug] script to mount payment-schedules volume results in invalid yml file + improved scripts for mounting volumes + increased verbosity of upgrade script --- CHANGELOG.md | 3 +++ scripts/mount-payment-schedules.sh | 8 +++++--- scripts/mount-webpack.sh | 6 ++++-- setup/upgrade.sh | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ece307cf..d4f3b12f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Next release - Allow inserting hyperlinks in customized info messages +- Improved scripts for mounting volumes +- Increased verbosity of upgrade script +- Fix a bug: mounting the payment-schedules volume in the docker-compose file results in an invalid file ## v4.7.3 2021 March 03 - Improved the setup script diff --git a/scripts/mount-payment-schedules.sh b/scripts/mount-payment-schedules.sh index 7ad7a92e2..2bd354b71 100644 --- a/scripts/mount-payment-schedules.sh +++ b/scripts/mount-payment-schedules.sh @@ -18,9 +18,11 @@ config() add_mount() { - # shellcheck disable=SC2016 - # we don't want to expand ${PWD} - yq -i eval ".services.$SERVICE.volumes += [\"\${PWD}/payment_schedules:/usr/src/app/payment_schedules\"]" docker-compose.yml + if [[ ! $(yq eval ".services.$SERVICE.volumes.[] | select (. == \"*payment_schedules\")" docker-compose.yml) ]]; then + # shellcheck disable=SC2016 + # we don't want to expand ${PWD} + yq -i eval ".services.$SERVICE.volumes += [\"\${PWD}/payment_schedules:/usr/src/app/payment_schedules\"]" docker-compose.yml + fi } proceed() diff --git a/scripts/mount-webpack.sh b/scripts/mount-webpack.sh index 5dc9a2b7e..895891d2d 100644 --- a/scripts/mount-webpack.sh +++ b/scripts/mount-webpack.sh @@ -18,8 +18,10 @@ config() change_mount() { - yq -i eval ".services.$SERVICE.volumes.[] | select(. == \"*assets\") |= \"\${PWD}/public/packs:/usr/src/app/public/packs\"" docker-compose.yml - echo "Service volume was replaced for $SERVICE: /assets changed to /packs" + if [[ $(yq eval ".services.$SERVICE.volumes.[] | select (. == \"*assets\")" docker-compose.yml) ]]; then + yq -i eval ".services.$SERVICE.volumes.[] |= select(. == \"*assets\") |= \"\${PWD}/public/packs:/usr/src/app/public/packs\"" docker-compose.yml + echo "Service volume was replaced for $SERVICE: /assets changed to /packs" + fi } proceed() diff --git a/setup/upgrade.sh b/setup/upgrade.sh index 4075e4969..e6a865e46 100644 --- a/setup/upgrade.sh +++ b/setup/upgrade.sh @@ -87,6 +87,7 @@ add_environments() { for ENV in "${ENVIRONMENTS[@]}"; do if [[ "$ENV" =~ ^[A-Z0-9_]+=.*$ ]]; then + printf "Inserting variable %s...\n" "$ENV" printf "# added on %s\n%s\n" "$(date +%Y-%m-%d\ %R)" "$ENV" >> "config/env" else echo "Ignoring invalid option: -e $ENV. Given value is not valid environment variable, please see https://huit.re/environment-doc" @@ -125,6 +126,7 @@ upgrade() BRANCH='master' if yq eval '.services.*.image | select(. == "sleede/fab-manager*")' docker-compose.yml | grep -q ':dev'; then BRANCH='dev'; fi for SCRIPT in "${SCRIPTS[@]}"; do + printf "Running script %s from branch %s...\n" "$SCRIPT" "$BRANCH" if [[ "$YES_ALL" = "true" ]]; then \curl -sSL "https://raw.githubusercontent.com/sleede/fab-manager/$BRANCH/scripts/$SCRIPT.sh" | bash -s -- -y else @@ -134,6 +136,7 @@ upgrade() compile_assets docker-compose run --rm "$SERVICE" bundle exec rake db:migrate for COMMAND in "${COMMANDS[@]}"; do + printf "Running command %s...\n" "$COMMAND" docker-compose run --rm "$SERVICE" bundle exec "$COMMAND" done docker-compose up -d From 10fbea92892b55e5c0325b4bbc03b3154c603ad6 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 14:09:11 +0100 Subject: [PATCH 05/21] Allow writing short rich descriptions for each subscription plan --- CHANGELOG.md | 4 +- .../src/javascript/components/plan-card.tsx | 42 +++++++------- .../src/javascript/controllers/admin/plans.js | 8 +++ .../src/stylesheets/app.components.scss | 58 ++++++++++++------- app/frontend/src/stylesheets/app.layout.scss | 9 +++ app/frontend/templates/admin/plans/_form.html | 2 +- app/themes/casemate/style.scss.erb | 19 +++--- 7 files changed, 90 insertions(+), 52 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4f3b12f2..7720fbfa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ # Changelog Fab-manager ## Next release +- Allow writing short rich descriptions for each subscription plan - Allow inserting hyperlinks in customized info messages - Improved scripts for mounting volumes - Increased verbosity of upgrade script - Fix a bug: mounting the payment-schedules volume in the docker-compose file results in an invalid file +- [TODO DEPLOY] `rails fablab:maintenance:rebuild_stylesheet` ## v4.7.3 2021 March 03 - Improved the setup script @@ -19,7 +21,7 @@ - Fix a bug: unable to upgrade using the easy upgrade command - Fix a security issue: possible SQL injection when dropping the database - Fix a security issue: restrict allowed keys when creating/updating credits -- [TODO DEPLOY] `bundle exec rails fablab:openlab:bulk_export` if you have enabled OpenLab (projects sharing) +- [TODO DEPLOY] `rails fablab:openlab:bulk_export` if you have enabled OpenLab (projects sharing) ## v4.7.1 2021 February 24 - Fix a security issue: updated axios to 0.21.1 to fix [CVE-2020-28168](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-28168) diff --git a/app/frontend/src/javascript/components/plan-card.tsx b/app/frontend/src/javascript/components/plan-card.tsx index 2d9134063..2911e8e12 100644 --- a/app/frontend/src/javascript/components/plan-card.tsx +++ b/app/frontend/src/javascript/components/plan-card.tsx @@ -106,26 +106,28 @@ const PlanCard: React.FC = ({ plan, userId, subscribedPlanId, ope
} - {hasDescription() &&
} - {hasAttachment() && { t('app.public.plans.more_information') }} - {canSubscribeForMe() &&
- {!hasSubscribedToThisPlan() && } - {hasSubscribedToThisPlan() && } -
} - {canSubscribeForOther() &&
- -
} +
+ {hasDescription() &&
} + {hasAttachment() && { t('app.public.plans.more_information') }} + {canSubscribeForMe() &&
+ {!hasSubscribedToThisPlan() && } + {hasSubscribedToThisPlan() && } +
} + {canSubscribeForOther() &&
+ +
} +
); } diff --git a/app/frontend/src/javascript/controllers/admin/plans.js b/app/frontend/src/javascript/controllers/admin/plans.js index 9172956ab..bc230b43d 100644 --- a/app/frontend/src/javascript/controllers/admin/plans.js +++ b/app/frontend/src/javascript/controllers/admin/plans.js @@ -64,6 +64,14 @@ class PlanController { return file._destroy = true; } }; + + /** + * Check and limit + * @param content + */ + $scope.limitDescriptionSize = function (content) { + alert(content); + }; } } diff --git a/app/frontend/src/stylesheets/app.components.scss b/app/frontend/src/stylesheets/app.components.scss index 1db1463d1..3d52a94c2 100644 --- a/app/frontend/src/stylesheets/app.components.scss +++ b/app/frontend/src/stylesheets/app.components.scss @@ -281,6 +281,13 @@ @include border-radius(0 3px 3px 0); } + .plan-card { + height: 100%; + display: flex; + flex-direction: column; + justify-content: flex-start; + } + .title { margin: 10px 0; font-size: rem-calc(16); @@ -348,31 +355,38 @@ } } - .plan-description { - max-height: 5.2em; - overflow: hidden; - } + .card-footer { + display: flex; + flex-direction: column; + justify-content: space-around; + height: 100%; - .cta-button { - margin: 20px 0; - - .subscribe-button { - @extend .btn; - @extend .rounded; - - outline: 0; - font-weight: 600; - font-size: rem-calc(16); - background-color: white; - padding-left: 30px; - padding-right: 30px; + .plan-description { + max-height: 5.2em; + overflow: hidden; } - button.subscribe-button:focus, button.subscribe-button:hover { - outline: 0; + + .cta-button { + margin: 20px 0; + + .subscribe-button { + @extend .btn; + @extend .rounded; + + outline: 0; + font-weight: 600; + font-size: rem-calc(16); + background-color: white; + padding-left: 30px; + padding-right: 30px; + } + button.subscribe-button:focus, button.subscribe-button:hover { + outline: 0; + } + } + .info-link { + margin-top: 1em; } - } - .info-link { - margin-top: 1em; } } diff --git a/app/frontend/src/stylesheets/app.layout.scss b/app/frontend/src/stylesheets/app.layout.scss index fe62d9d64..fb5d2bd17 100644 --- a/app/frontend/src/stylesheets/app.layout.scss +++ b/app/frontend/src/stylesheets/app.layout.scss @@ -686,3 +686,12 @@ body.container { text-align: center; vertical-align: middle; } + +.plan-description-input .medium-editor-input div[medium-editor] { + max-height: 5.2em; + overflow: hidden; + + & p:nth-child(2n+3), p:nth-child(2n+4) { + display: none; + } +} diff --git a/app/frontend/templates/admin/plans/_form.html b/app/frontend/templates/admin/plans/_form.html index 32f25f48b..7161b264e 100644 --- a/app/frontend/templates/admin/plans/_form.html +++ b/app/frontend/templates/admin/plans/_form.html @@ -127,7 +127,7 @@ {{ 'app.shared.plan.monthly_payment_info' }}
-
+
Date: Mon, 8 Mar 2021 14:21:58 +0100 Subject: [PATCH 07/21] Do not close login modal when clicking on the backdrop --- CHANGELOG.md | 1 + app/frontend/src/javascript/controllers/application.js.erb | 1 + app/frontend/src/stylesheets/app.layout.scss | 6 ++++++ app/frontend/templates/shared/deviseModal.html | 1 + 4 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a901f4e8..5536f8fb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Allow writing short rich descriptions for each subscription plan - Allow inserting hyperlinks in customized info messages - Use the primary color to display plans' price in the public view +- Do not close login modal when clicking on the backdrop - Improved scripts for mounting volumes - Increased verbosity of upgrade script - Fix a bug: mounting the payment-schedules volume in the docker-compose file results in an invalid file diff --git a/app/frontend/src/javascript/controllers/application.js.erb b/app/frontend/src/javascript/controllers/application.js.erb index 9e9a58de0..c25601eb5 100644 --- a/app/frontend/src/javascript/controllers/application.js.erb +++ b/app/frontend/src/javascript/controllers/application.js.erb @@ -408,6 +408,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco <% else %> return $uibModal.open({ templateUrl: '/shared/deviseModal.html', + backdrop: 'static', size: 'sm', resolve: { settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['confirmation_required']" }).$promise; }] diff --git a/app/frontend/src/stylesheets/app.layout.scss b/app/frontend/src/stylesheets/app.layout.scss index fb5d2bd17..549bda911 100644 --- a/app/frontend/src/stylesheets/app.layout.scss +++ b/app/frontend/src/stylesheets/app.layout.scss @@ -695,3 +695,9 @@ body.container { display: none; } } + +.close-modal-button { + position: absolute; + right: 13px; + cursor: pointer; +} diff --git a/app/frontend/templates/shared/deviseModal.html b/app/frontend/templates/shared/deviseModal.html index ef8b95187..11e946442 100644 --- a/app/frontend/templates/shared/deviseModal.html +++ b/app/frontend/templates/shared/deviseModal.html @@ -1,6 +1,7 @@
+

{{ 'app.public.common.connection' }}

From 5527512b051ab5db4a5efac76a61366d302499eb Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:17:58 +0100 Subject: [PATCH 08/21] Show remaining training credits in the dashboard --- CHANGELOG.md | 1 + .../src/javascript/controllers/dashboard.js | 20 +++++++++++++++- app/frontend/src/javascript/router.js | 3 ++- .../templates/dashboard/trainings.html | 24 ++++++++++++++++++- config/locales/app.logged.en.yml | 4 ++++ config/locales/app.logged.fr.yml | 4 ++++ 6 files changed, 53 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5536f8fb1..79713a5ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog Fab-manager ## Next release +- Show remaining training credits in the dashboard - Allow writing short rich descriptions for each subscription plan - Allow inserting hyperlinks in customized info messages - Use the primary color to display plans' price in the public view diff --git a/app/frontend/src/javascript/controllers/dashboard.js b/app/frontend/src/javascript/controllers/dashboard.js index 6f2741898..aa908849c 100644 --- a/app/frontend/src/javascript/controllers/dashboard.js +++ b/app/frontend/src/javascript/controllers/dashboard.js @@ -12,7 +12,7 @@ */ 'use strict'; -Application.Controllers.controller('DashboardController', ['$scope', 'memberPromise', 'SocialNetworks', function ($scope, memberPromise, SocialNetworks) { +Application.Controllers.controller('DashboardController', ['$scope', 'memberPromise', 'trainingsPromise', 'SocialNetworks', function ($scope, memberPromise, trainingsPromise, SocialNetworks) { // Current user's profile $scope.user = memberPromise; @@ -22,6 +22,24 @@ Application.Controllers.controller('DashboardController', ['$scope', 'memberProm networks: SocialNetworks }; + /** + * Check if the member has used his training credits for the given credit + * @param trainingCredits array of credits used by the member + * @param trainingId id of the training to find + */ + $scope.hasUsedTrainingCredit = function (trainingCredits, trainingId) { + return trainingCredits.find(tc => tc.training_id === trainingId); + }; + + /** + * Return the name associated with the provided training ID + * @param trainingId training identifier + * @return {string} + */ + $scope.getTrainingName = function (trainingId) { + return trainingsPromise.find(t => t.id === trainingId).name; + }; + /* PRIVATE SCOPE */ /** diff --git a/app/frontend/src/javascript/router.js b/app/frontend/src/javascript/router.js index 38dc021b9..c6dfb5702 100644 --- a/app/frontend/src/javascript/router.js +++ b/app/frontend/src/javascript/router.js @@ -143,7 +143,8 @@ angular.module('application.router', ['ui.router']) abstract: true, url: '/dashboard', resolve: { - memberPromise: ['Member', 'currentUser', function (Member, currentUser) { return Member.get({ id: currentUser.id }).$promise; }] + memberPromise: ['Member', 'currentUser', function (Member, currentUser) { return Member.get({ id: currentUser.id }).$promise; }], + trainingsPromise: ['Training', function (Training) { return Training.query().$promise; }] } }) .state('app.logged.dashboard.profile', { diff --git a/app/frontend/templates/dashboard/trainings.html b/app/frontend/templates/dashboard/trainings.html index 754839adb..6209b0a3b 100644 --- a/app/frontend/templates/dashboard/trainings.html +++ b/app/frontend/templates/dashboard/trainings.html @@ -7,11 +7,33 @@ +
+
+
+
+

{{ 'app.logged.dashboard.trainings.your_training_credits' | translate }}

+
+
+ {{ 'app.logged.dashboard.trainings.subscribe_for_credits' }} + {{ 'app.logged.dashboard.trainings.register_for_free' }} +
    +
  • + {{getTrainingName(c.training_id)}} + +
    • +
+
+
+
+
+
-
+

{{ 'app.logged.dashboard.trainings.your_next_trainings' | translate }}

diff --git a/config/locales/app.logged.en.yml b/config/locales/app.logged.en.yml index 6607f18e6..fb0622936 100644 --- a/config/locales/app.logged.en.yml +++ b/config/locales/app.logged.en.yml @@ -109,6 +109,10 @@ en: your_previous_trainings: "Your previous trainings" your_approved_trainings: "Your approved trainings" no_trainings: "No trainings" + your_training_credits: "Your training credits" + subscribe_for_credits: "Subscribe to benefit from free trainings" + register_for_free: "Register for free to the following trainings:" + book_here: "Book here" #dashboard: my events events: your_next_events: "Your next events" diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml index 22aab44ff..8bb1a24e7 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -109,6 +109,10 @@ fr: your_previous_trainings: "Vos formations passées" your_approved_trainings: "Vos formations validées" no_trainings: "Aucune formation" + your_training_credits: "Vos crédits formation" + subscribe_for_credits: "Abonnez-vous pour bénéficier de formations gratuites" + register_for_free: "Inscrivez-vous gratuitement aux formations suivantes :" + book_here: "Réserver" #dashboard: my events events: your_next_events: "Vos prochains événements" From 41afe49475d0e3f6c7631b1f1577b43d34a2a495 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:32:42 +0100 Subject: [PATCH 09/21] New translations app.shared.en.yml (Portuguese) --- config/locales/app.shared.pt.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml index 214873eae..d630ab27e 100755 --- a/config/locales/app.shared.pt.yml +++ b/config/locales/app.shared.pt.yml @@ -192,6 +192,8 @@ pt: otherwise_it_will_begin_as_soon_as_it_is_bought: "Caso contrário, elecomeçará assim que for comprado." monthly_payment: "Monthly payment?" monthly_payment_info: "If monthly payment is enabled, the members will be able to choose between a one-time payment or a payment schedule staged each months." + description: "Description" + type_a_short_description: "Type a short description" information_sheet: "Folha de informação" attach_an_information_sheet: "Anexar folha de informação" notified_partner: "Parceiro notificado" From 2154fce13b060f817e03694a919a53321eec59ec Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:32:48 +0100 Subject: [PATCH 10/21] New translations app.logged.en.yml (Portuguese) --- config/locales/app.logged.pt.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/app.logged.pt.yml b/config/locales/app.logged.pt.yml index 452436ed7..bd978c0a9 100755 --- a/config/locales/app.logged.pt.yml +++ b/config/locales/app.logged.pt.yml @@ -109,6 +109,10 @@ pt: your_previous_trainings: "Seus treinamentos anteriores" your_approved_trainings: "Seus treinamentos aprovados" no_trainings: "Sem treinamentos" + your_training_credits: "Your training credits" + subscribe_for_credits: "Subscribe to benefit from free trainings" + register_for_free: "Register for free to the following trainings:" + book_here: "Book here" #dashboard: my events events: your_next_events: "Seus próximos eventos" From 77f039e0f766ce4b1d0c888401decaa61e50e608 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:32:55 +0100 Subject: [PATCH 11/21] New translations app.shared.en.yml (Zulu) --- config/locales/app.shared.zu.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/app.shared.zu.yml b/config/locales/app.shared.zu.yml index 052fa5066..88d40b6e9 100644 --- a/config/locales/app.shared.zu.yml +++ b/config/locales/app.shared.zu.yml @@ -192,6 +192,8 @@ zu: otherwise_it_will_begin_as_soon_as_it_is_bought: "crwdns9687:0crwdne9687:0" monthly_payment: "crwdns20936:0crwdne20936:0" monthly_payment_info: "crwdns20938:0crwdne20938:0" + description: "crwdns21422:0crwdne21422:0" + type_a_short_description: "crwdns21424:0crwdne21424:0" information_sheet: "crwdns9689:0crwdne9689:0" attach_an_information_sheet: "crwdns9691:0crwdne9691:0" notified_partner: "crwdns9693:0crwdne9693:0" From f2e8c6e032aaa3a9dd041a779ad4c75817b2a8fb Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:32:58 +0100 Subject: [PATCH 12/21] New translations app.shared.en.yml (German) --- config/locales/app.shared.de.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/app.shared.de.yml b/config/locales/app.shared.de.yml index 95c0027a5..b965df5db 100644 --- a/config/locales/app.shared.de.yml +++ b/config/locales/app.shared.de.yml @@ -192,6 +192,8 @@ de: otherwise_it_will_begin_as_soon_as_it_is_bought: "Andernfalls beginnt es ab Kaufdatum." monthly_payment: "Monthly payment?" monthly_payment_info: "If monthly payment is enabled, the members will be able to choose between a one-time payment or a payment schedule staged each months." + description: "Description" + type_a_short_description: "Type a short description" information_sheet: "Informationsblatt" attach_an_information_sheet: "Ein Informationsblatt anhängen" notified_partner: "Benachrichtigter Partner" From f42566967aa33c0a75fc7512a3687cfa65496f9a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:32:59 +0100 Subject: [PATCH 13/21] New translations app.logged.en.yml (German) --- config/locales/app.logged.de.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/app.logged.de.yml b/config/locales/app.logged.de.yml index b85375e20..72542c499 100644 --- a/config/locales/app.logged.de.yml +++ b/config/locales/app.logged.de.yml @@ -109,6 +109,10 @@ de: your_previous_trainings: "Ihre vorigen Schulungen" your_approved_trainings: "Ihre bestätigten Trainings" no_trainings: "Keine Schulungen" + your_training_credits: "Your training credits" + subscribe_for_credits: "Subscribe to benefit from free trainings" + register_for_free: "Register for free to the following trainings:" + book_here: "Book here" #dashboard: my events events: your_next_events: "Ihre nächsten Termine" From 7d32003f75b6fe6996fe2abfbf2039d9495dc3ee Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:33:04 +0100 Subject: [PATCH 14/21] New translations app.logged.en.yml (French) --- config/locales/app.logged.fr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml index 8bb1a24e7..043f93ac9 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -109,10 +109,10 @@ fr: your_previous_trainings: "Vos formations passées" your_approved_trainings: "Vos formations validées" no_trainings: "Aucune formation" - your_training_credits: "Vos crédits formation" - subscribe_for_credits: "Abonnez-vous pour bénéficier de formations gratuites" - register_for_free: "Inscrivez-vous gratuitement aux formations suivantes :" - book_here: "Réserver" + your_training_credits: "Your training credits" + subscribe_for_credits: "Subscribe to benefit from free trainings" + register_for_free: "Register for free to the following trainings:" + book_here: "Book here" #dashboard: my events events: your_next_events: "Vos prochains événements" From 048c3e7296fc4cd349109f7f052eda24fdd24275 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:33:06 +0100 Subject: [PATCH 15/21] New translations app.shared.en.yml (French) --- config/locales/app.shared.fr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index a81baae2e..19b6a03d4 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -193,7 +193,7 @@ fr: monthly_payment: "Paiement mensuel ?" monthly_payment_info: "Si le paiement mensuel est activé, les membres pourront choisir entre un paiement unique ou un échéancier de paiement échelonné chaque mois." description: "Description" - type_a_short_description: "Saisir une courte description" + type_a_short_description: "Type a short description" information_sheet: "Fiche descriptive" attach_an_information_sheet: "Joindre une fiche descriptive" notified_partner: "Partenaire notifié" From 583a281d83d5c407cb5ca46f0088f08b1d5fc6ee Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:33:11 +0100 Subject: [PATCH 16/21] New translations app.logged.en.yml (Spanish) --- config/locales/app.logged.es.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/app.logged.es.yml b/config/locales/app.logged.es.yml index e00715735..da085b805 100644 --- a/config/locales/app.logged.es.yml +++ b/config/locales/app.logged.es.yml @@ -109,6 +109,10 @@ es: your_previous_trainings: "Sus cursos anteriores" your_approved_trainings: "Sus cursos aprobados" no_trainings: "No trainings" + your_training_credits: "Your training credits" + subscribe_for_credits: "Subscribe to benefit from free trainings" + register_for_free: "Register for free to the following trainings:" + book_here: "Book here" #dashboard: my events events: your_next_events: "Sus próximos eventos" From ab9303c6c0ed002be3d8dd334d9b1c1734f9c72b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:33:14 +0100 Subject: [PATCH 17/21] New translations app.shared.en.yml (Spanish) --- config/locales/app.shared.es.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index 45b21c7cc..c4c13e744 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -192,6 +192,8 @@ es: otherwise_it_will_begin_as_soon_as_it_is_bought: "De otro modo, empezará tan pronto como se haya adquirido." monthly_payment: "Monthly payment?" monthly_payment_info: "If monthly payment is enabled, the members will be able to choose between a one-time payment or a payment schedule staged each months." + description: "Description" + type_a_short_description: "Type a short description" information_sheet: "hoja de información" attach_an_information_sheet: "adjuntar una hoja de infomación" notified_partner: "Compañero notificado" From 285cc6a0c87de17413b2e2cd5913fe953102dabb Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:33:18 +0100 Subject: [PATCH 18/21] New translations app.logged.en.yml (Zulu) --- config/locales/app.logged.zu.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/app.logged.zu.yml b/config/locales/app.logged.zu.yml index 1c86f7395..71da8e585 100644 --- a/config/locales/app.logged.zu.yml +++ b/config/locales/app.logged.zu.yml @@ -109,6 +109,10 @@ zu: your_previous_trainings: "crwdns8693:0crwdne8693:0" your_approved_trainings: "crwdns8695:0crwdne8695:0" no_trainings: "crwdns8697:0crwdne8697:0" + your_training_credits: "crwdns21426:0crwdne21426:0" + subscribe_for_credits: "crwdns21428:0crwdne21428:0" + register_for_free: "crwdns21430:0crwdne21430:0" + book_here: "crwdns21432:0crwdne21432:0" #dashboard: my events events: your_next_events: "crwdns8699:0crwdne8699:0" From f60ca7770645659b2760dc227e4f58473bdf74f2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:37:22 +0100 Subject: [PATCH 19/21] New translations app.logged.en.yml (French) --- config/locales/app.logged.fr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml index 043f93ac9..8bb1a24e7 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -109,10 +109,10 @@ fr: your_previous_trainings: "Vos formations passées" your_approved_trainings: "Vos formations validées" no_trainings: "Aucune formation" - your_training_credits: "Your training credits" - subscribe_for_credits: "Subscribe to benefit from free trainings" - register_for_free: "Register for free to the following trainings:" - book_here: "Book here" + your_training_credits: "Vos crédits formation" + subscribe_for_credits: "Abonnez-vous pour bénéficier de formations gratuites" + register_for_free: "Inscrivez-vous gratuitement aux formations suivantes :" + book_here: "Réserver" #dashboard: my events events: your_next_events: "Vos prochains événements" From 61453b64b6fd109660052744f527f2176a8428d3 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:37:25 +0100 Subject: [PATCH 20/21] New translations app.shared.en.yml (French) --- config/locales/app.shared.fr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 19b6a03d4..a81baae2e 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -193,7 +193,7 @@ fr: monthly_payment: "Paiement mensuel ?" monthly_payment_info: "Si le paiement mensuel est activé, les membres pourront choisir entre un paiement unique ou un échéancier de paiement échelonné chaque mois." description: "Description" - type_a_short_description: "Type a short description" + type_a_short_description: "Saisir une courte description" information_sheet: "Fiche descriptive" attach_an_information_sheet: "Joindre une fiche descriptive" notified_partner: "Partenaire notifié" From a53a6ba0eaaa8838eaa8dd808ae64689680bcbcc Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 8 Mar 2021 15:40:26 +0100 Subject: [PATCH 21/21] Version 4.7.4 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79713a5ee..5941302fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog Fab-manager -## Next release +## v4.7.4 2021 March 08 - Show remaining training credits in the dashboard - Allow writing short rich descriptions for each subscription plan - Allow inserting hyperlinks in customized info messages diff --git a/package.json b/package.json index 360eee85c..e85da3547 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "4.7.3", + "version": "4.7.4", "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.", "keywords": [ "fablab",