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 d70c09cd6ffd0ab76ee7e80a487da93e090da111 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Aug 1 10:46:34 2017 +0200 style et carte des sondage. --- pollen-ui-riot-js/src/main/web/css/custom.css | 8 +- pollen-ui-riot-js/src/main/web/css/main.css | 7 +- pollen-ui-riot-js/src/main/web/tag/Users.tag.html | 32 ++++--- .../web/tag/favoriteList/FavoriteList.tag.html | 102 +++++++++++---------- .../web/tag/favoriteList/FavoriteLists.tag.html | 4 - .../src/main/web/tag/poll/EditPoll.tag.html | 6 +- .../src/main/web/tag/poll/Poll.tag.html | 4 - .../src/main/web/tag/poll/PollCard.tag.html | 63 ++++++++----- .../src/main/web/tag/poll/Polls.tag.html | 68 +++++++------- 9 files changed, 157 insertions(+), 137 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/css/custom.css b/pollen-ui-riot-js/src/main/web/css/custom.css index 95ee3317..8d895817 100644 --- a/pollen-ui-riot-js/src/main/web/css/custom.css +++ b/pollen-ui-riot-js/src/main/web/css/custom.css @@ -9,10 +9,10 @@ --winner: #ff9e0d; --anonymous: #666666; - --poll-created: #eeeff8; - --poll-adding_choices: #fafaf0; - --poll-voting: #effff9; - --poll-closed: #f0faf1; + --poll-created: #a6e4e1; + --poll-adding_choices: #bcb2e9; + --poll-voting: #fff2ba; + --poll-closed: #ffd9ba; --link: #96a8b2; diff --git a/pollen-ui-riot-js/src/main/web/css/main.css b/pollen-ui-riot-js/src/main/web/css/main.css index 67f94bd6..8a840d7f 100644 --- a/pollen-ui-riot-js/src/main/web/css/main.css +++ b/pollen-ui-riot-js/src/main/web/css/main.css @@ -80,6 +80,10 @@ input, textarea { background-color: var(--body-content-background); } +.main-content { + padding: 20px 2%; +} + @media (orientation: portrait) { .body-content { width: 100%; @@ -237,6 +241,7 @@ ul { justify-content: left; align-items: center; margin: 0 auto; + padding: 0 2%; } .tabs.below-h1 { @@ -416,7 +421,7 @@ pollenheader .header-link:hover { h1 { color: var(--h1); background-color: var(--h1-background); - padding: 30px 20px 15px 20px; + padding: 30px 2% 15px 2%; border-bottom: 1px solid var(--separator); } diff --git a/pollen-ui-riot-js/src/main/web/tag/Users.tag.html b/pollen-ui-riot-js/src/main/web/tag/Users.tag.html index c37775e2..bb2d4351 100644 --- a/pollen-ui-riot-js/src/main/web/tag/Users.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/Users.tag.html @@ -4,24 +4,26 @@ require("./components/Search.tag.html"); require("./UserCard.tag.html"); <Users> <div class="container" show="{loaded}"> - <h1 class="c-heading">{__.title}</h1> + <h1>{__.title}</h1> - <div class="c-alert c-alert--info"> - {count === 0 ? __.noUser : (count + " " + (count === 1 ? __.one : __.many))} - </div> + <div class="main-content"> + <div class="c-alert c-alert--info"> + {count === 0 ? __.noUser : (count + " " + (count === 1 ? __.one : __.many))} + </div> - <Search onsearch="{refresh}" search="{search}" /> + <Search onsearch="{refresh}" search="{search}" /> - <LazyLoad pagination={pagination} onload={lazyLoad} load-size="20" ref="lazyLoad" class="elements"> - <yield to="element"> - <UserCard user={element} on-user-change={parent.parent.refresh}/> - </yield> - <yield to="loading"> - <LoadingCard loading={nbNextGroup}> - {parent.parent._l("loading", nbNext)} - </LoadingCard> - </yield> - </LazyLoad> + <LazyLoad pagination={pagination} onload={lazyLoad} load-size="20" ref="lazyLoad" class="elements"> + <yield to="element"> + <UserCard user={element} on-user-change={parent.parent.refresh}/> + </yield> + <yield to="loading"> + <LoadingCard loading={nbNextGroup}> + {parent.parent._l("loading", nbNext)} + </LoadingCard> + </yield> + </LazyLoad> + </div> </div> <script type="es6"> diff --git a/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteList.tag.html b/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteList.tag.html index 6320f749..1b3ec55f 100644 --- a/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteList.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteList.tag.html @@ -22,58 +22,60 @@ require("../components/LoadingCard.tag.html"); <h1>{favoriteList.name}</h1> - <div class="c-alert c-alert--info"> - <span if={favoriteList.countChildren > 0}> - {favoriteList.countChildren} {favoriteList.countChildren > 1 ? __.children : __.child} - </span> - <span if={favoriteList.countChildren === 0 && favoriteList.countMembers == 0}> - {__.noMember} - </span> - <span if={favoriteList.countMembers > 0}> - {favoriteList.countMembers} {favoriteList.countMembers > 1 ? __.members : __.member} - </span> - </div> + <div class="main-content"> + <div class="c-alert c-alert--info"> + <span if={favoriteList.countChildren > 0}> + {favoriteList.countChildren} {favoriteList.countChildren > 1 ? __.children : __.child} + </span> + <span if={favoriteList.countChildren === 0 && favoriteList.countMembers == 0}> + {__.noMember} + </span> + <span if={favoriteList.countMembers > 0}> + {favoriteList.countMembers} {favoriteList.countMembers > 1 ? __.members : __.member} + </span> + </div> + + <Search onsearch={refresh} search={search}/> + + <LazyLoad pagination={pagination} onload={lazyLoad} load-size="20" ref="lazyLoad" class="elements"> + <yield to="element"> + <ChildListCard if={element.child} child-list={element} favorite-list={parent.parent.favoriteList} on-child-list-change={parent.parent.refresh}/> + <MemberCard if={element.name} member={element} favorite-list={parent.parent.favoriteList} on-member-change={parent.parent.refresh}/> + </yield> + <yield to="loading"> + <LoadingCard loading={nbNextGroup}> + {parent.parent._l("loading", nbNext)} + </LoadingCard> + </yield> + </LazyLoad> + + <ContextualMenu> + <a onclick={parent.addMember} > + {parent.__.member_new} + </a> + <a onclick={parent.importCsv} > + {parent.__.member_importCsv} + </a> + <a onclick={parent.importLdap} > + {parent.__.member_importLdap} + </a> + <a onclick={parent.createChildList} > + {parent.__.childList_new} + </a> + </ContextualMenu> - <Search onsearch={refresh} search={search}/> - - <LazyLoad pagination={pagination} onload={lazyLoad} load-size="20" ref="lazyLoad" class="elements"> - <yield to="element"> - <ChildListCard if={element.child} child-list={element} favorite-list={parent.parent.favoriteList} on-child-list-change={parent.parent.refresh}/> - <MemberCard if={element.name} member={element} favorite-list={parent.parent.favoriteList} on-member-change={parent.parent.refresh}/> - </yield> - <yield to="loading"> - <LoadingCard loading={nbNextGroup}> - {parent.parent._l("loading", nbNext)} - </LoadingCard> - </yield> - </LazyLoad> - - <ContextualMenu> - <a onclick={parent.addMember} > - {parent.__.member_new} - </a> - <a onclick={parent.importCsv} > - {parent.__.member_importCsv} - </a> - <a onclick={parent.importLdap} > - {parent.__.member_importLdap} - </a> - <a onclick={parent.createChildList} > - {parent.__.childList_new} - </a> - </ContextualMenu> - - <MemberEditModal ref="createMemberModal" - favorite-list={favoriteList} /> - - <ImportCsvModal ref="importCsvModal" - favorite-list={favoriteList}/> - - <ImportLdapModal ref="importLdapModal" - favorite-list={favoriteList}/> - - <ChildListEditModal ref="createChildListModal" + <MemberEditModal ref="createMemberModal" + favorite-list={favoriteList} /> + + <ImportCsvModal ref="importCsvModal" favorite-list={favoriteList}/> + + <ImportLdapModal ref="importLdapModal" + favorite-list={favoriteList}/> + + <ChildListEditModal ref="createChildListModal" + favorite-list={favoriteList}/> + </div> </div> </div> diff --git a/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteLists.tag.html b/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteLists.tag.html index 10845333..db7706c8 100644 --- a/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteLists.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/favoriteList/FavoriteLists.tag.html @@ -130,10 +130,6 @@ require("./FavoriteListEditModal.tag.html"); </script> <style> - .main-content { - padding: 20px; - } - .exemple { font-size: 0.9em; padding-top: 0.5em; diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/EditPoll.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/EditPoll.tag.html index 384f1649..fad56756 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/EditPoll.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/EditPoll.tag.html @@ -53,7 +53,7 @@ require("../components/HumanInput.tag.html"); </div> </div> - <div class="form"> + <div class="main-content"> <Description if={!showSummary && form.step === 0} form={form} ref="description"/> <Choices if={!showSummary && form.step === 1} form={form} ref="choices"/> <Settings if={!showSummary && form.step === 2} form={form} ref="settings"/> @@ -184,10 +184,6 @@ require("../components/HumanInput.tag.html"); <style> - .form { - padding: 30px 20px 60px 20px; - } - .actions { position: absolute; bottom: 0; diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html index 3e648b3f..3ccc48f3 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html @@ -238,10 +238,6 @@ require("./Report.tag.html"); margin: 0 2px; } - .main-content { - padding: 20px 20px 40px 20px; - } - .poll-info { display: flex; flex-direction: row; diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html index 999696e2..d91ac32c 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html @@ -23,16 +23,18 @@ {opts.poll.title} </a> - <div class="poll-creator-avatar"> - <LetterAvatar name={opts.poll.creatorName} rounded="true"/> - </div> - <div class="poll-creator-name" title={opts.poll.creatorName}> - {opts.poll.creatorName} + <div class="poll-description" title={opts.poll.description}> + {opts.poll.description} </div> - <div class="poll-creation-date"> - {formatDate(opts.poll.createDate, "LL")} - <br\> - {formatDate(opts.poll.createDate, "LT")} + + <div class="poll-creator" title={opts.poll.creatorName}> + <LetterAvatar name={opts.poll.creatorName} rounded="true"/> + <div class="creator-name"> + {opts.poll.creatorName} + <div class="creation-date"> + {formatDate(opts.poll.createDate)} + </div> + </div> </div> <a class="poll-votes" @@ -63,13 +65,12 @@ <style> pollcard { - height: 207px; position: relative; display: block; - padding: 10px 0; + padding: 5px; margin: 10px; box-shadow: 0 0 10px hsla(0,0%,7%,.6); - width: 180px; + width: 300px; overflow: hidden; } @@ -88,26 +89,46 @@ .card-content { display: flex; flex-direction: column; - align-items: center; + align-items: flex-start; + } + + .card-content > * { + margin-bottom: 10px; } .poll-title { width: 100%; font-size: 1.5em; - white-space: nowrap; - overflow: hidden; + height: 2.2em; text-align: center; - text-overflow: ellipsis; + } + + .poll-description { + font-style: italic; + height: 2.2em; } .poll-title, - .poll-creator-name, - .poll-creation-date { - margin-bottom: 20px; + .poll-description { + overflow: hidden; + text-overflow: ellipsis; } - .poll-creator-avatar { - font-size: 1.5em; + .poll-creator { + margin-left: 20px; + display: flex; + } + + .poll-creator .creator-name { + margin-left: 5px; + } + + .poll-creator .creator-name .creation-date { + font-size: 0.9em; + } + + .poll-votes { + align-self: center; } a { diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html index eadb4e2e..6f403e32 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Polls.tag.html @@ -6,44 +6,46 @@ require("../components/Search.tag.html"); <div class="container" show="{loaded}"> <h1>{__[opts.method]}</h1> - <div class="c-alert c-alert--info"> - {count === 0 ? __.noPoll : (count + " " + (count === 1 ? __.one : __.many))} - </div> + <div class="main-content"> + <div class="c-alert c-alert--info"> + {count === 0 ? __.noPoll : (count + " " + (count === 1 ? __.one : __.many))} + </div> - <Search onsearch="{refresh}" search="{search}" /> + <Search onsearch="{refresh}" search="{search}" /> - <LazyLoad pagination={pagination} onload={lazyLoad} load-size="20" ref="lazyLoad" class="elements"> - <yield to="element"> - <PollCard poll={element} on-poll-list-change={parent.parent.refresh}/> - </yield> - <yield to="loading"> - <LoadingCard loading={nbNextGroup}> - {parent.parent._l("loading", nbNext)} - </LoadingCard> - </yield> - </LazyLoad> + <LazyLoad pagination={pagination} onload={lazyLoad} load-size="20" ref="lazyLoad" class="elements"> + <yield to="element"> + <PollCard poll={element} on-poll-list-change={parent.parent.refresh}/> + </yield> + <yield to="loading"> + <LoadingCard loading={nbNextGroup}> + {parent.parent._l("loading", nbNext)} + </LoadingCard> + </yield> + </LazyLoad> - <ContextualMenu if={opts.method === "createdPolls"}> - <a onclick={parent.assignPoll}> - {parent.__.assignPollToMe_title} - </a> - </ContextualMenu> + <ContextualMenu if={opts.method === "createdPolls"}> + <a onclick={parent.assignPoll}> + {parent.__.assignPollToMe_title} + </a> + </ContextualMenu> - <Modal ref="assignModal" onsubmit={assign} header={__.assignPollToMe_title} label={__.assignPollToMe} type="success"> - <div class="o-form-element"> - <label class="c-label" for="pollToAssign">{parent.__.assignPollToMe_desc}</label> - <div class="o-field o-field--icon-left"> - <i class="fa fa-fw fa-link c-icon"></i> - <input class="c-field" - type="text" - name="pollToAssign" - ref="pollToAssign" - placeholder={parent.pollToAssignPlaceholder} - pattern={parent.pollToAssignUrlPattern} - required> + <Modal ref="assignModal" onsubmit={assign} header={__.assignPollToMe_title} label={__.assignPollToMe} type="success"> + <div class="o-form-element"> + <label class="c-label" for="pollToAssign">{parent.__.assignPollToMe_desc}</label> + <div class="o-field o-field--icon-left"> + <i class="fa fa-fw fa-link c-icon"></i> + <input class="c-field" + type="text" + name="pollToAssign" + ref="pollToAssign" + placeholder={parent.pollToAssignPlaceholder} + pattern={parent.pollToAssignUrlPattern} + required> + </div> </div> - </div> - </Modal> + </Modal> + </div> </div> <script type="es6"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.