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 0b4bb3296f97dc33f9133be33f10f16d9579b596 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 21 16:50:20 2017 +0100 badge d'info des choix + formatiage des resultats sur la page des votes --- .../src/main/web/tag/poll/ChoiceView.tag.html | 15 ++++++++++++--- pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 12 ++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/ChoiceView.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/ChoiceView.tag.html index 9c99052..f18319e 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/ChoiceView.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/ChoiceView.tag.html @@ -1,5 +1,5 @@ <ChoiceView> - <div class="choice" + <div class="choice-view" onclick={openModalImage} title={opts.choice.description}> <span class="choice-text" @@ -18,6 +18,9 @@ if={opts.choice.choiceType === "RESOURCE"}> <img class="image-preview" src="{session.configuration.endPoint}/v1/resources/{opts.choice.choiceValue}/preview"/> </div> + <div if={opts.choice.choiceType === "RESOURCE" || opts.choice.description} class="info"> + <i class="fa fa-question-circle" aria-hidden="true"></i> + </div> </div> <div if={showModalImage} onclick={closeModalImage}> @@ -61,8 +64,14 @@ </script> <style> - .choice { - display: inline-block; + .choice-view { + display: flex; + justify-content: center; + } + + .choice-view .info { + font-size: 0.5em; + color: #13a2ff; } .choice-ressource .image-preview{ 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 10fcbee..dcefdfd 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 @@ -75,14 +75,14 @@ require("./ChoiceView.tag.html"); <div class="frame"> <div if={poll.resultIsVisible} class="results"> <div class="result-label"> - <i class="fa fa-trophy fa-15x"></i> {__.results} + {__.results} </div> <div each={choice in poll.choices} class="score-choice"> <span if={!choice.score}>{parent.__.noVote}</span> <span if={choice.score}> - {choice.score.scoreOrder + 1 } - ({choice.score.scoreValue} - {choice.score.scoreValue > 1 ? parent.__.votes : parent.__.vote}) + <i if={choice.score.scoreOrder === 0} class="fa fa-trophy fa-15x"></i> + {choice.score.scoreValue} + {choice.score.scoreValue > 1 ? parent.__.votes : parent.__.vote} </span> </div> <div class="results-actions"> @@ -443,6 +443,10 @@ require("./ChoiceView.tag.html"); justify-content: center; } + .voters .window .frame .results .score-choice .fa-trophy { + color: #ff9e0d; + } + .check { width: 25px; height: 25px; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.