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
The following commit(s) were added to
refs/heads/OPENMEETINGS-2721-form-bootstrapization by this push:
new 9f626ccd4 [OPENMEETINGS-2721] multiple forms are modernized
9f626ccd4 is described below
commit 9f626ccd48ad08034cac07446f293f9359609eeb
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Jun 2 14:58:23 2022 +0700
[OPENMEETINGS-2721] multiple forms are modernized
---
.../web/admin/configurations/ConfigsPanel.html | 2 +-
.../openmeetings/web/admin/extra/ExtraPanel.html | 28 ++--
.../openmeetings/web/admin/groups/GroupsPanel.html | 12 +-
.../web/admin/labels/AddLanguageDialog.html | 12 +-
.../openmeetings/web/admin/labels/LangPanel.html | 16 +-
.../openmeetings/web/admin/ldaps/LdapsPanel.html | 56 ++++---
.../openmeetings/web/admin/oauth/OAuthPanel.html | 108 ++++++++------
.../openmeetings/web/admin/rooms/RoomsPanel.html | 164 ++++++++++++---------
.../apache/openmeetings/web/common/Captcha.html | 4 +-
.../openmeetings/web/common/InvitationForm.html | 60 ++++----
.../apache/openmeetings/web/common/NameDialog.html | 7 +-
.../openmeetings/web/room/NicknameDialog.html | 24 +--
.../web/room/menu/RoomInvitationForm.html | 14 +-
.../web/room/menu/SipDialerDialog.html | 2 +-
.../web/room/poll/CreatePollDialog.html | 18 ++-
.../web/room/poll/PollResultsDialog.html | 14 +-
.../web/room/poll/PollResultsDialog.java | 2 +-
.../web/room/sidebar/RoomUploadForm.html | 7 +-
.../openmeetings/web/user/MessageDialog.html | 2 +-
.../web/user/calendar/AppointmentDialog.html | 102 ++++++++-----
.../web/user/calendar/CalendarDialog.html | 36 +++--
.../web/user/profile/ChangePasswordDialog.html | 12 +-
.../web/user/profile/EditProfileForm.html | 8 +-
.../web/user/profile/MessagesContactsPanel.html | 8 +-
.../web/user/profile/UserSearchPanel.html | 6 +-
.../web/user/profile/WidgetsPanel.html | 2 +-
.../web/user/record/RecordingInvitationForm.html | 6 +-
.../src/main/webapp/css/raw-general.css | 21 +--
28 files changed, 434 insertions(+), 319 deletions(-)
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 070167aab..808102b73 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
@@ -58,7 +58,7 @@
<input
class="form-control" type="text" wicket:id="key"/>
</div>
</div>
- <div class="formelement row">
+ <div class="formelement">
<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">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.html
index 90d30481e..bfffdd7a8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/extra/ExtraPanel.html
@@ -46,20 +46,26 @@
<div class="scrollcontent" id="adminForm">
<fieldset>
<legend><wicket:message
key="admin.extra.group.label" /></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 wicket:for="link"
class="col-3 text-right"><wicket:message key="admin.extra.link" /></label>
- <input type="text"
wicket:id="link" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="link"
class="form-label col-3 text-right"><wicket:message key="admin.extra.link"
/></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="link" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="description"
class="col-3 text-right"><wicket:message key="lbl.description" /></label>
- <textarea
wicket:id="description" class="col-8"></textarea>
+ <div class="formelement row">
+ <label wicket:for="description"
class="form-label col-3 text-right"><wicket:message key="lbl.description"
/></label>
+ <div class="col-8 p-0">
+ <textarea
wicket:id="description" class="form-control"></textarea>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="groups"
class="col-3 text-right"><wicket:message key="126" /></label>
+ <div class="formelement row">
+ <label wicket:for="groups"
class="form-label col-3 text-right"><wicket:message key="126" /></label>
<div class="om-select2 p-0
d-inline-block col-8"><select class="input w-100"
wicket:id="groups"></select></div>
</div>
</fieldset>
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 4560fc309..231213a8c 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
@@ -72,17 +72,13 @@
<div class="formelement row">
<div wicket:id="users"></div>
</div>
- <div class="formelement row">
+ <div class="formelement">
<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>
+ <input type="checkbox"
class="form-check-input" wicket:id="restricted" />
</div>
- <div class="formelement row">
+ <div class="formelement">
<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>
+ <input type="checkbox"
class="form-check-input" wicket:id="limited" />
</div>
<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>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html
index f14e8bcb1..9a89d2616 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html
@@ -23,12 +23,12 @@
<wicket:extend>
<form wicket:id="addLangForm">
<div wicket:id="feedback"></div>
- <table>
- <tr>
- <td><wicket:message key="1422" /></td>
- <td><input type="text" wicket:id="iso" /></td>
- </tr>
- </table>
+ <div class="row">
+ <label wicket:for="iso" class="form-label col-3
text-right"><wicket:message key="1422"/></label>
+ <div class="col-8 p-0">
+ <input type="text" wicket:id="iso"
class="form-control"/>
+ </div>
+ </div>
</form>
</wicket:extend>
</html>
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 d3f2e1029..3e9bf7c69 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
@@ -59,13 +59,17 @@
<div class="scrollcontent" id="adminForm">
<fieldset>
<legend><wicket:message key="353"
/></legend>
- <div class="formelement">
- <label wicket:for="key"
class="col-3 text-right"><wicket:message key="165" /></label>
- <input type="text"
wicket:id="key" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="key"
class="form-label col-3 text-right"><wicket:message key="165" /></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="key" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="value"
class="col-3 text-right"><wicket:message key="271" /></label>
- <textarea wicket:id="value"
class="col-8"></textarea>
+ <div class="formelement row">
+ <label wicket:for="value"
class="form-label col-3 text-right"><wicket:message key="271" /></label>
+ <div class="col-8 p-0">
+ <textarea
wicket:id="value" class="form-control"></textarea>
+ </div>
</div>
</fieldset>
<div class="bottom-bumper"></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
index 68be12765..0d6bd03db 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
@@ -46,53 +46,61 @@
<div class="scrollcontent" id="adminForm">
<fieldset>
<legend><wicket:message key="1107"
/></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 wicket:for="active"
class="col-3 text-right"><wicket:message key="1109" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="active"/>
+ <label wicket:for="active"
class="form-label col-3 text-right"><wicket:message key="1109" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="active"/>
</div>
- <div class="formelement">
- <label class="col-3
text-right"><wicket:message key="1110" /></label>
+ <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="1111" /></label>
+ <div class="formelement row">
+ <label class="form-label col-3
text-right"><wicket:message key="1111" /></label>
<span
wicket:id="insertedby.login" class="col-8"/>
</div>
- <div class="formelement">
- <label class="col-3
text-right"><wicket:message key="1112" /></label>
+ <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 class="col-3
text-right"><wicket:message key="269" /></label>
+ <div class="formelement row">
+ <label class="form-label col-3
text-right"><wicket:message key="269" /></label>
<span
wicket:id="updatedby.login" class="col-8"/>
</div>
- <div class="formelement">
+ <div class="formelement row">
<div>
<div class="col-3
d-inline-block"></div>
<div class="col-8
d-inline-block"><i class="fas fa-info-circle m-1 text-info"></i><wicket:message
key="1114" /></div>
</div>
- <label
wicket:for="configFileName" class="col-3 text-right"><wicket:message key="1115"
/></label>
- <input type="text"
wicket:id="configFileName" class="col-8"/>
+ <label
wicket:for="configFileName" class="form-label col-3 text-right"><wicket:message
key="1115" /></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="configFileName" class="form-control"/>
+ </div>
</div>
<div class="formelement">
<div>
<div class="col-3
d-inline-block"></div>
<div class="col-8
d-inline-block"><i class="fas fa-info-circle m-1 text-info"></i><wicket:message
key="1116" /></div>
</div>
- <label
wicket:for="addDomainToUserName" class="col-3 text-right"><wicket:message
key="1117" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="addDomainToUserName"/>
+ <label
wicket:for="addDomainToUserName" class="form-label col-3
text-right"><wicket:message key="1117" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="addDomainToUserName"/>
</div>
- <div class="formelement">
- <label wicket:for="domain"
class="col-3 text-right"><wicket:message key="1118" /></label>
- <input type="text"
wicket:id="domain" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="domain"
class="form-label col-3 text-right"><wicket:message key="1118" /></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="domain" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="comment"
class="col-3 text-right"><wicket:message key="196" /></label>
- <textarea wicket:id="comment"
class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="comment"
class="form-label col-3 text-right"><wicket:message key="196" /></label>
+ <div class="col-8 p-0">
+ <textarea
wicket:id="comment" class="form-control"/>
+ </div>
</div>
</fieldset>
<div class="bottom-bumper"></div>
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 f60f5c903..574667334 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
@@ -45,65 +45,91 @@
<fieldset>
<legend><wicket:message
key="1581"/></legend>
<div class="formelement">
- <label wicket:for="isEnabled"
class="col-3 text-right"><wicket:message key="1109"/></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="isEnabled"/>
+ <label wicket:for="isEnabled"
class="form-label col-3 text-right"><wicket:message key="1109"/></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="isEnabled"/>
</div>
- <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 wicket:for="iconUrl"
class="col-3 text-right"><wicket:message key="1575"/></label>
- <input type="text"
wicket:id="iconUrl" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="iconUrl"
class="form-label col-3 text-right"><wicket:message key="1575"/></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="iconUrl" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="clientId"
class="col-3 text-right">client_id</label>
- <input type="text"
wicket:id="clientId" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="clientId"
class="form-label col-3 text-right">client_id</label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="clientId" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label
wicket:for="clientSecret" class="col-3 text-right">client_secret</label>
- <input type="text"
wicket:id="clientSecret" class="col-8"/>
+ <div class="formelement row">
+ <label
wicket:for="clientSecret" class="form-label col-3
text-right">client_secret</label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="clientSecret" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="redirectUri"
class="col-3 text-right"><wicket:message key="1587"/></label>
- <input type="text"
readonly="readonly" wicket:id="redirectUri" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="redirectUri"
class="form-label col-3 text-right"><wicket:message key="1587"/></label>
+ <div class="col-8 p-0">
+ <input type="text"
readonly="readonly" wicket:id="redirectUri" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label
wicket:for="requestKeyUrl" class="col-3 text-right"><wicket:message
key="1578"/></label>
- <input type="text"
wicket:id="requestKeyUrl" class="col-8"/>
+ <div class="formelement row">
+ <label
wicket:for="requestKeyUrl" class="form-label col-3 text-right"><wicket:message
key="1578"/></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="requestKeyUrl" class="form-control"/>
+ </div>
</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="form-select col-8"></select>
+ <div class="formelement row">
+ <label
wicket:for="requestTokenMethod" class="form-label col-3
text-right"><wicket:message key="admin.oauth.req.token.method"/></label>
+ <div class="col-8 p-0">
+ <select
wicket:id="requestTokenMethod" class="form-select"></select>
+ </div>
</div>
- <div class="formelement">
- <label
wicket:for="requestTokenUrl" class="col-3 text-right"><wicket:message
key="1579"/></label>
- <input type="text"
wicket:id="requestTokenUrl" class="col-8"/>
+ <div class="formelement row">
+ <label
wicket:for="requestTokenUrl" class="form-label col-3
text-right"><wicket:message key="1579"/></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="requestTokenUrl" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label
wicket:for="requestTokenAttributes" class="col-3 text-right"><wicket:message
key="1586"/></label>
- <input type="text"
wicket:id="requestTokenAttributes" class="col-8"/>
+ <div class="formelement row">
+ <label
wicket:for="requestTokenAttributes" class="form-label col-3
text-right"><wicket:message key="1586"/></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="requestTokenAttributes" class="form-control"/>
+ </div>
</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="form-select col-8"></select>
+ <div class="formelement row">
+ <label
wicket:for="requestInfoMethod" class="form-label col-3
text-right"><wicket:message key="admin.oauth.req.info.method"/></label>
+ <div class="col-8 p-0">
+ <select
wicket:id="requestInfoMethod" class="form-select"></select>
+ </div>
</div>
- <div class="formelement">
- <label
wicket:for="requestInfoUrl" class="col-3 text-right"><wicket:message
key="1580"/></label>
- <input type="text"
wicket:id="requestInfoUrl" class="col-8"/>
+ <div class="formelement row">
+ <label
wicket:for="requestInfoUrl" class="form-label col-3 text-right"><wicket:message
key="1580"/></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="requestInfoUrl" class="form-control"/>
+ </div>
</div>
</fieldset>
<!-- Attribute mapping -->
<fieldset>
<legend><wicket:message
key="admin.oauth.user.mapping" /></legend>
<div wicket:id="mappingForm">
- <div class="formelement">
- <label
wicket:for="omAttr" class="col-3 text-right"><wicket:message
key="admin.oauth.attr.om" /></label>
- <input type="text"
wicket:id="omAttr" class="col-8"/>
+ <div class="formelement row">
+ <label
wicket:for="omAttr" class="form-label col-3 text-right"><wicket:message
key="admin.oauth.attr.om" /></label>
+ <div class="col-8 p-0">
+ <input
type="text" wicket:id="omAttr" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label
wicket:for="oauthAttr" class="col-3 text-right"><wicket:message
key="admin.oauth.attr.oauth" /></label>
- <input type="text"
wicket:id="oauthAttr" class="col-8"/>
+ <div class="formelement row">
+ <label
wicket:for="oauthAttr" class="form-label col-3 text-right"><wicket:message
key="admin.oauth.attr.oauth" /></label>
+ <div class="col-8 p-0">
+ <input
type="text" wicket:id="oauthAttr" class="form-control"/>
+ </div>
</div>
<div class="col-3
d-inline-block"></div>
<div class="col-8
d-inline-block">
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 1855ea5a1..98d160f4b 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
@@ -47,33 +47,45 @@
<!-- General -->
<fieldset>
<legend><wicket:message
key="lbl.general" /></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 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="capacity"
class="col-3 text-right"><wicket:message key="482" /></label>
- <select wicket:id="capacity"
class="form-select col-8"/>
+ <div class="formelement row">
+ <label wicket:for="capacity"
class="form-label col-3 text-right"><wicket:message key="482" /></label>
+ <div class="col-8 p-0">
+ <select
wicket:id="capacity" class="form-select"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="type"
class="col-3 text-right"><wicket:message key="45" /></label>
- <select wicket:id="type"
class="form-select col-8"/>
+ <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"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="comment"
class="col-3 text-right"><wicket:message key="196" /></label>
- <textarea wicket:id="comment"
class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="comment"
class="form-label col-3 text-right"><wicket:message key="196" /></label>
+ <div class="col-8 p-0">
+ <textarea
wicket:id="comment" class="form-control"/>
+ </div>
</div>
<div class="formelement">
- <label wicket:for="appointment"
class="col-3 text-right"><wicket:message key="620" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="appointment" />
+ <label wicket:for="appointment"
class="form-label col-3 text-right"><wicket:message key="620" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="appointment" />
</div>
- <div class="formelement">
- <label wicket:for="ownerId"
class="col-3 text-right"><wicket:message key="1308" /></label>
- <input type="text"
wicket:id="ownerId" class="col-8" readonly="readonly"/>
+ <div class="formelement row">
+ <label wicket:for="ownerId"
class="form-label col-3 text-right"><wicket:message key="1308" /></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="ownerId" class="form-control" readonly="readonly"/>
+ </div>
</div>
</fieldset>
@@ -81,15 +93,15 @@
<fieldset>
<legend><wicket:message key="126"
/></legend>
<div class="formelement">
- <label wicket:for="ispublic"
class="col-3 text-right"><wicket:message key="190" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="ispublic" />
+ <label wicket:for="ispublic"
class="form-label col-3 text-right"><wicket:message key="190" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="ispublic" />
</div>
- <div class="formelement">
+ <div class="formelement row">
<div class="col-3
d-inline-block"></div>
<div class="col-8
d-inline-block">
<i class="fas
fa-info-circle m-1 text-info"></i><wicket:message key="828" />
</div>
- <label wicket:for="groups"
class="col-3 text-right"><wicket:message key="126" /></label>
+ <label wicket:for="groups"
class="form-label col-3 text-right"><wicket:message key="126" /></label>
<div class="om-select2 p-0
d-inline-block col-8"><select class="input w-100"
wicket:id="groups"></select></div>
</div>
</fieldset>
@@ -98,12 +110,14 @@
<fieldset>
<legend><wicket:message key="830"
/></legend>
<div class="formelement">
- <label wicket:for="isDemoRoom"
class="col-3 text-right"><wicket:message key="636" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="isDemoRoom" />
+ <label wicket:for="isDemoRoom"
class="form-label col-3 text-right"><wicket:message key="636" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="isDemoRoom" />
</div>
- <div class="formelement">
- <label wicket:for="demoTime"
class="col-3 text-right"><wicket:message key="637" /></label>
- <input type="text"
wicket:id="demoTime" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="demoTime"
class="form-label col-3 text-right"><wicket:message key="637" /></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="demoTime" class="form-control"/>
+ </div>
</div>
</fieldset>
@@ -115,61 +129,63 @@
<div class="col-8
d-inline-block">
<i class="fas
fa-info-circle m-1 text-info"></i><wicket:message key="880" />
</div>
- <label
wicket:for="allowUserQuestions" class="col-3 text-right"><wicket:message
key="879" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="allowUserQuestions" />
+ <label
wicket:for="allowUserQuestions" class="form-label col-3
text-right"><wicket:message key="879" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="allowUserQuestions" />
</div>
<div class="formelement">
<div class="col-3
d-inline-block"></div>
<div class="col-8
d-inline-block">
<i class="fas
fa-info-circle m-1 text-info"></i><wicket:message key="1077" />
</div>
- <label wicket:for="audioOnly"
class="col-3 text-right"><wicket:message key="1076" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="audioOnly" />
+ <label wicket:for="audioOnly"
class="form-label col-3 text-right"><wicket:message key="1076" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="audioOnly" />
</div>
<div class="formelement">
<div class="col-3
d-inline-block"></div>
<div class="col-8
d-inline-block">
<i class="fas
fa-info-circle m-1 text-info"></i><wicket:message key="1101" />
</div>
- <label wicket:for="closed"
class="col-3 text-right"><wicket:message key="1099" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="closed" />
+ <label wicket:for="closed"
class="form-label col-3 text-right"><wicket:message key="1099" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="closed" />
</div>
- <div class="formelement">
- <label wicket:for="redirectURL"
class="col-3 text-right"><wicket:message key="1100" /></label>
- <input type="text"
wicket:id="redirectURL" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="redirectURL"
class="form-label col-3 text-right"><wicket:message key="1100" /></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="redirectURL" class="form-control"/>
+ </div>
</div>
<div class="formelement">
<div class="col-3
d-inline-block"></div>
<div class="col-8
d-inline-block">
<i class="fas
fa-info-circle m-1 text-info"></i><wicket:message key="1102" />
</div>
- <label
wicket:for="waitRecording" class="col-3 text-right"><wicket:message key="1356"
/></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="waitRecording" />
+ <label
wicket:for="waitRecording" class="form-label col-3 text-right"><wicket:message
key="1356" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="waitRecording" />
</div>
<div class="formelement">
- <label
wicket:for="allowRecording" class="col-3 text-right"><wicket:message key="1355"
/></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="allowRecording" />
+ <label
wicket:for="allowRecording" class="form-label col-3 text-right"><wicket:message
key="1355" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="allowRecording" />
</div>
<div class="formelement">
- <label
wicket:for="chatModerated" class="col-3 text-right"><wicket:message key="1513"
/></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="chatModerated" />
+ <label
wicket:for="chatModerated" class="form-label col-3 text-right"><wicket:message
key="1513" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="chatModerated" />
</div>
</fieldset>
<!-- Room Layout options -->
<fieldset>
<legend><wicket:message key="1443"
/></legend>
- <div class="formelement">
- <label
wicket:for="hiddenElements" class="col-3 text-right"><wicket:message
key="admin.room.hidden.elements" /></label>
+ <div class="formelement row">
+ <label
wicket:for="hiddenElements" class="form-label col-3 text-right"><wicket:message
key="admin.room.hidden.elements" /></label>
<div class="om-select2 p-0
d-inline-block col-8"><select class="input w-100"
wicket:id="hiddenElements"></select></div>
</div>
<div class="formelement">
- <label wicket:for="chatOpened"
class="col-3 text-right"><wicket:message key="1515" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="chatOpened" />
+ <label wicket:for="chatOpened"
class="form-label col-3 text-right"><wicket:message key="1515" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="chatOpened" />
</div>
<div class="formelement">
- <label wicket:for="filesOpened"
class="col-3 text-right"><wicket:message key="1516" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="filesOpened" />
+ <label wicket:for="filesOpened"
class="form-label col-3 text-right"><wicket:message key="1516" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="filesOpened" />
</div>
</fieldset>
@@ -177,13 +193,15 @@
<fieldset>
<legend><wicket:message key="245"
/></legend>
<div wicket:id="filesForm">
- <div class="formelement">
- <label
wicket:for="files2add" class="col-3 text-right"><wicket:message key="245"
/></label>
+ <div class="formelement row">
+ <label
wicket:for="files2add" class="form-label col-3 text-right"><wicket:message
key="245" /></label>
<div class="om-select2
p-0 d-inline-block col-8"><select class="input w-100"
wicket:id="files2add"></select></div>
</div>
- <div class="formelement">
- <label
wicket:for="wbidx" class="col-3 text-right"><wicket:message key="615" /></label>
- <input type="number"
wicket:id="wbidx" class="col-8"/>
+ <div class="formelement row">
+ <label
wicket:for="wbidx" class="form-label col-3 text-right"><wicket:message
key="615" /></label>
+ <div class="col-8 p-0">
+ <input
type="number" wicket:id="wbidx" class="form-control"/>
+ </div>
</div>
<div class="col-3
d-inline-block"></div>
<div class="col-8
d-inline-block">
@@ -241,22 +259,22 @@
<div class="col-8
d-inline-block">
<i class="fas
fa-info-circle m-1 text-info"></i><wicket:message key="823" />
</div>
- <label wicket:for="moderated"
class="col-3 text-right"><wicket:message key="640" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="moderated" />
+ <label wicket:for="moderated"
class="form-label col-3 text-right"><wicket:message key="640" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="moderated" />
</div>
<div class="formelement">
<div class="col-3
d-inline-block"></div>
<div class="col-8
d-inline-block">
<i class="fas
fa-info-circle m-1 text-info"></i><wicket:message
key="admin.room.wait-moderator.info" />
</div>
- <label
wicket:for="waitModerator" class="col-3 text-right"><wicket:message
key="admin.room.wait-moderator.label" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="waitModerator" />
+ <label
wicket:for="waitModerator" class="form-label col-3 text-right"><wicket:message
key="admin.room.wait-moderator.label" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="waitModerator" />
</div>
- <div class="formelement">
- <label
wicket:for="moderator2add" class="col-3 text-right"><wicket:message key="816"
/></label>
+ <div class="formelement row">
+ <label
wicket:for="moderator2add" class="form-label col-3 text-right"><wicket:message
key="816" /></label>
<div class="om-select2 p-0
d-inline-block col-8"><select wicket:id="moderator2add" class="input
w-100"></select></div>
</div>
- <div class="formelement"
wicket:id="moderatorContainer">
+ <div class="formelement row"
wicket:id="moderatorContainer">
<table class="list-table small
table table-striped table-hover">
<thead>
<tr>
@@ -284,20 +302,24 @@
<!--SIP Settings -->
<fieldset>
<legend><wicket:message key="1001"
/></legend>
- <div class="formelement">
+ <div class="formelement row">
<i class="fas fa-info-circle
m-1 text-info"></i><wicket:message key="1002" />
</div>
- <div class="formelement">
- <label wicket:for="confno"
class="col-3 text-right"><wicket:message key="1003" /></label>
- <input type="text"
wicket:id="confno" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="confno"
class="form-label col-3 text-right"><wicket:message key="1003" /></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="confno" class="form-control"/>
+ </div>
</div>
- <div class="formelement">
- <label wicket:for="pin"
class="col-3 text-right"><wicket:message key="1004" /></label>
- <input type="text"
wicket:id="pin" class="col-8"/>
+ <div class="formelement row">
+ <label wicket:for="pin"
class="form-label col-3 text-right"><wicket:message key="1004" /></label>
+ <div class="col-8 p-0">
+ <input type="text"
wicket:id="pin" class="form-control"/>
+ </div>
</div>
<div class="formelement">
- <label wicket:for="sipEnabled"
class="col-3 text-right"><wicket:message key="1538" /></label>
- <input type="checkbox"
class="formcheckbox" wicket:id="sipEnabled" />
+ <label wicket:for="sipEnabled"
class="form-label col-3 text-right"><wicket:message key="1538" /></label>
+ <input type="checkbox"
class="formcheckbox form-check-input" wicket:id="sipEnabled" />
</div>
</fieldset>
<div class="bottom-bumper"></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
index c999be73b..8fca63bec 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
@@ -21,7 +21,9 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd";>
<wicket:panel>
- <input type="text" wicket:id="captchaText"
wicket:message="title:captcha.text" class="captcha-text"/><br/>
+ <div class="col-5 d-inline-block">
+ <input type="text" wicket:id="captchaText"
wicket:message="title:captcha.text" class="captcha-text form-control"/>
+ </div>
<img wicket:id="captcha" class="captcha-img"/>
<button wicket:id="refresh"
wicket:message="alt:lbl.refresh,title:lbl.refresh"></button>
</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 3ee0a2457..21c6c0490 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
@@ -21,25 +21,31 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd";>
<wicket:panel>
- <div class="formelement">
- <label class="col-3 text-right"
wicket:for="subject"><wicket:message key="215" /></label>
- <input class="col-8" type="text" wicket:id="subject"/>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"
wicket:for="subject"><wicket:message key="215" /></label>
+ <div class="col-8 p-0">
+ <input class="form-control" type="text"
wicket:id="subject"/>
+ </div>
</div>
<wicket:child/>
- <div class="formelement">
- <label class="col-3 text-right"
wicket:for="message"><wicket:message key="217" /></label>
- <textarea class="col-8" wicket:id="message"></textarea>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"
wicket:for="message"><wicket:message key="217" /></label>
+ <div class="col-8 p-0">
+ <textarea class="form-control"
wicket:id="message"></textarea>
+ </div>
</div>
<div class="formelement">
- <label class="col-3 text-right"
wicket:for="passwordProtected"><wicket:message key="524" /></label>
- <input wicket:id="passwordProtected" type="checkbox"/>
+ <label class="form-label col-3 text-right"
wicket:for="passwordProtected"><wicket:message key="524" /></label>
+ <input wicket:id="passwordProtected" type="checkbox"
class="form-check-input"/>
</div>
- <div class="formelement">
- <label class="col-3 text-right"
wicket:for="password"><wicket:message key="110" /></label>
- <input class="col-8" wicket:id="password" type="password"/>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"
wicket:for="password"><wicket:message key="110" /></label>
+ <div class="col-8 p-0">
+ <input class="form-control" wicket:id="password"
type="password"/>
+ </div>
</div>
- <div class="formelement">
- <label class="col-3 text-right"
wicket:for="valid"><wicket:message key="526" /></label>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"
wicket:for="valid"><wicket:message key="526" /></label>
<div class="col-8 d-inline-block" wicket:id="valid">
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio"
wicket:id="one"/>
@@ -55,24 +61,28 @@
</div>
</div>
</div>
- <div class="formelement">
- <label class="col-3 text-right"
wicket:for="from"><wicket:message key="530" /></label>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"
wicket:for="from"><wicket:message key="530" /></label>
<div class="d-inline-block col-8 p-0"><span class="date time
picker" wicket:id="from"></span></div>
</div>
- <div class="formelement">
- <label class="col-3 text-right" wicket:for="to"><wicket:message
key="531" /></label>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"
wicket:for="to"><wicket:message key="531" /></label>
<div class="d-inline-block col-8 p-0"><span class="date time
picker" wicket:id="to"></span></div>
</div>
- <div class="formelement">
- <label class="col-3 text-right"
wicket:for="timeZoneId"><wicket:message key="1143" /></label>
- <select class="form-select col-8" wicket:id="timeZoneId"/>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"
wicket:for="timeZoneId"><wicket:message key="1143" /></label>
+ <div class="col-8 p-0">
+ <select class="form-select" wicket:id="timeZoneId"/>
+ </div>
</div>
- <div class="formelement">
- <label class="col-3 text-right"
wicket:for="language"><wicket:message key="59" /></label>
- <select class="form-select col-8" wicket:id="language"/>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"
wicket:for="language"><wicket:message key="59" /></label>
+ <div class="col-8 p-0">
+ <select class="form-select" wicket:id="language"/>
+ </div>
</div>
- <div class="formelement">
- <input class="col-12 text-right" wicket:id="url" type="text"
readonly="readonly"/>
+ <div class="formelement row">
+ <input class="text-right form-control" wicket:id="url"
type="text" readonly="readonly"/>
</div>
<span wicket:id="feedback"></span>
</wicket:panel>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
index d87ae6736..58203c59c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
@@ -21,8 +21,11 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd";>
<wicket:extend>
- <form wicket:id="form">
- <label class="px-4" wicket:id="label"></label><input
type="text" wicket:id="title"/>
+ <form wicket:id="form" class="row">
+ <label class="px-4 form-label col-3" wicket:id="label"></label>
+ <div class="col-8 p-0">
+ <input type="text" wicket:id="title"
class="form-control"/>
+ </div>
<div wicket:id="feedback"></div>
<input type="submit" wicket:id="submit" hidden="hidden"/>
</form>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html
index a50b6fb8f..f896f61dc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.html
@@ -22,18 +22,22 @@
<wicket:extend>
<form wicket:id="form">
<div wicket:id="feedback"></div>
- <div class="table">
- <div>
- <div class="column label"><label
wicket:for="subject"><wicket:message key="135" /></label></div>
- <div class="column data"><input type="text"
wicket:id="firstname" class="input"/></div>
+ <div class="row">
+ <label wicket:for="firstname" class="form-label
col-4"><wicket:message key="135" /></label>
+ <div class="col-7">
+ <input type="text" wicket:id="firstname"
class="input form-control"/>
</div>
- <div>
- <div class="column label"><label
wicket:for="subject"><wicket:message key="136" /></label></div>
- <div class="column data"><input type="text"
wicket:id="lastname" class="input"/></div>
+ </div>
+ <div class="row">
+ <label wicket:for="lastname" class="form-label
col-4"><wicket:message key="136" /></label>
+ <div class="col-7">
+ <input type="text" wicket:id="lastname"
class="input form-control"/>
</div>
- <div>
- <div class="column label"><label
wicket:for="subject"><wicket:message key="119" /></label></div>
- <div class="column data"><input type="text"
wicket:id="address.email" class="input"/></div>
+ </div>
+ <div class="row">
+ <label wicket:for="address.email" class="form-label
col-4"><wicket:message key="119" /></label>
+ <div class="col-7">
+ <input type="text" wicket:id="address.email"
class="input form-control"/>
</div>
</div>
</form>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html
index c1a8807cc..7f7d21f44 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html
@@ -22,21 +22,23 @@
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd";>
<wicket:extend>
<div wicket:id="inviteeType">
- <div class="formelement">
+ <div class="formelement row">
<div class="col-3 text-right d-inline-block">
- <input type="radio"
wicket:id="user"/> <label wicket:for="recipients"><wicket:message
key="216" /></label>
+ <input type="radio" wicket:id="user"
class="form-check-input"/>
+ <label wicket:for="recipients"
class="form-check-label"><wicket:message key="216" /></label>
</div>
<div class="om-select2 p-0 d-inline-block
col-8"><select class="input w-100" wicket:id="recipients"></select></div>
</div>
- <div class="formelement" wicket:id="groupContainer">
+ <div class="formelement row" wicket:id="groupContainer">
<div class="col-3 text-right d-inline-block">
- <input type="radio"
wicket:id="group"/> <label wicket:for="groups"><wicket:message key="126"
/></label>
+ <input type="radio" wicket:id="group"
class="form-check-input"/>
+ <label wicket:for="groups"
class="form-check-label"><wicket:message key="126" /></label>
</div>
<div class="om-select2 p-0 d-inline-block
col-8"><select class="input w-100" wicket:id="groups"></select></div>
</div>
</div>
- <div class="formelement" wicket:id="sip-container">
- <div class="col-3 text-right"><wicket:message key="1003"/></div>
+ <div class="formelement row" wicket:id="sip-container">
+ <div class="form-label col-3 text-right"><wicket:message
key="1003"/></div>
<div class="col-8"><span wicket:id="room.confno"></span></div>
</div>
</wicket:extend>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
index b67c5d9ed..3adb6b1cd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
@@ -24,7 +24,7 @@
<div class="sip">
<div class="button-row">
<form wicket:id="form">
- <input wicket:id="number" class="sip-number"
type="text"/>
+ <input wicket:id="number" class="sip-number
form-control d-inline-block" type="text"/>
<span id="sip-dialer-btn-erase" class="btn
btn-outline-danger">←</span>
<input type="submit" wicket:id="submit"
hidden="hidden"/>
</form>
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 45634eea1..1995f4a42 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
@@ -26,16 +26,22 @@
<div class="col-11"><wicket:message key="19"/></div>
</div>
<div class="row mb-1">
- <label wicket:for="name" class="col-4"><wicket:message
key="1410"/></label>
- <input type="text" wicket:id="name" class="col-7"/>
+ <label wicket:for="name" class="form-label
col-4"><wicket:message key="1410"/></label>
+ <div class="col-7 p-0">
+ <input type="text" wicket:id="name"
class="form-control"/>
+ </div>
</div>
<div class="row mb-1">
- <label wicket:for="question"
class="col-4"><wicket:message key="20"/></label>
- <textarea wicket:id="question" class="col-7"></textarea>
+ <label wicket:for="question" class="form-label
col-4"><wicket:message key="20"/></label>
+ <div class="col-7 p-0">
+ <textarea wicket:id="question"
class="form-control"></textarea>
+ </div>
</div>
<div class="row mb-1">
- <label wicket:for="type" class="col-4"><wicket:message
key="21" /></label>
- <select wicket:id="type" class="form-select col-7"/>
+ <label wicket:for="type" class="form-label
col-4"><wicket:message key="21" /></label>
+ <div class="col-7 p-0">
+ <select wicket:id="type" class="form-select"/>
+ </div>
</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 4d70abb61..c950c33f9 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
@@ -23,8 +23,10 @@
<wicket:extend>
<form wicket:id="selForm">
<div class="row">
- <div class="col-4"><wicket:message key="1412"/></div>
- <select class="form-select col-7"
wicket:id="polls"></select>
+ <label wicket:for="polls" class="form-label
col-4"><wicket:message key="1412"/></label>
+ <div class="col-7 p-0">
+ <select class="form-select"
wicket:id="polls"></select>
+ </div>
</div>
</form>
<form wicket:id="dispForm">
@@ -37,12 +39,14 @@
<div class="col-11"><span
wicket:id="question"></span></div>
</div>
<div class="row">
- <div class="col-4"><wicket:message
key="39"/> (<span wicket:id="count"></span>)</div>
- <select class="form-select col-7"
wicket:id="chartType"></select>
+ <label wicket:for="chartType" class="form-label
col-4"><wicket:message key="39"/> (<span wicket:id="count"></span>)</label>
+ <div class="col-7 p-0">
+ <select class="form-select"
wicket:id="chartType"></select>
+ </div>
</div>
</form>
<div class="row">
- <div class="col-4"><wicket:message key="40"/></div>
+ <label class="form-label col-4"><wicket:message
key="40"/></label>
<div class="col-7" wicket:id="chart" id="room-poll-chart"></div>
</div>
</wicket:extend>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
index 545249fa1..73a5f751d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
@@ -136,7 +136,7 @@ public class PollResultsDialog extends Modal<RoomPoll> {
close(target);
}
});
-
delete.setIconType(FontAwesome5IconType.times_s).add(newOkCancelDangerConfirm(this,
getString("1421")));
+
delete.setIconType(FontAwesome5IconType.trash_s).add(newOkCancelDangerConfirm(this,
getString("1421")));
delete.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true);
addButton(clone = new BootstrapAjaxLink<>(BUTTON_MARKUP_ID,
null, Buttons.Type.Outline_Danger, new ResourceModel("poll.clone")) {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomUploadForm.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomUploadForm.html
index 3eaa6e563..756b55a84 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomUploadForm.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomUploadForm.html
@@ -22,9 +22,12 @@
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd";>
<wicket:extend>
<div class="mt-3">
- <input id="room-upload-to-wb" name="room-upload-to-wb"
type="checkbox" value="true"/> <label
for="room-upload-to-wb"><wicket:message key="1312"/></label>
+ <input id="room-upload-to-wb" name="room-upload-to-wb"
type="checkbox" value="true" class="form-check-input"/>
+ <label for="room-upload-to-wb"
class="form-check-label"><wicket:message key="1312"/></label>
+
<div class="me-3 d-none" id="room-upload-clean-block">
- <input id="room-upload-clean" name="room-upload-clean"
type="checkbox" value="true"/> <label
for="room-upload-clean"><wicket:message key="62"/></label>
+ <input id="room-upload-clean" name="room-upload-clean"
type="checkbox" value="true" class="form-check-input"/>
+ <label for="room-upload-clean"
class="form-check-label"><wicket:message key="62"/></label>
</div>
</div>
<input wicket:id="lastSelectedId" name="room-upload-last-selected-id"
type="hidden" value=""/>
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 f551c7503..c6d40faf9 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
@@ -32,7 +32,7 @@
</tr>
<tr>
<td class="messages column
label"><wicket:message key="1211"/></td>
- <td><input class="messages text" type="text"
wicket:id="subject"/></td>
+ <td><input class="messages text form-control"
type="text" wicket:id="subject"/></td>
</tr>
<tr>
<td colspan="2">
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 a5253551e..670df51fd 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
@@ -31,42 +31,52 @@
</ul>
<div class="tab-content">
<div id="tab1" class="tab-pane fade show active
pt-1" role="tabpanel" aria-labelledby="tab1-tab">
- <div>
- <label wicket:for="title"
class="col-3 p-0"><wicket:message key="572" /></label>
- <input class="col-8"
type="text" wicket:id="title" />
+ <div class="row">
+ <label wicket:for="title"
class="form-label col-3 p-0"><wicket:message key="572" /></label>
+ <div class="col-8 p-0">
+ <input
class="form-control" type="text" wicket:id="title" />
+ </div>
</div>
- <div>
- <label wicket:for="start"
class="col-3 p-0"><wicket:message key="label.start" /></label>
+ <div class="row">
+ <label wicket:for="start"
class="form-label col-3 p-0"><wicket:message key="label.start" /></label>
<div class="d-inline-block
col-8 p-0"><span class="date time picker" wicket:id="start"></span></div>
</div>
- <div>
- <label wicket:for="end"
class="col-3 p-0"><wicket:message key="label.end" /></label>
+ <div class="row">
+ <label wicket:for="end"
class="form-label col-3 p-0"><wicket:message key="label.end" /></label>
<div class="d-inline-block
col-8 p-0"><span class="date time picker" wicket:id="end"></span></div>
</div>
- <div wicket:id="owner-row">
- <label class="col-3
p-0"><wicket:message key="1156" /></label>
+ <div wicket:id="owner-row" class="row">
+ <label class="form-label col-3
p-0"><wicket:message key="1156" /></label>
<span class="col-8"
wicket:id="aowner"></span>
</div>
<div wicket:id="inviteeType">
- <div>
- <label
wicket:for="attendees" class="col-3 p-0"><input type="radio"
wicket:id="user"/><label wicket:for="user"><wicket:message key="803"
/></label></label>
+ <div class="row">
+ <label
wicket:for="attendees" class="form-label col-3 p-0">
+ <input
type="radio" wicket:id="user" class="form-check-input"/>
+ <label
wicket:for="user" class="form-check-label"><wicket:message key="803" /></label>
+ </label>
<div class="om-select2
p-0 d-inline-block col-8" wicket:message="title:1588">
<select
class="attendees w-100" wicket:id="attendees"></select>
</div>
</div>
- <div wicket:id="groupContainer">
- <label
wicket:for="groups" class="col-3 p-0"><input type="radio"
wicket:id="group"/><label wicket:for="group"><wicket:message key="126"
/></label></label>
+ <div wicket:id="groupContainer"
class="row">
+ <label
wicket:for="groups" class="form-label col-3 p-0">
+ <input
type="radio" wicket:id="group" class="form-check-input"/>
+ <label
wicket:for="group" class="form-check-label"><wicket:message key="126" /></label>
+ </label>
<div class="om-select2
p-0 d-inline-block col-8">
<select
wicket:id="groups" class="input invitees w-100"></select>
</div>
</div>
</div>
- <div>
- <label wicket:for="location"
class="col-3 p-0"><wicket:message key="569" /></label>
- <input class="col-8"
type="text" wicket:id="location" />
+ <div class="row">
+ <label wicket:for="location"
class="form-label col-3 p-0"><wicket:message key="569" /></label>
+ <div class="col-8 p-0">
+ <input
class="form-control" type="text" wicket:id="location" />
+ </div>
</div>
- <div>
- <label wicket:for="description"
class="col-3 p-0"><wicket:message key="196" /></label>
+ <div class="row">
+ <label wicket:for="description"
class="form-label col-3 p-0"><wicket:message key="196" /></label>
<div class="d-inline-block
col-8 p-0">
<div
wicket:id="toolbarContainer"></div>
<div
wicket:id="description"></div>
@@ -75,43 +85,55 @@
</div>
<div id="tab2" class="tab-pane fade pt-1"
role="tabpanel" aria-labelledby="tab2-tab">
<div wicket:enclosure="createRoom">
- <input type="checkbox"
wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:message
key="1509" /></label>
+ <input type="checkbox"
wicket:id="createRoom" class="form-check-input"/>
+ <label wicket:for="createRoom"
class="form-check-label"><wicket:message key="1509" /></label>
</div>
<div wicket:id="create-room-block">
- <div>
- <label
wicket:for="type" class="col-3 p-0"><wicket:message key="619" /></label>
- <select
class="form-select col-8" wicket:id="type" ></select>
+ <div class="row">
+ <label
wicket:for="type" class="form-label col-3 p-0"><wicket:message key="619"
/></label>
+ <div class="col-8 p-0">
+ <select
class="form-select" wicket:id="type" ></select>
+ </div>
</div>
- <div>
- <label class="col-3
p-0" wicket:for="moderated"><wicket:message key="640" /></label>
- <input type="checkbox"
wicket:id="moderated" />
+ <div class="row">
+ <label
class="form-label col-3 p-0" wicket:for="moderated"><wicket:message key="640"
/></label>
+ <input type="checkbox"
wicket:id="moderated" class="form-check-input p-0"/>
</div>
</div>
- <div>
- <label wicket:for="groom"
class="col-3 p-0"><wicket:message key="406" /></label>
- <select class="form-select
col-8" wicket:id="groom" ></select>
+ <div class="row">
+ <label wicket:for="groom"
class="form-label col-3 p-0"><wicket:message key="406" /></label>
+ <div class="col-8 p-0">
+ <select
class="form-select" wicket:id="groom" ></select>
+ </div>
</div>
- <div wicket:id="sip-container">
- <label class="col-3
p-0"><wicket:message key="1003"/></label>
+ <div wicket:id="sip-container"
class="row">
+ <label class="form-label col-3
p-0"><wicket:message key="1003"/></label>
<span class="col-8"
wicket:id="room.confno"></span>
</div>
</div>
<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="form-select
col-8" wicket:id="reminder"></select>
+ <div class="row">
+ <label wicket:for="reminder"
class="form-label col-3 p-0"><wicket:message key="565" /></label>
+ <div class="col-8 p-0">
+ <select
class="form-select" wicket:id="reminder"></select>
+ </div>
</div>
<div>
- <input type="checkbox"
wicket:id="passwordProtected" /><label
wicket:for="passwordProtected"><wicket:message key="524" /></label>
+ <input type="checkbox"
wicket:id="passwordProtected" class="form-check-input"/>
+ <label
wicket:for="passwordProtected" class="form-check-label"><wicket:message
key="524" /></label>
</div>
- <div>
- <label wicket:for="password"
class="col-3 p-0"><wicket:message key="110" /></label>
- <input class="col-8"
type="password" wicket:id="password" />
+ <div class="row">
+ <label wicket:for="password"
class="form-label col-3 p-0"><wicket:message key="110" /></label>
+ <div class="col-8 p-0">
+ <input
class="form-control" type="password" wicket:id="password" />
+ </div>
</div>
<div><wicket:message key="1445" /></div>
- <div>
- <label wicket:for="calendar"
class="col-3 p-0"><wicket:message key="162" /></label>
- <select class="form-select
col-8" wicket:id="calendar"></select>
+ <div class="row">
+ <label wicket:for="calendar"
class="form-label col-3 p-0"><wicket:message key="162" /></label>
+ <div class="col-8 p-0">
+ <select
class="form-select" wicket:id="calendar"></select>
+ </div>
</div>
</div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.html
index 935ed861d..52f528c14 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.html
@@ -24,25 +24,33 @@
<form wicket:id="calform" class="appointmentPopUp">
<span wicket:id="feedback"></span>
<div id="tabs">
- <div>
- <label class="col-3"
wicket:for="title"><wicket:message key="572"/></label>
- <input class="col-8" type="text"
wicket:id="title"/>
+ <div class="row">
+ <label class="form-label col-3"
wicket:for="title"><wicket:message key="572"/></label>
+ <div class="col-8 p-0">
+ <input class="form-control" type="text"
wicket:id="title"/>
+ </div>
</div>
- <div>
- <label class="col-3" wicket:for="url"><span
wicket:id="urlLabel"/></label>
- <input class="col-8" type="url"
wicket:id="url"/>
+ <div class="row">
+ <label class="form-label col-3"
wicket:for="url"><span wicket:id="urlLabel"/></label>
+ <div class="col-8 p-0">
+ <input class="form-control" type="url"
wicket:id="url"/>
+ </div>
</div>
- <div>
- <label class="col-3" wicket:for="login"><span
wicket:id="userLabel"/></label>
- <input class="col-8" type="text"
wicket:id="login"/>
+ <div class="row">
+ <label class="form-label col-3"
wicket:for="login"><span wicket:id="userLabel"/></label>
+ <div class="col-8 p-0">
+ <input class="form-control" type="text"
wicket:id="login"/>
+ </div>
</div>
- <div>
- <label class="col-3"
wicket:for="password"><span wicket:id="passLabel"/></label>
- <input class="col-8" type="password"
wicket:id="password"/>
+ <div class="row">
+ <label class="form-label col-3"
wicket:for="password"><span wicket:id="passLabel"/></label>
+ <div class="col-8 p-0">
+ <input class="form-control"
type="password" wicket:id="password"/>
+ </div>
</div>
<div>
- <label class="col-3"
wicket:for="gcal"><wicket:message key="calendar.gcal"/></label>
- <input type="checkbox" wicket:id="gcal"/>
+ <label class="form-label col-3"
wicket:for="gcal"><wicket:message key="calendar.gcal"/></label>
+ <input type="checkbox" wicket:id="gcal"
class="form-check-input"/>
</div>
</div>
</form>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.html
index e78bb2d19..de8363365 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.html
@@ -25,16 +25,16 @@
<div wicket:id="feedback" class="error"></div>
<table>
<tr>
- <td class="desc"><label
wicket:for="current"><wicket:message key="current.password" /></label></td>
- <td><input wicket:id="current" type="password"
value="" /></td>
+ <td class="desc"><label wicket:for="current"
class="form-label"><wicket:message key="current.password" /></label></td>
+ <td><input wicket:id="current" type="password"
value="" class="form-control"/></td>
</tr>
<tr>
- <td class="desc"><label
wicket:for="pass"><wicket:message key="328" /></label></td>
- <td><input wicket:id="pass" type="password"
value="" /></td>
+ <td class="desc"><label wicket:for="pass"
class="form-label"><wicket:message key="328" /></label></td>
+ <td><input wicket:id="pass" type="password"
value="" class="form-control"/></td>
</tr>
<tr>
- <td class="desc"><label
wicket:for="pass2"><wicket:message key="116" /></label></td>
- <td><input wicket:id="pass2" type="password"
value="" /></td>
+ <td class="desc"><label wicket:for="pass2"
class="form-label"><wicket:message key="116" /></label></td>
+ <td><input wicket:id="pass2" type="password"
value="" class="form-control"/></td>
</tr>
</table>
</form>
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 575fafbea..402f977c8 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
@@ -30,9 +30,11 @@
<wicket:message key="143" />
</legend>
<button type="button"
wicket:id="changePwd" id="changePwd"></button>
- <div class="formelement"
wicket:enclosure="passwd">
- <label class="col-3 text-right"
wicket:for="passwd"><wicket:message key="current.password" /></label>
- <input type="password"
wicket:id="passwd" class="col-8"/>
+ <div class="formelement row"
wicket:enclosure="passwd">
+ <label class="form-label col-3
text-right" wicket:for="passwd"><wicket:message key="current.password"
/></label>
+ <div class="col-8 p-0">
+ <input type="password"
wicket:id="passwd" class="form-control"/>
+ </div>
</div>
<form wicket:id="general"></form>
</fieldset>
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 d2a11719d..4627ffe71 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,9 @@
</tbody>
</table>
<div wicket:id="buttons">
- <select class="form-select
col-2" wicket:id="msgSelect"></select>
+ <div class="col-2 p-0
d-inline-block">
+ <select
class="form-select" wicket:id="msgSelect"></select>
+ </div>
<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 +86,9 @@
<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="form-select
col-3" wicket:id="msgMove"></select>
+ <div class="col-3 p-0
d-inline-block">
+ <select
class="form-select" wicket:id="msgMove"></select>
+ </div>
</div>
<div wicket:id="selectedMessage">
<table class="w-100">
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 cdffed6ed..ef19defeb 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
@@ -26,11 +26,11 @@
<div>
<form wicket:id="form">
<div><wicket:message key="1179"/></div>
- <input type="text" wicket:id="text"/><br/>
+ <input type="text" wicket:id="text"
class="form-control"/>
<div><wicket:message key="1177"/></div>
- <input type="text" wicket:id="offer"/><br/>
+ <input type="text" wicket:id="offer"
class="form-control"/>
<div><wicket:message key="1178"/></div>
- <input type="text" wicket:id="search"/><br/>
+ <input type="text" wicket:id="search"
class="form-control"/>
<br/>
<button wicket:id="submit"
type="button"></button>
</form>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html
index 414d12cef..9a7b1feb3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html
@@ -30,7 +30,7 @@
<tr wicket:id="widgets">
<td wicket:id="name"></td>
<td wicket:id="description"></td>
- <td><input type="checkbox" wicket:id="display"/></td>
+ <td><input type="checkbox" wicket:id="display"
class="form-check-input"/></td>
</tr>
</table>
</wicket:panel>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html
index ce8062beb..a2dbb1f45 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html
@@ -21,7 +21,9 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd";>
<wicket:extend>
- <label class="col-3 text-right" wicket:for="recipients"><wicket:message
key="216" /></label>
- <div class="om-select2 p-0 d-inline-block col-8"><select class="input
w-100" wicket:id="recipients"></select></div>
+ <div class="formelement row">
+ <label class="form-label col-3 text-right"
wicket:for="recipients"><wicket:message key="216" /></label>
+ <div class="om-select2 p-0 d-inline-block col-8"><select
class="input w-100" wicket:id="recipients"></select></div>
+ </div>
</wicket:extend>
</html>
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css
b/openmeetings-web/src/main/webapp/css/raw-general.css
index 7f2cdee77..a29ef5485 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -321,10 +321,6 @@ table.messages td.from, table.messages td.subject {
position: absolute;
left: 4px;
}
-.messages.column.label {
- width: 20px;
- min-height: inherit;
-}
input[type="text"].messages.text {
width: 100%;
}
@@ -512,24 +508,9 @@ select.messages.selector {
.no-close .ui-dialog-titlebar-close {
display: none;
}
-.table, .msg-row {
+.msg-row {
position: relative;
}
-.table .column {
- display: inline-block;
- margin-bottom: 5px;
- min-height: auto; /* IE */
- min-height: initial;
- float: none;
- margin-right: 0;
-}
-.table .column.label {
- width: 20%;
-}
-.table .column.data {
- width: 75%;
- vertical-align: middle;
-}
.col-wrapper {
word-wrap: break-word;
}
