You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by it...@apache.org on 2010/02/06 17:29:02 UTC
svn commit: r907250 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent:
org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/
org.apache.clerezza.web.resources.style/src/main/resources/org/...
Author: ito
Date: Sat Feb 6 16:29:02 2010
New Revision: 907250
URL: http://svn.apache.org/viewvc?rev=907250&view=rev
Log:
CLEREZZA-104: org.apache.clerezza.platform.security.auth.cookie using ssp instead of seedsnipe, css and js for login added
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/bg/fade-login.png (with props)
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/logo-big.png (with props)
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/login.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/staticweb/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/staticweb/scripts/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/staticweb/scripts/login.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/reset.js
Removed:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/logout_success.xhtml
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogout.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/onotology/LOGIN.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login_naked.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset_success.xhtml
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/bg/fade-login.png
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/bg/fade-login.png?rev=907250&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/bg/fade-login.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/logo-big.png
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/logo-big.png?rev=907250&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/logo-big.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/login.css
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/login.css?rev=907250&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/login.css (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/login.css Sat Feb 6 16:29:02 2010
@@ -0,0 +1,103 @@
+body {
+ background-color: #eeeeee;
+ background-image: url(./images/bg/fade-login.png);
+ background-repeat: repeat-x;
+ background-position: center top;
+}
+
+
+#tx-login-mask ol {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+#tx-login-mask ol li {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ height: 2em;
+}
+
+#tx-login-mask ol li:last-child {
+ padding-top: 0.8em;
+}
+
+
+#tx-login-mask label {
+ width: 8em;
+ float: left;
+ color: #666666;
+}
+
+#tx-login-mask label.tx-checkbox {
+ width: 8em;
+ float: left;
+}
+
+#tx-login-mask input[type="checkbox"] {
+ margin-left: 8em;
+ float: left;
+}
+
+#tx-login-mask input[type="text"], #tx-login-mask input[type="password"] {
+ width: 20em;
+}
+
+#tx-login-mask .tx-button {
+ width: 5em;
+ float: right;
+}
+
+#tx-login-mask {
+ top: 30%;
+ position: absolute;
+ width: 99%;
+}
+
+#tx-login-mask > div {
+ margin: 0 auto;
+ width: 29.7em;
+}
+
+#tx-login-mask > div > div {
+ text-align: center;
+ margin: 1em;
+}
+
+#tx-login-mask #tx-logo {
+ height: 23px;
+ width: 166px;
+ background-image: url(./images/logo-big.png);
+ background-repeat: no-repeat;
+ background-position: center;
+ margin: 1em auto;
+}
+
+#tx-login-mask fieldset {
+ padding: 0.5em;
+ margin: 0.5em 0;
+}
+
+#tx-login-mask .tx-info .tx-icon {
+ vertical-align: middle;
+ float: none;
+ display: inline-block;
+}
+
+.tx-error {
+ color: #cc3333;
+ font-weight: bold;
+ margin: 0.3em;
+}
+
+.tx-info {
+ color: #c59e00;
+ font-weight: bold;
+ margin: 0.3em;
+}
+
+.tx-line {
+ border-bottom: 1px solid #E4E4E4;
+ border-top: none;
+}
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/pom.xml?rev=907250&r1=907249&r2=907250&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/pom.xml Sat Feb 6 16:29:02 2010
@@ -33,11 +33,15 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.platform.typerendering.seedsnipe</artifactId>
+ <artifactId>org.apache.clerezza.platform.typerendering.scalaserverpages</artifactId>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.jaxrs.utils</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.web.fileserver</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java?rev=907250&r1=907249&r2=907250&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java Sat Feb 6 16:29:02 2010
@@ -31,6 +31,7 @@
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
@@ -49,7 +50,7 @@
import org.apache.clerezza.platform.security.auth.NoSuchAgent;
import org.apache.clerezza.platform.security.auth.cookie.onotology.LOGIN;
import org.apache.clerezza.platform.typerendering.RenderletManager;
-import org.apache.clerezza.platform.typerendering.seedsnipe.SeedsnipeRenderlet;
+import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
import org.apache.clerezza.rdf.core.BNode;
import org.apache.clerezza.rdf.core.PlainLiteral;
import org.apache.clerezza.rdf.core.UriRef;
@@ -57,18 +58,25 @@
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
+import org.apache.clerezza.web.fileserver.BundlePathNode;
+import org.apache.clerezza.web.fileserver.FileServer;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.osgi.framework.Bundle;
import org.wymiwyg.commons.util.Base64;
+import org.wymiwyg.commons.util.dirbrowser.PathNode;
import org.wymiwyg.wrhapi.HandlerException;
import org.wymiwyg.wrhapi.util.Cookie;
/**
*
- * @scr.component
- * @scr.service interface="java.lang.Object"
- * @scr.property name="javax.ws.rs" type="Boolean" value="true"
- *
* @author mir
*/
+@Component
+@Service(Object.class)
+@Property(name = "javax.ws.rs", boolValue = true)
@Path("/login")
public class CookieLogin {
@@ -77,13 +85,12 @@
*/
public static final String AUTH_COOKIE_NAME = "auth";
private final Logger logger = LoggerFactory.getLogger(CookieLogin.class);
- /**
- * @scr.reference
- */
+ private FileServer fileServer;
+
+ @Reference
private RenderletManager renderletManager;
- /**
- * @scr.reference
- */
+
+ @Reference
AuthenticationChecker authenticationChecker;
/**
@@ -92,13 +99,20 @@
* @param componentContext
*/
protected void activate(ComponentContext componentContext) {
+
+ Bundle bundle = componentContext.getBundleContext().getBundle();
+ URL resourceDir = getClass().getResource("staticweb");
+ PathNode pathNode = new BundlePathNode(bundle, resourceDir.getPath());
+ fileServer = new FileServer(pathNode);
+
+
URL templateURL = getClass().getResource("login.xhtml");
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
+ renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(templateURL.toString()), LOGIN.LoginPage,
null, MediaType.APPLICATION_XHTML_XML_TYPE, true);
templateURL = getClass().getResource("login_naked.xhtml");
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
+ renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(templateURL.toString()), LOGIN.LoginPage,
"naked", MediaType.APPLICATION_XHTML_XML_TYPE, true);
@@ -200,4 +214,10 @@
cookieString.getBytes()));
return cookie;
}
+
+ @GET
+ @Path("{path:.+}")
+ public PathNode getStaticFile(@PathParam("path") String path) {
+ return fileServer.getNode(path);
+ }
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogout.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogout.java?rev=907250&r1=907249&r2=907250&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogout.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogout.java Sat Feb 6 16:29:02 2010
@@ -18,12 +18,10 @@
*/
package org.apache.clerezza.platform.security.auth.cookie;
-import java.net.URL;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.UriInfo;
@@ -38,26 +36,28 @@
import org.slf4j.LoggerFactory;
import org.apache.clerezza.jaxrs.utils.RedirectUtil;
import org.apache.clerezza.platform.typerendering.RenderletManager;
-import org.apache.clerezza.platform.typerendering.seedsnipe.SeedsnipeRenderlet;
+import org.apache.clerezza.rdf.core.PlainLiteral;
import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
import org.wymiwyg.wrhapi.util.Cookie;
/**
*
- * @scr.component
- * @scr.service interface="java.lang.Object"
- * @scr.property name="javax.ws.rs" type="Boolean" value="true"
- *
* @author mir
*/
+@Component
+@Service(Object.class)
+@Property(name = "javax.ws.rs", boolValue = true)
@Path("/logout")
public class CookieLogout {
private final Logger logger = LoggerFactory.getLogger(CookieLogout.class);
- /**
- * @scr.reference
- */
+ @Reference
private RenderletManager renderletManager;
/**
@@ -66,10 +66,6 @@
* @param componentContext
*/
protected void activate(ComponentContext componentContext) {
- URL templateURL = getClass().getResource("logout_success.xhtml");
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
- new UriRef(templateURL.toString()), LOGIN.LogoutSuccessPage,
- null, MediaType.APPLICATION_XHTML_XML_TYPE, true);
logger.info("Cookie Logout activated.");
}
@@ -88,7 +84,15 @@
public GraphNode logoutSuccessPage(@Context UriInfo uriInfo) {
TrailingSlash.enforcePresent(uriInfo);
GraphNode result = new GraphNode(new BNode(), new SimpleMGraph());
- result.addProperty(RDF.type, LOGIN.LogoutSuccessPage);
+ PlainLiteral message = new PlainLiteralImpl(
+ "You successfully logged out.");
+ result.addProperty(LOGIN.message, message);
+ result.addProperty(RDF.type, LOGIN.LoginPage);
+
+ String baseUri = uriInfo.getBaseUri().getScheme() + "://" +
+ uriInfo.getBaseUri().getAuthority();
+
+ result.addProperty(LOGIN.refererUri, new UriRef(baseUri + "/dashboard/overview"));
return result;
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/onotology/LOGIN.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/onotology/LOGIN.java?rev=907250&r1=907249&r2=907250&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/onotology/LOGIN.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/onotology/LOGIN.java Sat Feb 6 16:29:02 2010
@@ -28,12 +28,6 @@
*/
public static final UriRef LoginPage = new UriRef("http://clerezza.org/2009/07/login#LoginPage");
- /**
- * A page which informs the user that he/she logged out.
- */
- public static final UriRef LogoutSuccessPage = new UriRef("http://clerezza.org/2009/07/login#LogoutSuccessPage");
-
-
// Properties
/**
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login.xhtml?rev=907250&r1=907249&r2=907250&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login.xhtml Sat Feb 6 16:29:02 2010
@@ -1,17 +1,42 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en">
+def login(s: Any) = new UriRef("http://clerezza.org/2009/07/login#"+s);
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-${ns:login=http://clerezza.org/2009/07/login#}
-<title>Login</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<title>Login Page</title>
+
+ <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
+ <link href="/style/login.css" media="screen" rel="stylesheet" type="text/css" />
+
</head>
- <body>
- <h1>Clerezza Login</h1>
- <hr/>
- ${if login:message}
- ${login:message}
- ${/if}
- ${render(., "naked")}
- <a href="../reset/">forgot password?</a>
- </body>
-</html>
\ No newline at end of file
+
+<body>
+
+<!-- header -->
+<div id="tx-header">
+ <!-- system -->
+ <div id="tx-system"></div>
+ <!-- //system -->
+</div>
+<!-- // header -->
+
+<!-- content -->
+<div id="tx-login-mask">
+ <div>
+ <div>
+ <div id="tx-logo"></div>
+ <div class="tx-info"></div>
+ {ifx((res/login("message")).length > 0) {
+ <div class="tx-error">{res/login("message")*}</div>
+ }
+ }
+
+ </div>
+ {render(res, "naked")}
+ <a href="/reset/" class="tx-icon-right" style="padding-left: 1em; background-position: left center;">Forgot password</a>
+ </div>
+</div>
+<!-- // content -->
+
+</body>
+</html>
+
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login_naked.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login_naked.xhtml?rev=907250&r1=907249&r2=907250&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login_naked.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login_naked.xhtml Sat Feb 6 16:29:02 2010
@@ -1,7 +1,20 @@
-${ns:login=http://clerezza.org/2009/07/login#}
-<form method="post" action="../login">
- <label for="user" id="label_user">User name:</label><input type="text" id="user" name="user"/>
- <label for="pass" id="label_pass">Password:</label><input type="password" id="pass" name="pass" value="" />
- <input type="hidden" id="referer" name="referer" value="${login:refererUri}" />
- <input value="Login" type="submit"/><p />
-</form>
+def login(s: Any) = new UriRef("http://clerezza.org/2009/07/login#"+s);
+
+
+resultDocModifier.addScriptReference("/jquery/jquery-1.3.2.min.js");
+resultDocModifier.addScriptReference("/login/scripts/login.js");
+
+<form action="/login" method="post" id="login-form">
+ <fieldset class="tx-line">
+ <ol>
+ <li><label>Username</label>
+ <input size="30" type="text" name="user" value="" /></li>
+ <li><label>Password</label>
+ <input size="30" type="password" name="pass" value="" /></li>
+ <li>
+ <input type="submit" value="Log in" id="submitButton"></input>
+ </li>
+ </ol>
+ <input type="hidden" id="referer" name="referer" value={res/login("refererUri")*} />
+ </fieldset>
+</form>
\ No newline at end of file
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/staticweb/scripts/login.js
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/staticweb/scripts/login.js?rev=907250&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/staticweb/scripts/login.js (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/staticweb/scripts/login.js Sat Feb 6 16:29:02 2010
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+$(document).ready(function() {
+
+ $("#submitButton").hide();
+ $("<a/>").addClass("tx-button tx-button-generic").attr("href", "#")
+ .text("Log in").insertBefore("#submitButton");
+
+ $(".tx-button-generic").click(function(){
+ $("#login-form").submit();
+ });
+
+ $("input[name*='user']").focus();
+
+});
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset.xhtml?rev=907250&r1=907249&r2=907250&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset.xhtml Sat Feb 6 16:29:02 2010
@@ -1,16 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>Password Reset</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+
+ <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
+ <link href="/style/login.css" media="screen" rel="stylesheet" type="text/css" />
+ <script src="/jquery/jquery-1.3.2.min.js" type="text/javascript"></script>
+ <script type="text/javascript" src="/admin/user-manager/js/reset.js"></script>
+
</head>
- <body>
- <h1>Clerezza Password Reset</h1>
- <hr/>
- <form method="post" action="../reset/">
- <label for="user" id="label_user">User name:</label><input type="text" id="user" name="user"/>
- <label for="email" id="label_pass">Email address:</label><input type="text" id="email" name="email" value="" />
- <input value="Reset" type="submit"/><p />
+
+<body>
+
+<!-- header -->
+<div id="tx-header">
+ <!-- system -->
+ <div id="tx-system"></div>
+ <!-- //system -->
+</div>
+<!-- // header -->
+
+<!-- content -->
+<div id="tx-login-mask">
+ <div>
+ <div>
+ <div id="tx-logo"></div>
+ <div class="tx-info"></div>
+ </div>
+ <form action="/reset/" method="post" id="reset-form">
+ <fieldset class="tx-line">
+ <ol>
+ <li><label>Username</label>
+ <input size="50" type="text" name="user" value="" /></li>
+ <li><label>Email</label>
+ <input size="50" type="text" name="email" value="" /></li>
+ <li>
+ <input value="Reset" type="submit" id="resetButton"/>
+ </li>
+ </ol>
+ </fieldset>
</form>
- </body>
-</html>
\ No newline at end of file
+ </div>
+</div>
+<!-- // content -->
+
+</body>
+</html>
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset_success.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset_success.xhtml?rev=907250&r1=907249&r2=907250&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset_success.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset_success.xhtml Sat Feb 6 16:29:02 2010
@@ -1,12 +1,37 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>Password Reset Success</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+
+ <link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
+ <link href="/style/login.css" media="screen" rel="stylesheet" type="text/css" />
+
</head>
+
<body>
-<h1>Clerezza Password Reset</h1>
-<hr/>
-Check your mail box. An automatically generated password was sent to your e-mail address.
+
+<!-- header -->
+<div id="tx-header">
+ <!-- system -->
+ <div id="tx-system"></div>
+ <!-- //system -->
+</div>
+<!-- // header -->
+
+<!-- content -->
+<div id="tx-login-mask">
+ <div>
+ <div>
+ <div id="tx-logo"></div>
+ <div class="tx-info">Password Reset Success
+ <br/>
+ <br/>
+ Check your mail box. An automatically generated password was sent to your e-mail address.
+ <a href="/login">Login Page</a>
+ </div>
+ </div>
+ </div>
+</div>
+<!-- // content -->
+
</body>
</html>
\ No newline at end of file
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/reset.js
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/reset.js?rev=907250&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/reset.js (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/reset.js Sat Feb 6 16:29:02 2010
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+$(document).ready(function() {
+
+ $("#resetButton").hide();
+ $("<a/>").addClass("tx-button tx-button-generic").attr("href", "#")
+ .text("Reset").insertBefore("#resetButton");
+
+ $(".tx-button-generic").click(function(){
+ $("#reset-form").submit();
+ });
+
+ $("input[name*='user']").focus();
+
+ var aHref = $("<a/>").addClass("tx-icon-right")
+ .attr({"href": "/login?referer=" +
+ document.location.href.substring(0,
+ document.location.href.indexOf(document.location.pathname)) +
+ "/dashboard/overview",
+ "style" : "padding-left: 1em; background-position: left center;"})
+ .text("Login Page").insertAfter("#reset-form");
+});
\ No newline at end of file