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/06/01 10:55:09 UTC
[openmeetings] branch OPENMEETINGS-2721-form-bootstrapization created (now f274e15a6)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch OPENMEETINGS-2721-form-bootstrapization
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
at f274e15a6 [OPENMEETINGS-2721] form bootstrapization
This branch includes the following new commits:
new f274e15a6 [OPENMEETINGS-2721] form bootstrapization
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[openmeetings] 01/01: [OPENMEETINGS-2721] form bootstrapization
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch OPENMEETINGS-2721-form-bootstrapization
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit f274e15a62b60c783cf14fe6acda00f5814ad70a
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Jun 1 17:54:52 2022 +0700
[OPENMEETINGS-2721] form bootstrapization
---
.../openmeetings/web/admin/backup/BackupPanel.html | 64 +++++------
.../web/admin/configurations/ConfigsPanel.html | 64 ++++++-----
.../openmeetings/web/admin/groups/GroupsPanel.html | 110 ++++++++++++-------
.../openmeetings/web/admin/labels/LangPanel.html | 2 +-
.../openmeetings/web/admin/oauth/OAuthPanel.html | 4 +-
.../openmeetings/web/admin/rooms/RoomsPanel.html | 5 +-
.../openmeetings/web/admin/users/UserForm.html | 49 ++++++---
.../openmeetings/web/admin/users/UserForm.java | 4 +-
...omunityUserForm.html => CommunityUserForm.html} | 21 ++--
...omunityUserForm.java => CommunityUserForm.java} | 8 +-
.../openmeetings/web/common/GeneralUserForm.html | 118 ++++++++++++++-------
.../openmeetings/web/common/InvitationForm.html | 22 ++--
.../web/common/PagingNavigatorPanel.html | 2 +-
.../openmeetings/web/pages/auth/SignInDialog.html | 8 +-
.../web/pages/install/InstallWizard$DbStep.html | 2 +-
.../pages/install/InstallWizard$ParamsStep1.html | 2 +-
.../pages/install/InstallWizard$ParamsStep2.html | 2 +-
.../apache/openmeetings/web/room/RoomPanel.html | 28 ++---
.../openmeetings/web/room/VideoSettings.html | 6 +-
.../web/room/poll/CreatePollDialog.html | 2 +-
.../web/room/poll/PollResultsDialog.html | 4 +-
.../openmeetings/web/room/poll/VoteDialog.html | 14 +--
.../openmeetings/web/user/MessageDialog.html | 2 +-
.../web/user/calendar/AppointmentDialog.html | 8 +-
.../web/user/profile/EditProfileForm.java | 4 +-
.../web/user/profile/MessagesContactsPanel.html | 4 +-
26 files changed, 335 insertions(+), 224 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
index b721562f4..37372ee6c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
@@ -21,43 +21,45 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
<wicket:panel>
- <div wicket:id="feedback"></div>
- <fieldset class="container">
- <legend><wicket:message key="admin.backup.lbl"/></legend>
- <form wicket:id="backupUpload" class="adminForm adminBackupForm">
- <div class="card">
- <div class="card-header"><wicket:message key="admin.backup.lbl"/></div>
+ <div class="h-100 overflow-auto">
+ <div wicket:id="feedback"></div>
+ <fieldset class="container">
+ <legend><wicket:message key="admin.backup.lbl"/></legend>
+ <form wicket:id="backupUpload" class="adminForm adminBackupForm">
+ <div class="card">
+ <div class="card-header"><wicket:message key="admin.backup.lbl"/></div>
+ <div class="card-body">
+ <p class="card-text">
+ <i class="fas fa-info-circle m-1 text-info"></i><span wicket:id="backupSteps"></span>
+ </p>
+ <div class="ps-4">
+ <div class="form-check m-2">
+ <input class="form-check-input" type="checkbox" wicket:id="includeFilesInBackup" />
+ <label class="form-check-label" wicket:for="includeFilesInBackup"><wicket:message key="admin.backup.add.files" /></label>
+ </div>
+ <!-- Perform Download -->
+ <button wicket:id="download"></button>
+ <div class="m-3" wicket:id="progress"></div>
+ </div>
+ </div>
+ </div>
+ </form>
+ <div class="card mt-2 backup-upload">
+ <div class="card-header"><wicket:message key="admin.backup.import.lbl"/></div>
<div class="card-body">
- <p class="card-text">
- <i class="fas fa-info-circle m-1 text-info"></i><span wicket:id="backupSteps"></span>
- </p>
<div class="ps-4">
- <div class="custom-control custom-checkbox m-2">
- <input class="custom-control-input" type="checkbox" wicket:id="includeFilesInBackup" />
- <label class="custom-control-label" wicket:for="includeFilesInBackup"><wicket:message key="admin.backup.add.files" /></label>
- </div>
- <!-- Perform Download -->
- <button wicket:id="download"></button>
- <div class="m-3" wicket:id="progress"></div>
+ <div wicket:id="upload"></div>
</div>
</div>
+ <div class="card-footer"></div>
</div>
- </form>
- <div class="card mt-2 backup-upload">
- <div class="card-header"><wicket:message key="admin.backup.import.lbl"/></div>
- <div class="card-body">
- <div class="ps-4">
- <div wicket:id="upload"></div>
- </div>
+ <div class="formelement mt-2">
+ <!-- Backup CLI import information -->
+ <i class="fas fa-info-circle m-1 text-info"></i>
+ <div wicket:id="cmdLineDesc"></div>
</div>
- <div class="card-footer"></div>
- </div>
- <div class="formelement mt-2">
- <!-- Backup CLI import information -->
- <i class="fas fa-info-circle m-1 text-info"></i>
- <div wicket:id="cmdLineDesc"></div>
- </div>
- </fieldset>
+ </fieldset>
+ </div>
</wicket:panel>
</html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
index a4b7a8f8d..070167aab 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
@@ -46,44 +46,58 @@
<div class="scrollcontent" id="adminForm">
<fieldset>
<legend><wicket:message key="266" /></legend>
- <div class="formelement">
- <label wicket:for="type" class="col-3 text-right"><wicket:message key="45" /></label>
- <select class="custom-select col-8" wicket:id="type"></select>
+ <div class="formelement row">
+ <label wicket:for="type" class="form-label col-3 text-right"><wicket:message key="45" /></label>
+ <div class="col-8 p-0">
+ <select class="form-select" wicket:id="type"></select>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="key" class="col-3 text-right"><wicket:message key="265" /></label>
- <input class="col-8" type="text" wicket:id="key"/>
+ <div class="formelement row">
+ <label wicket:for="key" class="form-label col-3 text-right"><wicket:message key="265" /></label>
+ <div class="col-8 p-0">
+ <input class="form-control" type="text" wicket:id="key"/>
+ </div>
</div>
- <div class="formelement">
- <div wicket:id="string-box">
- <label wicket:for="valueS" class="col-3 text-right"><wicket:message key="271" /></label>
- <textarea class="col-8" wicket:id="valueS"/>
+ <div class="formelement row">
+ <div wicket:id="string-box" class="row">
+ <label wicket:for="valueS" class="form-label col-3 text-right"><wicket:message key="271" /></label>
+ <div class="col-8 p-0">
+ <textarea class="form-control" wicket:id="valueS"/>
+ </div>
</div>
- <div wicket:id="number-box">
- <label wicket:for="valueN" class="col-3 text-right"><wicket:message key="271" /></label>
- <input class="col-8" type="number" wicket:id="valueN"/>
+ <div wicket:id="number-box" class="row">
+ <label wicket:for="valueN" class="form-label col-3 text-right"><wicket:message key="271" /></label>
+ <div class="col-8 p-0">
+ <input class="form-control" type="number" wicket:id="valueN"/>
+ </div>
</div>
- <div wicket:id="boolean-box">
- <label wicket:for="valueB" class="col-3 text-right"><wicket:message key="271" /></label>
+ <div wicket:id="boolean-box" class="row">
+ <label wicket:for="valueB" class="form-label col-3 text-right"><wicket:message key="271" /></label>
<div class="onoffswitch">
<input type="checkbox" class="onoff-checkbox" wicket:id="valueB"/>
<label class="onoff-label clickable" wicket:for="valueB"></label>
</div>
</div>
- <div wicket:id="hotkey-box">
- <label wicket:for="value" class="col-3 text-right"><wicket:message key="271" /></label>
- <input type="text" class="hotkey-input" wicket:id="value"/>
+ <div wicket:id="hotkey-box" class="row">
+ <label wicket:for="value" class="form-label col-3 text-right"><wicket:message key="271" /></label>
+ <div class="col-8 p-0">
+ <input type="text" class="hotkey-input form-control" wicket:id="value"/>
+ </div>
</div>
</div>
- <div class="formelement">
- <label class="col-3 text-right"><wicket:message key="268" /></label><span wicket:id="updated"/>
+ <div class="formelement row">
+ <label class="form-labelcol-3 text-right"><wicket:message key="268" /></label>
+ <span wicket:id="updated"/>
</div>
- <div class="formelement">
- <label class="col-3 text-right"><wicket:message key="269" /></label><span wicket:id="user.login"/>
+ <div class="formelement row">
+ <label class="form-labelcol-3 text-right"><wicket:message key="269" /></label>
+ <span wicket:id="user.login"/>
</div>
- <div class="formelement">
- <label class="col-3 text-right" wicket:for="comment"><wicket:message key="196" /></label>
- <textarea class="col-8" wicket:id="comment"/>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right" wicket:for="comment"><wicket:message key="196" /></label>
+ <div class="col-8 p-0">
+ <textarea class="form-control" wicket:id="comment"/>
+ </div>
</div>
</fieldset>
<div class="bottom-bumper"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
index 63e863c23..4560fc309 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
@@ -49,59 +49,91 @@
<div class="scrollcontent" id="adminForm">
<fieldset>
<legend><wicket:message key="161" /></legend>
- <div class="formelement">
- <label wicket:for="name" class="col-3 text-right"><wicket:message key="165" /></label>
- <input type="text" wicket:id="name" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="name" class="form-label col-3 text-right"><wicket:message key="165" /></label>
+ <div class="col-8 p-0">
+ <input type="text" wicket:id="name" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label class="col-3 text-right"><wicket:message key="admin.group.form.logo" /></label>
- <div wicket:id="logo" class="input group logo col-3 d-inline-block"></div>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"><wicket:message key="admin.group.form.logo" /></label>
+ <div wicket:id="logo" class="input group logo col-4 d-inline-block"></div>
</div>
- <div class="formelement">
- <label wicket:for="tag" class="col-3 text-right"><wicket:message key="admin.group.form.tag" /></label>
- <input type="text" wicket:id="tag" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="tag" class="form-label col-3 text-right"><wicket:message key="admin.group.form.tag" /></label>
+ <div class="col-8 p-0">
+ <input type="text" wicket:id="tag" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="user2add" class="col-3 text-right"><strong><wicket:message key="178" /></strong></label>
+ <div class="formelement row">
+ <label wicket:for="user2add" class="form-label col-3 text-right"><strong><wicket:message key="178" /></strong></label>
<div class="om-select2 p-0 d-inline-block col-8"><select wicket:id="user2add" class="input w-100"></select></div>
</div>
- <div class="formelement">
+ <div class="formelement row">
<div wicket:id="users"></div>
</div>
- <div class="formelement">
- <label wicket:for="restricted" class="col-3 text-right"><wicket:message key="restricted.group.files" /></label>
- <input type="checkbox" wicket:id="restricted" />
+ <div class="formelement row">
+ <label wicket:for="restricted" class="form-label col-3 text-right"><wicket:message key="restricted.group.files" /></label>
+ <div class="col-3 row">
+ <input type="checkbox" class="form-check" wicket:id="restricted" />
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="limited" class="col-3 text-right"><wicket:message key="admin.group.form.limited" /></label>
- <input type="checkbox" wicket:id="limited" />
+ <div class="formelement row">
+ <label wicket:for="limited" class="form-label col-3 text-right"><wicket:message key="admin.group.form.limited" /></label>
+ <div class="col-3 row">
+ <input type="checkbox" class="form-check" wicket:id="limited" />
+ </div>
</div>
- <div class="formelement d-none">
- <label wicket:for="maxFilesSize" class="col-3 text-right"><wicket:message key="admin.group.form.maxFilesSize" /></label>
- <input type="number" wicket:id="maxFilesSize" class="col-8"/><wicket:message key="network.test.mb"/>
+ <div class="formelement d-none row">
+ <label wicket:for="maxFilesSize" class="form-label col-3 text-right"><wicket:message key="admin.group.form.maxFilesSize" /></label>
+ <div class="col-8 p-0 row">
+ <div class="col-10">
+ <input type="number" wicket:id="maxFilesSize" class="form-control"/>
+ </div>
+ <div class="col-1 d-inline-block"><wicket:message key="network.test.mb"/></div>
+ </div>
</div>
- <div class="formelement d-none">
- <label wicket:for="maxRecordingsSize" class="col-3 text-right"><wicket:message key="admin.group.form.maxRecordingsSize" /></label>
- <input type="number" wicket:id="maxRecordingsSize" class="col-8"/><wicket:message key="network.test.mb"/>
+ <div class="formelement d-none row">
+ <label wicket:for="maxRecordingsSize" class="form-label col-3 text-right"><wicket:message key="admin.group.form.maxRecordingsSize" /></label>
+ <div class="col-8 p-0 row">
+ <div class="col-10">
+ <input type="number" wicket:id="maxRecordingsSize" class="form-control"/>
+ </div>
+ <div class="col-1 d-inline-block"><wicket:message key="network.test.mb"/></div>
+ </div>
</div>
- <div class="formelement d-none">
- <label wicket:for="maxRooms" class="col-3 text-right"><wicket:message key="admin.group.form.maxRooms" /></label>
- <input type="number" wicket:id="maxRooms" class="col-8"/>
+ <div class="formelement d-none row">
+ <label wicket:for="maxRooms" class="form-label col-3 text-right"><wicket:message key="admin.group.form.maxRooms" /></label>
+ <div class="col-8 p-0">
+ <input type="number" wicket:id="maxRooms" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="recordingTtl" class="col-3 text-right"><wicket:message key="admin.group.form.recordingTtl" /></label>
- <input type="number" wicket:id="recordingTtl" class="col-7"/>
- <div class="col-1 d-inline-block"><wicket:message key="admin.group.form.days"/></div>
+ <div class="formelement row">
+ <label wicket:for="recordingTtl" class="form-label col-3 text-right"><wicket:message key="admin.group.form.recordingTtl" /></label>
+ <div class="col-8 p-0 row">
+ <div class="col-10">
+ <input type="number" wicket:id="recordingTtl" class="form-control"/>
+ </div>
+ <div class="col-1 d-inline-block"><wicket:message key="admin.group.form.days"/></div>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="reminderDays" class="col-3 text-right"><wicket:message key="admin.group.form.reminderDays" /></label>
- <input type="number" wicket:id="reminderDays" class="col-7"/>
- <div class="col-1 d-inline-block"><wicket:message key="admin.group.form.days"/></div>
+ <div class="formelement row">
+ <label wicket:for="reminderDays" class="form-label col-3 text-right"><wicket:message key="admin.group.form.reminderDays" /></label>
+ <div class="col-8 p-0 row">
+ <div class="col-10">
+ <input type="number" wicket:id="reminderDays" class="form-control"/>
+ </div>
+ <div class="col-1 d-inline-block"><wicket:message key="admin.group.form.days"/></div>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="notifyInterval" class="col-3 text-right"><wicket:message key="admin.group.new.users.notification.interval" /></label>
- <input type="number" wicket:id="notifyInterval" class="col-7"/>
- <div class="col-1 d-inline-block"><wicket:message key="admin.group.form.minutes"/></div>
+ <div class="formelement row">
+ <label wicket:for="notifyInterval" class="form-label col-3 text-right"><wicket:message key="admin.group.new.users.notification.interval" /></label>
+ <div class="col-8 p-0 row">
+ <div class="col-10">
+ <input type="number" wicket:id="notifyInterval" class="form-control"/>
+ </div>
+ <div class="col-1 d-inline-block"><wicket:message key="admin.group.form.minutes"/></div>
+ </div>
</div>
</fieldset>
<div class="bottom-bumper"></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
index e59890dfd..d3f2e1029 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
@@ -29,7 +29,7 @@
<i class="fas fa-plus"></i>
</button>
<button wicket:id="deleteLangBtn" wicket:message="title:363"></button>
- <select wicket:id="language" class="form-control"></select>
+ <select wicket:id="language" class="form-select"></select>
<button wicket:id="export"></button>
<button class="fileupload fileupload-new m-0 btn btn-file btn-xs btn-primary" data-provides="fileupload">
<wicket:message key="387"/>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
index 330c8e649..f60f5c903 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
@@ -74,7 +74,7 @@
</div>
<div class="formelement">
<label wicket:for="requestTokenMethod" class="col-3 text-right"><wicket:message key="admin.oauth.req.token.method"/></label>
- <select wicket:id="requestTokenMethod" class="custom-select col-8"></select>
+ <select wicket:id="requestTokenMethod" class="form-select col-8"></select>
</div>
<div class="formelement">
<label wicket:for="requestTokenUrl" class="col-3 text-right"><wicket:message key="1579"/></label>
@@ -86,7 +86,7 @@
</div>
<div class="formelement">
<label wicket:for="requestInfoMethod" class="col-3 text-right"><wicket:message key="admin.oauth.req.info.method"/></label>
- <select wicket:id="requestInfoMethod" class="custom-select col-8"></select>
+ <select wicket:id="requestInfoMethod" class="form-select col-8"></select>
</div>
<div class="formelement">
<label wicket:for="requestInfoUrl" class="col-3 text-right"><wicket:message key="1580"/></label>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
index 4746f2742..1855ea5a1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
@@ -44,7 +44,6 @@
<form wicket:id="form" class="adminForm">
<div class="actions" wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
-
<!-- General -->
<fieldset>
<legend><wicket:message key="lbl.general" /></legend>
@@ -58,11 +57,11 @@
</div>
<div class="formelement">
<label wicket:for="capacity" class="col-3 text-right"><wicket:message key="482" /></label>
- <select wicket:id="capacity" class="custom-select col-8"/>
+ <select wicket:id="capacity" class="form-select col-8"/>
</div>
<div class="formelement">
<label wicket:for="type" class="col-3 text-right"><wicket:message key="45" /></label>
- <select wicket:id="type" class="custom-select col-8"/>
+ <select wicket:id="type" class="form-select col-8"/>
</div>
<div class="formelement">
<label wicket:for="comment" class="col-3 text-right"><wicket:message key="196" /></label>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
index 4b45aa18a..a314ed2e1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
@@ -27,33 +27,48 @@
<wicket:message key="143" />
</legend>
<div class="formelement row">
- <span class="col-3 text-right"></span>
+ <span class="form-label col-3 text-right"></span>
<span class="col-8" wicket:id="avatar"></span>
</div>
- <div class="formelement">
- <label wicket:for="login" class="col-3 text-right"><wicket:message key="108" /></label><input type="text" wicket:id="login" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="login" class="form-label col-3 text-right"><wicket:message key="108" /></label>
+ <div class="col-8 p-0">
+ <input type="text" wicket:id="login" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="password" class="col-3 text-right"><wicket:message key="110" /></label><input type="password" wicket:id="password" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="password" class="form-label col-3 text-right"><wicket:message key="110" /></label>
+ <div class="col-8 p-0">
+ <input type="password" wicket:id="password" class="form-control"/>
+ </div>
</div>
<form wicket:id="general"></form>
- <div class="formelement">
- <label wicket:for="type" class="col-3 text-right"><wicket:message key="45" /></label><select wicket:id="type" class="custom-select col-8"></select>
+ <div class="formelement row">
+ <label wicket:for="type" class="form-label col-3 text-right"><wicket:message key="45" /></label>
+ <div class="col-8 p-0">
+ <select wicket:id="type" class="form-select"></select>
+ </div>
</div>
- <div class="formelement" wicket:id="domain">
- <label wicket:for="domainId" class="col-3 text-right"><wicket:message key="1118" /></label><select wicket:id="domainId" class="col-8"></select>
+ <div class="formelement row" wicket:id="domain">
+ <label wicket:for="domainId" class="form-label col-3 text-right"><wicket:message key="1118" /></label>
+ <div class="col-8 p-0">
+ <select wicket:id="domainId" class="form-select"></select>
+ </div>
</div>
- <div class="formelement">
- <label class="col-3 text-right"><wicket:message key="1308" /></label><span wicket:id="ownerId" class="col-8"/>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"><wicket:message key="1308" /></label>
+ <span wicket:id="ownerId" class="col-8"/>
</div>
- <div class="formelement">
- <label class="col-3 text-right"><wicket:message key="1110" /></label><span wicket:id="inserted" class="col-8"/>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"><wicket:message key="1110" /></label>
+ <span wicket:id="inserted" class="col-8"/>
</div>
- <div class="formelement">
- <label class="col-3 text-right"><wicket:message key="1112" /></label><span wicket:id="updated" class="col-8"/>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"><wicket:message key="1112" /></label>
+ <span wicket:id="updated" class="col-8"/>
</div>
- <div class="formelement">
- <label wicket:for="rights" class="col-3 text-right"><wicket:message key="881" /></label>
+ <div class="formelement row">
+ <label wicket:for="rights" class="form-label col-3 text-right"><wicket:message key="881" /></label>
<div class="om-select2 p-0 d-inline-block col-8"><select class="input w-100" wicket:id="rights"></select></div>
</div>
</fieldset>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index b60059c71..1e6a08c1e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -47,7 +47,7 @@ import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.service.mail.EmailManager;
import org.apache.openmeetings.web.admin.AdminBaseForm;
-import org.apache.openmeetings.web.common.ComunityUserForm;
+import org.apache.openmeetings.web.common.CommunityUserForm;
import org.apache.openmeetings.web.common.GeneralUserForm;
import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
import org.apache.openmeetings.web.util.DateLabel;
@@ -166,7 +166,7 @@ public class UserForm extends AdminBaseForm<User> {
return Right.valueOf(id);
}
}));
- mainContainer.add(new ComunityUserForm("comunity", getModel()));
+ mainContainer.add(new CommunityUserForm("comunity", getModel()));
remove(validationBehavior);
setNewRecordVisible(true);
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/CommunityUserForm.html
similarity index 66%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/common/CommunityUserForm.html
index ecddec7af..bdb2c885a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/CommunityUserForm.html
@@ -25,29 +25,36 @@
<div>
<div class="d-inline-block col-3"></div>
<div class="d-inline-block col-8">
- <input wicket:id="everybody" type="radio" /><label wicket:for="everybody"><wicket:message key="1160"/></label>
+ <input wicket:id="everybody" type="radio" class="form-check-input me-2"/>
+ <label wicket:for="everybody" class="form-check-label"><wicket:message key="1160"/></label>
</div>
</div>
<div>
<div class="d-inline-block col-3"></div>
<div class="d-inline-block col-8">
- <input wicket:id="contact" type="radio" /><label wicket:for="contact"><wicket:message key="1168"/></label>
+ <input wicket:id="contact" type="radio" class="form-check-input me-2"/>
+ <label wicket:for="contact" class="form-check-label"><wicket:message key="1168"/></label>
</div>
</div>
<div>
<div class="d-inline-block col-3"></div>
<div class="d-inline-block col-8">
- <input wicket:id="nobody" type="radio" /><label wicket:for="nobody"><wicket:message key="1169"/></label>
+ <input wicket:id="nobody" type="radio" class="form-check-input me-2"/>
+ <label wicket:for="nobody" class="form-check-label"><wicket:message key="1169"/></label>
</div>
</div>
</div>
- <div class="formelement">
+ <div class="formelement row">
<label wicket:for="userOffers" class="col-3"><wicket:message key="1162" /></label>
- <textarea wicket:id="userOffers" class="col-8"/>
+ <div class="col-8 p-0">
+ <textarea wicket:id="userOffers" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
+ <div class="formelement row">
<label wicket:for="userSearchs" class="col-3"><wicket:message key="1163" /></label>
- <textarea wicket:id="userSearchs" class="col-8"/>
+ <div class="col-8 p-0">
+ <textarea wicket:id="userSearchs" class="form-control"/>
+ </div>
</div>
</wicket:panel>
</html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/CommunityUserForm.java
similarity index 91%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/common/CommunityUserForm.java
index 60b002067..0ea599c87 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/CommunityUserForm.java
@@ -28,10 +28,10 @@ import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-public class ComunityUserForm extends Form<User> {
+public class CommunityUserForm extends Form<User> {
private static final long serialVersionUID = 1L;
- public ComunityUserForm(String id, IModel<User> model) {
+ public CommunityUserForm(String id, IModel<User> model) {
super(id, model);
RadioGroup<Long> rg = new RadioGroup<>("community_settings", new IModel<Long>() {
@@ -39,7 +39,7 @@ public class ComunityUserForm extends Form<User> {
@Override
public Long getObject() {
- User u = ComunityUserForm.this.getModelObject();
+ User u = CommunityUserForm.this.getModelObject();
if (u.isShowContactData()) {
return 1L;
} else if (u.isShowContactDataToContacts()) {
@@ -50,7 +50,7 @@ public class ComunityUserForm extends Form<User> {
@Override
public void setObject(Long choice) {
- User u = ComunityUserForm.this.getModelObject();
+ User u = CommunityUserForm.this.getModelObject();
if (choice.equals(1L)) {
u.setShowContactData(true);
u.setShowContactDataToContacts(false);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
index 75a9aa706..df0b777d9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
@@ -21,57 +21,99 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
<wicket:panel>
- <div class="formelement">
- <label wicket:for="address.email" class="col-3 text-right"><wicket:message key="119" /></label>
- <input type="text" wicket:id="address.email" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="address.email" class="form-label col-3 text-right"><wicket:message key="119" /></label>
+ <div class="col-8 p-0">
+ <input type="text" wicket:id="address.email" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="firstname" class="col-3 text-right"><wicket:message key="135" /></label>
- <select wicket:id="salutation" class="custom-select col-2"/><input type="text" wicket:id="firstname" class="col-6"/>
+ <div class="formelement row">
+ <label wicket:for="firstname" class="form-label col-3 text-right"><wicket:message key="135" /></label>
+ <div class="col-8 p-0">
+ <div class="input-group">
+ <div class="col-3">
+ <select wicket:id="salutation" class="form-select"/>
+ </div>
+ <div class="col-9">
+ <input type="text" wicket:id="firstname" class="form-control"/>
+ </div>
+ </div>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="lastname" class="col-3 text-right"><wicket:message key="136" /></label>
- <input type="text" wicket:id="lastname" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="lastname" class="form-label col-3 text-right"><wicket:message key="136" /></label>
+ <div class="col-8 p-0">
+ <input type="text" wicket:id="lastname" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="displayName" class="col-3 text-right"><wicket:message key="user.label.displayName" /></label>
- <input type="text" wicket:id="displayName" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="displayName" class="form-label col-3 text-right"><wicket:message key="user.label.displayName" /></label>
+ <div class="col-8 p-0">
+ <input type="text" wicket:id="displayName" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="timeZoneId" class="col-3 text-right"><wicket:message key="1143" /></label>
- <select wicket:id="timeZoneId" class="custom-select col-8"/>
+ <div class="formelement row">
+ <label wicket:for="timeZoneId" class="form-label col-3 text-right"><wicket:message key="1143" /></label>
+ <div class="col-8 p-0">
+ <select wicket:id="timeZoneId" class="form-select"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="languageId" class="col-3 text-right"><wicket:message key="59" /></label>
- <select wicket:id="languageId" class="custom-select col-8"/>
+ <div class="formelement row">
+ <label wicket:for="languageId" class="form-label col-3 text-right"><wicket:message key="59" /></label>
+ <div class="col-8 p-0">
+ <select wicket:id="languageId" class="form-select"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="address.phone" class="col-3 text-right"><wicket:message key="607" /></label>
- <input type="text" wicket:id="address.phone" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="address.phone" class="form-label col-3 text-right"><wicket:message key="607" /></label>
+ <div class="col-8 p-0">
+ <input type="text" wicket:id="address.phone" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="age" class="col-3 text-right"><wicket:message key="138" /></label>
+ <div class="formelement row">
+ <label wicket:for="age" class="form-label col-3 text-right"><wicket:message key="138" /></label>
<div class="d-inline-block col-8 p-0"><span class="date time picker" wicket:id="age"></span></div>
</div>
- <div class="formelement">
- <label wicket:for="address.street" class="col-3 text-right"><wicket:message key="139" /></label>
- <input type="text" wicket:id="address.street" class="col-6"/>
- <input type="text" wicket:id="address.additionalname" class="col-2"/>
+ <div class="formelement row">
+ <label wicket:for="address.street" class="form-label col-3 text-right"><wicket:message key="139" /></label>
+ <div class="col-8 p-0">
+ <div class="input-group">
+ <div class="col-9">
+ <input type="text" wicket:id="address.street" class="form-control"/>
+ </div>
+ <div class="col-3">
+ <input type="text" wicket:id="address.additionalname" class="form-control"/>
+ </div>
+ </div>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="address.town" class="col-3 text-right"><wicket:message key="140" /></label>
- <input type="text" wicket:id="address.zip" class="col-2"/> <input type="text" wicket:id="address.town" class="col-6"/>
+ <div class="formelement row">
+ <label wicket:for="address.town" class="form-label col-3 text-right"><wicket:message key="140" /></label>
+ <div class="col-8 p-0">
+ <div class="input-group">
+ <div class="col-3">
+ <input type="text" wicket:id="address.zip" class="form-control"/>
+ </div>
+ <div class="col-9">
+ <input type="text" wicket:id="address.town" class="form-control"/>
+ </div>
+ </div>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="address.country" class="col-3 text-right"><wicket:message key="141" /></label>
- <select wicket:id="address.country" class="custom-select col-8"/>
+ <div class="formelement row">
+ <label wicket:for="address.country" class="form-label col-3 text-right"><wicket:message key="141" /></label>
+ <div class="col-8 p-0">
+ <select wicket:id="address.country" class="form-select"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="address.comment" class="col-3 text-right"><wicket:message key="142" /></label>
- <textarea wicket:id="address.comment" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="address.comment" class="form-label col-3 text-right"><wicket:message key="142" /></label>
+ <div class="col-8 p-0">
+ <textarea wicket:id="address.comment" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="groupUsers" class="col-3 text-right"><wicket:message key="161" /></label>
+ <div class="formelement row">
+ <label wicket:for="groupUsers" class="form-label col-3 text-right"><wicket:message key="161" /></label>
<div class="om-select2 p-0 d-inline-block col-8"><select class="input w-100" wicket:id="groupUsers"></select></div>
</div>
</wicket:panel>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
index 826586bb1..3ee0a2457 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
@@ -41,17 +41,17 @@
<div class="formelement">
<label class="col-3 text-right" wicket:for="valid"><wicket:message key="526" /></label>
<div class="col-8 d-inline-block" wicket:id="valid">
- <div class="custom-control custom-radio custom-control-inline">
- <input class="custom-control-input" type="radio" wicket:id="one"/>
- <label class="custom-control-label" wicket:for="one"><wicket:message key="529" /></label>
+ <div class="form-check form-check-inline">
+ <input class="form-check-input" type="radio" wicket:id="one"/>
+ <label class="form-check-label" wicket:for="one"><wicket:message key="529" /></label>
</div>
- <div class="custom-control custom-radio custom-control-inline">
- <input class="custom-control-input" type="radio" wicket:id="period"/>
- <label class="custom-control-label" wicket:for="period"><wicket:message key="528" /></label>
+ <div class="form-check form-check-inline">
+ <input class="form-check-input" type="radio" wicket:id="period"/>
+ <label class="form-check-label" wicket:for="period"><wicket:message key="528" /></label>
</div>
- <div class="custom-control custom-radio custom-control-inline">
- <input class="custom-control-input" type="radio" wicket:id="endless"/>
- <label class="custom-control-label" wicket:for="endless"><wicket:message key="527" /></label>
+ <div class="form-check form-check-inline">
+ <input class="form-check-input" type="radio" wicket:id="endless"/>
+ <label class="form-check-label" wicket:for="endless"><wicket:message key="527" /></label>
</div>
</div>
</div>
@@ -65,11 +65,11 @@
</div>
<div class="formelement">
<label class="col-3 text-right" wicket:for="timeZoneId"><wicket:message key="1143" /></label>
- <select class="custom-select col-8" wicket:id="timeZoneId"/>
+ <select class="form-select col-8" wicket:id="timeZoneId"/>
</div>
<div class="formelement">
<label class="col-3 text-right" wicket:for="language"><wicket:message key="59" /></label>
- <select class="custom-select col-8" wicket:id="language"/>
+ <select class="form-select col-8" wicket:id="language"/>
</div>
<div class="formelement">
<input class="col-12 text-right" wicket:id="url" type="text" readonly="readonly"/>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
index 2a9eaffd5..4533e16cc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
@@ -23,7 +23,7 @@
<wicket:panel>
<form wicket:id="pagingForm" class="pagedEntityListPanel">
<div class="input-group input-group-sm">
- <select wicket:id="entitiesPerPage" class="form-control"></select>
+ <select wicket:id="entitiesPerPage" class="form-select pe-4"></select>
<span wicket:id="navigator" class="mt-1 pagination pagination-sm">[dataview navigator]</span>
</div>
</form>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
index 954807447..d7c1d069d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
@@ -33,13 +33,13 @@
</div>
<div class="input-group mb-1 g-0" wicket:id="ldap">
<span class="input-group-text"><i class="fa fa-users"></i></span>
- <select wicket:id="domain" class="form-control" wicket:message="title:1118"></select>
+ <select wicket:id="domain" class="form-select" wicket:message="title:1118"></select>
</div>
<div class="row mb-1 g-0">
<div class="col-6">
- <div class="custom-control custom-checkbox">
- <input type="checkbox" wicket:id="rememberMe" class="custom-control-input"/>
- <label wicket:for="rememberMe" class="custom-control-label"><wicket:message key="288" /></label>
+ <div class="form-check">
+ <input type="checkbox" wicket:id="rememberMe" class="form-check-input"/>
+ <label wicket:for="rememberMe" class="form-check-label"><wicket:message key="288" /></label>
</div>
</div>
<div class="col-5">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
index 1c59c8381..6239b0c4d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
@@ -27,7 +27,7 @@
<form class="adminForm" wicket:id="form">
<div class="formelement">
<label wicket:for="dbType" class="col-3 text-right"><wicket:message key="install.wizard.db.step.dbtype" /></label>
- <select wicket:id="dbType" class="custom-select col-3"></select>
+ <select wicket:id="dbType" class="form-select col-3"></select>
</div>
<div wicket:enclosure="host" class="formelement">
<label wicket:for="host" class="col-3 text-right"><wicket:message key="install.wizard.db.step.host" /></label>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
index d2967cfc8..7598ec1f2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
@@ -37,7 +37,7 @@
</div>
<div class="formelement">
<label wicket:for="timeZone" class="col-3 text-right"><wicket:message key="install.wizard.params.step1.tz"/></label>
- <select wicket:id="timeZone" class="custom-select col-3"></select>
+ <select wicket:id="timeZone" class="form-select col-3"></select>
</div>
</fieldset>
<fieldset class="" id="userGroupa">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
index e214d8d9f..2cb5ba361 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
@@ -87,7 +87,7 @@
</div>
<div class="formelement">
<label wicket:for="defaultLangId" class="col-3 text-right"><wicket:message key="install.wizard.params.step2.defaultLangId"/></label>
- <select wicket:id="defaultLangId" class="custom-select col-3"></select>
+ <select wicket:id="defaultLangId" class="form-select col-3"></select>
</div>
</fieldset>
</wicket:panel>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
index 84650eacf..2980961d1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
@@ -47,27 +47,27 @@
<div class="modal-body">
<h5><wicket:message key="video.muteothers"/></h5>
<div class="row justify-content-end">
- <div class="custom-control custom-checkbox col-10">
- <input type="checkbox" class="custom-control-input" id="muteOthersAsk">
- <label class="custom-control-label" for="muteOthersAsk"><wicket:message key="dont.ask.again"/></label>
+ <div class="form-check col-10">
+ <input type="checkbox" class="form-check-input" id="muteOthersAsk">
+ <label class="form-check-label" for="muteOthersAsk"><wicket:message key="dont.ask.again"/></label>
</div>
</div>
<h5 class="mt-2"><wicket:message key="244"/></h5>
<div class="row justify-content-end">
- <div class="custom-control custom-checkbox col-10">
- <input type="checkbox" class="custom-control-input" id="chatNotify">
- <label class="custom-control-label" for="chatNotify"><wicket:message key="sound.enable"/></label>
+ <div class="form-check col-10">
+ <input type="checkbox" class="form-check-input" id="chatNotify">
+ <label class="form-check-label" for="chatNotify"><wicket:message key="sound.enable"/></label>
</div>
- <div class="custom-control custom-checkbox col-10">
- <input type="checkbox" class="custom-control-input" id="sendOnCtrlEnter">
- <label class="custom-control-label" for="sendOnCtrlEnter"><wicket:message key="send.on.ctrl.enter"/></label>
+ <div class="form-check col-10">
+ <input type="checkbox" class="form-check-input" id="sendOnCtrlEnter">
+ <label class="form-check-label" for="sendOnCtrlEnter"><wicket:message key="send.on.ctrl.enter"/></label>
</div>
</div>
<h5 class="mt-2"><wicket:message key="lbl.video"/></h5>
<div class="row justify-content-end">
- <div class="custom-control custom-checkbox col-10">
- <input type="checkbox" class="custom-control-input" id="fixedVideoPod">
- <label class="custom-control-label" for="fixedVideoPod"><wicket:message key="fixed.video.pod.size"/></label>
+ <div class="form-check col-10">
+ <input type="checkbox" class="form-check-input" id="fixedVideoPod">
+ <label class="form-check-label" for="fixedVideoPod"><wicket:message key="fixed.video.pod.size"/></label>
</div>
<div id="video-sizes-container" class="col-10"></div>
</div>
@@ -147,14 +147,14 @@
<div class="container p-0 m-0">
<div class="row g-0">
<label class="col-7"><wicket:message key="734"/></label>
- <select name="type" class="type col-4 custom-select">
+ <select name="type" class="type col-4 form-select">
<option value="screen">Screen</option>
<option value="window">Window</option>
</select>
</div>
<div class="row g-0">
<label class="col-7"><wicket:message key="1089"/></label>
- <select name="fps" class="fps col-4 custom-select">
+ <select name="fps" class="fps col-4 form-select">
<option value="2">2 FPS</option>
<option value="5">5 FPS</option>
<option value="10" selected>10 FPS</option>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
index 014ce2822..4b68f1c08 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
@@ -34,13 +34,13 @@
<div class="cam-row sett-row">
<div><wicket:message key="52"/></div>
<div>
- <select class="custom-select custom-select-sm cam"></select>
+ <select class="form-select form-select-sm cam"></select>
</div>
</div>
<div class="mic-row sett-row">
<div><wicket:message key="53"/></div>
<div>
- <select class="custom-select custom-select-sm mic"></select>
+ <select class="form-select form-select-sm mic"></select>
</div>
</div>
<div class="res-row sett-row">
@@ -49,7 +49,7 @@
<i class="warn fas fa-exclamation-triangle text-warning" wicket:message="title:1430"></i>
</div>
<div>
- <select class="custom-select custom-select-sm cam-resolution">
+ <select class="form-select form-select-sm cam-resolution">
<option value="1" data-width="40" data-height="30">40x30 [4:3 (~6 KByte/sec)]</option>
<option value="2" data-width="80" data-height="60">80x60 [4:3 (~12 KByte/sec)]</option>
<option value="3" data-width="120" data-height="90" selected="selected">120x90 [4:3 (~20 KByte/sec)]</option>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
index b0f8d9a3a..45634eea1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
@@ -35,7 +35,7 @@
</div>
<div class="row mb-1">
<label wicket:for="type" class="col-4"><wicket:message key="21" /></label>
- <select wicket:id="type" class="custom-select col-7"/>
+ <select wicket:id="type" class="form-select col-7"/>
</div>
<div class="row">
<div class="col-11"><wicket:message key="23" /></div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
index 54678cfb4..4d70abb61 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
@@ -24,7 +24,7 @@
<form wicket:id="selForm">
<div class="row">
<div class="col-4"><wicket:message key="1412"/></div>
- <select class="custom-select col-7" wicket:id="polls"></select>
+ <select class="form-select col-7" wicket:id="polls"></select>
</div>
</form>
<form wicket:id="dispForm">
@@ -38,7 +38,7 @@
</div>
<div class="row">
<div class="col-4"><wicket:message key="39"/> (<span wicket:id="count"></span>)</div>
- <select class="custom-select col-7" wicket:id="chartType"></select>
+ <select class="form-select col-7" wicket:id="chartType"></select>
</div>
</form>
<div class="row">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
index 3848da10b..2cd062c8c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
@@ -35,18 +35,18 @@
<div class="col-7">
<div wicket:id="typeBool">
<div wicket:id="answer">
- <div class="custom-control custom-radio">
- <input type="radio" wicket:id="true" class="custom-control-input"/>
- <label wicket:for="true" class="custom-control-label"><wicket:message key="34" /></label>
+ <div class="form-check">
+ <input type="radio" wicket:id="true" class="form-check-input"/>
+ <label wicket:for="true" class="form-check-label"><wicket:message key="34" /></label>
</div>
- <div class="custom-control custom-radio">
- <input type="radio" wicket:id="false" class="custom-control-input"/>
- <label wicket:for="false" class="custom-control-label"><wicket:message key="35" /></label>
+ <div class="form-check">
+ <input type="radio" wicket:id="false" class="form-check-input"/>
+ <label wicket:for="false" class="form-check-label"><wicket:message key="35" /></label>
</div>
</div>
</div>
<div wicket:id="typeInt">
- <select class="custom-select" wicket:id="pointList"></select>
+ <select class="form-select" wicket:id="pointList"></select>
</div>
</div>
</div>
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 f50441a5c..f551c7503 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
@@ -51,7 +51,7 @@
<table>
<tr>
<td><wicket:message key="45"/></td>
- <td><select class="messages selector" wicket:id="room.type"></select></td>
+ <td><select class="form-select messages selector" wicket:id="room.type"></select></td>
</tr>
<tr>
<td><wicket:message key="label.start" /></td>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
index 3e49ff15a..a5253551e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
@@ -80,7 +80,7 @@
<div wicket:id="create-room-block">
<div>
<label wicket:for="type" class="col-3 p-0"><wicket:message key="619" /></label>
- <select class="custom-select col-8" wicket:id="type" ></select>
+ <select class="form-select col-8" wicket:id="type" ></select>
</div>
<div>
<label class="col-3 p-0" wicket:for="moderated"><wicket:message key="640" /></label>
@@ -89,7 +89,7 @@
</div>
<div>
<label wicket:for="groom" class="col-3 p-0"><wicket:message key="406" /></label>
- <select class="custom-select col-8" wicket:id="groom" ></select>
+ <select class="form-select col-8" wicket:id="groom" ></select>
</div>
<div wicket:id="sip-container">
<label class="col-3 p-0"><wicket:message key="1003"/></label>
@@ -99,7 +99,7 @@
<div id="tab3" class="tab-pane fade pt-1" role="tabpanel" aria-labelledby="tab3-tab">
<div>
<label wicket:for="reminder" class="col-3 p-0"><wicket:message key="565" /></label>
- <select class="custom-select col-8" wicket:id="reminder"></select>
+ <select class="form-select col-8" wicket:id="reminder"></select>
</div>
<div>
<input type="checkbox" wicket:id="passwordProtected" /><label wicket:for="passwordProtected"><wicket:message key="524" /></label>
@@ -111,7 +111,7 @@
<div><wicket:message key="1445" /></div>
<div>
<label wicket:for="calendar" class="col-3 p-0"><wicket:message key="162" /></label>
- <select class="custom-select col-8" wicket:id="calendar"></select>
+ <select class="form-select col-8" wicket:id="calendar"></select>
</div>
</div>
</div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
index 053f5ed33..8077360c6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
@@ -26,7 +26,7 @@ import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.common.ComunityUserForm;
+import org.apache.openmeetings.web.common.CommunityUserForm;
import org.apache.openmeetings.web.common.FormActionsPanel;
import org.apache.openmeetings.web.common.GeneralUserForm;
import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
@@ -123,7 +123,7 @@ public class EditProfileForm extends Form<User> {
}.setVisible(checkPassword));
add(userForm);
add(new UploadableProfileImagePanel("img", getUserId()));
- add(new ComunityUserForm("comunity", getModel()));
+ add(new CommunityUserForm("comunity", getModel()));
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
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 89f9556c1..d2a11719d 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
@@ -76,7 +76,7 @@
</tbody>
</table>
<div wicket:id="buttons">
- <select class="custom-select col-2" wicket:id="msgSelect"></select>
+ <select class="form-select col-2" wicket:id="msgSelect"></select>
<div class="btn-group">
<button class="btn btn-sm btn-outline-primary" wicket:id="toInboxBtn"><wicket:message key="1255"/></button>
<button class="btn btn-sm btn-outline-primary" wicket:id="replyBtn"><wicket:message key="messages.btn.reply"/></button>
@@ -84,7 +84,7 @@
<button class="btn btn-sm btn-outline-secondary" wicket:id="readBtn"><wicket:message key="1248"/></button>
<button class="btn btn-sm btn-outline-secondary" wicket:id="unreadBtn"><wicket:message key="1247"/></button>
</div>
- <select class="custom-select col-3" wicket:id="msgMove"></select>
+ <select class="form-select col-3" wicket:id="msgMove"></select>
</div>
<div wicket:id="selectedMessage">
<table class="w-100">