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 ec9b09012da6860a93bb0b494c63f4c1cae5993c Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 7 18:04:10 2017 +0200 fixes #138 Ajout de choix avant le tableau des votes --- .../src/main/web/tag/poll/Votes.tag.html | 49 ++++++++++++---------- 1 file changed, 26 insertions(+), 23 deletions(-) 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 f9424f0a..032376a2 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 @@ -112,6 +112,28 @@ require("../components/HumanInput.tag.html"); </form> </div> + <!-- Form to add a choice --> + <form ref="formAddChoice" class="formAddChoice" if={poll.status === "ADDING_CHOICES"}> + <HumanInput onsubmit="{addChoice}"></HumanInput> + <div class="o-form-element"> + <label class="c-label" for="choice">{__.addChoice}</label> + <div class="c-input-group"> + <div class="o-field"> + <Choice ref="choice" + class="choice c-field" + name="choice" + choice="{choiceToAdd}"></Choice> + </div> + <button type="submit" + class="c-button c-button--success" + tooltips="{__.addChoice}" + disabled="{addingChoice}"> + <i class="fa fa-plus"></i> + </button> + </div> + </div> + </form> + <!-- Show votes --> <div class="voters" if="{poll.resultIsVisible && poll.votes && poll.votes.length > 0}"> <div class="row header separator-bottom"> @@ -161,29 +183,6 @@ require("../components/HumanInput.tag.html"); </div> </div> - <!-- Form to add a choice --> - <form ref="formAddChoice" - if={poll.status === "ADDING_CHOICES"}> - <HumanInput onsubmit="{addChoice}"></HumanInput> - <div class="o-form-element"> - <label class="c-label" for="choice">{__.addChoice}</label> - <div class="c-input-group"> - <div class="o-field"> - <Choice ref="choice" - class="choice c-field" - name="choice" - choice="{choiceToAdd}"></Choice> - </div> - <button type="submit" - class="c-button c-button--success" - tooltips="{__.addChoice}" - disabled="{addingChoice}"> - <i class="fa fa-plus"></i> - </button> - </div> - </div> - - </form> </div> <script type="es6"> @@ -574,6 +573,10 @@ require("../components/HumanInput.tag.html"); padding: 0 0 0 1px; } + .formAddChoice { + margin-top: 20px; + } + .voters { display: flex; flex-direction: column; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.