From db23ab6a291261633ef8f0e4e1a5d82f071ae8bf Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Mon, 13 Apr 2020 20:01:13 +0200 Subject: Post list: Improve lazy chat message edit button layout. Change-Id: I46100b4b0039f241c7fb13905fb203303f1a466d --- src/main/resources/META-INF/resources/cms2/base.css | 13 +++++++++++++ .../resources/META-INF/resources/posts/postList.js | 15 +++++++++++---- .../resources/templates/benki/posts/postList.html | 21 ++++++++++++++------- 3 files changed, 38 insertions(+), 11 deletions(-) (limited to 'src/main') diff --git a/src/main/resources/META-INF/resources/cms2/base.css b/src/main/resources/META-INF/resources/cms2/base.css index c455ce8..b165f1c 100644 --- a/src/main/resources/META-INF/resources/cms2/base.css +++ b/src/main/resources/META-INF/resources/cms2/base.css @@ -174,6 +174,7 @@ article.bookmark { font-size: smaller; margin: 0; padding: 0; + flex: auto; } article.lazychat-message { @@ -183,6 +184,10 @@ article.lazychat-message { background: #f0f8f0; } +article.lazychat-message > header { + display: flex +} + #bookmark-submission textarea { min-width: calc(100% - 12em); } @@ -196,6 +201,14 @@ elix-expandable-section.editor-pane::part(header) { display: inline-block; } +.lazychat-edit-button { + font-size: small; +} + +.lazychat-message-controls { + flex: initial; +} + .paging { display: flex; flex-direction: row; diff --git a/src/main/resources/META-INF/resources/posts/postList.js b/src/main/resources/META-INF/resources/posts/postList.js index 3eb23ce..7bab4f9 100644 --- a/src/main/resources/META-INF/resources/posts/postList.js +++ b/src/main/resources/META-INF/resources/posts/postList.js @@ -11,9 +11,16 @@ document.addEventListener('DOMContentLoaded', () => { lazychatSubmissionPane.addEventListener('opened',() => lazychatSubmissionForm.focus()); } - let lazychatEditorPanes = document.getElementsByClassName('lazychat-editor-pane'); - for (let pane of lazychatEditorPanes) { - let form = pane.getElementsByTagName('mlk-lazychat-submission-form')[0]; - pane.addEventListener('opened', () => form.focus()); + let lazychatMessages = document.getElementsByClassName('lazychat-message'); + for (let message of lazychatMessages) { + let editorPane = message.getElementsByClassName('lazychat-editor-pane')[0]; + if (editorPane) { + let form = message.getElementsByTagName('mlk-lazychat-submission-form')[0]; + let editButton = message.getElementsByClassName('lazychat-edit-button')[0]; + editButton.addEventListener('click', () => { + editorPane.toggle(); + form.focus(); + }); + } } }); diff --git a/src/main/resources/templates/benki/posts/postList.html b/src/main/resources/templates/benki/posts/postList.html index a66528b..3cd4e49 100644 --- a/src/main/resources/templates/benki/posts/postList.html +++ b/src/main/resources/templates/benki/posts/postList.html @@ -17,6 +17,8 @@ {#head} + + @@ -69,24 +71,29 @@ {#else}
-
+
{owner.firstName} {owner.lastName}
+
+ {#if showLazychatForm} + + {/if} +
+
+ +
{#if showLazychatForm} - + - + {/if} - +
{contentHtml.raw}
- -
-
{/if} {/with} -- cgit v1.2.3