branch develop updated (5b124a40 -> aa72e74a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 5b124a40 ajout de la réactivation des avertissements + style ref #63 new aa72e74a tooltips pour les boutons du pannaux des commentaires (ref #73) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit aa72e74a8abb44a91c93506f2877a65c1d259c81 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Jun 26 14:29:51 2017 +0200 tooltips pour les boutons du pannaux des commentaires (ref #73) Summary of changes: pollen-ui-riot-js/src/main/web/i18n.json | 18 +++++++++++++-- .../src/main/web/tag/poll/Comments.tag.html | 27 ++++++++++++++-------- 2 files changed, 34 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 aa72e74a8abb44a91c93506f2877a65c1d259c81 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Jun 26 14:29:51 2017 +0200 tooltips pour les boutons du pannaux des commentaires (ref #73) --- pollen-ui-riot-js/src/main/web/i18n.json | 18 +++++++++++++-- .../src/main/web/tag/poll/Comments.tag.html | 27 ++++++++++++++-------- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n.json b/pollen-ui-riot-js/src/main/web/i18n.json index 12b985a2..b38ab8ec 100644 --- a/pollen-ui-riot-js/src/main/web/i18n.json +++ b/pollen-ui-riot-js/src/main/web/i18n.json @@ -97,6 +97,13 @@ "poll_comments_cancelEditComment": "Annuler", "poll_comments_deleteComment" : "Voulez-vous supprimer ce commentaire ?", "poll_comments_updateComment": "Valider", + "poll_comments_close": "Fermer", + "poll_comments_sort_asc": "Trier du plus récent au plus ancien", + "poll_comments_sort_desc": "Trier du plus ancien au plus récent", + "poll_comments_goToEnd": "Aller à la fin", + "poll_comments_goToStart": "Aller au début", + "poll_comments_delete": "Supprimer", + "poll_comments_edit": "Modifier", "poll_voteStart": "Les votes ont commencé, certaines options ne sont pas modifiables.", "poll_votes_title": "Votes", "poll_votes_deleteVote": "Supprimer le vote ?", @@ -581,8 +588,15 @@ "poll_comments_authorPlaceholder": "Fill your name", "poll_comments_textPlaceholder": "Fill your comment", "poll_comments_cancelEditComment": "Cancel", - "poll_comments_deleteComment" : "Delete comment?", - "poll_comments_updateComment": "Valider", + "poll_comments_deleteComment" : "Delete", + "poll_comments_updateComment": "Save", + "poll_comments_close": "Close", + "poll_comments_sort_asc": "Sort from newest to oldest", + "poll_comments_sort_desc": "Sort from oldest to newest", + "poll_comments_goToEnd": "Go to end", + "poll_comments_goToStart": "Go to start", + "poll_comments_delete": "Delete", + "poll_comments_edit": "Edit", "poll_voteStart": "Votes are started, some options can't be updated.", "poll_votes_title": "Votes", "poll_votes_deleteVote": "Delete vote?", diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html index 6a47c2d4..553416de 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html @@ -6,7 +6,8 @@ require("./Report.tag.html"); <div class="comments {open : open}"> <button type="button" class="c-button c-button--error close-btn" - onclick="{closeComments}"> + onclick="{closeComments}" + title={__.close}> <i class="fa fa-times"/> </button> @@ -16,7 +17,8 @@ require("./Report.tag.html"); <h2 class="c-heading">{__.title}</h2> <button type="button" class="c-button c-button--error close-btn-inner" - onclick="{closeComments}"> + onclick="{closeComments}" + title={__.close}> <i class="fa fa-times"/> </button> </div> @@ -62,12 +64,14 @@ require("./Report.tag.html"); <div class="actions" show="{poll.comments && poll.comments.length > 0}"> <button type="button" class="c-button c-button--info" - onclick="{toggleSort}"> + onclick="{toggleSort}" + title={orderDesc ? __.sort_desc : __.sort_asc}> <i class="fa fa-sort-amount-{desc : orderDesc, asc : !orderDesc}"/> </button> <button type="button" class="c-button c-button--info" - onclick="{scrollBottom}"> + onclick="{scrollBottom}" + title={__.goToEnd}> <i class="fa fa-arrow-down"/> </button> </div> @@ -88,12 +92,14 @@ require("./Report.tag.html"); if={comment.permission}> <button type="button" class="c-button c-button--error u-small" - onclick="{parent.deleteComment(comment)}"> + onclick="{parent.deleteComment(comment)}" + title={parent.__.delete}> <i class="fa fa-trash"/> </button> <button type="button" class="c-button c-button--brand u-small" - onclick="{parent.startEditComment(comment)}"> + onclick="{parent.startEditComment(comment)}" + title={parent.__.edit}> <i class="fa fa-pencil-square-o"/> </button> </span> @@ -142,12 +148,14 @@ require("./Report.tag.html"); <div class="actions"> <button class="c-button c-button--error" type="button" - onclick="{cancelEditComment}"> + onclick="{cancelEditComment}" + title={parent.__.cancelEditComment}> <i class="fa fa-remove"/> {parent.__.cancelEditComment} </button> <button class="c-button c-button--success pull-right" - type="submit"> + type="submit" + title={parent.__.updateComment}> <i class="fa fa-check"/> {parent.__.updateComment} </button> @@ -158,7 +166,8 @@ require("./Report.tag.html"); <div class="actions-right" show="{poll.comments && poll.comments.length > 0}"> <button type="button" class="c-button c-button--info" - onclick="{scrollTop}"> + onclick="{scrollTop}" + title={__.goToStart}> <i class="fa fa-arrow-up"/> </button> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm