Vineet Reynolds avatar Vineet Reynolds committed 8d3d5c8

Renamed Application.xhtml to HomePage.xhtml.

Comments (0)

Files changed (9)

galleria-jsf/src/main/java/info/galleria/filters/UserRedirectFilter.java

 		HttpServletResponse httpResponse = (HttpServletResponse) response;
 		if (httpRequest.getUserPrincipal() != null)
 		{
-			httpResponse.sendRedirect(contextPath + "/private/Application.xhtml");
+			httpResponse.sendRedirect(contextPath + "/private/HomePage.xhtml");
 		}
 
 		// pass the request along the filter chain

galleria-jsf/src/main/java/info/galleria/view/album/AlbumManager.java

 			albumService.createAlbum(album);
 			String key = "CreateAlbum.AlbumCreationSuccessMessage";
 			buildMessageForDisplay(key, FacesMessage.SEVERITY_INFO);
-			result = "/private/Application.xhtml?faces-redirect=true";
+			result = "/private/HomePage.xhtml?faces-redirect=true";
 		}
 		catch (AlbumException albumEx)
 		{
 			String messageKey = "DeleteAlbum.InternalErrorMessage";
 			processContainerException(messageKey);
 		}
-		return "/private/Application.xhtml?faces-redirect=true";
+		return "/private/HomePage.xhtml?faces-redirect=true";
 	}
 
 	public String editAlbum()
 		{
 			ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();
 			String contextPath = externalContext.getRequestContextPath();
-			externalContext.redirect(contextPath + "/private/Application.xhtml");
+			externalContext.redirect(contextPath + "/private/HomePage.xhtml");
 		}
 		catch (IOException ioEx)
 		{

galleria-jsf/src/main/java/info/galleria/view/user/Authenticator.java

 		try
 		{
 			request.login(userId, new String(password));
-			result = "/private/Application.xhtml?faces-redirect=true";
+			result = "/private/HomePage.xhtml?faces-redirect=true";
 		}
 		catch (ServletException ex)
 		{

galleria-jsf/src/main/java/info/galleria/view/user/UserManager.java

 			String message = Messages.getString("AccountPreferences.PasswordModificationSuccessMessage", locale);
 			FacesMessage facesMessage = new FacesMessage(FacesMessage.SEVERITY_ERROR, message, null);
 			context.addMessage(null, facesMessage);
-			result = "/private/Application.xhtml?faces-redirect=true";
+			result = "/private/HomePage.xhtml?faces-redirect=true";
 		}
 		catch (ModifyPasswordException modifyEx)
 		{

galleria-jsf/src/main/webapp/private/Application.xhtml

-<ui:composition template="/templates/privateLayout.xhtml"
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:p="http://primefaces.prime.com.tr/ui">
-	<ui:define name="title">
-		<h:outputText value="#{msg['Application.title']}" />
-	</ui:define>
-
-	<ui:define name="content">
-		<div class="mainpane">
-			<h:form id="viewAllAlbums">
-				<p:dataGrid id="albumGrid" value="#{albumManager.ownedAlbums}" rendered="#{albumManager.ownedAlbums.size() > 0}"
-					var="album" columns="3" rows="6" paginator="true">
-					<p:column>
-						<p:panel styleClass="panelWrapper"> 
-							<h:panelGrid columns="1" styleClass="photoPanel">
-								<h:panelGroup>
-									<ul class="photoWrapper">
-										<li class="photolink">
-											<h:outputLink value="album/ViewAlbum.xhtml">
-												<f:param name="albumId" value="#{album.albumId}" />
-												<p:graphicImage id="photo" value="#{photoStreamer.fileContent}">
-													<f:param id="photo_id" name="photo_id" value="#{album.coverPhoto.photoId}" />
-												</p:graphicImage>
-											</h:outputLink>
-										</li>
-										<li class="name">
-											<h:outputText value="#{album.name}" />
-										</li>
-										<li class="description">
-											<h:outputText value="#{album.description}" />
-										</li>
-									</ul>
-								</h:panelGroup>
-							</h:panelGrid>
-						</p:panel>
-					</p:column>
-				</p:dataGrid>
-			</h:form>
-			<h:messages id="messages" globalOnly="true" infoClass="infoStyle"
-				warnClass="warnStyle" errorClass="errorStyle" />
-		</div>
-		<div class="actionpane">
-			<p>
-				<h:outputLink id="CreateAlbum" value="album/CreateAlbum.xhtml">
-					<h:outputText value="#{msg['Application.CreateAlbum.label']}" />
-				</h:outputLink>
-			</p>
-			<p>
-				<h:outputLink id="Upload" value="photo/UploadPhoto.xhtml">
-					<h:outputText value="#{msg['Application.Upload.label']}" />
-				</h:outputLink>
-			</p>
-		</div>
-	</ui:define>
-</ui:composition>

galleria-jsf/src/main/webapp/private/HomePage.xhtml

+<ui:composition template="/templates/privateLayout.xhtml"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:p="http://primefaces.prime.com.tr/ui">
+	<ui:define name="title">
+		<h:outputText value="#{msg['Application.title']}" />
+	</ui:define>
+
+	<ui:define name="content">
+		<div class="mainpane">
+			<h:form id="viewAllAlbums">
+				<p:dataGrid id="albumGrid" value="#{albumManager.ownedAlbums}" rendered="#{albumManager.ownedAlbums.size() > 0}"
+					var="album" columns="3" rows="6" paginator="true">
+					<p:column>
+						<p:panel styleClass="panelWrapper"> 
+							<h:panelGrid columns="1" styleClass="photoPanel">
+								<h:panelGroup>
+									<ul class="photoWrapper">
+										<li class="photolink">
+											<h:outputLink value="album/ViewAlbum.xhtml">
+												<f:param name="albumId" value="#{album.albumId}" />
+												<p:graphicImage id="photo" value="#{photoStreamer.fileContent}">
+													<f:param id="photo_id" name="photo_id" value="#{album.coverPhoto.photoId}" />
+												</p:graphicImage>
+											</h:outputLink>
+										</li>
+										<li class="name">
+											<h:outputText value="#{album.name}" />
+										</li>
+										<li class="description">
+											<h:outputText value="#{album.description}" />
+										</li>
+									</ul>
+								</h:panelGroup>
+							</h:panelGrid>
+						</p:panel>
+					</p:column>
+				</p:dataGrid>
+			</h:form>
+			<h:messages id="messages" globalOnly="true" infoClass="infoStyle"
+				warnClass="warnStyle" errorClass="errorStyle" />
+		</div>
+		<div class="actionpane">
+			<p>
+				<h:outputLink id="CreateAlbum" value="album/CreateAlbum.xhtml">
+					<h:outputText value="#{msg['Application.CreateAlbum.label']}" />
+				</h:outputLink>
+			</p>
+			<p>
+				<h:outputLink id="Upload" value="photo/UploadPhoto.xhtml">
+					<h:outputText value="#{msg['Application.Upload.label']}" />
+				</h:outputLink>
+			</p>
+		</div>
+	</ui:define>
+</ui:composition>

galleria-jsf/src/main/webapp/private/album/CreateAlbum.xhtml

 					</li>
 					<li>
 						<h:commandButton id="createAlbumButton" value="#{msg['CreateAlbum.createAlbumButton.label']}" action="#{albumManager.createAlbum}" styleClass="submit" />
-			    		<h:outputLink id="cancel" value="#{request.contextPath}/private/Application.xhtml" >
+			    		<h:outputLink id="cancel" value="#{request.contextPath}/private/HomePage.xhtml" >
 			    			<h:outputText value="#{msg['CreateAlbum.cancel.label']}" />
 			    		</h:outputLink>
 					</li>

galleria-jsf/src/main/webapp/private/album/ViewAlbum.xhtml

 		</div>
 		<div class="actionpane">
 			<p>
-				<h:outputLink id="viewALbums" value="#{request.contextPath}/private/Application.xhtml">
+				<h:outputLink id="viewALbums" value="#{request.contextPath}/private/HomePage.xhtml">
 					<h:outputText value="#{msg['ViewAlbum.viewAlbums.label']}" />
 				</h:outputLink>
 			</p>

galleria-jsf/src/test/java/info/galleria/view/user/AllPagesIntegrationTest.java

 				.addAsWebResource(new File("src/main/webapp", "Index.xhtml"))
 				.addAsWebResource(new File("src/main/webapp", "Signup.xhtml"))
 				.addAsWebResource(new File("src/main/webapp", "Login.xhtml"))
-				.addAsWebResource(new File("src/main/webapp/private", "Application.xhtml"), "private/Application.xhtml")
+				.addAsWebResource(new File("src/main/webapp/private", "HomePage.xhtml"), "private/HomePage.xhtml")
 				.addAsWebResource(new File("src/main/webapp/private/user", "AccountPreferences.xhtml"),	"private/user/AccountPreferences.xhtml")
 				.addAsWebResource(new File("src/main/webapp/private/album", "CreateAlbum.xhtml"), "private/album/CreateAlbum.xhtml")
 				.addAsWebResource(new File("src/main/webapp/private/album", "EditAlbum.xhtml"),	"private/album/EditAlbum.xhtml")
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.