This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/csp by this push:
new 7213313 [OPENMEETINGS-2165] basic initial steps to migrate to
bootstrap
7213313 is described below
commit 72133131649de8ea6c67f1b6a856691870698d08
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Jan 24 00:23:40 2020 +0700
[OPENMEETINGS-2165] basic initial steps to migrate to bootstrap
---
openmeetings-web/pom.xml | 10 ++++++++++
.../java/org/apache/openmeetings/web/app/Application.java | 14 ++++++++++++++
.../openmeetings/web/pages/auth/ForgetPasswordDialog.java | 6 +++---
.../apache/openmeetings/web/pages/auth/RegisterDialog.java | 6 +++---
.../openmeetings/web/pages/auth/ResetPasswordDialog.java | 6 +++---
.../apache/openmeetings/web/pages/auth/SignInDialog.java | 6 +++---
pom.xml | 3 ++-
7 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 95b86a7..2e39289 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -660,6 +660,16 @@
<version>${wickets.version}</version>
</dependency>
<dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-core</artifactId>
+ <version>${wicket-bootstrap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-themes</artifactId>
+ <version>${wicket-bootstrap.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index f64d741..32d0674 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -141,6 +141,15 @@ import com.hazelcast.core.MemberAttributeEvent;
import com.hazelcast.core.MembershipEvent;
import com.hazelcast.core.MembershipListener;
+import de.agilecoders.wicket.core.Bootstrap;
+import
de.agilecoders.wicket.core.markup.html.references.PopperJavaScriptReference;
+import de.agilecoders.wicket.core.settings.BootstrapSettings;
+import de.agilecoders.wicket.core.settings.IBootstrapSettings;
+import de.agilecoders.wicket.core.settings.SingleThemeProvider;
+import
de.agilecoders.wicket.themes.markup.html.material_design.MaterialDesignTheme;
+import de.agilecoders.wicket.webjars.WicketWebjars;
+import de.agilecoders.wicket.webjars.settings.WebjarsSettings;
+
@Component
public class Application extends AuthenticatedWebApplication implements
IApplication {
private static final Logger log =
LoggerFactory.getLogger(Application.class);
@@ -268,6 +277,11 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
}
});
super.init();
+ WicketWebjars.install(this, new WebjarsSettings());
+ final IBootstrapSettings settings = new BootstrapSettings();
+ settings.setThemeProvider(new SingleThemeProvider(new
MaterialDesignTheme()));
+
settings.setPopperJsResourceReference(PopperJavaScriptReference.instance());
+
Bootstrap.builder().withBootstrapSettings(settings).install(this);
// register some widgets
final DashboardContext dashboardContext = getDashboardContext();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
index 03dd837..9be2f6b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
@@ -55,18 +55,18 @@ import org.apache.wicket.validation.Validatable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
-import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
+
+import
de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
public class ForgetPasswordDialog extends AbstractFormDialog<String> {
private static final Logger log =
LoggerFactory.getLogger(ForgetPasswordDialog.class);
private static final long serialVersionUID = 1L;
private DialogButton send;
private DialogButton cancel;
- private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
+ private final NotificationPanel feedback = new
NotificationPanel("feedback");
private final IValidator<String> emailValidator =
RfcCompliantEmailAddressValidator.getInstance();
private final RequiredTextField<String> name = new
RequiredTextField<>("name", Model.of((String)null));
private final RadioGroup<Type> rg = new RadioGroup<>("type",
Model.of(Type.email));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
index bf2818e..df7fdd1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
@@ -57,17 +57,17 @@ import org.apache.wicket.validation.IValidatable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
-import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
+
+import
de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
public class RegisterDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
private static final Logger log =
LoggerFactory.getLogger(RegisterDialog.class);
private DialogButton cancelBtn;
private DialogButton registerBtn;
- private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
+ private final NotificationPanel feedback = new
NotificationPanel("feedback");
private final IModel<String> tzModel =
Model.of(WebSession.get().getClientTZCode());
private RegisterForm form;
private SignInDialog s;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
index 665a89d..d388b41 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
@@ -38,16 +38,16 @@ import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
-import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
-import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
+
+import
de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
public class ResetPasswordDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
private DialogButton resetBtn;
private Form<String> form = new ResetForm("form");
- private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
+ private final NotificationPanel feedback = new
NotificationPanel("feedback");
private PasswordTextField password;
private final User user;
MessageDialog confirmReset;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index 0698b44..d89cfb0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -69,11 +69,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
-import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.effect.JQueryEffectBehavior;
import com.googlecode.wicket.jquery.ui.form.button.Button;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
-import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
+
+import
de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
public class SignInDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
@@ -88,7 +88,7 @@ public class SignInDialog extends NonClosableDialog<String> {
private ForgetPasswordDialog f;
private LdapConfig domain;
private SignInPage page;
- private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
+ private final NotificationPanel feedback = new
NotificationPanel("feedback");
@SpringBean
private ConfigurationDao cfgDao;
@SpringBean
diff --git a/pom.xml b/pom.xml
index 7b1b35e..aaf39e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,8 @@
<junit.version>5.5.2</junit.version>
<wicket.version>9.0.0-M5-SNAPSHOT</wicket.version>
<wicketju.version>9.0.0-SNAPSHOT</wicketju.version>
- <wickets.version>9.0.0-M4</wickets.version>
+ <wickets.version>9.0.0-M5-SNAPSHOT</wickets.version>
+
<wicket-bootstrap.version>4.0.0-M1-SNAPSHOT</wicket-bootstrap.version>
<red5-client.version>1.2.3</red5-client.version>
<spring.version>5.2.3.RELEASE</spring.version>
<mina.version>2.1.3</mina.version>
