zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Browser detection filter.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-06-21 20:16:13 -03:00
parent f49448d22f
commit a5bf5b8d57
8 changed files with 72 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
View File

@@ -153,7 +153,7 @@ EMPTY_RECENT_MINDMAP_TABLE=No recent maps
TAGS_DETAILS=Add tags you maps is very simple. Try!
TAG_IT=Tag It
PUBLISH_IT=Publish It
USUPPORTED_BROWSER=Unsupported Browser
UNSUPPORTED_BROWSER=Unsupported Browser
FIELD_REQUIRED_MSG=Fields marked with an asterisk <span class="fieldRequired">*</span> are required.
TAGS_MSG=Tagging is a simple way to keep your maps in order and help other people to find your public maps
COMMA_SEPARATED_EMAILS=Comma separated emails

2
wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties
View File

@@ -151,7 +151,7 @@ EMPTY_RECENT_MINDMAP_TABLE=No hay mapas recientes
TAGS_DETAILS=Agregar etiquetas a sus mapas en muy facil! Intentelo!
TAG_IT=Etiquetalo!
PUBLISH_IT=Publicalo!
USUPPORTED_BROWSER=Navegador no soportado
UNSUPPORTED_BROWSER=Navegador no soportado
FIELD_REQUIRED_MSG=Fields marked with an asterisk <span class="fieldRequired">*</span> are required.
TAGS_MSG=Tagging is a simple way to keep your maps in order and help other people to find your public maps
COMMA_SEPARATED_EMAILS=E-mails separados por comas

2
wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.properties
View File

@@ -154,7 +154,7 @@ EMPTY_RECENT_MINDMAP_TABLE = Aucune carte r\u00e9cente
TAGS_DETAILS = Ajoutez des mots-cl\u00e9s \u00e0 vos maps en 1 clic.
TAG_IT = Taguer
PUBLISH_IT = Publier
USUPPORTED_BROWSER = Navigateur non support\u00e9
UNSUPPORTED_BROWSER = Navigateur non support\u00e9
FIELD_REQUIRED_MSG=Les champs marqu\u00e9s avec une ast\u00e9risque sont requis.
COMMA_SEPARATED_EMAILS = S\u00e9parer les adresses email par une virgule

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

@@ -10,6 +10,7 @@
<definition name="mindmapEditor" template="/jsp/mindmapEditor.jsp"/>
<definition name="mindmapPrint" template="/jsp/mindmapPrint.jsp"/>
<!-- Template Declaration -->
<definition name="pageTemplate" template="/jsp/template.jsp">
<put-attribute name="title" value="" type="string"/>
@@ -57,6 +58,11 @@
</definition>
<!-- Main Pages -->
<definition name="login" extends="pageTemplate">
<put-attribute name="title" value="LOGIN"/>
<put-attribute name="body" value="/jsp/login.jsp"/>
</definition>
<definition name="forgotPasswordError" extends="errorTemplate">
<put-attribute name="title" value="INVALID_EMAIL_ERROR"/>
<put-attribute name="body" value="/jsp/userForgotPasswordError.jsp"/>
@@ -82,9 +88,14 @@
<put-attribute name="body" value="/jsp/userRegistrationSuccess.jsp"/>
</definition>
<definition name="login" extends="pageTemplate">
<put-attribute name="title" value="LOGIN"/>
<put-attribute name="body" value="/jsp/login.jsp"/>
<definition name="userRegistrationSuccess" extends="pageTemplate">
<put-attribute name="title" value="USER_REGISTRATION"/>
<put-attribute name="body" value="/jsp/userRegistrationSuccess.jsp"/>
</definition>
<definition name="browserNotSupported" extends="pageTemplate">
<put-attribute name="title" value="UNSUPPORTED_BROWSER"/>
<put-attribute name="body" value="/jsp/browserNotSupported.jsp"/>
</definition>
<!-- Dialog Forms -->

48
wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
View File

@@ -15,6 +15,29 @@
<context:annotation-config/>
<mvc:annotation-driven/>
<!-- Interceptors Registration -->
<mvc:interceptors>
<bean id="browserSupportInterceptor" class="com.wisemapping.filter.BrowserSupportInterceptor">
<property name="exclude">
<set>
<value>/</value>
<value>/index.jsp</value>
<value>/c/home</value>
<value>/c/j_spring_security</value>
<value>/c/login</value>
<value>/service/</value>
<value>/c/maps/*/embed</value>
<value>/c/maps/*/public</value>
<value>/c/embeddedView</value>
<value>/c/user/resetPassword</value>
<value>/c/user/registration</value>
</set>
</property>
</bean>
<bean id="localeChangeInterceptor" class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor">
<property name="paramName" value="locale"/>
</bean>
</mvc:interceptors>
<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="/WEB-INF/app.properties"/>
@@ -50,11 +73,6 @@
<property name="defaultLocale" value="en"/>
</bean>
<bean id="localeChangeInterceptor"
class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor">
<property name="paramName" value="language"/>
</bean>
<bean id="reCaptcha" class="net.tanesha.recaptcha.ReCaptchaImpl">
<property name="privateKey" value="${registration.recaptcha.privateKey}"/>
<property name="publicKey" value="${registration.recaptcha.publicKey}"/>
@@ -67,26 +85,6 @@
<property name="maxUploadSize" value="522240"/>
</bean>
<bean id="browserSupportInterceptor" class="com.wisemapping.filter.BrowserSupportInterceptor">
<property name="exclude">
<list>
<value>/</value>
<value>/index.jsp</value>
<value>/c/home</value>
<value>/c/login</value>
<value>/c/user/registration</value>
<value>/c/captcha</value>
<value>/c/publicView</value>
<value>/service/*</value>
<value>/c/search</value>
<value>/c/keyboard</value>
<value>/c/renameMap</value>
<value>/c/embeddedView</value>
<value>/c/user/resetPassword</value>
</list>
</property>
</bean>
<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
<property name="basenames">
<list>