Finish OpenId implementation.

wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml

@@ -75,7 +75,7 @@
         <put-attribute name="removeSignin" value="true"/>
     </definition>
 
-    <definition name="loginOpenId" extends="pageTemplate">
+    <definition name="loginopenid" extends="pageTemplate">
         <put-attribute name="title" value="LOGIN"/>
         <put-attribute name="body" value="/jsp/loginOpenId.jsp"/>
         <put-attribute name="removeSignin" value="true"/>

wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml

@@ -15,7 +15,7 @@
     <sec:http pattern="/favicon.ico" security="none"/>
 
     <sec:http pattern="/c/login" security="none"/>
-    <sec:http pattern="/c/loginOpenId" security="none"/>
+    <sec:http pattern="/c/loginopenid" security="none"/>
     <sec:http pattern="/c/user/registration" security="none"/>
     <sec:http pattern="/c/user/resetpassword" security="none"/>
     <sec:http pattern="/c/home" security="none"/>
@@ -66,6 +66,11 @@
                 <sec:openid-attribute name="fullname" type="http://axschema.org/namePerson" required="true"/>
             </sec:attribute-exchange>
 
+            <sec:attribute-exchange identifier-match=".*yahoo.com.*">
+                <sec:openid-attribute name="email" type="http://axschema.org/contact/email" required="true"/>
+                <sec:openid-attribute name="fullname" type="http://axschema.org/namePerson" required="true"/>
+            </sec:attribute-exchange>
+
             <sec:attribute-exchange identifier-match=".*myopenid.com.*">
                 <sec:openid-attribute name="email" type="http://schema.openid.net/contact/email" required="true"/>
                 <sec:openid-attribute name="fullname" type="http://schema.openid.net/namePerson" required="true"/>

wise-webapp/src/main/webapp/jsp/login.jsp

@@ -75,6 +75,10 @@
                 <spring:message code="JOIN_NOW"/>
             </a>
         </c:if>
+        <p>
+        Do you already have an account on <b>GMail, Yahoo, AOL or other OpenId site</b> ?. Sign in in with it <a href="/c/loginopenid"><b>here</b></a>.
+
+        </p>
     </div>
 </div>
 

wise-webapp/src/main/webapp/jsp/loginOpenId.jsp

@@ -2,6 +2,17 @@
 <%@ include file="/jsp/init.jsp" %>
 
 <%--@elvariable id="isHsql" type="boolean"--%>
+<!-- Simple OpenID Selector -->
+<link type="text/css" rel="stylesheet" href="css/openid.css"/>
+<script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
+<script type="text/javascript" language="javascript" src="js/openid-jquery.js"></script>
+<script type="text/javascript" language="javascript" src="js/openid-en.js"></script>
+<!-- /Simple OpenID Selector -->
+<script type="text/javascript">
+    $(document).ready(function() {
+        openid.init('openid_identifier');
+    });
+</script>
 
 <script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
 <script type="text/javascript" language="javascript">
@@ -11,7 +22,7 @@
         });
     });
 </script>
-<div class="row-fluid">
+<div class="row-fluid" style="padding: 10px 0px">
     <h1><spring:message code="OPEN_ID_LOGIN"/></h1>
     <spring:message code="LOGING_OPENID_DETAILS"/>
 </div>
@@ -38,4 +49,8 @@
         </form>
         <!-- /Simple OpenID Selector -->
     </div>
-</div>
+    <div class="span4" style="background-color: #FFEFC6;padding: 10px">
+        <spring:message code="WHY_OPENID"/>
+     </div>
+</div>
+

wise-webapp/src/main/webapp/jsp/template.jsp

@@ -42,18 +42,6 @@
 
     <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
     <script src="js/less.js" type="text/javascript"></script>
-
-    <!-- Simple OpenID Selector -->
-    <link type="text/css" rel="stylesheet" href="css/openid.css"/>
-    <script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
-    <script type="text/javascript" language="javascript" src="js/openid-jquery.js"></script>
-    <script type="text/javascript" language="javascript" src="js/openid-en.js"></script>
-    <!-- /Simple OpenID Selector -->
-    <script type="text/javascript">
-        $(document).ready(function() {
-            openid.init('openid_identifier');
-        });
-    </script>
 </head>
 <body>