You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2022/12/21 09:53:56 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2716] panels under Settings main menu are more responsive
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 58a8ef1aa [OPENMEETINGS-2716] panels under Settings main menu are more responsive
58a8ef1aa is described below
commit 58a8ef1aa3a4f52acd7464e5cd0a30eb06673d36
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Dec 21 16:53:44 2022 +0700
[OPENMEETINGS-2716] panels under Settings main menu are more responsive
---
.../web/user/profile/EditProfileForm.html | 8 +++----
.../web/user/profile/UserSearchPanel.html | 25 +++++++++++-----------
.../web/user/profile/UserSearchPanel.java | 6 +++++-
.../src/main/webapp/css/raw-general.css | 3 ++-
4 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.html
index 402f977c8..b06f9a9a1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.html
@@ -23,8 +23,8 @@
<wicket:panel>
<div class="actions" wicket:id="buttons"></div>
<div class="profile-edit-form overflow-y-auto">
- <div class="h-100 row m-0">
- <div class="col-6">
+ <div class="h-100 row row-cols-lg-auto m-0">
+ <div class="col-12">
<fieldset class="">
<legend class="">
<wicket:message key="143" />
@@ -39,8 +39,8 @@
<form wicket:id="general"></form>
</fieldset>
</div>
- <div class="col-6">
- <div wicket:id="img" class="pb-5"></div>
+ <div class="col-12">
+ <div wicket:id="img" class=""></div>
<fieldset class="mt-5">
<legend class="">
<wicket:message key="1159" />
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
index ef19defeb..0fac551ad 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
@@ -23,20 +23,19 @@
<wicket:panel>
<!-- TODO move styles into CSS -->
<div class="d-flex profile-panel">
- <div>
- <form wicket:id="form">
- <div><wicket:message key="1179"/></div>
- <input type="text" wicket:id="text" class="form-control"/>
- <div><wicket:message key="1177"/></div>
- <input type="text" wicket:id="offer" class="form-control"/>
- <div><wicket:message key="1178"/></div>
- <input type="text" wicket:id="search" class="form-control"/>
- <br/>
- <button wicket:id="submit" type="button"></button>
- </form>
- </div>
<div wicket:id="container" class="pe-3 h-100">
- <div><strong><wicket:message key="1184"/></strong> <div class="adminNav" wicket:id="navigator"></div></div>
+ <div>
+ <strong><wicket:message key="1184"/></strong>
+ <div class="adminNav ms-2 d-inline-block" wicket:id="navigator"></div>
+ <form wicket:id="form" class="d-inline-block">
+ <div class="input-group">
+ <input type="text" wicket:id="text" class="form-control" wicket:message="placeholder:1179,aria-label:1179"/>
+ <input type="text" wicket:id="offer" class="form-control" wicket:message="placeholder:1177,aria-label:1177"/>
+ <input type="text" wicket:id="search" class="form-control" wicket:message="placeholder:1178,aria-label:1178"/>
+ <button wicket:id="submit" type="button"></button>
+ </div>
+ </form>
+ </div>
<table id="searchUsersTable" class="list-table table table-striped table-hover">
<thead>
<tr>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
index b17e4dde6..98db6288f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
@@ -71,8 +71,12 @@ public class UserSearchPanel extends UserBasePanel {
public UserSearchPanel(String id) {
super(id);
+ }
- add(new Form<Void>("form") {
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ container.add(new Form<Void>("form") {
private static final long serialVersionUID = 1L;
@Override
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css b/openmeetings-web/src/main/webapp/css/raw-general.css
index 4881ce276..652dda0a3 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -488,6 +488,7 @@ select.messages.selector {
}
.profile {
position: relative;
+ display: inline-block;
}
.profile img {
width: 125px;
@@ -497,7 +498,7 @@ select.messages.selector {
}
.profile .remove {
position: absolute;
- right: 5px;
+ right: -10px;
top: 5px;
border: 1px solid #cccc;
padding: 0px 7px;