This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit fee30bd7446cdd34dbe2e1c1c42c77bd0b81c175
Merge: ebddc8e 37c12d6
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Thu Aug 26 22:54:05 2021 +0700
[OPENMEETINGS-2637] Merge branch 'bootstrap-5'
openmeetings-web/src/main/front/chat/src/chat.js | 2 +-
.../src/main/front/main/src/omutils.js | 4 +-
.../openmeetings/web/admin/AdminActionsPanel.java | 2 +-
.../openmeetings/web/admin/AdminBasePanel.html | 2 +-
.../web/admin/configurations/ConfigsPanel.html | 2 +-
.../web/admin/connection/ConnectionsPanel.html | 4 +-
.../web/admin/connection/ConnectionsPanel.java | 2 +-
.../openmeetings/web/admin/email/EmailForm.java | 2 +-
.../openmeetings/web/admin/email/EmailPanel.html | 4 +-
.../openmeetings/web/admin/extra/ExtraPanel.html | 2 +-
.../web/admin/groups/GroupUsersPanel.html | 4 +-
.../web/admin/groups/GroupUsersPanel.java | 6 +-
.../openmeetings/web/admin/groups/GroupsPanel.html | 2 +-
.../openmeetings/web/admin/labels/LangPanel.html | 24 +-
.../openmeetings/web/admin/labels/LangPanel.java | 2 +-
.../openmeetings/web/admin/ldaps/LdapsPanel.html | 2 +-
.../openmeetings/web/admin/oauth/OAuthForm.java | 2 +-
.../openmeetings/web/admin/oauth/OAuthPanel.html | 6 +-
.../openmeetings/web/admin/rooms/RoomForm.java | 6 +-
.../openmeetings/web/admin/rooms/RoomsPanel.html | 14 +-
.../web/admin/users/PasswordDialog.html | 2 +-
.../openmeetings/web/admin/users/UsersPanel.html | 2 +-
.../openmeetings/web/common/FormActionsPanel.java | 2 +-
.../apache/openmeetings/web/common/MainPanel.java | 2 +-
.../apache/openmeetings/web/common/NameDialog.html | 2 +-
.../web/common/PagedEntityListPanel.html | 4 +-
.../web/common/PagingNavigatorPanel.html | 4 +-
.../web/common/UploadableImagePanel.java | 2 +-
.../common/confirmation/ConfirmationBehavior.java | 112 ----
.../common/confirmation/ConfirmationConfig.java | 114 ----
.../common/confirmation/ConfirmationHelper.java | 44 ++
.../common/confirmation/bootstrap-confirmation.js | 596 ---------------------
.../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/NetTestPanel.html | 32 +-
.../apache/openmeetings/web/room/RoomPanel.html | 28 +-
.../openmeetings/web/room/VideoSettings.html | 10 +-
.../web/room/activities/ActivitiesPanel.html | 4 +-
.../web/room/poll/CreatePollDialog.html | 8 +-
.../web/room/poll/PollResultsDialog.java | 2 +-
.../openmeetings/web/room/poll/VoteDialog.html | 4 +-
.../apache/openmeetings/web/room/raw-nettest.js | 2 +-
.../openmeetings/web/room/sidebar/RoomSidebar.html | 8 +-
.../web/room/sidebar/UploadDialog.html | 2 +-
.../apache/openmeetings/web/room/wb/WbPanel.html | 62 +--
.../apache/openmeetings/web/user/AboutDialog.html | 8 +-
.../openmeetings/web/user/OmWysiwygToolbar.html | 4 +-
.../web/user/calendar/AppointmentDialog.html | 6 +-
.../web/user/calendar/AppointmentDialog.java | 4 +-
.../web/user/calendar/CalendarDialog.java | 2 +-
.../apache/openmeetings/web/user/chat/Chat.html | 4 +-
.../openmeetings/web/user/chat/ChatPanel.html | 2 +-
.../openmeetings/web/user/chat/ChatToolbar.html | 14 +-
.../openmeetings/web/user/chat/ChatToolbar.java | 4 +-
.../web/user/dashboard/RssWidgetView.html | 4 +-
.../web/user/dashboard/StartWidgetView.html | 8 +-
.../dashboard/admin/AdminCleanupInfoDialog.java | 2 +-
.../apache/openmeetings/web/user/dashboard/rss.js | 2 +-
.../web/user/profile/InvitationDetails.java | 2 +-
.../web/user/profile/InvitationsPanel.html | 12 +-
.../web/user/profile/MessagesContactsPanel.html | 6 +-
.../web/user/profile/MessagesContactsPanel.java | 2 +-
.../web/user/profile/UserSearchPanel.html | 4 +-
.../web/user/profile/WidgetsPanel.html | 2 +-
.../openmeetings/web/user/rooms/RoomsPanel.html | 2 +-
.../src/main/webapp/css/raw-activities.css | 2 +-
openmeetings-web/src/main/webapp/css/raw-admin.css | 4 +-
openmeetings-web/src/main/webapp/css/raw-chat.css | 2 +-
.../src/main/webapp/css/raw-general.css | 11 +-
openmeetings-web/src/main/webapp/css/raw-menu.css | 4 +-
.../src/main/webapp/css/raw-nettest.css | 20 +-
openmeetings-web/src/main/webapp/css/raw-room.css | 58 +-
openmeetings-web/src/main/webapp/css/raw-tree.css | 18 +-
openmeetings-web/src/main/webapp/css/raw-wb.css | 2 +-
.../openmeetings/web/pages/TestHashPage.java | 4 +-
pom.xml | 2 +-
80 files changed, 318 insertions(+), 1139 deletions(-)
diff --cc
openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
index 10a7605,9c5e899..469b535
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
@@@ -40,10 -40,10 +40,10 @@@ import org.apache.wicket.markup.repeate
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
--import de.agilecoders.wicket.core.markup.html.bootstrap.badge.BadgeBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.badge.BootstrapBadge;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
++import
de.agilecoders.wicket.core.markup.html.bootstrap.utilities.BackgroundColorBehavior;
import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType;
public class GroupUsersPanel extends Panel {
@@@ -95,7 -95,7 +95,7 @@@
del.setIconType(FontAwesome5IconType.times_s)
.add(newOkCancelDangerConfirm(this, getString("833")));
item.add(del);
-- item.add(new BootstrapBadge("new", new
ResourceModel("lbl.new"),
BadgeBehavior.Type.Warning).setVisible((grpUser.getId() == null)));
++ item.add(new BootstrapBadge("new", new
ResourceModel("lbl.new"),
BackgroundColorBehavior.Color.Warning).setVisible((grpUser.getId() == null)));
}
};
add(dataView).setOutputMarkupId(true);
diff --cc
openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
index b93776d,6048d49..afcb9b9
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
@@@ -80,11 -80,11 +80,11 @@@ import org.wicketstuff.select2.Response
import org.wicketstuff.select2.Select2Choice;
import org.wicketstuff.select2.Select2MultiChoice;
--import de.agilecoders.wicket.core.markup.html.bootstrap.badge.BadgeBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.badge.BootstrapBadge;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButton;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
++import
de.agilecoders.wicket.core.markup.html.bootstrap.utilities.BackgroundColorBehavior;
import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType;
public class RoomForm extends AdminBaseForm<Room> {
@@@ -325,7 -325,7 +325,7 @@@
.add(name)
.add(new Label("email",
moderator.getUser().getAddress().getEmail()))
.add(del)
-- .add(new BootstrapBadge("new", new
ResourceModel("lbl.new"),
BadgeBehavior.Type.Warning).setVisible((moderator.getId() == null)));
++ .add(new BootstrapBadge("new", new
ResourceModel("lbl.new"),
BackgroundColorBehavior.Color.Warning).setVisible((moderator.getId() == null)));
}
}).setOutputMarkupId(true));
diff --cc
openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
index 92e5195,92e5195..e94fa3c
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
@@@ -25,7 -25,7 +25,7 @@@ import static org.apache.openmeetings.w
import static org.apache.openmeetings.web.pages.HashPage.PANEL_MAIN;
import static org.apache.openmeetings.web.pages.HashPage.PANEL_RECORDING;
import static org.apache.openmeetings.web.util.OmUrlFragment.CHILD_ID;
--import static org.junit.Assert.assertTrue;
++import static org.junit.Assert.assertEquals;
import java.util.Date;
import java.util.UUID;
@@@ -67,7 -67,7 +67,7 @@@ class TestHashPage extends AbstractWick
private void checkAccessDenied(boolean visible) {
@SuppressWarnings("unchecked")
Modal<String> dlg =
(Modal<String>)tester.getComponentFromLastRenderedPage("access-denied");
-- assertTrue(tester.getLastResponseAsString().contains("$('#" +
dlg.getMarkupId() + "').modal({keyboard:true, show:" + visible + "});"));
++ assertEquals(visible,
tester.getLastResponseAsString().contains("new
bootstrap.Modal(document.getElementById('" + dlg.getMarkupId() +
"')).show();"));
}
private void checkAccessDenied(PageParameters pp) {
diff --cc pom.xml
index 6b2dae0,c7ea575..659c2a1
--- a/pom.xml
+++ b/pom.xml
@@@ -81,11 -80,11 +81,11 @@@
<junit.version>5.7.1</junit.version>
<wicket.version>9.4.0</wicket.version>
<wicket-jquery-ui.version>9.3.2</wicket-jquery-ui.version>
- <wicketstuff.version>9.3.0</wicketstuff.version>
-
<wicket-bootstrap.version>6.0.0-SNAPSHOT</wicket-bootstrap.version>
+ <wicketstuff.version>9.4.0</wicketstuff.version>
- <wicket-bootstrap.version>5.0.5</wicket-bootstrap.version>
++ <wicket-bootstrap.version>6.0.0-M2</wicket-bootstrap.version>
<font-awesome.version>5.15.3</font-awesome.version>
- <spring.version>5.3.8</spring.version>
- <tomcat.version>9.0.50</tomcat.version>
+ <spring.version>5.3.9</spring.version>
+ <tomcat.version>9.0.52</tomcat.version>
<ical4j.version>3.0.21</ical4j.version>
<cxf.version>3.4.4</cxf.version>
<io.prometheus.version>0.11.0</io.prometheus.version>
