You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/07/07 06:15:13 UTC
[2/7] struts-examples git commit: Cleaning up CR/LF and tabs
Cleaning up CR/LF and tabs
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/35a4fef0
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/35a4fef0
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/35a4fef0
Branch: refs/heads/master
Commit: 35a4fef0e4eff60bb2b5c2ccde231fe52ad79610
Parents: 876600a
Author: tkofford <tk...@home.ku.edu>
Authored: Thu Jul 6 08:03:22 2017 -0500
Committer: tkofford <tk...@home.ku.edu>
Committed: Thu Jul 6 08:03:22 2017 -0500
----------------------------------------------------------------------
shiro-basic/src/main/webapp/pages/login.jsp | 20 ++++++++++----------
shiro-basic/src/main/webapp/pages/welcome.jsp | 16 ++++++++--------
2 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/35a4fef0/shiro-basic/src/main/webapp/pages/login.jsp
----------------------------------------------------------------------
diff --git a/shiro-basic/src/main/webapp/pages/login.jsp b/shiro-basic/src/main/webapp/pages/login.jsp
index 8d62758..a8941a1 100644
--- a/shiro-basic/src/main/webapp/pages/login.jsp
+++ b/shiro-basic/src/main/webapp/pages/login.jsp
@@ -5,8 +5,8 @@
<%@ taglib uri="/struts-tags" prefix="s"%>
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
- <title>Login Page</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+ <title>Login Page</title>
<link href="<s:url value='/css/main.css'/>" rel="stylesheet" type="text/css"/>
</head>
<s:head theme="xhtml" />
@@ -14,14 +14,14 @@
<body>
<h3>Welcome User, please login below</h3>
<s:form action="authuser" theme="xhtml">
- <s:textfield name="username" label="User Name"></s:textfield>
- <s:textfield name="password" label="Password" type="password"></s:textfield>
- <s:submit value="Login"></s:submit>
- <s:if test="hasActionErrors()">
- <div class="errors">
- <s:actionerror/>
- </div>
- </s:if>
+ <s:textfield name="username" label="User Name"></s:textfield>
+ <s:textfield name="password" label="Password" type="password"></s:textfield>
+ <s:submit value="Login"></s:submit>
+ <s:if test="hasActionErrors()">
+ <div class="errors">
+ <s:actionerror/>
+ </div>
+ </s:if>
</s:form>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/35a4fef0/shiro-basic/src/main/webapp/pages/welcome.jsp
----------------------------------------------------------------------
diff --git a/shiro-basic/src/main/webapp/pages/welcome.jsp b/shiro-basic/src/main/webapp/pages/welcome.jsp
index 813d3ab..600971d 100644
--- a/shiro-basic/src/main/webapp/pages/welcome.jsp
+++ b/shiro-basic/src/main/webapp/pages/welcome.jsp
@@ -5,9 +5,9 @@
<!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=US-ASCII">
- <title>Welcome Page</title>
- <link href="<s:url value='/css/main.css'/>" rel="stylesheet" type="text/css"/>
+ <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+ <title>Welcome Page</title>
+ <link href="<s:url value='/css/main.css'/>" rel="stylesheet" type="text/css"/>
</head>
<s:head theme="xhtml" />
@@ -21,10 +21,10 @@
</ul>
<h4>Permissions:</h4>
<ul>
- <shiro:hasPermission name="lightsaber:weild"><li>You may use a lightsaber ring. Use it wisely.<br></shiro:hasPermission>
- <shiro:lacksPermission name="lightsaber:weild"><li>Sorry, lightsaber rings are for schwartz masters only.</shiro:lacksPermission>
- <shiro:hasPermission name="winnebago:drive:eagle5"><li>You are permitted to 'drive' the winnebago with license plate (id) 'eagle5'.<br>Here are the keys - have fun!<br></shiro:hasPermission>
- <shiro:lacksPermission name="winnebago:drive:eagle5"><li>Sorry, you aren't allowed to drive the 'eagle5' winnebago!</shiro:lacksPermission>
+ <shiro:hasPermission name="lightsaber:weild"><li>You may use a lightsaber ring. Use it wisely.<br></shiro:hasPermission>
+ <shiro:lacksPermission name="lightsaber:weild"><li>Sorry, lightsaber rings are for schwartz masters only.</shiro:lacksPermission>
+ <shiro:hasPermission name="winnebago:drive:eagle5"><li>You are permitted to 'drive' the winnebago with license plate (id) 'eagle5'.<br>Here are the keys - have fun!<br></shiro:hasPermission>
+ <shiro:lacksPermission name="winnebago:drive:eagle5"><li>Sorry, you aren't allowed to drive the 'eagle5' winnebago!</shiro:lacksPermission>
</ul>
</shiro:authenticated>
<shiro:notAuthenticated>
@@ -33,7 +33,7 @@
<br>
<s:form action="logout">
- <s:submit value="Logout"></s:submit>
+ <s:submit value="Logout"></s:submit>
</s:form>
</body>
</html>
\ No newline at end of file