mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-05 07:03:24 +01:00
Minor fixes.
This commit is contained in:
parent
0d81db52f1
commit
8ed1a18280
@ -45,6 +45,9 @@ public class RequestPropertiesInterceptor extends HandlerInterceptorAdapter {
|
|||||||
@Value("${security.type}")
|
@Value("${security.type}")
|
||||||
private String securityType;
|
private String securityType;
|
||||||
|
|
||||||
|
@Value("${security.openid.enabled}")
|
||||||
|
private Boolean openIdEnabled;
|
||||||
|
|
||||||
public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, Object object) throws Exception {
|
public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, Object object) throws Exception {
|
||||||
|
|
||||||
request.setAttribute("google.analytics.enabled", analyticsEnabled);
|
request.setAttribute("google.analytics.enabled", analyticsEnabled);
|
||||||
@ -52,6 +55,7 @@ public class RequestPropertiesInterceptor extends HandlerInterceptorAdapter {
|
|||||||
request.setAttribute("google.ads.enabled", adsEnabled);
|
request.setAttribute("google.ads.enabled", adsEnabled);
|
||||||
request.setAttribute("site.homepage", siteHomepage);
|
request.setAttribute("site.homepage", siteHomepage);
|
||||||
request.setAttribute("security.type", securityType);
|
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...
|
// If the property could not be resolved, try to infer one from the request...
|
||||||
|
@ -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_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.
|
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
|
TUTORIAL_VIDEO=Video tutorial
|
||||||
|
LOGIN_USING_OPENID=Create Property
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -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_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 <a href\="mailto\:support@wisemapping.com">support@wisemapping.com </a>
|
TEMPORAL_PASSWORD_SENT_SUPPORT=Falls sie Probleme haben die email zu empfangen, kontaktieren Sie uns unter <a href\="mailto\:support@wisemapping.com">support@wisemapping.com </a>
|
||||||
TUTORIAL_VIDEO=Tutorial Video
|
TUTORIAL_VIDEO=Tutorial Video
|
||||||
|
LOGIN_USING_OPENID=Create Property
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -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_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.
|
MINDMAP_LOCKED=Map is being edited by {0} <{1}>. Map is opened in read only mode.
|
||||||
TUTORIAL_VIDEO=Tutorial Video
|
TUTORIAL_VIDEO=Tutorial Video
|
||||||
|
LOGIN_USING_OPENID=Create Property
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -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_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.
|
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
|
TUTORIAL_VIDEO=Tutorial Video
|
||||||
|
LOGIN_USING_OPENID=Create Property
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -251,6 +251,7 @@ LICENSE=License
|
|||||||
WELCOME_TO_WISEMAPPING=Welcome to WiseMapping
|
WELCOME_TO_WISEMAPPING=Welcome to WiseMapping
|
||||||
WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: <ul><li>Embed mind map it in web pages and blogs</li><li>Link mind map and documents</li><li>Share your maps with friend and colleagues</li><li>Export your maps SVG,PNG,JPG and FreeMind</li></ul>.
|
WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: <ul><li>Embed mind map it in web pages and blogs</li><li>Link mind map and documents</li><li>Share your maps with friend and colleagues</li><li>Export your maps SVG,PNG,JPG and FreeMind</li></ul>.
|
||||||
TUTORIAL_VIDEO=Tutorial Video
|
TUTORIAL_VIDEO=Tutorial Video
|
||||||
|
LOGIN_USING_OPENID=Create Property
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -236,6 +236,7 @@ TUTORIAL.FONT_STYLE=Stili
|
|||||||
TUTORIAL.FONT_TYPE=Font
|
TUTORIAL.FONT_TYPE=Font
|
||||||
TUTORIAL.SAMPLE_NOTE=Questa è una semplice nota !.
|
TUTORIAL.SAMPLE_NOTE=Questa è una semplice nota !.
|
||||||
TUTORIAL_VIDEO=Tutorial Video
|
TUTORIAL_VIDEO=Tutorial Video
|
||||||
|
LOGIN_USING_OPENID=Create Property
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -236,4 +236,5 @@ SUPPORT=Ajudar
|
|||||||
FEEDBACK=Feedback
|
FEEDBACK=Feedback
|
||||||
CONTACT_US=Contato
|
CONTACT_US=Contato
|
||||||
TUTORIAL_VIDEO=Tutorial Video
|
TUTORIAL_VIDEO=Tutorial Video
|
||||||
|
LOGIN_USING_OPENID=Create Property
|
||||||
|
|
||||||
|
@ -211,4 +211,5 @@ CONTACT_US=联系我们
|
|||||||
FEEDBACK=反馈
|
FEEDBACK=反馈
|
||||||
SUPPORT=支援
|
SUPPORT=支援
|
||||||
TUTORIAL_VIDEO=Tutorial Video
|
TUTORIAL_VIDEO=Tutorial Video
|
||||||
|
LOGIN_USING_OPENID=Create Property
|
||||||
|
|
||||||
|
@ -211,4 +211,5 @@ CONTACT_US=聯繫我們
|
|||||||
FEEDBACK=反饋
|
FEEDBACK=反饋
|
||||||
SUPPORT=幫助
|
SUPPORT=幫助
|
||||||
TUTORIAL_VIDEO=Tutorial Video
|
TUTORIAL_VIDEO=Tutorial Video
|
||||||
|
LOGIN_USING_OPENID=Create Property
|
||||||
|
|
||||||
|
@ -131,7 +131,8 @@ security.ldap.auth.attribute=mail
|
|||||||
security.ldap.lastName.attribute=sn
|
security.ldap.lastName.attribute=sn
|
||||||
security.ldap.firstName.attribute=givenName
|
security.ldap.firstName.attribute=givenName
|
||||||
|
|
||||||
|
# Enable OpenId Authentication.
|
||||||
|
security.openid.enabled=true
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -75,10 +75,11 @@
|
|||||||
<spring:message code="JOIN_NOW"/>
|
<spring:message code="JOIN_NOW"/>
|
||||||
</a>
|
</a>
|
||||||
</c:if>
|
</c:if>
|
||||||
<p>
|
<c:if test="${requestScope['security.openid.enabled']}">
|
||||||
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>
|
||||||
|
<spring:message code="LOGIN_USING_OPENID"/><a href="/c/loginopenid"><b><spring:message code="HERE"/></b></a>.
|
||||||
</p>
|
</p>
|
||||||
|
</c:if>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -42,8 +42,7 @@
|
|||||||
<noscript>
|
<noscript>
|
||||||
<p>OpenID is service that allows you to log-on to many different websites using a single indentity.
|
<p>OpenID is service that allows you to log-on to many different websites using a single indentity.
|
||||||
Find out <a href="http://openid.net/what/">more about OpenID</a> and <a
|
Find out <a href="http://openid.net/what/">more about OpenID</a> and <a
|
||||||
href="http://openid.net/get/">how
|
href="http://openid.net/get/">how to get an OpenID enabled account</a>.</p>
|
||||||
to get an OpenID enabled account</a>.</p>
|
|
||||||
</noscript>
|
</noscript>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</form>
|
</form>
|
||||||
|
Loading…
Reference in New Issue
Block a user