This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push: new 08fbc69 [OPENMEETINGS-2706] confirm popup should be functional 08fbc69 is described below commit 08fbc69fa541b7badff9077301987cfa721bc5c3 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Mon Nov 22 22:40:19 2021 +0700 [OPENMEETINGS-2706] confirm popup should be functional --- openmeetings-web/src/main/front/wb/src/wb-tools.js | 1 + .../common/confirmation/ConfirmationHelper.java | 25 +++++++++++++++------- .../openmeetings/web/user/chat/ChatToolbar.java | 2 +- openmeetings-web/src/main/webapp/css/raw-chat.css | 3 +++ pom.xml | 2 +- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/openmeetings-web/src/main/front/wb/src/wb-tools.js b/openmeetings-web/src/main/front/wb/src/wb-tools.js index 321ba15..6b4e223 100644 --- a/openmeetings-web/src/main/front/wb/src/wb-tools.js +++ b/openmeetings-web/src/main/front/wb/src/wb-tools.js @@ -324,6 +324,7 @@ module.exports = class WbTools { const clearAll = tools.find('.om-icon.clear-all') , sBtn = tools.find('.om-icon.settings');; + clearAll.attr('data-bs-placement', Settings.isRtl ? 'right' : 'left'); let _firstToolItem = true; switch (role) { case Role.PRESENTER: diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationHelper.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationHelper.java index b3a06cc..444452e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationHelper.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationHelper.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.web.common.confirmation; +import java.util.function.Consumer; + import org.apache.wicket.Component; import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior; @@ -28,17 +30,24 @@ public class ConfirmationHelper { return new ConfirmationBehavior(newOkCancelConfirmCfg(c, title)); } - public static ConfirmationConfig newOkCancelConfirmCfg(Component c, String title) { + public static ConfirmationBehavior newOkCancelDangerConfirm(Component c, String title) { + return newOkCancelDangerConfirm(c, title, null); + } + + public static ConfirmationBehavior newOkCancelDangerConfirm(Component c, String title, Consumer<ConfirmationConfig> cfgCustomizer) { + ConfirmationConfig cfg = newOkCancelConfirmCfg(c, title) + .withBtnOkClass("btn btn-sm btn-danger") + .withBtnOkIconClass("fas fa-exclamation-triangle"); + if (cfgCustomizer != null) { + cfgCustomizer.accept(cfg); + } + return new ConfirmationBehavior(cfg); + } + + private static ConfirmationConfig newOkCancelConfirmCfg(Component c, String title) { return new ConfirmationConfig() .withBtnCancelLabel(c.getString("lbl.cancel")) .withBtnOkLabel(c.getString("54")) .withTitle(title); } - - public static ConfirmationBehavior newOkCancelDangerConfirm(Component c, String title) { - return new ConfirmationBehavior(newOkCancelConfirmCfg(c, title) - .withBtnOkClass("btn btn-sm btn-danger") - .withBtnOkIconClass("fas fa-exclamation-triangle") - ); - } } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java index eb4394a..1273f7c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java @@ -209,7 +209,7 @@ public class ChatToolbar extends Panel implements IWysiwygToolbar { }); } }; - delBtn.add(newOkCancelDangerConfirm(this, getString("832"))); + delBtn.add(newOkCancelDangerConfirm(this, getString("832"), cfg -> cfg.withCustomClass("chat-delete"))); toolbar.add(delBtn.setVisible(hasAdminLevel(getRights())).setOutputMarkupId(true) .setOutputMarkupPlaceholderTag(true)); toolbar.add(save.setVisible(hasAdminLevel(getRights())).setOutputMarkupId(true) diff --git a/openmeetings-web/src/main/webapp/css/raw-chat.css b/openmeetings-web/src/main/webapp/css/raw-chat.css index bfaf9c2..4b3d707 100644 --- a/openmeetings-web/src/main/webapp/css/raw-chat.css +++ b/openmeetings-web/src/main/webapp/css/raw-chat.css @@ -7,6 +7,9 @@ width: var(--chat-width); height: var(--chat-height); } +.chat-delete.confirmation { + z-index: 2001; +} #chatPanel #chatPopup { height: 100%; } diff --git a/pom.xml b/pom.xml index 5108d02..d514b8e 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ <wicket.version>9.6.0</wicket.version> <wicket-jquery-ui.version>9.5.0</wicket-jquery-ui.version> <wicketstuff.version>9.6.0</wicketstuff.version> - <wicket-bootstrap.version>6.0.0-M4</wicket-bootstrap.version> + <wicket-bootstrap.version>6.0.0-M6-SNAPSHOT</wicket-bootstrap.version> <font-awesome.version>5.15.4</font-awesome.version> <spring.version>5.3.13</spring.version> <tomcat.version>9.0.55</tomcat.version>