You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2005/11/21 22:45:27 UTC

svn commit: r347993 - in /portals/pluto/trunk/pluto-portal/src/main/webapp: WEB-INF/web.xml login.jsp pluto.css

Author: ddewolf
Date: Mon Nov 21 13:45:21 2005
New Revision: 347993

URL: http://svn.apache.org/viewcvs?rev=347993&view=rev
Log:
Adding login page;  Small ui updates

Added:
    portals/pluto/trunk/pluto-portal/src/main/webapp/login.jsp
Modified:
    portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
    portals/pluto/trunk/pluto-portal/src/main/webapp/pluto.css

Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml?rev=347993&r1=347992&r2=347993&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/WEB-INF/web.xml Mon Nov 21 13:45:21 2005
@@ -53,23 +53,28 @@
 
     <security-constraint>
         <web-resource-collection>
-            <web-resource-name></web-resource-name>
-            <url-pattern>/login_success.jsp</url-pattern>
+            <web-resource-name>portal</web-resource-name>
+            <url-pattern>/portal</url-pattern>
+            <url-pattern>/portal/*</url-pattern>
             <http-method>GET</http-method>
             <http-method>POST</http-method>
             <http-method>PUT</http-method>
         </web-resource-collection>
         <auth-constraint>
-            <role-name>tomcat</role-name>
+            <role-name>pluto</role-name>
         </auth-constraint>
     </security-constraint>
 
     <login-config>
-        <auth-method>BASIC</auth-method>
+      <auth-method>FORM</auth-method>
+      <form-login-config>
+        <form-login-page>/login.jsp</form-login-page>
+        <form-error-page>/login.jsp?error=1</form-error-page>
+      </form-login-config>
     </login-config>
 
     <security-role>
-        <role-name>tomcat</role-name>
+        <role-name>pluto</role-name>
     </security-role>
 
     <taglib>

Added: portals/pluto/trunk/pluto-portal/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal/src/main/webapp/login.jsp?rev=347993&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/login.jsp (added)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/login.jsp Mon Nov 21 13:45:21 2005
@@ -0,0 +1,39 @@
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
+<html>
+<head>
+  <title>Pluto Portal</title>
+    <style type="text/css" title="currentStyle" media="screen">
+        @import "<c:out value="${pageContext.request.contextPath}"/>/pluto.css";
+	</style>
+    <script type="text/javascript" src="<c:out value="${pageContext.request.contextPath}"/>/pluto.js"></script>
+</head>
+
+<body>
+ <div id="portal" style="width: 500px;">
+  <div id="header">
+    <h1><span>Apache Pluto</span></h1>
+    <h2><span>A Apache Portals Project</span></h2>
+  </div>
+
+  <div id="content">
+    <c:if test='${param.error == "1"}'>
+        <p style="color:red;text-align:center">
+            Invalid credentials. Please try again
+        </p>
+    </c:if>
+    <form method="POST" action="j_security_check">
+    <fieldset>
+      <legend>Login to Pluto</legend>
+      <div><label for="j_username">User Name</label><input type="text" name="j_username" id="j_username"/></div>
+      <div><label for="j_password">Password</label><input type="text" name="j_password" id="j_password"/></div>
+      <div><label for="j_login"></label><input type="submit" value="Login" name="login" id="j_login"/></div>
+    </fieldset>
+    </form>
+  </div>
+  <div id="footer">
+      &copy; 2003-2005 Apache Software Foundation
+  </div>
+ </div>
+</body>
+</html>
\ No newline at end of file

Modified: portals/pluto/trunk/pluto-portal/src/main/webapp/pluto.css
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal/src/main/webapp/pluto.css?rev=347993&r1=347992&r2=347993&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/src/main/webapp/pluto.css (original)
+++ portals/pluto/trunk/pluto-portal/src/main/webapp/pluto.css Mon Nov 21 13:45:21 2005
@@ -5,7 +5,7 @@
 }
 
 #portal {
-  margin: 0px;
+  margin: 0px auto;
   background-color: white;
   border: 1px solid black;
 }
@@ -13,7 +13,6 @@
 #header {
   background-color: #8DB7DF;
   border-bottom: 1px solid #2E6794;
-  border-top: 1px solid #2E6794;
   width: auto;
   height: 50px;
   vertical-align: top;
@@ -177,4 +176,35 @@
 
 span.help {
   background: url(images/controls/help.png) no-repeat;
+}
+
+/* Start look and feel -- end positioning */
+
+fieldset {
+  margin: .5em;
+  border: 1px solid #2E6794;
+}
+
+label {
+  float: left;
+  text-align: right;
+  margin: 0 1em 10px 0;
+  clear: both;
+  width: 40%;
+}
+
+input {
+  margin-bottom: 10px;
+  color: #2E6794;
+  background: #8DB7DF;
+  border: 1px solid #2E6794;
+}
+
+input.submit
+{
+  margin-left: 5em;
+  clear: both;
+  color: #2E6794;
+  background: #8DB7DF;
+  border: 1px solid #2E6794;
 }