Index: standard/src/main/webapp/templates/attach_openid.vm =================================================================== --- standard/src/main/webapp/templates/attach_openid.vm (revision 0) +++ standard/src/main/webapp/templates/attach_openid.vm (revision 0) @@ -0,0 +1,61 @@ +#template("startpage.vm") +
+ +

$msg.get("openid.attach.title")

+#if($status && $status <= 0) + #if($status == -1) + #error("$msg.get('openid.attach.alreadyAssociatedOpenId')") + #elseif($status == -2) + #error("$msg.get('openid.registration.invalidOpenID')") + #elseif($status == -3) + #error("$msg.get('openid.attach.openIdAlreadyRegistered', [$openid_identifier])") + #elseif($status == -4) + #error("$msg.get('openid.attach.passwordInvalid')") + #elseif($status == -5) + #error("$msg.get('openid.common.discovery_cancelled')") + #elseif($status == -6) + #error("$msg.get('openid.common.discovery_failed')") + #else + #error("$msg.get('openid.attach.internalError')") + #end +#elseif($status && $status != 1) + #info("$msg.get('openid.attach.successful', [$openid_identifier, $username])") +#end +#if(!$status || ($status < 0 && $status != -4)) +

$msg.get("openid.attach.welcome")

+
+
+ + +
+
$msg.get("openid.common.identifier_field_label")
+
+
+ +
+
+#elseif($status && ($status == 1 || $status == -4)) +

$msg.get("openid.attach.confirm")

+
+
+ + + + #set($class = $xwiki.getClass("XWiki.XWikiUsers")) + #set($obj = $class.newObject()) + #set($serverobj = $class.newObject()) + #set($discard = $doc.use("XWiki.XWikiUsers")) +
+
$msg.get("openid.common.identifier_field_label")
+
$openid_identifier
+ + #set($prop = $class.password) +
$msg.get("core.register.password")
+
$doc.displayEdit($prop, "", $obj)
+
+ +
+
+#end +
+#template("endpage.vm") \ No newline at end of file Index: standard/src/main/webapp/templates/login.vm =================================================================== --- standard/src/main/webapp/templates/login.vm (revision 11817) +++ standard/src/main/webapp/templates/login.vm (working copy) @@ -18,34 +18,71 @@ ### #template("startpage.vm")
-
- -#xwikimessageboxstart($msg.get("login") "") +###xwikimessageboxstart($msg.get("login") "") + +
+

$msg.get("login")

#set($message = $msg.get($xwiki.parseMessage())) #if($message) #error($message) #end - - - - - +
+ + + +
+ + + +

with your username and password

+ + + + + #if(0) - - + + #else - + #end +
+
+ +
+
+ +

... or with your OpenID

+ + + +#if(0) + + +#else + +#end +
+
+
+
-
-#xwikimessageboxend() -
+ +###xwikimessageboxend() + +
## Ensure that the username field of the login form has the focus to make it easy for users to log in quickly