This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch bootstrap-5 in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit b13bf8245625d74b1bb95371e667f2adf66b16d6 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Sat Jul 3 23:28:35 2021 +0700 [OPENMEETINGS-2637] initial commit --- .../src/main/front/main/src/omutils.js | 4 +- .../openmeetings/web/admin/AdminBasePanel.html | 2 +- .../web/admin/connection/ConnectionsPanel.html | 2 +- .../openmeetings/web/admin/email/EmailPanel.html | 2 +- .../web/admin/groups/GroupUsersPanel.html | 2 +- .../openmeetings/web/admin/labels/LangPanel.html | 22 ++++------ .../openmeetings/web/admin/oauth/OAuthPanel.html | 2 +- .../openmeetings/web/admin/rooms/RoomsPanel.html | 6 +-- .../web/admin/users/PasswordDialog.html | 2 +- .../apache/openmeetings/web/common/NameDialog.html | 2 +- .../web/common/PagedEntityListPanel.html | 4 +- .../web/common/PagingNavigatorPanel.html | 4 +- .../web/common/tree/FileTreePanel.html | 6 +-- .../apache/openmeetings/web/pages/BasePage.html | 2 +- .../web/pages/auth/ForgetPasswordDialog.html | 14 +++---- .../web/pages/auth/RegisterDialog.html | 32 +++++---------- .../web/pages/auth/ResetPasswordDialog.html | 6 +-- .../openmeetings/web/pages/auth/SignInDialog.html | 34 +++++---------- .../apache/openmeetings/web/room/RoomPanel.html | 22 ++++------ .../openmeetings/web/room/VideoSettings.html | 8 ++-- .../web/room/activities/ActivitiesPanel.html | 2 +- .../web/room/poll/CreatePollDialog.html | 8 ++-- .../openmeetings/web/room/poll/VoteDialog.html | 4 +- .../web/room/sidebar/UploadDialog.html | 2 +- .../apache/openmeetings/web/room/wb/WbPanel.html | 48 ++++++++-------------- .../apache/openmeetings/web/user/AboutDialog.html | 8 ++-- .../web/user/calendar/AppointmentDialog.java | 2 +- .../apache/openmeetings/web/user/chat/Chat.html | 4 +- .../openmeetings/web/user/chat/ChatPanel.html | 2 +- .../openmeetings/web/user/chat/ChatToolbar.html | 2 +- .../web/user/profile/InvitationsPanel.html | 10 ++--- .../web/user/profile/MessagesContactsPanel.html | 6 +-- .../web/user/profile/UserSearchPanel.html | 2 +- .../openmeetings/web/user/rooms/RoomsPanel.html | 2 +- pom.xml | 2 +- 35 files changed, 111 insertions(+), 171 deletions(-) diff --git a/openmeetings-web/src/main/front/main/src/omutils.js b/openmeetings-web/src/main/front/main/src/omutils.js index 78cb21b..b8270e6 100644 --- a/openmeetings-web/src/main/front/main/src/omutils.js +++ b/openmeetings-web/src/main/front/main/src/omutils.js @@ -17,9 +17,7 @@ function __alert(level, msg, autohideAfter) { const holder = $('#alert-holder'); const curId = 'om-alert' + alertId++; holder.append($(`<div id="${curId}" class="alert alert-${level} alert-dismissible fade show m-0" role="alert">${msg} - <button type="button" class="close" data-dismiss="alert" aria-label="${holder.data('lbl-close')}"> - <span aria-hidden="true">×</span> - </button> + <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="${holder.data('lbl-close')}"></button> </div>`)); if (autohideAfter > 0) { setTimeout(() => { $(`#${curId}`).alert('close');}, autohideAfter); diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html index d369035..278dfdd 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html @@ -21,7 +21,7 @@ <!DOCTYPE html> <html xmlns:wicket="http://wicket.apache.org"> <wicket:panel> - <div class="adminPanel row no-gutters"> + <div class="adminPanel row g-0"> <wicket:child/> </div> </wicket:panel> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html index 6989638..56fd80e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html @@ -30,7 +30,7 @@ <th class="col-2"><wicket:message key="108" /></th> <th class="col-2"><wicket:message key="601" /></th> <th class="col-2"><wicket:message key="602" /></th> - <th class="col-2 pl-3 pr-3"><wicket:message key="603" /></th> + <th class="col-2 px-3"><wicket:message key="603" /></th> <th class="col-2"><wicket:message key="1500" /></th> </tr> </thead> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html index 6c53e74..18215f0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html @@ -84,7 +84,7 @@ <div class="col-8 d-inline-block text-pre" wicket:id="lastError"></div> </div> </div> - <button wicket:id="reset" class="align-right mr-3"></button> + <button wicket:id="reset" class="align-right ms-3"></button> </fieldset> <div class="bottom-bumper"></div> </div> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html index 3c5c12d..b6c8dc6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html @@ -35,7 +35,7 @@ <td class="col-1"><input type="checkbox" wicket:id="isModerator"/></td> <td class="col-10"><div class="col-wrapper"><span wicket:id="new"/><span wicket:id="label"></span></div></td> <td class="col-1"> - <button wicket:id="deleteUserBtn" wicket:message="title:274" class="btn-sm p-0 pl-2 pr-2"></button> + <button wicket:id="deleteUserBtn" wicket:message="title:274" class="btn-sm p-0 px-2"></button> </td> </tr> </tbody> 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 7b24017..f833b68 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 @@ -25,20 +25,16 @@ <div class="adminPanelColumnTable label col-6"> <form wicket:id="langForm" class="addLanguagePanel"> <div class="input-group input-group-sm"> - <div class="input-group-prepend"> - <button class="btn btn-outline-success" wicket:id="addLangBtn" wicket:message="title:362"> - <i class="fas fa-plus"></i> - </button> - <button wicket:id="deleteLangBtn" wicket:message="title:363"></button> - </div> + <button class="btn btn-outline-success" wicket:id="addLangBtn" wicket:message="title:362"> + <i class="fas fa-plus"></i> + </button> + <button wicket:id="deleteLangBtn" wicket:message="title:363"></button> <select wicket:id="language" class="form-control"></select> - <div class="input-group-append"> - <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"/> - <input type="file" accept="text/xml" wicket:id="fileInput"/> - </button> - </div> + <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"/> + <input type="file" accept="text/xml" wicket:id="fileInput"/> + </button> </div> </form> <div class="adminNav" wicket:id="navigator">[dataview navigator]</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 a7a333b..60c008e 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 @@ -123,7 +123,7 @@ <td class="col-7"><div class="col-wrapper"><span wicket:id="key"></span></div></td> <td class="col-4"><div class="col-wrapper"><span wicket:id="value"></span></div></td> <td class="col-1"> - <button wicket:id="delete" wicket:message="title:80" class="btn-sm p-0 pl-2 pr-2"></button> + <button wicket:id="delete" wicket:message="title:80" class="btn-sm p-0 px-2"></button> </td> </tr> </tbody> 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 83b7752..11b87f2 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 @@ -204,7 +204,7 @@ <td class="col-9"><div class="col-wrapper w-auto"><span wicket:id="name"></span></div></td> <td class="col-2"><span wicket:id="wbIdx"></span></td> <td class="col-1"> - <button wicket:id="delete" wicket:message="title:80" class="btn-sm p-0 pl-2 pr-2"></button> + <button wicket:id="delete" wicket:message="title:80" class="btn-sm p-0 px-2"></button> </td> </tr> </tbody> @@ -227,7 +227,7 @@ <td class="col-1"><div class="col-wrapper"><span wicket:id="clientId"></span></div></td> <td class="col-10"><div class="col-wrapper"><span wicket:id="clientLogin"></span></div></td> <td class="col-1"> - <button wicket:id="clientDelete" wicket:message="title:603" class="btn-sm p-0 pl-2 pr-2"></button> + <button wicket:id="clientDelete" wicket:message="title:603" class="btn-sm p-0 px-2"></button> </td> </tr> </tbody> @@ -275,7 +275,7 @@ <td class="col-4"><div class="col-wrapper"><span wicket:id="new"/><span wicket:id="uName"></span></div></td> <td class="col-5"><div class="col-wrapper overflow-hidden"><span wicket:id="email"></span></div></td> <td class="col-1"> - <button wicket:id="delete" wicket:message="title:80" class="btn-sm p-0 pl-2 pr-2"></button> + <button wicket:id="delete" wicket:message="title:80" class="btn-sm p-0 px-2"></button> </td> </tr> </tbody> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html index a441ed0..2b6fa3a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/PasswordDialog.html @@ -22,7 +22,7 @@ <html xmlns:wicket="http://wicket.apache.org"> <wicket:extend> <form wicket:id="form"> - <label class="pl-4 pr-4" wicket:for="password"><wicket:message key="current.password"/></label><input type="password" wicket:id="password"/> + <label class="px-4" wicket:for="password"><wicket:message key="current.password"/></label><input type="password" wicket:id="password"/> <div wicket:id="feedback"></div> </form> </wicket:extend> 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 722ffb5..2fa06ef 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 @@ -22,7 +22,7 @@ <html xmlns:wicket="http://wicket.apache.org"> <wicket:extend> <form wicket:id="form"> - <label class="pl-4 pr-4" wicket:id="label"></label><input type="text" wicket:id="title"/> + <label class="px-4" wicket:id="label"></label><input type="text" wicket:id="title"/> <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/common/PagedEntityListPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.html index fed18cf..f7ca165 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.html @@ -25,9 +25,7 @@ <form wicket:id="searchForm" class="searchForm"> <div class="input-group input-group-sm"> <input type="text" wicket:id="searchText" wicket:message="title:714" class="form-control"/> - <div class="input-group-append"> - <button wicket:id="search"></button> - </div> + <button wicket:id="search"></button> </div> </form> </wicket:panel> 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 6e59ce9..eaba7d1 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 @@ -24,9 +24,7 @@ <form wicket:id="pagingForm" class="pagedEntityListPanel"> <div class="input-group input-group-sm"> <select wicket:id="entitiesPerPage" class="form-control"></select> - <div class="input-group-append"> - <span wicket:id="navigator" class="mt-1 pagination pagination-sm">[dataview navigator]</span> - </div> + <span wicket:id="navigator" class="mt-1 pagination pagination-sm">[dataview navigator]</span> </div> </form> </wicket:panel> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html index b1dc66a..fb3f9ce 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html @@ -29,19 +29,19 @@ <span wicket:id="refresh" class="refresh om-icon big align-left clickable" wicket:message="title:lbl.refresh"></span> <span wicket:id="trash"></span> <div class="clear"></div> - <div id="om-js-trash-confirm" class="modal om-confirm-dialog" tabindex="-1" data-backdrop="static" role="dialog" aria-labelledby="om-js-trash-confirm-header" aria-modal="true" aria-hidden="true"> + <div id="om-js-trash-confirm" class="modal om-confirm-dialog" tabindex="-1" data-bs-backdrop="static" role="dialog" aria-labelledby="om-js-trash-confirm-header" aria-modal="true" aria-hidden="true"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title" id="om-js-trash-confirm-header"><wicket:message key="80"/></h4> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body"><wicket:message key="713"/></div> <div class="modal-footer"> <button type="button" class="btn btn-outline-danger ok-btn"> <i class="fas fa-exclamation-triangle"></i> <wicket:message key="54"/> </button> - <button type="button" data-dismiss="modal" class="btn btn-outline-secondary"><wicket:message key="lbl.cancel"/></button> + <button type="button" data-bs-dismiss="modal" class="btn btn-outline-secondary"><wicket:message key="lbl.cancel"/></button> </div> </div> </div> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html index 686579b..9744926 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html @@ -36,6 +36,6 @@ </div> <div wicket:id="header" id="header"></div> <wicket:child /> - <div id="alert-holder" wicket:message="data-lbl-close:85" class="mr-3 ml-3"/> + <div id="alert-holder" wicket:message="data-lbl-close:85" class="mx-3"/> </body> </html> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html index 27e2d4b..438226f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html @@ -22,7 +22,7 @@ <html xmlns:wicket="http://wicket.apache.org"> <wicket:extend> <form wicket:id="form" class="signin-forget"> - <div class="row form-group no-gutters" wicket:id="type"> + <div class="row mb-1 ms-2 me-2 g-0" wicket:id="type"> <div class="col-6"> <div class="form-check form-check-inline"> <label class="form-check-label" wicket:for="email"><wicket:message key="313" /></label> @@ -36,15 +36,11 @@ </div> </div> </div> - <div class="form-group no-gutters"> - <div class="input-group"> - <div class="input-group-prepend"> - <span class="input-group-text"><i wicket:id="label" class="fa fa-lock"></i></span> - </div> - <input wicket:id="name" class="form-control auto-focus" type="text" value=""/> - </div> + <div class="input-group mb-1 g-0"> + <span class="input-group-text"><i wicket:id="label" class="fa fa-lock"></i></span> + <input wicket:id="name" class="form-control auto-focus" type="text" value=""/> </div> - <div class="row form-group no-gutters"> + <div class="row mb-1 g-0"> <div class="col-12 centered" wicket:id="captcha"></div> </div> <div wicket:id="feedback"></div> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html index 8b58c24..086a8c2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html @@ -22,61 +22,49 @@ <html xmlns:wicket="http://wicket.apache.org"> <wicket:extend> <form wicket:id="form"> - <div class="row form-group no-gutters"> + <div class="row mb-1 g-0"> <div class="col-6"> <div class="input-group"> - <div class="input-group-prepend"> - <span class="input-group-text"><i class="fa fa-user"></i></span> - </div> + <span class="input-group-text"><i class="fa fa-user"></i></span> <input wicket:id="firstName" class="form-control auto-focus" type="text" wicket:message="placeholder:117" value=""/> </div> </div> <div class="col-6"> <div class="input-group"> - <div class="input-group-prepend"> - <span class="input-group-text"><i class="fa fa-user"></i></span> - </div> + <span class="input-group-text"><i class="fa fa-user"></i></span> <input wicket:id="lastName" class="form-control" type="text" wicket:message="placeholder:136" value=""/> </div> </div> </div> - <div class="row form-group no-gutters"> + <div class="row mb-1 g-0"> <div class="col-6"> <div class="input-group"> - <div class="input-group-prepend"> - <span class="input-group-text"><i class="fa fa-user"></i></span> - </div> + <span class="input-group-text"><i class="fa fa-user"></i></span> <input wicket:id="login" class="form-control" type="text" wicket:message="placeholder:114" value=""/> </div> </div> <div class="col-6"> <div class="input-group"> - <div class="input-group-prepend"> - <span class="input-group-text"><i class="fas fa-envelope"></i></span> - </div> + <span class="input-group-text"><i class="fas fa-envelope"></i></span> <input wicket:id="email" class="form-control" type="email" wicket:message="placeholder:119" value=""/> </div> </div> </div> - <div class="row form-group no-gutters"> + <div class="row mb-1 g-0"> <div class="col-6"> <div class="input-group"> - <div class="input-group-prepend"> - <span class="input-group-text"><i class="fa fa-lock"></i></span> - </div> + <span class="input-group-text"><i class="fa fa-lock"></i></span> <input wicket:id="password" class="form-control" type="password" wicket:message="placeholder:110" value=""/> </div> </div> <div class="col-6"> <div class="input-group"> - <div class="input-group-prepend"> - <span class="input-group-text"><i class="fa fa-lock"></i></span> - </div> + <span class="input-group-text"><i class="fa fa-lock"></i></span> <input wicket:id="confirmPassword" class="form-control" type="password" wicket:message="placeholder:116" value=""/> </div> </div> </div> - <div class="row form-group no-gutters"> + <div class="row mb-1 g-0"> <div class="col-12 centered" wicket:id="captcha"></div> </div> <div wicket:id="feedback" class="error"></div> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html index 373be93..a8da3f1 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html @@ -22,15 +22,15 @@ <html xmlns:wicket="http://wicket.apache.org"> <wicket:extend> <form wicket:id="form"> - <div class="row form-group no-gutters"> + <div class="row mb-1 g-0"> <div class="desc col-6"><label wicket:for="login"><wicket:message key="314"/></label></div> <div class="col-5"><input type="text" readonly="readonly" wicket:id="login"/></div> </div> - <div class="row form-group no-gutters"> + <div class="row mb-1 g-0"> <div class="desc col-6"><label wicket:for="password"><wicket:message key="328"/></label></div> <div class="col-5"><input type="password" wicket:id="password"/></div> </div> - <div class="row form-group no-gutters"> + <div class="row mb-1 g-0"> <div class="desc col-6"><label wicket:for="confirmPassword"><wicket:message key="116"/></label></div> <div class="col-5"><input type="password" wicket:id="confirmPassword"/></div> </div> 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 699300c..2ee7ad3 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 @@ -23,31 +23,19 @@ <wicket:extend> <form wicket:id="signin" class="signin"> <div wicket:id="credentials"> - <div class="form-group no-gutters"> - <div class="input-group"> - <div class="input-group-prepend"> - <span class="input-group-text"><i class="fa fa-user"></i></span> - </div> - <input wicket:id="login" class="form-control auto-focus" type="text" value="" wicket:message="placeholder:109,title:109"/> - </div> + <div class="input-group mb-1 g-0"> + <span class="input-group-text"><i class="fa fa-user"></i></span> + <input wicket:id="login" class="form-control auto-focus" type="text" value="" wicket:message="placeholder:109,title:109"/> </div> - <div class="form-group no-gutters"> - <div class="input-group"> - <div class="input-group-prepend"> - <span class="input-group-text"><i class="fa fa-lock"></i></span> - </div> - <input wicket:id="pass" class="form-control" type="password" value="" wicket:message="placeholder:110,title:110"/> - </div> + <div class="input-group mb-1 g-0"> + <span class="input-group-text"><i class="fa fa-lock"></i></span> + <input wicket:id="pass" class="form-control" type="password" value="" wicket:message="placeholder:110,title:110"/> </div> - <div class="form-group no-gutters" wicket:id="ldap"> - <div class="input-group"> - <div class="input-group-prepend"> - <span class="input-group-text"><i class="fa fa-users"></i></span> - </div> - <select wicket:id="domain" class="form-control" wicket:message="title:1118"></select> - </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> </div> - <div class="row form-group no-gutters"> + <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"/> @@ -68,7 +56,7 @@ </div> </div> <div wicket:id="feedback" class="error"></div> - <div class="row no-gutters"> + <div class="row g-0"> <div class="col-6"><a class="text-primary" wicket:id="privacy" target="_blank" rel="noopener noreferrer"><wicket:message key="register.privacy.statement"/></a></div> <div class="col-5"><a class="text-primary" wicket:id="netTest" target="_blank" rel="noopener noreferrer"><wicket:message key="1527"/></a></div> </div> 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 224721f..f0698d8 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 @@ -37,14 +37,12 @@ <div wicket:id="nickname" class="room-nickname-dialog"></div> <div wicket:id="client-kicked"></div> <div wicket:id="wait-moderator" class="wait-moder"></div> - <div id="room-local-settings" class="modal fade" tabindex="-1" role="dialog" data-backdrop="static" aria-hidden="true"> + <div id="room-local-settings" class="modal fade" tabindex="-1" role="dialog" data-bs-backdrop="static" aria-hidden="true"> <div class="modal-dialog modal-sm" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title"><wicket:message key="edit.settings"/></h5> - <button type="button" class="close" data-dismiss="modal" wicket:message="aria-label:85"> - <span aria-hidden="true">×</span> - </button> + <button type="button" class="btn-close" data-bs-dismiss="modal" wicket:message="aria-label:85"></button> </div> <div class="modal-body"> <h5><wicket:message key="video.muteothers"/></h5> @@ -78,20 +76,18 @@ </div> </div> </div> - <div id="disconnected-dlg" class="modal fade" tabindex="-1" role="dialog" data-backdrop="static" aria-hidden="true"> + <div id="disconnected-dlg" class="modal fade" tabindex="-1" role="dialog" data-bs-backdrop="static" aria-hidden="true"> <div class="modal-dialog modal-sm" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title"><wicket:message key="204"/></h5> - <button type="button" class="close" data-dismiss="modal" wicket:message="aria-label:85"> - <span aria-hidden="true">×</span> - </button> + <button type="button" class="close" data-bs-dismiss="modal" wicket:message="aria-label:85"></button> </div> <div class="modal-body"> <wicket:message key="556"/> </div> <div class="modal-footer"> - <button type="button" class="btn btn-outline-secondary" data-dismiss="modal"> + <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal"> <i class="fas fa-sync-alt"></i> <wicket:message key="753"/> </button> </div> @@ -125,10 +121,10 @@ <i class="m-2 warn fas fa-exclamation-triangle text-warning"></i><wicket:message key="ulist.user.muteothers.confirm"/> </div> <br/> - <input id="muteothers-confirm-dont-show" type="checkbox"/><label for="muteothers-confirm-dont-show" class="mr-2 ml-2"><wicket:message key="dont.ask.again"/></label> + <input id="muteothers-confirm-dont-show" type="checkbox"/><label for="muteothers-confirm-dont-show" class="mx-2"><wicket:message key="dont.ask.again"/></label> </div> <div id="clipboard-dialog" wicket:message="title:1121,data-btn-ok:54"> - <p><span class="ui-icon ui-icon-alert align-left mr-2 mt-2 mb-3 ml-0"></span><span class="text"></span></p> + <p><span class="ui-icon ui-icon-alert align-left ms-2 mt-2 mb-3 me-0"></span><span class="text"></span></p> </div> <div id="quick-vote-template"> <div class="close-btn btn btn-outline-secondary btn-sm" @@ -149,14 +145,14 @@ <div id="sharer" wicket:message="title:730"> <h2 class="alert text-warning">Screen-sharing is not supported in your browser</h2> <div class="container p-0 m-0"> - <div class="row-no-gutters"> + <div class="row g-0"> <label class="col-7"><wicket:message key="734"/></label> <select name="type" class="type col-4 custom-select"> <option value="screen">Screen</option> <option value="window">Window</option> </select> </div> - <div class="row-no-gutters"> + <div class="row g-0"> <label class="col-7"><wicket:message key="1089"/></label> <select name="fps" class="fps col-4 custom-select"> <option value="2">2 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 15434ce..b6a2363 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 @@ -20,14 +20,12 @@ <!DOCTYPE html> <html xmlns:wicket="http://wicket.apache.org"> <wicket:panel> - <div class="modal fade video" id="video-settings" data-backdrop="false" tabindex="-1" role="dialog" aria-labelledby="video-settings-title" aria-hidden="true"> + <div class="modal fade video" id="video-settings" data-bs-backdrop="false" tabindex="-1" role="dialog" aria-labelledby="video-settings-title" aria-hidden="true"> <div class="modal-dialog" role="document"> <div class="modal-content"> - <div class="modal-header p-0 pr-2 pl-2"> + <div class="modal-header p-0 px-2"> <h5 class="modal-title" id="video-settings-title"><wicket:message key="51"/></h5> - <button type="button" class="close p-0 pr-1 pl-1" data-dismiss="modal" aria-hidden="true" wicket:message="title:85,aria-label:85"> - × - </button> + <button type="button" class="close p-0 px-1" data-bs-dismiss="modal" aria-hidden="true" wicket:message="title:85,aria-label:85"></button> </div> <div class="modal-body"> <div class="title"><wicket:message key="758"/></div> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html index 53cb055..b18e23a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html @@ -22,7 +22,7 @@ <html xmlns:wicket="http://wicket.apache.org"> <wicket:panel> <div class="clickable control block bg-secondary" wicket:message="data-new-aa:notification.room.activity"> - <i class="fas ml-1 fa-angle-up"></i> + <i class="fas me-1 fa-angle-up"></i> <span class="badge badge-secondary">42</span> <div class="label"><wicket:message key="1363"/></div> </div> 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 1885736..afb23a0 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 @@ -22,18 +22,18 @@ <html xmlns:wicket="http://wicket.apache.org"> <wicket:extend> <form wicket:id="form"> - <div class="row form-group"> + <div class="row mb-1"> <div class="col-11"><wicket:message key="19"/></div> </div> - <div class="row form-group"> + <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"/> </div> - <div class="row form-group"> + <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> </div> - <div class="row form-group"> + <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"/> </div> 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 11d2463..7f99e9b 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 @@ -22,12 +22,12 @@ <html xmlns:wicket="http://wicket.apache.org"> <wicket:extend> <form wicket:id="form"> - <div class="row form-group"> + <div class="row mb-1"> <div class="col-11"> <span wicket:id="user"></span> <wicket:message key="36"/> </div> </div> - <div class="row form-group"> + <div class="row mb-1"> <div class="col-11"><span wicket:id="roomPoll.question"></span></div> </div> <div class="row"> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html index 26441e3..d4efebb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html @@ -33,7 +33,7 @@ <div class="error"></div> <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> - <div class="ml-3 d-none" id="room-upload-clean-block"> + <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> </div> </div> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html index 81fdd3c..c442b36 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html @@ -91,30 +91,20 @@ </div> <div id="wb-zoom" class="wb-zoom"> <div class="doc-group input-group input-group-sm"> - <div class="input-group-prepend"> - <button type="button" class="btn btn-outline-secondary up" wicket:message="title:256"> - <i class="fas fa-reply"></i> - </button> - </div> + <button type="button" class="btn btn-outline-secondary up" wicket:message="title:256"> + <i class="fas fa-reply"></i> + </button> <input class="curr-slide" type="number" min="1" max="1"/> - <div class="input-group-append"> - <div class="input-group-text"><wicket:message key="254"/></div> - </div> - <div class="input-group-append"> - <div class="last-page input-group-text">1</div> - </div> - <div class="input-group-append"> - <button type="button" class="btn btn-outline-secondary down" wicket:message="title:257"> - <i class="fas fa-share"></i> - </button> - </div> + <div class="input-group-text"><wicket:message key="254"/></div> + <div class="last-page input-group-text">1</div> + <button type="button" class="btn btn-outline-secondary down" wicket:message="title:257"> + <i class="fas fa-share"></i> + </button> </div> <div class="zoom-group input-group input-group-sm"> - <div class="input-group-prepend"> - <button type="button" class="btn btn-outline-secondary zoom-out" wicket:message="title:259"> - <i class="fas fa-search-minus"></i> - </button> - </div> + <button type="button" class="btn btn-outline-secondary zoom-out" wicket:message="title:259"> + <i class="fas fa-search-minus"></i> + </button> <select class="zoom text-dark" data-custom-val="1.20"> <option value="FULL_FIT"><wicket:message key="zoom.FULL_FIT"/></option> <option value="PAGE_WIDTH"><wicket:message key="zoom.PAGE_WIDTH"/></option> @@ -128,11 +118,9 @@ <option value="3.00">300%</option> <option value="4.00">400%</option> </select> - <div class="input-group-append"> - <button type="button" class="btn btn-outline-secondary zoom-in" wicket:message="title:260"> - <i class="fas fa-search-plus"></i> - </button> - </div> + <button type="button" class="btn btn-outline-secondary zoom-in" wicket:message="title:260"> + <i class="fas fa-search-plus"></i> + </button> </div> <div class="settings-group"> <button type="button" class="btn btn-outline-secondary btn-sm settings" wicket:message="title:lbl.settings.whiteboard"> @@ -209,14 +197,12 @@ <div class="status"></div> </div> </div> - <div id="wb-settings" class="wb-settings modal fade" tabindex="-1" role="dialog" data-backdrop="false" aria-hidden="true"> + <div id="wb-settings" class="wb-settings modal fade" tabindex="-1" role="dialog" data-bs-backdrop="false" aria-hidden="true"> <div class="modal-dialog modal-sm" role="document"> <div class="modal-content"> <div class="modal-header"> <h5 class="modal-title"><wicket:message key="4"/></h5> - <button type="button" class="close" data-dismiss="modal" wicket:message="aria-label:85"> - <span aria-hidden="true">×</span> - </button> + <button type="button" class="btn-close" data-bs-dismiss="modal" wicket:message="aria-label:85"></button> </div> <div class="modal-body"> <div class="om-tbl"> @@ -234,7 +220,7 @@ <button type="button" class="btn btn-outline-primary btn-ok"> <wicket:message key="54"/> </button> - <button type="button" class="btn btn-outline-secondary" data-dismiss="modal"> + <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal"> <wicket:message key="lbl.cancel"/> </button> </div> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html index 93eb6ec..f7e0a98 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html @@ -21,19 +21,19 @@ <!DOCTYPE html> <html xmlns:wicket="http://wicket.apache.org"> <wicket:extend> - <div class="row no-gutters"> + <div class="row g-0"> <div class="col-6"><wicket:message key="165"/></div> <div class="col-6" wicket:id="name"></div> </div> - <div class="row no-gutters"> + <div class="row g-0"> <div class="col-6"><wicket:message key="1551"/></div> <div class="col-6" wicket:id="version"></div> </div> - <div class="row no-gutters"> + <div class="row g-0"> <div class="col-6"><wicket:message key="1552"/></div> <div class="col-6" wicket:id="revision"></div> </div> - <div class="row no-gutters"> + <div class="row g-0"> <div class="col-6"><wicket:message key="1553"/></div> <div class="col-6" wicket:id="buildDate"></div> </div> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java index 4c51295..9100e9b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java @@ -222,7 +222,7 @@ public class AppointmentDialog extends Modal<Appointment> { } }); enterRoom.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true); - enterRoom.add(AttributeModifier.append("data-dismiss", "modal")); + enterRoom.add(AttributeModifier.append("data-bs-dismiss", "modal")); delete = new BootstrapAjaxLink<>(BUTTON_MARKUP_ID, null, Buttons.Type.Outline_Danger, new ResourceModel("80")) { private static final long serialVersionUID = 1L; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html index 7bd1581..762d545 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html @@ -30,9 +30,7 @@ <div class="chat-msg-container"> <div class="input-group"> <div id="chatMessage" wicket:id="chatMessage"></div> - <div class="input-group-append" id="button-addon4"> - <button class="send btn btn-outline-primary" wicket:id="send" wicket:message="title:218">↵</button> - </div> + <button class="send btn btn-outline-primary" wicket:id="send" wicket:message="title:218">↵</button> </div> <input type="hidden" wicket:id="activeTab" id="activeChatTab"/> </div> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html index 1792579..b7f6c03 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.html @@ -22,7 +22,7 @@ <wicket:panel> <div id="chatPopup" class="bg-light"> <div class="control block clickable bg-secondary" wicket:message="data-ttl-dock:label.dock.panel,data-ttl-undock:label.undock.panel,data-new-msg:notification.chat.message"> - <i class="fas ml-1"></i> + <i class="fas me-1"></i> <div class="label"><wicket:message key="244"/></div> </div> <div wicket:id="chat"></div> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html index 919d3c1..3edfb5c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html @@ -26,7 +26,7 @@ <span class="navbar-toggler-icon"></span> </button> <div class="collapse navbar-collapse" id="navbarChatContent"> - <ul class="navbar-nav mr-auto"> + <ul class="navbar-nav ms-auto"> <li class="nav-item dropup"> <a id="emoticons" class="chat btn btn-outline-secondary emt dropdown-toggle nav-link" data-toggle="dropdown" title="Emoticons"></a> <ul class="chat dropdown-menu" > diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html index 482bf66..36d5a89 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/InvitationsPanel.html @@ -52,23 +52,23 @@ <fieldset> <legend><wicket:message key="profile.invitation" /></legend> <div class="formelement"> - <div class="row no-gutters"> + <div class="row g-0"> <label class="col-6"><wicket:message key="188" /></label> <span class="input col-6" wicket:id="id"></span> </div> - <div class="row no-gutters"> + <div class="row g-0"> <label class="col-6"><wicket:message key="526" /></label> <span class="input col-6" wicket:id="valid"></span> </div> - <div class="row no-gutters"> + <div class="row g-0"> <label class="col-6"><wicket:message key="216" /></label> <span class="input col-6" wicket:id="invitee"></span> </div> - <div class="row no-gutters"> + <div class="row g-0"> <label class="col-6"><wicket:message key="530" /></label> <span class="input col-6" wicket:id="validFrom"></span> </div> - <div class="row no-gutters"> + <div class="row g-0"> <label class="col-6"><wicket:message key="531" /></label> <span class="input col-6" wicket:id="validTo"></span> </div> 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 8eb56ed..67c7cef 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 @@ -89,15 +89,15 @@ <div wicket:id="selectedMessage"> <table class="w-100"> <tr> - <td class="pr-4"><wicket:message key="1202"/></td> + <td class="ps-4"><wicket:message key="1202"/></td> <td wicket:id="from"></td> </tr> <tr> - <td class="pr-4"><wicket:message key="1210"/></td> + <td class="ps-4"><wicket:message key="1210"/></td> <td wicket:id="to"></td> </tr> <tr> - <td class="pr-4"><wicket:message key="1211"/></td> + <td class="ps-4"><wicket:message key="1211"/></td> <td wicket:id="subj"></td> </tr> </table> 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 df8c22f..5313e19 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 @@ -35,7 +35,7 @@ <button wicket:id="submit" type="button"></button> </form> </div> - <div wicket:id="container" class="pl-3 h-100"> + <div wicket:id="container" class="pe-3 h-100"> <div><strong><wicket:message key="1184"/></strong> <div class="adminNav" wicket:id="navigator"></div></div> <table id="searchUsersTable" class="list-table table-striped table-hover"> <thead> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html index 8a6b9d6..359bdbe 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html @@ -41,7 +41,7 @@ <label><wicket:message key="407" /></label> </div> <div class="tableWrapper overflow-y-auto" id="adminTable" wicket:id="clientsContainer"> - <div class="row no-gutters" wicket:id="clients"> + <div class="row g-0" wicket:id="clients"> <div class="col-2"> <img class="img-fluid" wicket:id="clientImage"/> </div> diff --git a/pom.xml b/pom.xml index d332992..0ce30fe 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ <wicket.version>9.3.0</wicket.version> <wicket-jquery-ui.version>9.3.2</wicket-jquery-ui.version> <wicketstuff.version>9.3.0</wicketstuff.version> - <wicket-bootstrap.version>5.0.5</wicket-bootstrap.version> + <wicket-bootstrap.version>6.0.0-SNAPSHOT</wicket-bootstrap.version> <font-awesome.version>5.15.3</font-awesome.version> <spring.version>5.3.8</spring.version> <tomcat.version>9.0.48</tomcat.version>