Home Explore Help
Register Sign In
github
/
spring-security
mirror of https://github.com/spring-projects/spring-security
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

SEC-2194: hello samples displays username and logout properly

Rob Winch 12 years ago
parent
b5ecaf61ed
commit
fea4d01aad
2 changed files with 16 additions and 6 deletions
Unified View Show Diff Stats
  1. 5 2
      samples/hellomvc-jc/src/main/webapp/WEB-INF/decorators/main.jsp
  2. 11 4
      samples/helloworld-jc/src/main/webapp/index.jsp

+ 5 - 2
samples/hellomvc-jc/src/main/webapp/WEB-INF/decorators/main.jsp
View File 

@@ -103,13 +103,16 @@
 
             <c:url var="logoUrl" value="/resources/img/logo.png"/>
 
             <c:url var="logoUrl" value="/resources/img/logo.png"/>
 
             <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
 
             <a class="brand" href="${homeUrl}"><img src="${logoUrl}" alt="Spring Security Sample"/></a>
 
             <div class="nav-collapse collapse">
 
             <div class="nav-collapse collapse">
 
+              <p class="navbar-text pull-right">
 
+                <c:out value="${pageContext.request.remoteUser}"/>
 
+                <c:url var="logoutUrl" value="/logout"/>
 
+                <a href="${logoutUrl}">Log out</a>
 
+              </p>
 
               <ul class="nav">
 
               <ul class="nav">
 
                 <c:url var="inboxUrl" value="/"/>
 
                 <c:url var="inboxUrl" value="/"/>
 
                 <li><a href="${inboxUrl}">Inbox</a></li>
 
                 <li><a href="${inboxUrl}">Inbox</a></li>
 
                 <c:url var="composeUrl" value="/?form"/>
 
                 <c:url var="composeUrl" value="/?form"/>
 
                 <li><a href="${composeUrl}">Compose</a></li>
 
                 <li><a href="${composeUrl}">Compose</a></li>
 
-                <c:url var="logoutUrl" value="/logout"/>
 
-                <li><a href="${logoutUrl}">Log out</a></li>
 
               </ul>
 
               </ul>
 
             </div>
 
             </div>
 
           </div>
 
           </div>

+ 11 - 4
samples/helloworld-jc/src/main/webapp/index.jsp
View File 

@@ -22,9 +22,16 @@
 
   </head>
 
   </head>
 
 
 
   <body>
 
   <body>
 
-    <h1>This page is secured!</h1>
 
-    <c:url value="/logout" var="logoutUrl"/>
 
-    <p>You can also <a href="${logoutUrl}">logout</a>.</p>
 
-</body>
 
+    <div class="container">
 
+      <h1>This is secured!</h1>
 
+      <c:url var="logoutUrl" value="/logout"/>
 
+      <p>
 
+        Hello <b><c:out value="${pageContext.request.remoteUser}"/></b>
 
+      </p>
 
+      <p>
 
+        <a href="${logoutUrl}">Click here</a> to log out.
 
+      </p>
 
+    </div>
 
+  </body>
 
 </html>
 
 </html>
 
 </jsp:root>
 
 </jsp:root>