branch feature/253-tuiles updated (07c25273 -> 2c77e0c1)
This is an automated email from the git hooks/post-receive script. New change to branch feature/253-tuiles in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 07c25273 [Storybook] Simplification des stories new 2c77e0c1 ref #253 Menu sur la ligne 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 2c77e0c12cff8a615da14a2fe779ed1c9ffc3a91 Author: Cécilia Bossard <bossard@codelutin.com> Date: Wed Mar 11 15:55:32 2020 +0100 ref #253 Menu sur la ligne Summary of changes: .../web/tag/components/CheckboxReboot.tag.html | 4 +- .../src/main/web/tag/poll/ListView.tag.html | 12 +--- .../src/main/web/tag/poll/PollLine.tag.html | 71 +++++++++++++++++++--- 3 files changed, 66 insertions(+), 21 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 feature/253-tuiles in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 2c77e0c12cff8a615da14a2fe779ed1c9ffc3a91 Author: Cécilia Bossard <bossard@codelutin.com> Date: Wed Mar 11 15:55:32 2020 +0100 ref #253 Menu sur la ligne --- .../web/tag/components/CheckboxReboot.tag.html | 4 +- .../src/main/web/tag/poll/ListView.tag.html | 12 +--- .../src/main/web/tag/poll/PollLine.tag.html | 71 +++++++++++++++++++--- 3 files changed, 66 insertions(+), 21 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/components/CheckboxReboot.tag.html b/pollen-ui-riot-js/src/main/web/tag/components/CheckboxReboot.tag.html index 5eba1f1b..556a0bcd 100644 --- a/pollen-ui-riot-js/src/main/web/tag/components/CheckboxReboot.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/components/CheckboxReboot.tag.html @@ -30,9 +30,7 @@ </label> <script type="es6"> - //import session from "../../js/Session"; - //this.session = session; - + this.checked = this.opts.checkboxchecked; if (this.opts.i18nprefix) { diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/ListView.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/ListView.tag.html index a2ef4fa5..874c7c44 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/ListView.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/ListView.tag.html @@ -29,7 +29,7 @@ import "./NoPoll.tag.html"; <div class="table-row header"> <div class="column index"><span></span></div> <div class="column checkbox"> - <CheckboxReboot class="checkbox-footer" ontogglecheckbox="{ontogglecheckbox}"></CheckboxReboot> + <!-- <CheckboxReboot class="checkbox-footer" ontogglecheckbox="{ontogglecheckbox}"></CheckboxReboot>--> </div> <div class="wrapper attributes"> <div class="column title"><span>Name</span></div> @@ -46,7 +46,7 @@ import "./NoPoll.tag.html"; <!-- Lines --> <LazyLoad pagination={pagination} onload={lazyLoad} load-size="20" ref="lazyLoad" class="elements" > <yield to="element"> - <PollLine poll={element} on-poll-list-change={parent.parent.parent.refresh} ontogglecheckbox="{parent.parent.parent.ontogglecheckbox}"/> + <PollLine poll={element} on-poll-list-change={parent.parent.parent.refresh} ontogglecheckbox="{parent.parent.parent.ontogglecheckbox}" ref="line"/> </yield> <yield to="loading"> <LoadingCard loading={nbNextGroup}> @@ -64,8 +64,6 @@ import "./NoPoll.tag.html"; import session from "../../js/Session"; import pollService from "../../js/PollService"; - - this.installBundle(session, "polls"); this.pagination = { @@ -77,7 +75,6 @@ import "./NoPoll.tag.html"; this.count = 0; this.checkedBoxes = []; - this.refresh = () => { this.parent.boxChecked = []; this.refs.lazyLoad.reload(); @@ -95,15 +92,10 @@ import "./NoPoll.tag.html"; this.update(); -console.log("RESULT") -console.log(result); - return result; }); }; - - </script> <style> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/PollLine.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/PollLine.tag.html index 92576178..d51c0953 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/PollLine.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/PollLine.tag.html @@ -6,14 +6,39 @@ import "../components/Avatar.tag.html"; <PollLine> <div class="table-row {opts.poll.status.toLowerCase()}"> <div class="column index"> - <Tooltip position="top" content="Menu"> - <i class="menu icon-burger"></i> - </Tooltip> + + <Popover> + <yield to="source"> + <Tooltip position="top" content="Menu"> + <i class="menu icon-burger"></i> + </Tooltip> + </yield> + <yield to="content"> + <ul> + <a if="{parent.opts.poll.permission}" title={parent._t.deletePoll} + onclick={parent.deletePoll} href="#"> <li>{parent._t.deletePoll} + </li></a> + <a if="{parent.opts.poll.permission}" title={parent._t.duplicatePoll} + onclick={parent.duplicatePoll} href="#poll/{parent.opts.poll.id}/clone/{parent.opts.poll.permission}"><li>{parent._t.duplicatePoll} + </li></a> + <a if="{parent.opts.poll.permission}" title={parent._t.invitePoll} + onclick={parent.invitePoll}><li>{parent._t.invitePoll} (TODO) + </li></a> + <a if="{parent.opts.poll.permission}" title={parent._t.pollOptions} + onclick={parent.pollOptions}><li>{parent._t.pollOptions} (TODO) + </li></a> + <a if="{parent.opts.poll.permission}" title={parent._t.editPoll} + href="#poll/{parent.opts.poll.id}/edit/{parent.opts.poll.permission}"><li>{parent._t.editPoll} + </li></a> + </ul> + </yield> + </Popover> + </div> <div class="column checkbox"> - <CheckboxReboot ontogglecheckbox="{ontogglecheckbox}"></CheckboxReboot> + <CheckboxReboot ontogglecheckbox="{ontogglecheckbox}" ref="checkbox"></CheckboxReboot> </div> - <div class="wrapper attributes"> + <div class="wrapper attributes" onclick="location.href='{redirectToPoll}'"> <div class="column title"> <div class="poll-title">{opts.poll.title}</div> </div> @@ -31,7 +56,7 @@ import "../components/Avatar.tag.html"; </Tooltip> </div> <div class="column votes"> - <Tooltip position="top" content="{parent.opts.poll.questions[0].voteCount === 0 ? 0 : (parent.opts.poll.questions[0].voteCount)} votes"> + <Tooltip position="top" content="{opts.poll.questions[0].voteCount === 0 ? 0 : (opts.poll.questions[0].voteCount)} votes"> <div class="voters"><span class="votesNb">{parent.opts.poll.questions[0].voteCount === 0 ? "-" : (parent.opts.poll.questions[0].voteCount)}</span></div></Tooltip> </Tooltip> </div> @@ -120,7 +145,16 @@ import "../components/Avatar.tag.html"; } - .selected { + .table-row:hover { + background: var(--White); + cursor: pointer; + } + + .table-row:hover .index { + visibility: visible; + } + + .table-row:hover .poll-description::after { background: var(--White); } @@ -138,6 +172,10 @@ import "../components/Avatar.tag.html"; font-size: 20px; } + .index { + visibility: hidden; + } + .title { display: flex; align-items: center; @@ -215,7 +253,7 @@ import "../components/Avatar.tag.html"; height: 1em; margin-top: 0.2em; /* bg color = bg color under block */ - background: white; + background: #F7F7F7; } .timing { @@ -283,6 +321,23 @@ import "../components/Avatar.tag.html"; padding-bottom: 10px; } + a { + font-family: Open Sans; + font-style: normal; + font-weight: normal; + font-size: 12px; + line-height: 16px; + + text-decoration: none; + + /* Black Pearl */ + color: var(--Black-Pearl); + } + + li:hover { + background: var(--White-Smoke); + } + </style> </PollLine> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm