diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java
index fff6c46e..09eeeec3 100644
--- a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java
+++ b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java
@@ -45,6 +45,9 @@ public class RequestPropertiesInterceptor extends HandlerInterceptorAdapter {
@Value("${security.type}")
private String securityType;
+ @Value("${security.openid.enabled}")
+ private Boolean openIdEnabled;
+
public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, Object object) throws Exception {
request.setAttribute("google.analytics.enabled", analyticsEnabled);
@@ -52,6 +55,7 @@ public class RequestPropertiesInterceptor extends HandlerInterceptorAdapter {
request.setAttribute("google.ads.enabled", adsEnabled);
request.setAttribute("site.homepage", siteHomepage);
request.setAttribute("security.type", securityType);
+ request.setAttribute("security.openid.enabled", openIdEnabled);
// If the property could not be resolved, try to infer one from the request...
diff --git a/wise-webapp/src/main/resources/messages_ca.properties b/wise-webapp/src/main/resources/messages_ca.properties
index bdba622f..f47c725d 100644
--- a/wise-webapp/src/main/resources/messages_ca.properties
+++ b/wise-webapp/src/main/resources/messages_ca.properties
@@ -251,6 +251,7 @@ TEMPORAL_PASSWORD_SENT=Li ha estat enviat la seva contrasenya temporal
MINDMAP_LOCKED=El mapa està essent editat per {0} <{1}>. Serà obert en modus lectura.
MINDMAP_TIMESTAMP_OUTDATED=No és possible desar els seus canvis perquè el mapa ha estat modificar per {0}'. Re-carregui la plana i torni a intentar-ho.
TUTORIAL_VIDEO=Video tutorial
+LOGIN_USING_OPENID=Create Property
diff --git a/wise-webapp/src/main/resources/messages_de.properties b/wise-webapp/src/main/resources/messages_de.properties
index e7a8d236..b3909d18 100644
--- a/wise-webapp/src/main/resources/messages_de.properties
+++ b/wise-webapp/src/main/resources/messages_de.properties
@@ -250,6 +250,7 @@ TEMPORAL_PASSWORD_SENT=Ihr temporäres Passwort wurde angelegt
TEMPORAL_PASSWORD_SENT_DETAILS=Wir haben Ihnen eine email gesendet, die es Ihnen erlaubt Ihr Passwort zurückzusetzen. Bitte prüfen Sie den Posteingang.
TEMPORAL_PASSWORD_SENT_SUPPORT=Falls sie Probleme haben die email zu empfangen, kontaktieren Sie uns unter support@wisemapping.com
TUTORIAL_VIDEO=Tutorial Video
+LOGIN_USING_OPENID=Create Property
diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties
index 9dbaedbf..6a902ced 100644
--- a/wise-webapp/src/main/resources/messages_en.properties
+++ b/wise-webapp/src/main/resources/messages_en.properties
@@ -256,6 +256,7 @@ MINDMAP_TIMESTAMP_OUTDATED=It's not possible to save your changes because your m
MINDMAP_OUTDATED_BY_YOU=It's not possible to save your changes because map is out of date. Do you have multiple tabs opened ?. Refresh the page and try again.
MINDMAP_LOCKED=Map is being edited by {0} <{1}>. Map is opened in read only mode.
TUTORIAL_VIDEO=Tutorial Video
+LOGIN_USING_OPENID=Create Property
diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-webapp/src/main/resources/messages_es.properties
index 008984fa..e1d4c049 100644
--- a/wise-webapp/src/main/resources/messages_es.properties
+++ b/wise-webapp/src/main/resources/messages_es.properties
@@ -251,6 +251,7 @@ TEMPORAL_PASSWORD_SENT=Tu contraseña temporal ha sido enviada
MINDMAP_LOCKED=El mapa esta siendo editado por {0} <{1}>. Mapa sera abierto en modo lectura.
MINDMAP_TIMESTAMP_OUTDATED=No es posible grabar sus cambios por que el mapa ha sido modificado por {0}'. Refresque la pagina y intentelo nuevamente.
TUTORIAL_VIDEO=Tutorial Video
+LOGIN_USING_OPENID=Create Property
diff --git a/wise-webapp/src/main/resources/messages_fr.properties b/wise-webapp/src/main/resources/messages_fr.properties
index fabd4a86..351b8a4c 100644
--- a/wise-webapp/src/main/resources/messages_fr.properties
+++ b/wise-webapp/src/main/resources/messages_fr.properties
@@ -251,6 +251,7 @@ LICENSE=License
WELCOME_TO_WISEMAPPING=Welcome to WiseMapping
WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can:
Embed mind map it in web pages and blogs
Link mind map and documents
Share your maps with friend and colleagues
Export your maps SVG,PNG,JPG and FreeMind
.
TUTORIAL_VIDEO=Tutorial Video
+LOGIN_USING_OPENID=Create Property
diff --git a/wise-webapp/src/main/resources/messages_it.properties b/wise-webapp/src/main/resources/messages_it.properties
index 21ca548a..34ea362d 100644
--- a/wise-webapp/src/main/resources/messages_it.properties
+++ b/wise-webapp/src/main/resources/messages_it.properties
@@ -236,6 +236,7 @@ TUTORIAL.FONT_STYLE=Stili
TUTORIAL.FONT_TYPE=Font
TUTORIAL.SAMPLE_NOTE=Questa è una semplice nota !.
TUTORIAL_VIDEO=Tutorial Video
+LOGIN_USING_OPENID=Create Property
diff --git a/wise-webapp/src/main/resources/messages_pt_BR.properties b/wise-webapp/src/main/resources/messages_pt_BR.properties
index 93e299e3..291c8385 100644
--- a/wise-webapp/src/main/resources/messages_pt_BR.properties
+++ b/wise-webapp/src/main/resources/messages_pt_BR.properties
@@ -236,4 +236,5 @@ SUPPORT=Ajudar
FEEDBACK=Feedback
CONTACT_US=Contato
TUTORIAL_VIDEO=Tutorial Video
+LOGIN_USING_OPENID=Create Property
diff --git a/wise-webapp/src/main/resources/messages_zh_CN.properties b/wise-webapp/src/main/resources/messages_zh_CN.properties
index 2c5cfad4..b88612b5 100644
--- a/wise-webapp/src/main/resources/messages_zh_CN.properties
+++ b/wise-webapp/src/main/resources/messages_zh_CN.properties
@@ -211,4 +211,5 @@ CONTACT_US=联系我们
FEEDBACK=反馈
SUPPORT=支援
TUTORIAL_VIDEO=Tutorial Video
+LOGIN_USING_OPENID=Create Property
diff --git a/wise-webapp/src/main/resources/messages_zh_TW.properties b/wise-webapp/src/main/resources/messages_zh_TW.properties
index a29ab284..6c2a1b5a 100644
--- a/wise-webapp/src/main/resources/messages_zh_TW.properties
+++ b/wise-webapp/src/main/resources/messages_zh_TW.properties
@@ -211,4 +211,5 @@ CONTACT_US=聯繫我們
FEEDBACK=反饋
SUPPORT=幫助
TUTORIAL_VIDEO=Tutorial Video
+LOGIN_USING_OPENID=Create Property
diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties
index 1677196b..73206612 100755
--- a/wise-webapp/src/main/webapp/WEB-INF/app.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties
@@ -131,7 +131,8 @@ security.ldap.auth.attribute=mail
security.ldap.lastName.attribute=sn
security.ldap.firstName.attribute=givenName
-
+# Enable OpenId Authentication.
+security.openid.enabled=true
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp
index cf9bc22f..81ab3f5c 100644
--- a/wise-webapp/src/main/webapp/jsp/login.jsp
+++ b/wise-webapp/src/main/webapp/jsp/login.jsp
@@ -75,10 +75,11 @@
-
- Do you already have an account on GMail, Yahoo, AOL or other OpenId site ?. Sign in in with it here.
-
-