added formatting to jsp files
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/2a1e6fb9 Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/2a1e6fb9 Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/2a1e6fb9 Branch: refs/heads/master Commit: 2a1e6fb99fed63ecf24fcd0a8e543a8dad85f1fe Parents: eb862b6 Author: Stefaan Dutry <stefaan.du...@gmail.com> Authored: Tue Apr 25 22:06:26 2017 +0200 Committer: Stefaan Dutry <stefaan.du...@gmail.com> Committed: Tue Apr 25 22:06:26 2017 +0200 ---------------------------------------------------------------------- form-processing/src/main/webapp/HelloWorld.jsp | 25 ++++++------ form-processing/src/main/webapp/index.jsp | 45 +++++++++------------ form-processing/src/main/webapp/register.jsp | 37 ++++++++--------- form-processing/src/main/webapp/thankyou.jsp | 24 +++++------ 4 files changed, 59 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/2a1e6fb9/form-processing/src/main/webapp/HelloWorld.jsp ---------------------------------------------------------------------- diff --git a/form-processing/src/main/webapp/HelloWorld.jsp b/form-processing/src/main/webapp/HelloWorld.jsp index 286a6ab..0fc29c0 100644 --- a/form-processing/src/main/webapp/HelloWorld.jsp +++ b/form-processing/src/main/webapp/HelloWorld.jsp @@ -1,16 +1,15 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> <%@ taglib prefix="s" uri="/struts-tags" %> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Hello World!</title> -</head> -<body> -<h2><s:property value="messageStore.message" /></h2> -<p>I've said hello <s:property value="helloCount" /> times!</p> -<p><s:property value="messageStore" /></p> -<p><a href="<s:url action='index' />" >Return to home page</a>.</p> -</body> -</html> \ No newline at end of file + <head> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + <title>Hello World!</title> + </head> + <body> + <h2><s:property value="messageStore.message" /></h2> + <p>I've said hello <s:property value="helloCount" /> times!</p> + <p><s:property value="messageStore" /></p> + <p><a href="<s:url action='index' />" >Return to home page</a>.</p> + </body> +</html> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/2a1e6fb9/form-processing/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/form-processing/src/main/webapp/index.jsp b/form-processing/src/main/webapp/index.jsp index 091f505..7c8987d 100644 --- a/form-processing/src/main/webapp/index.jsp +++ b/form-processing/src/main/webapp/index.jsp @@ -1,30 +1,25 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> <%@ taglib prefix="s" uri="/struts-tags" %> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Basic Struts 2 Application - Welcome</title> -</head> -<body> -<h1>Welcome To Struts 2!</h1> -<p><a href="<s:url action='hello'/>">Hello World</a></p> -<s:url action="hello" var="helloLink"> - <s:param name="userName">Bruce Phillips</s:param> -</s:url> -<p><a href="${helloLink}">Hello Bruce Phillips</a></p> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + <title>Basic Struts 2 Application - Welcome</title> + </head> + <body> + <h1>Welcome To Struts 2!</h1> + <p><a href="<s:url action='hello'/>">Hello World</a></p> + <s:url action="hello" var="helloLink"> + <s:param name="userName">Bruce Phillips</s:param> + </s:url> + <p><a href="${helloLink}">Hello Bruce Phillips</a></p> -<p>Get your own personal hello by filling out and submitting this form.</p> + <p>Get your own personal hello by filling out and submitting this form.</p> + <s:form action="hello"> + <s:textfield name="userName" label="Your name" /> + <s:submit value="Submit" /> + </s:form> -<s:form action="hello"> - - <s:textfield name="userName" label="Your name" /> - - <s:submit value="Submit" /> - -</s:form> - -<p><a href="register.jsp">Please register</a> for our prize drawing.</p> -</body> -</html> \ No newline at end of file + <p><a href="register.jsp">Please register</a> for our prize drawing.</p> + </body> +</html> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/2a1e6fb9/form-processing/src/main/webapp/register.jsp ---------------------------------------------------------------------- diff --git a/form-processing/src/main/webapp/register.jsp b/form-processing/src/main/webapp/register.jsp index 0adac76..c638407 100644 --- a/form-processing/src/main/webapp/register.jsp +++ b/form-processing/src/main/webapp/register.jsp @@ -1,26 +1,21 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <%@ taglib prefix="s" uri="/struts-tags" %> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Register</title> -</head> -<body> -<h3>Register for a prize by completing this form.</h3> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> + <title>Register</title> + </head> + <body> + <h3>Register for a prize by completing this form.</h3> -<s:form action="register"> - - <s:textfield name="personBean.firstName" label="First name" /> - <s:textfield name="personBean.lastName" label="Last name" /> - <s:textfield name="personBean.email" label ="Email"/> - <s:textfield name="personBean.age" label="Age" /> - - <s:submit/> - -</s:form> - -</body> -</html> \ No newline at end of file + <s:form action="register"> + <s:textfield name="personBean.firstName" label="First name" /> + <s:textfield name="personBean.lastName" label="Last name" /> + <s:textfield name="personBean.email" label ="Email"/> + <s:textfield name="personBean.age" label="Age" /> + <s:submit/> + </s:form> + </body> +</html> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/2a1e6fb9/form-processing/src/main/webapp/thankyou.jsp ---------------------------------------------------------------------- diff --git a/form-processing/src/main/webapp/thankyou.jsp b/form-processing/src/main/webapp/thankyou.jsp index 3c845bc..f5f3043 100644 --- a/form-processing/src/main/webapp/thankyou.jsp +++ b/form-processing/src/main/webapp/thankyou.jsp @@ -1,19 +1,17 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <%@ taglib prefix="s" uri="/struts-tags" %> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Registration Successful</title> -</head> -<body> -<h3>Thank you for registering for a prize.</h3> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> + <title>Registration Successful</title> + </head> + <body> + <h3>Thank you for registering for a prize.</h3> -<p>Your registration information: <s:property value="personBean" /> </p> + <p>Your registration information: <s:property value="personBean" /> </p> -<p><a href="<s:url action='index' />" >Return to home page</a>.</p> - -</body> -</html> \ No newline at end of file + <p><a href="<s:url action='index' />" >Return to home page</a>.</p> + </body> +</html>