This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push: new 397127453 [OPENMEETINGS-2471] messages panel is improved 397127453 is described below commit 397127453e9de4a89d74b6a27ce406c783d2e033 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Thu Dec 15 17:08:38 2022 +0700 [OPENMEETINGS-2471] messages panel is improved --- .../openmeetings/web/user/MessageDialog.html | 86 ++++++++++------------ .../web/user/profile/MessagesContactsPanel.html | 14 ++-- .../src/main/webapp/css/raw-general.css | 5 +- 3 files changed, 50 insertions(+), 55 deletions(-) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html index c6d40faf9..71d12e1cf 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html @@ -22,53 +22,45 @@ <html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd"> <wicket:extend> <form wicket:id="form"> - <table class="w-100 private-message"> - <tr> - <td colspan="2" wicket:id="feedback"></td> - </tr> - <tr> - <td class="messages column label"><wicket:message key="1210"/></td> - <td wicket:message="title:1588" class="om-select2 full-width"><select class="messages text to" wicket:id="to"></select></td> - </tr> - <tr> - <td class="messages column label"><wicket:message key="1211"/></td> - <td><input class="messages text form-control" type="text" wicket:id="subject"/></td> - </tr> - <tr> - <td colspan="2"> - <div wicket:id="toolbarContainer"></div> - <div class="private message body" wicket:id="message"></div> - </td> - </tr> - <tr wicket:enclosure="bookedRoom"> - <td colspan="2"><input type="checkbox" wicket:id="bookedRoom" /><label wicket:for="bookedRoom"><wicket:message key="1218"/></label></td> - </tr> - <tr wicket:id="roomParamsBlock"> - <td colspan="2" wicket:id="roomParams"> - <table class="w-100"> - <tr> - <td> - <table> - <tr> - <td><wicket:message key="45"/></td> - <td><select class="form-select messages selector" wicket:id="room.type"></select></td> - </tr> - <tr> - <td><wicket:message key="label.start" /></td> - <td><span class="date time picker" wicket:id="start"></span></td> - </tr> - <tr> - <td><wicket:message key="label.end" /></td> - <td><span class="date time picker" wicket:id="end"></span></td> - </tr> - </table> - </td> - <td><i class="fas fa-info-circle m-1 text-info"></i><wicket:message key="1221" /></td> - </tr> - </table> - </td> - </tr> - </table> + <td wicket:id="feedback"></td> + <div class="formelement row"> + <label wicket:for="to" class="form-label col-2 text-right"><wicket:message key="1210" /></label> + <div class="om-select2 p-0 d-inline-block col-9"><select class="input w-100" wicket:id="to"></select></div> + </div> + <div class="formelement row"> + <label wicket:for="subject" class="form-label col-2 text-right"><wicket:message key="1211" /></label> + <div class="col-9 p-0"> + <input type="text" wicket:id="subject" class="form-control"/> + </div> + </div> + <div wicket:id="toolbarContainer"></div> + <div class="private message body" wicket:id="message"></div> + <div class="mt-1 mb-1" wicket:enclosure="bookedRoom"> + <input type="checkbox" wicket:id="bookedRoom" /><label wicket:for="bookedRoom"><wicket:message key="1218"/></label> + </div> + <div wicket:id="roomParamsBlock"> + <div class="row" wicket:id="roomParams"> + <div class="col-7"> + <div class="formelement row"> + <label wicket:for="room.type" class="form-label col-2 text-right"><wicket:message key="45" /></label> + <div class="col-10 p-0"> + <select wicket:id="room.type" class="form-select"/> + </div> + </div> + <div class="formelement row"> + <label wicket:for="start" class="form-label col-2 text-right"><wicket:message key="label.start" /></label> + <div class="d-inline-block col-10 p-0"><span class="date time picker" wicket:id="start"></span></div> + </div> + <div class="formelement row"> + <label wicket:for="end" class="form-label col-2 text-right"><wicket:message key="label.end" /></label> + <div class="d-inline-block col-10 p-0"><span class="date time picker" wicket:id="end"></span></div> + </div> + </div> + <div class="col-5"> + <i class="fas fa-info-circle m-1 text-info"></i><wicket:message key="1221" /> + </div> + </div> + </div> </form> </wicket:extend> </html> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html index 4627ffe71..2429bb715 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html @@ -91,18 +91,18 @@ </div> </div> <div wicket:id="selectedMessage"> - <table class="w-100"> + <table class="w-100 bg-light"> <tr> - <td class="ps-4"><wicket:message key="1202"/></td> - <td wicket:id="from"></td> + <td class="ps-4 col-1"><wicket:message key="1202"/></td> + <td class="col-10" wicket:id="from"></td> </tr> <tr> - <td class="ps-4"><wicket:message key="1210"/></td> - <td wicket:id="to"></td> + <td class="ps-4 col-1"><wicket:message key="1210"/></td> + <td class="col-10" wicket:id="to"></td> </tr> <tr> - <td class="ps-4"><wicket:message key="1211"/></td> - <td wicket:id="subj"></td> + <td class="ps-4 col-1"><wicket:message key="1211"/></td> + <td class="col-10" wicket:id="subj"></td> </tr> </table> <div wicket:id="body"></div> diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css b/openmeetings-web/src/main/webapp/css/raw-general.css index a29ef5485..4881ce276 100644 --- a/openmeetings-web/src/main/webapp/css/raw-general.css +++ b/openmeetings-web/src/main/webapp/css/raw-general.css @@ -340,11 +340,14 @@ select.messages.selector { margin-left: 10px; } #messagesTable tr.selected { - background-color: #d7ebf9; + background-color: var(--bs-light); } #messagesTable tr.unread { font-weight: bold; } +#messagesTable tr.unread>td:nth-child(1)::before { + content: '*' +} .fht-tbody { background-color: white; }