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/08/10 17:27:54 UTC

svn commit: r984087 - in /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/src/main: java/org/apache/clerezza/platform/security/auth/cookie/ resources/org/apache/clerezza/platform/security/auth/cookie/

Author: ito
Date: Tue Aug 10 15:27:54 2010
New Revision: 984087

URL: http://svn.apache.org/viewvc?rev=984087&view=rev
Log:
labels renamed

Modified:
    incubator/clerezza/trunk/org.apache.clerezza.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.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.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login_naked.xhtml

Modified: incubator/clerezza/trunk/org.apache.clerezza.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.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java?rev=984087&r1=984086&r2=984087&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.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.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogin.java Tue Aug 10 15:27:54 2010
@@ -177,7 +177,7 @@ public class CookieLogin {
 				GraphNode result = new GraphNode(new BNode(), new SimpleMGraph());
 				result.addProperty(RDF.type, LOGIN.LoginPage);
 				PlainLiteral failedMessage = new PlainLiteralImpl(
-						"Login name or password are wrong");
+						"Username name or password are wrong");
 				try {
 					if (authenticationChecker.authenticate(userName,password)) {
 

Modified: incubator/clerezza/trunk/org.apache.clerezza.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.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login.xhtml?rev=984087&r1=984086&r2=984087&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.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.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login.xhtml Tue Aug 10 15:27:54 2010
@@ -32,7 +32,7 @@ def login(s: Any) = new UriRef("http://c
 			
 		</div>
 			{render(res, "naked")}
-		<a href="/reset/" class="tx-icon-right" style="padding-left: 1em; background-position: left center;">Forgot password</a>
+		<a href="/reset/" class="tx-icon-right" style="padding-left: 1em; background-position: left center;">Forgot your password?</a>
 	</div>
 </div>
 <!-- // content -->

Modified: incubator/clerezza/trunk/org.apache.clerezza.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.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login_naked.xhtml?rev=984087&r1=984086&r2=984087&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.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.platform.security.auth.cookie/src/main/resources/org/apache/clerezza/platform/security/auth/cookie/login_naked.xhtml Tue Aug 10 15:27:54 2010
@@ -12,8 +12,8 @@ resultDocModifier.addScriptReference("/l
 			<li><label>Password</label>
 				<input size="30" type="password" name="pass" value="" /></li>
 			<li>
-				<input type="checkbox" value="true" name="stayloggedin" /><label class="tx-checkbox">Stay logged in</label>
-				<input type="submit" value="Log in" id="submitButton"></input>
+				<input type="checkbox" value="true" name="stayloggedin" /><label class="tx-checkbox">&#160;Keep me logged in</label>
+				<input type="submit" value="Log In" id="submitButton"></input>
 			</li>
 		</ol>
 		<input type="hidden" id="referer" name="referer" value={res/login("refererUri")*} />