Upgrade Spring version.

Fix failing export tests
2018-09-14 17:50:27 -07:00
parent 57b2e79c0d
commit 4234ca7e38
30 changed files with 187 additions and 163 deletions
--- a/wise-webapp/src/main/webapp/jsp/template.jsp
+++ b/wise-webapp/src/main/webapp/jsp/template.jsp
@@ -24,7 +24,6 @@
    <meta property="og:url" content="http://www.wisemapping.com"/>
    <meta property="og:image" content="http://www.wisemapping.com/images/logo.png"/>
    <meta property="og:site_name" content="WiseMapping.com"/>
-
    <title>
        <spring:message code="SITE.TITLE"/>-
        <c:choose>
@@ -44,6 +43,8 @@

    <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.min.js"></script>
    <script src="js/less.js" type="text/javascript"></script>
+    <script src='https://www.google.com/recaptcha/api.js'></script>
+
 </head>
 <body>

--- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
@@ -47,11 +47,9 @@
    </div>
    <div class="form-group">
        <div class="col-md-10 col-md-offset-2">
-            <c:if test="${requestScope.captchaEnabled}">
-                ${requestScope.captchaHtml}
-                <p>
-                    <form:errors path="captcha" cssClass="errorMsg"/>
-                </p>
+            <c:if test="${requestScope.recaptchaEnabled}">
+                <div class="g-recaptcha" data-sitekey="${requestScope.recaptchaSiteKey}"></div>
+                <p>${requestScope.captcha}</p>
            </c:if>
        </div>
    </div>