Use Wicket Bootstrap - Fix example project

Author: MarcGiffing

README.adoc

@@ -2,7 +2,8 @@
 
 Current release version:
 
-* 4.0.x - http://wicket.apache.org/[Wicket 10.x] with Spring Boot 3.2.x - Branch master
+* 4.1.x - http://wicket.apache.org/[Wicket 10.2] with Spring Boot 3.3.4 - Branch master
+* 4.0.x - http://wicket.apache.org/[Wicket 10.0] with Spring Boot 3.2.x - Branch master
 
 NOTE: http://search.maven.org/#search|ga|1|com.giffing.wicket.spring.boot
 

wicket-spring-boot-starter-example/pom.xml

@@ -18,6 +18,7 @@
 		<maven.deploy.skip>true</maven.deploy.skip>
 		<maven-processor-plugin.version>5.1-jdk8</maven-processor-plugin.version>
 		<maven.javadoc.skip>true</maven.javadoc.skip>
+		<wicket-bootstrap.version>7.0.8</wicket-bootstrap.version>
 	</properties>
 
 	<dependencies>
@@ -49,6 +50,29 @@
 			<groupId>org.wicketstuff</groupId>
 			<artifactId>wicketstuff-annotation</artifactId>
 		</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-extensions</artifactId>
+			<version>${wicket-bootstrap.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>de.agilecoders.wicket</groupId>
+			<artifactId>wicket-bootstrap-sass</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.wicketstuff</groupId>
 			<artifactId>wicketstuff-htmlcompressor</artifactId>
@@ -81,11 +105,6 @@
 			<groupId>org.wicketstuff</groupId>
 			<artifactId>wicketstuff-serializer-fast2</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>bootstrap</artifactId>
-			<version>5.3.3</version>
-		</dependency>
 		<dependency>
 			<groupId>de.agilecoders.wicket</groupId>
 			<artifactId>jquery-selectors</artifactId>

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/model/Customer.java

@@ -18,8 +18,6 @@ public class Customer implements Domain<Long>, Serializable {
 
 	private String username;
 
-	private String password;
-	
 	private String firstname;
 
 	private String lastname;
@@ -35,14 +33,6 @@ public void setId(Long id) {
 		this.id = id;
 	}
 
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
 	public String getUsername() {
 		return username;
 	}

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/assets/base/FixBootstrapStylesCssResourceReference.java

@@ -0,0 +1,12 @@
+package com.giffing.wicket.spring.boot.example.web.assets.base;
+
+import org.apache.wicket.request.resource.CssResourceReference;
+
+public class FixBootstrapStylesCssResourceReference extends CssResourceReference {
+
+    public static final FixBootstrapStylesCssResourceReference INSTANCE = new FixBootstrapStylesCssResourceReference();
+
+    public FixBootstrapStylesCssResourceReference() {
+        super(FixBootstrapStylesCssResourceReference.class, "fix.css");
+    }
+}

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/assets/base/fix.css

@@ -0,0 +1,3 @@
+.navbar {
+    --bs-navbar-padding-x: 1;
+}

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/general/action/panel/items/AbstractActionItemLink.java

@@ -21,7 +21,7 @@ public void onClick(AjaxRequestTarget target) {
 		};
 		add(link);
 		WebMarkupContainer webMarkupContainer = new WebMarkupContainer("icon-type");
-		webMarkupContainer.add(new AttributeAppender("class", "glyphicon glyphicon-" + iconType.getCssName()));
+		webMarkupContainer.add(new AttributeAppender("class", iconType.getCssName()));
 		link.add(webMarkupContainer);
 	}
 

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/general/action/panel/items/links/ActionItemLink.java

@@ -13,7 +13,7 @@ public class ActionItemLink extends AbstrractActionItem {
 	public ActionItemLink(IModel<String> label, IconType iconType, AbstractLink link) {
 		add(link);
 		WebMarkupContainer webMarkupContainer = new WebMarkupContainer("icon-type");
-		webMarkupContainer.add(new AttributeAppender("class", "glyphicon glyphicon-" + iconType.getCssName()));
+		webMarkupContainer.add(new AttributeAppender("class", "fa-solid fa-" + iconType.getCssName()));
 		link.add(webMarkupContainer);
 	}
 

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/general/action/panel/items/yesno/YesNoLink.java

@@ -1,12 +1,13 @@
 package com.giffing.wicket.spring.boot.example.web.general.action.panel.items.yesno;
 
+import com.giffing.wicket.spring.boot.example.web.pages.BasePage;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.panel.EmptyPanel;
 import org.apache.wicket.model.IModel;
 
 import com.giffing.wicket.spring.boot.example.web.general.action.panel.items.AbstractActionItemLink;
 import com.giffing.wicket.spring.boot.example.web.general.icons.IconType;
 import com.giffing.wicket.spring.boot.example.web.html.modal.YesNoModal;
-import com.giffing.wicket.spring.boot.example.web.pages.BasePage;
 
 public abstract class YesNoLink<T> extends AbstractActionItemLink<T>{
 
@@ -21,11 +22,12 @@ public void onClick(AjaxRequestTarget target) {
 			@Override
 			protected void yesClicked(AjaxRequestTarget target) {
 				YesNoLink.this.yesClicked(target);
-				this.close(target);
+				close(target);
+				((BasePage)getPage()).replaceDefaultModal( new EmptyPanel("defaultModal"), target);
 			}
 		};
-		((BasePage)getPage()).replaceDefaultModal(yesNoModal);
-		yesNoModal.open(target);
+		((BasePage)getPage()).replaceDefaultModal(yesNoModal, target);
+		yesNoModal.appendShowDialogJavaScript(target);
 	}
 
 	protected abstract void yesClicked(AjaxRequestTarget target);

wicket-spring-boot-starter-example/src/main/java/com/giffing/wicket/spring/boot/example/web/general/icons/IconType.java

@@ -1,9 +1,11 @@
 package com.giffing.wicket.spring.boot.example.web.general.icons;
 
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+
 public enum IconType {
-	CREATE("plus"),
-	EDIT("edit"),
-	DELETE("remove");
+	CREATE(FontAwesome6IconType.plus_s.cssClassName()),
+	EDIT(FontAwesome6IconType.pen_s.cssClassName()),
+	DELETE(FontAwesome6IconType.minus_s.cssClassName());
 
 	private String cssType;