mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-12-22 19:33:48 +01:00
Adding hsql warning message in login page
This commit is contained in:
parent
8ea733fc55
commit
e722fdd720
@ -30,6 +30,7 @@ import java.util.Calendar;
|
||||
|
||||
public class LoginController
|
||||
extends BaseMultiActionController {
|
||||
private String driver;
|
||||
|
||||
protected ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest request, HttpServletResponse httpServletResponse) throws Exception {
|
||||
// Reload user only in case of beeing necessary...
|
||||
@ -41,6 +42,7 @@ public class LoginController
|
||||
|
||||
} else {
|
||||
result = new ModelAndView("login");
|
||||
result.addObject("isHsql", driver.indexOf("hsql")!=-1);
|
||||
}
|
||||
|
||||
return result;
|
||||
@ -59,4 +61,12 @@ public class LoginController
|
||||
|
||||
return new ModelAndView("forward:/c/mymaps.htm");
|
||||
}
|
||||
|
||||
public void setDriver(String driver) {
|
||||
this.driver = driver;
|
||||
}
|
||||
|
||||
public String getDriver() {
|
||||
return driver;
|
||||
}
|
||||
}
|
||||
|
@ -30,7 +30,7 @@ SETTINGS=Settings
|
||||
USERNAME=Username
|
||||
BACK=Back
|
||||
CLOSE=Close
|
||||
NOT_READY_A_USER=Not ready a wisemapper?
|
||||
NOT_READY_A_USER=Not a member yet?
|
||||
NOT_READY_A_USER_MESSAGE=Registration is free and takes just a moment.
|
||||
JOIN_NOW=Join Now!
|
||||
REMOVE=Remove
|
||||
@ -301,7 +301,7 @@ NEWS_TOOLBAR_SHORT =New Editor Toolbar
|
||||
NEWS_TOOLBAR_TEXT = We have update our editor toolbar in order to be more intuitive.
|
||||
|
||||
#####FOOTER
|
||||
COPYRIGHT=All content Copyright 2007-2011, WiseMapping Corporation
|
||||
COPYRIGHT=Powered by WiseMapping
|
||||
TERMS_AND_CONDITIONS=Terms and Conditions
|
||||
CONTACT=Contact
|
||||
|
||||
|
@ -246,7 +246,6 @@ IT_IS_FREE=Es gratis!
|
||||
CREATE_EDIT_ACCESS_FROM_ANYWHERE=Crear, editar y acceder a sus mapas mentales desde cualquier lugar de Internet
|
||||
|
||||
#FOOTER
|
||||
COPYRIGHT=All content Copyright 2007, WiseMapping Corporation
|
||||
TERMS_AND_CONDITIONS=Términos and Condiciones
|
||||
CONTACT=Contacto
|
||||
|
||||
|
@ -97,6 +97,7 @@
|
||||
<property name="methodNameResolver" ref="paramResolverByAction"/>
|
||||
<property name="mindmapService" ref="mindmapService"/>
|
||||
<property name="userService" ref="userService"/>
|
||||
<property name="driver" value="${database.driver}"/>
|
||||
</bean>
|
||||
|
||||
<bean id="sharingController" class="com.wisemapping.controller.MindmapSharingController">
|
||||
|
@ -2,20 +2,7 @@
|
||||
<div id="footer">
|
||||
<div style="width:30%; float:left;"> </div>
|
||||
<div style="float:left; width:40%;">
|
||||
<a href="mailto:team@wisemapping.com"><spring:message code="CONTACT"/></a>
|
||||
|
||||
<p><spring:message code="COPYRIGHT"/></p>
|
||||
</div>
|
||||
|
||||
<div style="float:left; text-align:left;padding:5px;">
|
||||
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
|
||||
<input type="hidden" name="cmd" value="_s-xclick"/>
|
||||
<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" name="submit"
|
||||
alt="Make payments with PayPal - it's fast, free and secure!"/>
|
||||
<img alt="" style="border: 0;width:1;height:1;" src="https://www.paypal.com/en_US/i/scr/pixel.gif"/>
|
||||
<input type="hidden" name="encrypted"
|
||||
value="-----BEGIN PKCS7-----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-----END PKCS7-----"/>
|
||||
</form>
|
||||
<p><a href="http://www.wisemapping.com"><spring:message code="COPYRIGHT"/></a></p>
|
||||
</div>
|
||||
|
||||
<div style="float:left; text-align:left;padding:5px;">
|
||||
|
@ -11,6 +11,10 @@
|
||||
<div id="loginContent">
|
||||
|
||||
<div id="news" class="sb">
|
||||
|
||||
<c:if test="${isHsql== 'true'}">
|
||||
<h2 style="border:0; color:red;"> You are using an HSQL database. You shouldn't use this environment for production!</h2>
|
||||
</c:if>
|
||||
<h1>What is New: </h1>
|
||||
<ul>
|
||||
<li>Links Between Nodes</li>
|
||||
|
Loading…
Reference in New Issue
Block a user