This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit cb0ec4921904f7b9c76d1eea01b69572d883a640 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Sep 18 11:36:16 2017 +0200 feedback limitation de la taille des logs, correction formatage des mails (ref #97) + explication sondage restraint --- .../src/main/resources/email/FeedbackEmail.mustache | 17 ++++++++--------- .../src/main/resources/email/FeedbackEmail_fr.mustache | 14 +++++++------- pollen-ui-riot-js/src/main/web/i18n/en.json | 4 +++- pollen-ui-riot-js/src/main/web/i18n/fr.json | 4 +++- pollen-ui-riot-js/src/main/web/js/Logger.js | 12 +++++++++++- .../src/main/web/tag/poll/Settings.tag.html | 2 ++ 6 files changed, 34 insertions(+), 19 deletions(-) diff --git a/pollen-services/src/main/resources/email/FeedbackEmail.mustache b/pollen-services/src/main/resources/email/FeedbackEmail.mustache index 8aa5d042..fad17908 100644 --- a/pollen-services/src/main/resources/email/FeedbackEmail.mustache +++ b/pollen-services/src/main/resources/email/FeedbackEmail.mustache @@ -2,7 +2,7 @@ On {{feedbackDate}} Description ----------- -{{feedback.description}} +{{{feedback.description}}} Location @@ -13,14 +13,13 @@ URL : {{feedback.location}} Environment ----------- Browser : {{feedback.browser}} -Operating System : {{feedback.operatingSystem}} -Platform : {{feedback.platform}} -Screen resolution : {{feedback.screenResolution.width}} x {{feedback.screenResolution.height}} (L x H) -window resolution : {{feedback.windowDimension.width}} x {{feedback.windowDimension.height}} (L x H) -User : {{#user}}{{user.name}} ({{user.email}}){{/user}}{{^user}}Anonymous{{/user}} -Locale : {{feedback.locale}} - -Services version: {{applicationVersion}} +Operating System : {{feedback.operatingSystem}} +Platform : {{feedback.platform}} +Screen resolution : {{feedback.screenResolution.width}} x {{feedback.screenResolution.height}} (L x H) +window resolution : {{feedback.windowDimension.width}} x {{feedback.windowDimension.height}} (L x H) +User : {{#user}}{{user.name}} ({{user.email}}){{/user}}{{^user}}Anonymous{{/user}} +Locale : {{feedback.locale}} +Services version : {{applicationVersion}} {{#screenShotUrl}} Screen shot diff --git a/pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache b/pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache index ae33ed8a..5b9a8de8 100644 --- a/pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache @@ -2,7 +2,7 @@ Le {{feedbackDate}} Description ----------- -{{feedback.description}} +{{{feedback.description}}} Emplacement @@ -14,12 +14,12 @@ Environnement ------------- Navigateur : {{feedback.browser}} Système d'exploitation : {{feedback.operatingSystem}} -Plateforme : {{feedback.platform}} -Résolution : {{feedback.screenResolution.width}} x {{feedback.screenResolution.height}} (L x H) -Taille d'affichage : {{feedback.windowDimension.width}} x {{feedback.windowDimension.height}} (L x H) -Langue : {{feedback.locale}} -Utilisateur : {{#user}}{{user.name}} ({{user.email}}){{/user}}{{^user}}Anonyme{{/user}} -Version services : {{applicationVersion}} +Plateforme : {{feedback.platform}} +Résolution : {{feedback.screenResolution.width}} x {{feedback.screenResolution.height}} (L x H) +Taille d'affichage : {{feedback.windowDimension.width}} x {{feedback.windowDimension.height}} (L x H) +Langue : {{feedback.locale}} +Utilisateur : {{#user}}{{user.name}} ({{user.email}}){{/user}}{{^user}}Anonyme{{/user}} +Version services : {{applicationVersion}} {{#screenShotUrl}} Capture d'écran diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index 4623ffd7..cf9fd669 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -248,6 +248,8 @@ "poll_description_email": "Your email", "poll_description_emailPlaceHolder": "Enter your email", "poll_settings_restricted": "Restricted poll ?", + "poll_settings_restricted_yes": "Only those invited to the next stage can vote. An email will be sent to them with a personal link.", + "poll_settings_restricted_no": "All people with the poll link can vote", "poll_settings_basic_usage": "For a basic poll, you can skip this step.", "poll_settings_use_basic_usage": "Use the default options", "poll_settings_basic_usage_detail": "Default Pollen offers you : ", @@ -542,7 +544,7 @@ "feedback_description": "Thank to details below your bug report ou your observation", "feedback_descriptionNotBlank": "Observation must be not blank", "feedback_uploadScreenShot": "Screenshot", - "feedback_create_success": "Observation has been send.", + "feedback_create_success": "Thank for your observation. It will help to improve Pollen.", "loginProviders_title": "Login provider", "loginProviders_name": "Name", "loginProviders_key": "Client key", diff --git a/pollen-ui-riot-js/src/main/web/i18n/fr.json b/pollen-ui-riot-js/src/main/web/i18n/fr.json index 56d6968d..e096ac1d 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -248,6 +248,8 @@ "poll_description_email": "Votre courriel", "poll_description_emailPlaceHolder": "Renseignez votre courriel", "poll_settings_restricted": "Sondage restreint ?", + "poll_settings_restricted_yes": "Seul les personnes invité à l'etape suivante peuvent voter. Un courriel leur sera envoyé avec un lien personnel.", + "poll_settings_restricted_no": "Toutes les personnes ayant le lien du sondage peuvent voter.", "poll_settings_basic_usage": "Options par défaut", "poll_settings_use_basic_usage": "Utiliser les options par défaut", "poll_settings_basic_usage_detail": "Par défaut Pollen vous propose : ", @@ -542,7 +544,7 @@ "feedback_description": "Merci de détailler ci-dessous votre rapport de bug ou votre remarque", "feedback_descriptionNotBlank": "La description ne doit pas être blanc", "feedback_uploadScreenShot": "Copie d'écran", - "feedback_create_success": "La remarque est envoyée.", + "feedback_create_success": "Merci pour votre retour. Il contribura à améliorer Pollen.", "loginProviders_title": "Tiers pour la connexion", "loginProviders_name": "Nom", "loginProviders_key": "Clé client", diff --git a/pollen-ui-riot-js/src/main/web/js/Logger.js b/pollen-ui-riot-js/src/main/web/js/Logger.js index acb186e2..b3c5a80d 100644 --- a/pollen-ui-riot-js/src/main/web/js/Logger.js +++ b/pollen-ui-riot-js/src/main/web/js/Logger.js @@ -17,6 +17,16 @@ module.exports = { }, getHistory() { - return console.history; + let history = console.history.map(l => { + let log = Object.assign({}, l); + if (log.type === "info" || log.type === "log") { + delete log.stack; + } + log.arguments = Array.from(log.arguments).map(argument => { + return argument.DATETIME_INPUT_PATTERN && argument.logger ? "TAG : <" + argument.root.localName + ">" : argument; + }); + return log; + }); + return history; } }; diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html index 91e296ad..edcabb66 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html @@ -34,7 +34,9 @@ require("../components/date-time-picker.tag.html"); <div class="c-toggle__track"> <div class="c-toggle__handle"></div> </div> + {opts.form.model.pollType === "RESTRICTED" ? __.restricted_yes : __.restricted_no} </label> + </div> <h4><i class="fa fa-cogs"></i> {__.basic_usage}</h4> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.