branch develop updated (94b70ab -> 9ef3398)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 94b70ab correction d'un test. la verification du mot de passe n'est pas nécessaire pour modifier un utilisateur (l'administrateur peut aussi le modifier). new 9ef3398 initialiser un nouveaux choix avec les 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 9ef339894fa4169c815d1666d7c217645b407aca Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 28 10:18:19 2017 +0200 initialiser un nouveaux choix avec les Summary of changes: .../src/main/web/tag/poll/Comments.tag.html | 258 +++++++++++---------- 1 file changed, 138 insertions(+), 120 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 develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 9ef339894fa4169c815d1666d7c217645b407aca Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 28 10:18:19 2017 +0200 initialiser un nouveaux choix avec les --- .../src/main/web/tag/poll/Comments.tag.html | 258 +++++++++++---------- 1 file changed, 138 insertions(+), 120 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html index 385fe8c..3d60870 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Comments.tag.html @@ -2,141 +2,156 @@ require("../Pagination.tag.html"); require("./CommentPopup.tag.html"); <Comments> - <div show="{loaded}" class="actions-header"> + <form show="{loaded}" onsubmit="{addComment}" class="comment-form"> + <div class="actions"> + <div class="actions-left"> + </div> + <div class="actions-right"> + <button type="submit" + class="c-button c-button--info pull-right"> + <i class="fa fa-paper-plane"/> + {__.sendComment} + </button> + </div> + </div> + <div class="comment"> + <div class="comment-user"> + <div class="o-form-element"> + <div class="o-field o-field--icon-left"> + <i class="fa fa-fw fa-user c-icon"></i> + <input class="c-field" + type="text" + name="author" + ref="author" + required + value={userName} + placeholder="{__.authorPlaceholder}"> + </div> + </div> + </div> + <div class="comment-text"> + <div class="o-form-element "> + <textarea class="c-field" + rows="5" + ref="text" + name="text" + required + placeholder="{__.textPlaceholder}"/> + </div> + </div> + </div> + <div class="c-hint--static c-hint--error" + if="{error}"> + {error} + </div> + <div class="actions"> + <div class="actions-left"> + </div> + <div class="actions-right"> + <button type="submit" + class="c-button c-button--info pull-right"> + <i class="fa fa-paper-plane"/> + {__.sendComment} + </button> + </div> + </div> + </form> + <div show="{loaded}" > + <div show="{poll.comments && poll.comments.length === 0}">{__.noComment}</div> + <button type="button" + show="{poll.comments && poll.comments.length > 0}" class="c-button c-button--info" onclick="{toggleSort}"> - <i class="fa {fa-sort-amount-desc : orderDesc, fa-sort-amount-asc : !orderDesc}"/> + <i class="fa fa-sort-amount-{desc : orderDesc, asc : !orderDesc}"/> </button> - </div> - <div show="{loaded}" class="comments {inverse : orderDesc}"> - - <div show="{poll.comments && poll.comments.length == 0}">{__.noComment}</div> - <div each="{comment, index in poll.comments}"> + <div class="comments {inverse : orderDesc}"> + <div each="{comment, index in poll.comments}"> - <div if={commentEditing !== comment} class="comment"> - <div class="comment-user"> - <div class="icon"> - <i class="fa fa-user"/> - </div> - <div class="user"> - {comment.authorName} - <div class="comment-date"> - {formatDate(comment.postDate)} - </div> - </div> - <div class="actions" - if={comment.permission}> - <span class="c-input-group"> - <button type="button" - class="c-button c-button--ghost-error u-small" - onclick="{parent.deleteComment(comment)}"> - <i class="fa fa-trash"/> - </button> - <button type="button" - class="c-button c-button--ghost-brand u-small" - onclick="{parent.startEditComment(comment)}"> - <i class="fa fa-pencil-square-o"/> - </button> - </span> - </div> - </div> - <div class="comment-text"> - <div class="text"> - {comment.text} - </div> - </div> - </div> - <form if={commentEditing === comment} - onsubmit="{updateComment}" - class="comment-form"> - <div class="comment"> + <div if={commentEditing !== comment} class="comment"> <div class="comment-user"> - <div class="o-form-element"> - <div class="o-field o-field--icon-left"> - <i class="fa fa-fw fa-user c-icon"></i> - <input class="c-field" - type="text" - name="editAuthor" - ref="editAuthor" - required - value={commentEditing.authorName} - placeholder="{__.authorPlaceholder}"> - + <div class="icon"> + <i class="fa fa-user"/> + </div> + <div class="user"> + {comment.authorName} + <div class="comment-date"> + {formatDate(comment.postDate)} </div> </div> + <div class="actions" + if={comment.permission}> + <span class="c-input-group"> + <button type="button" + class="c-button c-button--ghost-error u-small" + onclick="{parent.deleteComment(comment)}"> + <i class="fa fa-trash"/> + </button> + <button type="button" + class="c-button c-button--ghost-brand u-small" + onclick="{parent.startEditComment(comment)}"> + <i class="fa fa-pencil-square-o"/> + </button> + </span> + </div> </div> <div class="comment-text"> - <div class="o-form-element "> - <textarea class="c-field" - rows="5" - ref="editText" - name="editText" - required - value={commentEditing.text} - placeholder="{__.textPlaceholder}"/> + <div class="text"> + {comment.text} </div> </div> </div> - <div class="c-hint--static c-hint--error" - if="{error}"> - {error} - </div> - <div class="actions"> - <button class="c-button c-button--error" - type="button" - onclick="{cancelEditComment}"> - <i class="fa fa-remove"/> - {parent.__.cancelEditComment} - </button> - <button class="c-button c-button--success pull-right" - type="submit"> - <i class="fa fa-check"/> - {parent.__.updateComment} - </button> - </div> - </form> - </div> - - <form onsubmit="{addComment}" class="comment-form"> - <div class="comment"> - <div class="comment-user"> - <div class="o-form-element"> - <div class="o-field o-field--icon-left"> - <i class="fa fa-fw fa-user c-icon"></i> - <input class="c-field" - type="text" - name="author" - ref="author" - required - value={userName} - placeholder="{__.authorPlaceholder}"> + <form if={commentEditing === comment} + onsubmit="{updateComment}" + class="comment-form"> + <div class="comment"> + <div class="comment-user"> + <div class="o-form-element"> + <div class="o-field o-field--icon-left"> + <i class="fa fa-fw fa-user c-icon"></i> + <input class="c-field" + type="text" + name="editAuthor" + ref="editAuthor" + required + value={commentEditing.authorName} + placeholder="{__.authorPlaceholder}"> + + </div> + </div> + </div> + <div class="comment-text"> + <div class="o-form-element "> + <textarea class="c-field" + rows="5" + ref="editText" + name="editText" + required + value={commentEditing.text} + placeholder="{__.textPlaceholder}"/> + </div> </div> </div> - </div> - <div class="comment-text"> - <div class="o-form-element "> - <textarea class="c-field" - rows="5" - ref="text" - name="text" - required - placeholder="{__.textPlaceholder}"/> - </div> - </div> + <div class="c-hint--static c-hint--error" + if="{error}"> + {error} + </div> + <div class="actions"> + <button class="c-button c-button--error" + type="button" + onclick="{cancelEditComment}"> + <i class="fa fa-remove"/> + {parent.__.cancelEditComment} + </button> + <button class="c-button c-button--success pull-right" + type="submit"> + <i class="fa fa-check"/> + {parent.__.updateComment} + </button> + </div> + </form> </div> - <div class="c-hint--static c-hint--error" - if="{error}"> - {error} - </div> - <div class="actions"> - <button type="submit" - class="c-button c-button--info pull-right"> - <i class="fa fa-paper-plane"/> - {__.sendComment} - </button> - </div> - </form> + </div> </div> <script type="es6"> @@ -221,13 +236,16 @@ require("./CommentPopup.tag.html"); } .comment { - border-top: 1px solid; padding: 3px 0; display: flex; flex-direction: row; justify-content: space-between; } + .comments .comment { + border-top: 1px solid; + } + .comment-form { padding-bottom: 3px; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm