branch develop updated (276a844 -> 4e0badd)
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 276a844 correction d'une NPE new 4e0badd adapter les unités des resultats au type de scrutin 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 4e0badd3eb4371566d83663782adb58a5a12de3a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 12 10:27:40 2017 +0200 adapter les unités des resultats au type de scrutin Summary of changes: pollen-ui-riot-js/src/main/web/i18n.json | 72 +++++++++++++++++++--- .../src/main/web/tag/poll/Results.tag.html | 46 +++++++------- .../src/main/web/tag/poll/Votes.tag.html | 2 +- 3 files changed, 88 insertions(+), 32 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 4e0badd3eb4371566d83663782adb58a5a12de3a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 12 10:27:40 2017 +0200 adapter les unités des resultats au type de scrutin --- pollen-ui-riot-js/src/main/web/i18n.json | 72 +++++++++++++++++++--- .../src/main/web/tag/poll/Results.tag.html | 46 +++++++------- .../src/main/web/tag/poll/Votes.tag.html | 2 +- 3 files changed, 88 insertions(+), 32 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n.json b/pollen-ui-riot-js/src/main/web/i18n.json index adf795f..4a29331 100644 --- a/pollen-ui-riot-js/src/main/web/i18n.json +++ b/pollen-ui-riot-js/src/main/web/i18n.json @@ -33,9 +33,23 @@ "poll_urlForEditVote" : "Vote enregistré, vous pourrez le modifier à l'adresse suivante (lorsque vous n'êtes pas connecté) : ", "poll_results_title": "Résultats", "poll_results_noResult": "Les résultats ne sont pas encore disponibles.", - "poll_results_rank": "Rang :", - "poll_results_vote": "vote", - "poll_results_votes": "votes", + "poll_results_ranks": "Rangs", + "poll_results_choices": "Choix", + "poll_results_results": "Résultats", + "poll_results_unit_1_one": "vote", + "poll_results_unit_1_many": "votes", + "poll_results_unit_2_one": "%", + "poll_results_unit_2_many": "%", + "poll_results_unit_3_one": "combat", + "poll_results_unit_3_many": "combats", + "poll_results_unit_4_one": "", + "poll_results_unit_4_many": "", + "poll_results_unit_5_one": "point", + "poll_results_unit_5_many": "points", + "poll_results_unit_6_one": "vote", + "poll_results_unit_6_many": "votes", + "poll_results_unit_7_one": "vote", + "poll_results_unit_7_many": "votes", "poll_comments": "Commentaires", "poll_comments_noComment": "Pas de commentaire.", "poll_comments_title": "Commentaires", @@ -55,8 +69,20 @@ "poll_votes_delete": "Supprimer le vote ?", "poll_votes_results": "Resultats", "poll_votes_noVote": "Aucun vote", - "poll_votes_vote": "vote", - "poll_votes_votes": "votes", + "poll_votes_results_unit_1_one": "vote", + "poll_votes_results_unit_1_many": "votes", + "poll_votes_results_unit_2_one": "%", + "poll_votes_results_unit_2_many": "%", + "poll_votes_results_unit_3_one": "combat", + "poll_votes_results_unit_3_many": "combats", + "poll_votes_results_unit_4_one": "", + "poll_votes_results_unit_4_many": "", + "poll_votes_results_unit_5_one": "point", + "poll_votes_results_unit_5_many": "points", + "poll_votes_results_unit_6_one": "vote", + "poll_votes_results_unit_6_many": "votes", + "poll_votes_results_unit_7_one": "vote", + "poll_votes_results_unit_7_many": "votes", "poll_votes_voteNotOpen": "Les votes ne sont pas encore ouverts.", "polls_createdPolls": "Mes sondages", "polls_invitedPolls": "Mes invitations", @@ -321,9 +347,23 @@ "poll_urlForEditVote" : "Vote saved, you can modify it using this address when you are not connected: ", "poll_results_noResult": "Results are not yet available.", "poll_results_title": "Results", - "poll_results_vote": "vote", - "poll_results_votes": "votes", - "poll_results_rank": "Rank:", + "poll_results_ranks": "Ranks", + "poll_results_choices": "Choices", + "poll_results_results": "Results", + "poll_results_unit_1_one": "vote", + "poll_results_unit_1_many": "votes", + "poll_results_unit_2_one": "%", + "poll_results_unit_2_many": "%", + "poll_results_unit_3_one": "battle", + "poll_results_unit_3_many": "battles", + "poll_results_unit_4_one": "", + "poll_results_unit_4_many": "", + "poll_results_unit_5_one": "point", + "poll_results_unit_5_many": "points", + "poll_results_unit_6_one": "vote", + "poll_results_unit_6_many": "votes", + "poll_results_unit_7_one": "vote", + "poll_results_unit_7_many": "votes", "poll_comments": "Comments", "poll_comments_noComment": "No comment.", "poll_comments_title": "Comments", @@ -344,8 +384,20 @@ "poll_votes_delete": "Delete vote?", "poll_votes_results": "Results", "poll_votes_noVote": "No vote", - "poll_votes_vote": "vote", - "poll_votes_votes": "votes", + "poll_votes_results_unit_1_one": "vote", + "poll_votes_results_unit_1_many": "votes", + "poll_votes_results_unit_2_one": "%", + "poll_votes_results_unit_2_many": "%", + "poll_votes_results_unit_3_one": "battle", + "poll_votes_results_unit_3_many": "battles", + "poll_votes_results_unit_4_one": "", + "poll_votes_results_unit_4_many": "", + "poll_votes_results_unit_5_one": "point", + "poll_votes_results_unit_5_many": "points", + "poll_votes_results_unit_6_one": "vote", + "poll_votes_results_unit_6_many": "votes", + "poll_votes_results_unit_7_one": "vote", + "poll_votes_results_unit_7_many": "votes", "poll_votes_voteNotOpen": "Votes are not open.", "polls_createdPolls": "My polls", "polls_invitedPolls": "My invitations", diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html index 43ef305..de5131d 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html @@ -9,13 +9,22 @@ require("./Podium.tag.html"); <div if="{poll.resultIsVisible && poll.results}" class="result-body" > <Podium/> <table class="table-results"> - <tr each="{result in poll.results.scores}"> - <td class="score">{result.scoreOrder + 1}</td> - <td class="votes">{result.scoreValue} {result.scoreValue > 1 ? parent.__.votes : parent.__.vote}</td> - <td class="choice"> - <ChoiceView choice={poll.getChoice(result.choiceId)}/> - </td> - </tr> + <thead> + <tr> + <th>{__.ranks}</th> + <th>{__.results}</th> + <th>{__.choices}</th> + </tr> + </thead> + <tbody> + <tr each="{result in poll.results.scores}"> + <td class="score">{result.scoreOrder + 1}</td> + <td class="votes">{result.scoreValue} {parent.__["unit_" + poll.voteCountingType + "_" + (result.scoreValue > 1 ? "many" : "one")]}</td> + <td class="choice"> + <ChoiceView choice={poll.getChoice(result.choiceId)}/> + </td> + </tr> + </tbody> </table> </div> @@ -54,24 +63,19 @@ require("./Podium.tag.html"); align-self: stretch; } - .table-results td { - text-align: center; - padding: 2px 5px + .table-results { + border-collapse: collapse; } - /*.table-results td.score { - min-width: 50px; + .table-results th { + padding: 5px 20px; } - - .table-results td.votes { - min-width: 50px; - }*/ - - - /*.table-results td.choice { - min-width: 50px; - }*/ + .table-results td { + text-align: center; + padding: 2px 5px; + border-top: 1px solid #b2c7d3; + } diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html index 188a91c..e47b697 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html @@ -73,7 +73,7 @@ require("./Podium.tag.html"); <span if={choice.score}> <i if={choice.score.scoreOrder === 0} class="fa fa-trophy fa-15x"></i> {choice.score.scoreValue} - {choice.score.scoreValue > 1 ? parent.__.votes : parent.__.vote} + {parent.__["results_unit_" + poll.voteCountingType + "_" + (choice.score.scoreValue > 1 ? "many" : "one")]} </span> </div> <div class="results-actions"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm