This is an automated email from the git hooks/post-receive script. New commit to branch ramonville in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit a54ceccae012aa2b1a98f25ecf34d3d5d0fa0603 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 9 15:18:02 2018 +0100 Adaptation pour Ramonville --- .gitlab-ci.yml | 2 +- pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0669446d..93029e90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ demo: script: - docker build --no-cache -t registry.nuiton.org/chorem/pollen -f Dockerfile . - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.nuiton.org - - docker push registry.nuiton.org/chorem/pollen + - docker push registry.nuiton.org/chorem/pollen:ramonville - docker logout registry.nuiton.org dependencies: - build-java 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 5f3dd0a4..159e7542 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 @@ -21,7 +21,7 @@ <Votes> <div class="container" show="{loaded}"> - <span class="c-input-group actions-right" + <!-- <span class="c-input-group actions-right" if={isVoteByOrder}> <button class="c-button c-button--info {c-button--ghost-info: !voteClickAndDrop, c-button--info: voteClickAndDrop}" onclick={voteClickAndDropChange(true)} @@ -31,7 +31,7 @@ onclick={voteClickAndDropChange(false)} title={_t.voteByInput} type="button"><i class="fa fa-i-cursor"></i></button> - </span> + </span> --> <EditVote ref="editVote" show={!isVoteByOrder || !voteClickAndDrop} @@ -102,7 +102,7 @@ this.onPollChange = poll2 => { this.loaded = poll2.choices !== undefined; this.poll = poll2; - this.isVoteByOrder = [3, 5, 6, 7].indexOf(poll2.voteCountingType) >= 0; + // this.isVoteByOrder = [3, 5, 6, 7].indexOf(poll2.voteCountingType) >= 0; this.voteClickAndDrop = this.isVoteByOrder && session.getUserSetting("voteClickAndDrop", "true") === "true"; this.update(); }; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.