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 6e45bf56c9299ff44860ecdc489332553c955942 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 28 12:00:29 2017 +0200 ajout d'un tooltip sur le bouton copier + suppression du warning --- pollen-ui-riot-js/src/main/web/i18n/en.json | 4 ++-- pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 +- pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) 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 a7af00cd..42f8a434 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -15,7 +15,6 @@ "main_emailOrProviderAccountAlreadyUsed": "The email address of the account you are connecting with is already used by another Pollen account.", "pagination_all": "All", "pagination_resultsPerPage": "Results per page", - "summary_doNotSharePageUrl": "Watch out, if you spread the adress of this page, other people will be able to modify the poll.", "summary_choices": "Choices", "summary_voteCountingType": "Poll type", "summary_dates": "Dates", @@ -25,7 +24,8 @@ "summary_toDate": "to", "summary_administrate": "Modérer les votes et les commentaires", "summary_sharing": "Sharing", - "summary_shareLink": "share this link to invite people to vote:", + "summary_shareLink": "Share this link to invite people to vote:", + "summary_copyLink": "Copy the link into the clipboard", "summary_shareByQR": "Show the QR Code to go to the poll", "summary_shareByEmail": "Send invitations by email", "summary_invitations": "Number of invitations to vote sent by email:", 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 1f7b12df..f114a1f3 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/fr.json +++ b/pollen-ui-riot-js/src/main/web/i18n/fr.json @@ -15,7 +15,6 @@ "main_emailOrProviderAccountAlreadyUsed": "L'adresse email du compte avec lequel vous essayez de vous connecter, est déjà utilisée par un autre compte Pollen.", "pagination_all": "Tous", "pagination_resultsPerPage": "Résultats par page", - "summary_doNotSharePageUrl": "Attention, si vous diffusez l'adresse de cette page, d'autres personnes pourront modifier le sondage.", "summary_choices": "Choix", "summary_voteCountingType": "Type de sondage", "summary_dates": "Dates", @@ -26,6 +25,7 @@ "summary_administrate": "Modérer les votes et les commentaires", "summary_sharing": "Partage", "summary_shareLink": "Partagez ce lien pour inviter les participants à voter :", + "summary_copyLink": "Copier le lien dans le presse-papier", "summary_shareByQR": "Afficher un QR code pour accéder au sondage", "summary_shareByEmail": "Envoyer des invitations par email", "summary_invitations": "Nombre d'invitations à voter envoyées par email:", diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html index c2915434..e3424d19 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Summary.tag.html @@ -26,9 +26,6 @@ require("../components/MultiLineLabel.tag.html"); <Summary> <div if={successMessage} class="c-alert c-alert--success">{successMessage}</div> - <div if={successMessage} class="c-alert c-alert--warning"> - <i class="fa fa-exclamation-triangle"></i> {__.doNotSharePageUrl} <i class="fa fa-exclamation-triangle"></i> - </div> <div class="summary-part"> <h2> @@ -87,7 +84,8 @@ require("../components/MultiLineLabel.tag.html"); readonly/> </div> <button class="c-button c-button--info" - onclick={copy("voteUrl")}> + onclick={copy("voteUrl")} + title="{__.copyLink}"> <i class="fa fa-clipboard" aria-hidden="true"></i> </button> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.