add custom homepage banner feature

ngandinh · ngandinh · commit 62b832986af2 · 2022-04-02T21:43:47.000-04:00
diff --git a/src/main/java/com/github/chipolaris/bootforum/DataInitializer.java b/src/main/java/com/github/chipolaris/bootforum/DataInitializer.java
@@ -303,6 +303,8 @@ private void createDisplayOption() {
 			displayOption.setThemeColor("w3-theme-light-blue");
 			displayOption.setThemeComponent("saga");
 			
+			displayOption.setHomePageBannerContent(HOMEPAGE_BANNER_CONTENT);
+			
 			displayOption.setShowMostCommentsDiscussions(true);
 			displayOption.setNumMostCommentsDiscussions(5);
 			
@@ -321,6 +323,9 @@ private void createDisplayOption() {
 		applicationEventPublisher.publishEvent(new DisplayOptionLoadEvent(this, displayOption));
 	}
 	
+	private static final String HOMEPAGE_BANNER_CONTENT = "<div class=\"w3-theme-dark w3-opacity-min w3-center\" "
+			+ "style=\"margin: 0 -16px;padding:16px;\"><h3>Welcome to BootForum</h3></div>";
+	
 	private void createRemoteIPFilterOption() {
 		
 		RemoteIPFilterOption remoteIPFilterOption = genericService.findEntity(RemoteIPFilterOption.class, 1L).getDataObject();
diff --git a/src/main/java/com/github/chipolaris/bootforum/domain/DisplayOption.java b/src/main/java/com/github/chipolaris/bootforum/domain/DisplayOption.java
@@ -2,13 +2,15 @@
 
 import java.util.List;
 
+import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
+import javax.persistence.Lob;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderColumn;
 import javax.persistence.Table;
@@ -26,6 +28,10 @@ public class DisplayOption extends BaseEntity {
 	@Column(name="THEME_COMPONENT")
 	private String themeComponent;
 	
+	@Lob @Basic(fetch=FetchType.LAZY) 
+	@Column(name="HOMEPAGE_BANNER_CONTENT")
+	private String homePageBannerContent; // HTML content for homepage's welcome area
+	
 	@Column(name = "SHOW_MOST_VIEWS_DIS")
 	private boolean showMostViewsDiscussions;
 	
@@ -79,6 +85,13 @@ public void setThemeComponent(String themeComponent) {
 		this.themeComponent = themeComponent;
 	}
 	
+	public String getHomePageBannerContent() {
+		return homePageBannerContent;
+	}
+	public void setHomePageBannerContent(String homePageBannerContent) {
+		this.homePageBannerContent = homePageBannerContent;
+	}
+	
 	public boolean isShowMostViewsDiscussions() {
 		return showMostViewsDiscussions;
 	}
diff --git a/src/main/java/com/github/chipolaris/bootforum/jsf/bean/ManageDisplay.java b/src/main/java/com/github/chipolaris/bootforum/jsf/bean/ManageDisplay.java
@@ -67,7 +67,7 @@ public void onLoad() {
 		this.tagDualList = new DualListModel<>(allTags, currentDisplayTags);
 	}
 
-	public void edit() {
+	public void update() {
 		
 		logger.info("Updating display options ");
 		
diff --git a/src/main/resources/ResourceBundle/messages_en.properties b/src/main/resources/ResourceBundle/messages_en.properties
@@ -238,6 +238,8 @@ email.management=Email Management
 
 host=Host
 
+homepage.banner.content=Homepage Banner Content
+
 show.most.comments.discussions=Show Most Comments Discussions
 
 tags.display.on.home.page=Tags display on Home Page
diff --git a/src/main/resources/ResourceBundle/messages_vi.properties b/src/main/resources/ResourceBundle/messages_vi.properties
@@ -240,6 +240,8 @@ email.management=Quản lý email
 
 host=Máy chủ
 
+homepage.banner.content=Nội Dung Chào Mừng Trang Chủ 
+
 show.most.comments.discussions=Hiển thị nhiều bình luận cuộc thảo luận nhất
 
 tags.display.on.home.page=Các thẻ hiển thị trên Trang chủ
diff --git a/src/main/webapp/admin/displayManagement.xhtml b/src/main/webapp/admin/displayManagement.xhtml
@@ -25,7 +25,13 @@
 
 			.formFieldLabel {
 				font-weight: 700;
-			}		
+			}
+			
+			.boxSizingBorder {
+			    -webkit-box-sizing: border-box;
+			       -moz-box-sizing: border-box;
+			            box-sizing: border-box;
+			}	
 		
 		</style>
 		
@@ -133,12 +139,31 @@
 				</div>
 				
 				<div class="w3-container w3-padding">
-					<p:commandButton value=" #{msg['save']}" icon="pi pi-save" ajax="true" action="#{manageDisplay.edit}"/>
+					<p:commandButton value=" #{msg['save']}" icon="pi pi-save" ajax="true" action="#{manageDisplay.update}"/>
 				</div>
 			
 			</h:form>
 			
-			<p/>	
+			<p/>
+			
+			<h:form>
+
+				<div class="w3-container w3-large w3-border-bottom">
+					#{msg['homepage.banner.content']}
+				</div>			
+			
+				<div class="w3-row w3-margin-top w3-padding">
+					<p:inputTextarea id="homePageBannerContent" value="#{manageDisplay.displayOption.homePageBannerContent}" 
+						styleClass="boxSizingBorder" style="width:100%" rows="12"/>
+					<h:message id="contentError" for="homePageBannerContent" styleClass="w3-pale-red"/>				
+				</div>
+				
+				<div class="w3-container w3-padding">
+					<p:commandButton value=" #{msg['save']}" icon="pi pi-save" ajax="true" action="#{manageDisplay.update}"/>
+				</div>
+			</h:form>	
+			
+			<p/>
 			
 			<h:form>
 				
@@ -209,7 +234,7 @@
 				<p/>
 				
 				<div class="w3-container w3-padding">
-					<p:commandButton value=" #{msg['save']}" ajax="true" action="#{manageDisplay.edit}" icon="pi pi-save"/>
+					<p:commandButton value=" #{msg['save']}" ajax="true" action="#{manageDisplay.update}" icon="pi pi-save"/>
 				</div>
 				
 			</h:form>
@@ -267,7 +292,7 @@
 				<p/>
 				
 				<div class="w3-container w3-padding">
-					<p:commandButton value=" #{msg['save']}" ajax="true" action="#{manageDisplay.editDisplayTags}" icon="pi pi-save"/>
+					<p:commandButton value=" #{msg['save']}" ajax="true" action="#{manageDisplay.updateDisplayTags}" icon="pi pi-save"/>
 				</div>
 				
 			</h:form>
diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml
@@ -22,21 +22,11 @@
 	
 		<div class="w3-panel w3-card-4" style="background-color: #f8f8f8">
 			
-			<div class="w3-theme-dark w3-opacity-min w3-center" style="margin: 0 -16px;padding:48px 16px;">
- 				<h3>#{msg['welcome.to.forum']}</h3>
- 				
- 				<h3>Custom content</h3>
- 			</div>
-			
-			<div class="w3-large w3-margin-top">
-				<p>
-					<!-- welcome text -->
-				</p>
-			</div>
-
-			<div class="w3-row">
+			<h:outputText value="#{homePage.displayOption.homePageBannerContent}" escape="false" id="banner"/>
+								
+			<div class="w3-row w3-margin-top">
 			
-				<div class="w3-col l9 m12 s12 w3-container">
+				<div class="w3-col l9 m12 s12 w3-container w3-margin-bottom">
 					<div class="w3-container w3-card w3-white w3-padding" jsf:rendered="#{not empty homePage.mostRecentDiscussions}">
 						<div class="w3-large w3-text-theme w3-margin-top">
 							<b><i class="pi pi-clock w3-large"/> #{msg['most.recent.discussions']}</b>
@@ -172,8 +162,6 @@
 							<p/>
 						</div>
 					</p:repeat>
-					
-					<hr/>
 						
 				</div> <!-- end div class=w3-col l9 m12 s12 -->
 				

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void onLoad() {`
`67`	`67`	`this.tagDualList = new DualListModel<>(allTags, currentDisplayTags);`
`68`	`68`	`}`
`69`	`69`
`70`		`- public void edit() {`
	`70`	`+ public void update() {`
`71`	`71`
`72`	`72`	`logger.info("Updating display options ");`
`73`	`73`