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 93e550c9e2cdce6118a83d6142c730f01dba71a5 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Oct 16 15:38:33 2019 +0200 Fix indentation --- .../src/main/web/tag/poll/EditVote.tag.html | 75 +++++++++++----------- .../src/main/web/tag/poll/EditVoteOrder.tag.html | 21 +++--- 2 files changed, 47 insertions(+), 49 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html index 1021b593..fa0c318a 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html @@ -40,16 +40,16 @@ <div class="current-voter separator-right"> <div class="o-field o-field--icon-left o-field--icon-right" if={poll.questions[0] && (poll.questions[0].canVote || voteInEdition)} > - <i class="fa fa-fw fa-user c-icon" aria-hidden="true"></i> - <input class="c-field {c-field--error: !voteInEdition && error && error['voter.name']}" - type="text" - ref="voterName" - name="voterName" - required - maxlength="255" - tabindex="1" - placeholder={_t.authorPlaceHolder} - value={poll.voterName}> + <i class="fa fa-fw fa-user c-icon" aria-hidden="true"></i> + <input class="c-field {c-field--error: !voteInEdition && error && error['voter.name']}" + type="text" + ref="voterName" + name="voterName" + required + maxlength="255" + tabindex="1" + placeholder={_t.authorPlaceHolder} + value={poll.voterName}> </div> <div if={poll.questions[0] && !poll.questions[0].canVote && !voteInEdition} class="choices-label"> @@ -57,9 +57,9 @@ </div> </div> <div if={poll.questions[0] && poll.questions[0].resultIsVisible} class="result-label"> - <strong if={poll.questions[0] && (poll.questions[0].voteCountingType !== 5) && (poll.questions[0].voteCountingType !== 2) && (poll.questions[0].voteCountingType !== 4)}>{_t.results}</strong> - <strong if={poll.questions[0] && ((poll.questions[0].voteCountingType === 5) || (poll.questions[0].voteCountingType === 2))}>{_t.scores}</strong> - <strong if={poll.questions[0] && (poll.questions[0].voteCountingType === 4)}>{_t.totals}</strong> + <strong if={poll.questions[0] && (poll.questions[0].voteCountingType !== 5) && (poll.questions[0].voteCountingType !== 2) && (poll.questions[0].voteCountingType !== 4)}>{_t.results}</strong> + <strong if={poll.questions[0] && ((poll.questions[0].voteCountingType === 5) || (poll.questions[0].voteCountingType === 2))}>{_t.scores}</strong> + <strong if={poll.questions[0] && (poll.questions[0].voteCountingType === 4)}>{_t.totals}</strong> </div> </div> <div each={choice, index in poll.questions[0] && poll.questions[0].choices} class="choice separator-top"> @@ -89,32 +89,32 @@ required onchange={onVoteChanged} tabindex="{10 * (index + 1)}"> - <option value=""></option> - <option each={grad, index in poll.questions[0].voteCountingConfig.grades} - value={index} - ref="{choice.id}_voteValue"> - {grad} - </option> + <option value=""></option> + <option each={grad, index in poll.questions[0].voteCountingConfig.grades} + value={index} + ref="{choice.id}_voteValue"> + {grad} + </option> </select> </div> </div> <div if={poll.questions[0].resultIsVisible} class="score-choice"> <span if={!choice.score}>{parent._t.noVote}</span> <span if={choice.score}> - <i if="{choice.score.scoreOrder === 0}" class="fa fa-trophy fa-15x winner" aria-hidden="true"></i> - <span if={!pollTypeSelect}> - {choice.score.scoreValue} - <span if={choice.score.scoreValue || !pollTypeCoombs}> - {parent._t["results_unit_" + poll.questions[0].voteCountingType + "_" + (choice.score.scoreValue > 1 ? "many" : "one")]} - </span> - <span if={!choice.score.scoreValue && pollTypeCoombs}> - {parent._t.eliminated} - </span> - </span> - <span if={pollTypeSelect}> - {poll.questions[0].voteCountingConfig.grades[choice.score.scoreValue]} - </span> - </span> + <i if="{choice.score.scoreOrder === 0}" class="fa fa-trophy fa-15x winner" aria-hidden="true"></i> + <span if={!pollTypeSelect}> + {choice.score.scoreValue} + <span if={choice.score.scoreValue || !pollTypeCoombs}> + {parent._t["results_unit_" + poll.questions[0].voteCountingType + "_" + (choice.score.scoreValue > 1 ? "many" : "one")]} + </span> + <span if={!choice.score.scoreValue && pollTypeCoombs}> + {parent._t.eliminated} + </span> + </span> + <span if={pollTypeSelect}> + {poll.questions[0].voteCountingConfig.grades[choice.score.scoreValue]} + </span> + </span> </div> </div> <div class="footer separator-top" if="{poll.questions[0] && poll.questions[0].choices && (poll.questions[0].canVote || voteInEdition)}"> @@ -131,7 +131,6 @@ </a> {_t.validation_after} </label> - </div> <div class="current-voter-buttons"> <button if={!voteInEdition} @@ -149,16 +148,16 @@ tabindex="{(poll.questions[0].choices.length + 2) * 10}" onclick="{cancelEditVote}" disabled={voting}> - <i class="fa fa-remove" aria-hidden="true"></i> - {_t.cancelEdition} + <i class="fa fa-remove" aria-hidden="true"></i> + {_t.cancelEdition} </button> <button if="{voteInEdition}" class="c-button c-button--success" tabindex="{(poll.questions[0].choices.length + 1) * 10}" disabled={tooManyChoicesSelected || remainPoints || voting} type="submit"> - <i class="fa fa-check" aria-hidden="true"></i> - {_t.validateEdition} + <i class="fa fa-check" aria-hidden="true"></i> + {_t.validateEdition} </button> </div> <div class="c-hint--static c-hint--info" if="{remainPoints > 0}"> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html index 8250d370..e5a955c1 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html @@ -27,16 +27,16 @@ <div class="current-voter"> <div class="o-field o-field--icon-left o-field--icon-right" if={poll.canVote || voteInEdition} > - <i class="fa fa-fw fa-user c-icon" aria-hidden="true"></i> - <input class="c-field {c-field--error: !voteInEdition && error && error['voter.name']}" - type="text" - ref="voterName" - name="voterName" - required - maxlength="255" - tabindex="1" - placeholder={_t.authorPlaceHolder} - value={poll.voterName}> + <i class="fa fa-fw fa-user c-icon" aria-hidden="true"></i> + <input class="c-field {c-field--error: !voteInEdition && error && error['voter.name']}" + type="text" + ref="voterName" + name="voterName" + required + maxlength="255" + tabindex="1" + placeholder={_t.authorPlaceHolder} + value={poll.voterName}> </div> <div if={!poll.canVote && !voteInEdition} class="choices-label"> @@ -118,7 +118,6 @@ </a> {_t.validation_after} </label> - </div> </form> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.