vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-05 07:03:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport

Browse Source 
Conflicts:
	wise-webapp/src/main/webapp/jsp/mindmapList.jsp
This commit is contained in:
Ezequiel Bergamaschi 2014-02-10 22:16:48 -03:00
commit 9e8f73df99
12 changed files with 568 additions and 656 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/resources/messages_en.properties
View File

@ -259,7 +259,7 @@ MAP_CAN_NOT_BE_FOUND= Upps. The map can not be found. It must have been deleted.
LABEL_CAN_NOT_BE_FOUND= Upps. The label can not be found. It must have been deleted. LABEL_CAN_NOT_BE_FOUND= Upps. The label can not be found. It must have been deleted.
LICENSE=License 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>
OPENID_LOGIN=Open Id Login OPENID_LOGIN=Open Id Login
LOGING_OPENID_DETAILS=Do you already have an account on one of these sites?. Click the logo to log in with it here: LOGING_OPENID_DETAILS=Do you already have an account on one of these sites?. Click the logo to log in with it here:
WHY_OPENID=<b>Why OpenID ?</b></br> It's a single username and password that allows you to log in to any OpenID-enabled site. It works on thousands of websites.</br>It's an open standard. </br><a href="http://openid.net/what/">learn more</a> WHY_OPENID=<b>Why OpenID ?</b></br> It's a single username and password that allows you to log in to any OpenID-enabled site. It works on thousands of websites.</br>It's an open standard. </br><a href="http://openid.net/what/">learn more</a>

2
wise-webapp/src/main/webapp/css/mindmapList.less
View File

@ -338,7 +338,7 @@ abbr[title] {
} }
#foldersContainer { #foldersContainer {
padding-top: 60px; padding-top: 86px;
} }
#footerContainer > ul { #footerContainer > ul {

1
wise-webapp/src/main/webapp/css/pageHeaders.css
View File

@ -57,6 +57,7 @@ html,body {
padding-left: 7px; padding-left: 7px;
font-weight: bold; font-weight: bold;
vertical-align: middle; vertical-align: middle;
font-size: 20px;
} }
#headerButtons { #headerButtons {

66
wise-webapp/src/main/webapp/css/pageTemplate.css
View File

@ -2,7 +2,7 @@
@import "pageHeaders.css"; @import "pageHeaders.css";
div#register { div#register {
margin: 40px auto; margin: 20px auto;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
} }
@ -17,34 +17,6 @@ div#pageContainer {
min-height: 100%; min-height: 100%;
} }
div.bodyContainer {
padding-top: 30px;
padding-bottom: 85px; /* Height of the footer */
}
div.bodyContainer h1 {
color: #093A9D;
font-size: 150%;
margin-bottom: 5px;
font-weight: bold;
}
div.bodyContainer h2 {
color: gray;
font-size: 150%;
border-bottom: 1px dashed #BBB4D6;
margin: 20px 0;
}
div.bodyContainer ul {
padding: 5px;
}
div.bodyContainer li {
list-style-type: disc;
margin-left: 12px;
}
#footerContainer { #footerContainer {
padding-top: 10px; padding-top: 10px;
border-top: 1px black solid; border-top: 1px black solid;
@ -58,21 +30,33 @@ div.bodyContainer li {
/*-- End Main Page Style -- */ /*-- End Main Page Style -- */
span.errorMsg {
color: red; /* Reduce styles */
.jumbotron > h1 {
font-size: 30px;
color: #00008b;
} }
div.fform { .jumbotron p {
background: #eeeeee; font-size: 15px;
border: 1px solid #cfcfcf;
padding: 5px 25px;
-moz-border-radius: 8px;
-khtml-border-radius: 8px;
-webkit-border-radius: 8px;
border-radius: 8px;
} }
div.fform label { #login h1 {
font-weight: bold; font-size: 25px;
color: #00008b;
} }
#loginPanel {
padding: 0 60px;
background: #ffffff;
margin-top: 40px;
background: #F7C931;
color: #ffffff;
}
#loginPanel h1 {
color: #ffffff;
}

30
wise-webapp/src/main/webapp/jsp/accountSettings.jsp
View File

@ -18,25 +18,25 @@
<form action="#" method="POST" id="changeUserForm" class="form-horizontal"> <form action="#" method="POST" id="changeUserForm" class="form-horizontal">
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<label for="email" class="col-sm-3 control-label"><strong><spring:message code="EMAIL"/>:</strong></label> <label for="email" class="col-md-3 control-label"><strong><spring:message code="EMAIL"/>:</strong></label>
<div class="col-sm-8"> <div class="col-md-8">
<input type="text" name="password" id="email" required="required" class="form-control" readonly="readonly" value="${user.email}"/> <input type="text" name="password" id="email" required="required" class="form-control" readonly="readonly" value="${user.email}"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="firstname" class="col-sm-3 control-label"><strong><spring:message code="FIRSTNAME"/>:</strong></label> <label for="firstname" class="col-md-3 control-label"><strong><spring:message code="FIRSTNAME"/>:</strong></label>
<div class="col-sm-8"> <div class="col-md-8">
<input type="text" name="firstname" id="firstname" required="required" class="form-control" value="${user.firstname}"/> <input type="text" name="firstname" id="firstname" required="required" class="form-control" value="${user.firstname}"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="lastname" class="col-sm-3 control-label"><strong><spring:message code="LASTNAME"/>:</strong></label> <label for="lastname" class="col-md-3 control-label"><strong><spring:message code="LASTNAME"/>:</strong></label>
<div class="col-sm-8"> <div class="col-md-8">
<input type="text" name="lastname" id="lastname" required="required" class="form-control" value="${user.lastname}"/> <input type="text" name="lastname" id="lastname" required="required" class="form-control" value="${user.lastname}"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-8 col-sm-2"> <div class="col-md-offset-8 col-md-2">
<input type="submit" id="changeUserInfoBtn" class="btn btn-primary" class="form-control" value="<spring:message code="SAVE_CHANGES"/>"/> <input type="submit" id="changeUserInfoBtn" class="btn btn-primary" class="form-control" value="<spring:message code="SAVE_CHANGES"/>"/>
<div> <div>
</div> </div>
@ -50,19 +50,19 @@
<form action="#" method="POST" id="changePasswordForm" class="form-horizontal"> <form action="#" method="POST" id="changePasswordForm" class="form-horizontal">
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<label for="password" class="col-sm-3 control-label"><strong><spring:message code="NEW_PASSWORD"/>:</strong></label> <label for="password" class="col-md-3 control-label"><strong><spring:message code="NEW_PASSWORD"/>:</strong></label>
<div class="col-sm-8"> <div class="col-md-8">
<input type="password" name="password" id="password" required="required" class="form-control"/> <input type="password" name="password" id="password" required="required" class="form-control"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="repassword" class="col-sm-3 control-label"><strong><spring:message code="CONFIRM_NEW_PASSWORD"/>:</strong></label> <label for="repassword" class="col-md-3 control-label"><strong><spring:message code="CONFIRM_NEW_PASSWORD"/>:</strong></label>
<div class="col-sm-8"> <div class="col-md-8">
<input type="password" name="password" id="repassword" required="required" class="form-control"/> <input type="password" name="password" id="repassword" required="required" class="form-control"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-8 col-sm-2"> <div class="col-md-offset-8 col-md-2">
<input type="submit" id="changePasswordBtn" class="btn btn-primary" value="<spring:message code="CHANGE_PASSWORD"/>"/> <input type="submit" id="changePasswordBtn" class="btn btn-primary" value="<spring:message code="CHANGE_PASSWORD"/>"/>
</div> </div>
</div> </div>
@ -74,8 +74,8 @@
</div> </div>
<form action="#" method="POST" id="languageForm" class="form-horizontal"> <form action="#" method="POST" id="languageForm" class="form-horizontal">
<div class="form-group"> <div class="form-group">
<label for="language" class="col-sm-3 control-label"><strong><spring:message code="LANGUAGE"/>:</strong></label> <label for="language" class="col-md-3 control-label"><strong><spring:message code="LANGUAGE"/>:</strong></label>
<div class="col-sm-8"> <div class="col-md-8">
<select name="language" id="language" class="form-control"> <select name="language" id="language" class="form-control">
<option value="en">English</option> <option value="en">English</option>
<option value="es" <c:if test="${user.locale=='es'}">selected="selected" </c:if>>Spanish - <option value="es" <c:if test="${user.locale=='es'}">selected="selected" </c:if>>Spanish -
@ -106,7 +106,7 @@
</select></div> </select></div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-8 col-sm-2"> <div class="col-md-offset-8 col-md-2">
<input type="submit" id="changeLanguageBtn" class="btn btn-primary" value="<spring:message code="CHANGE_LANGUAGE"/>"/> <input type="submit" id="changeLanguageBtn" class="btn btn-primary" value="<spring:message code="CHANGE_LANGUAGE"/>"/>
</div> </div>
</div> </div>

29
wise-webapp/src/main/webapp/jsp/footer.jsp
View File

@ -1,8 +1,10 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<div id="footerContainer" class="row"> <div id="footerContainer" class="row">
<script type="text/javascript" src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=a47981d6"></script> <script type="text/javascript"
<script type="text/javascript" src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=703b9822"></script> src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=a47981d6"></script>
<script type="text/javascript"
src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=703b9822"></script>
<script type="text/javascript"> <script type="text/javascript">
window.ATL_JQ_PAGE_PROPS = $.extend(window.ATL_JQ_PAGE_PROPS, { window.ATL_JQ_PAGE_PROPS = $.extend(window.ATL_JQ_PAGE_PROPS, {
@ -28,12 +30,19 @@
</script> </script>
<div class="col-md-1 col-md-offset-2"> <div class="col-md-1 col-md-offset-2">
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.wisemapping.com" data-text="Check out this site" data-via="wisemapping" data-related="wisemapping">Tweet</a> <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.wisemapping.com"
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script> data-text="Check out this site" data-via="wisemapping" data-related="wisemapping">Tweet</a>
<script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0], p = /^http:/.test(d.location) ? 'http' : 'https';
if (!d.getElementById(id)) {
js = d.createElement(s);
js.id = id;
js.src = p + '://platform.twitter.com/widgets.js';
fjs.parentNode.insertBefore(js, fjs);
}
}(document, 'script', 'twitter-wjs');</script>
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<!-- Place this tag where you want the +1 button to render. --> <!-- Place this tag where you want the +1 button to render. -->
<div class="g-plusone" data-href="http://www.wisemapping.com"></div> <div class="g-plusone" data-href="http://www.wisemapping.com"></div>
@ -49,15 +58,13 @@
})(); })();
</script> </script>
</div> </div>
<div class="col-md-4"> <div class="col-md-4" style="text-align: center">
<p style="text-align: center;">
<a href="" id="feedbackBtn"><spring:message code="FEEDBACK"/></a> | <a href="" id="feedbackBtn"><spring:message code="FEEDBACK"/></a> |
<a href="" id="reportIssueBtn"><spring:message code="REPORT_BUG"/></a> | <a href="" id="reportIssueBtn"><spring:message code="REPORT_BUG"/></a> |
<a href="mailto:team@wisemapping.com"><spring:message code="CONTACT_US"/></a> | <a href="mailto:team@wisemapping.com"><spring:message code="CONTACT_US"/></a> |
<a href="https://wisemapping.atlassian.net/wiki/display/WS/License "><spring:message code="LICENSE"/></a><br/> <a href="https://wisemapping.atlassian.net/wiki/display/WS/License "><spring:message
code="LICENSE"/></a><br/>
<a href="http://www.wisemapping.org/"><spring:message code="COPYRIGHT"/></a> <a href="http://www.wisemapping.org/"><spring:message code="COPYRIGHT"/></a>
</p>
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<form action="https://www.paypal.com/cgi-bin/webscr" method="post"> <form action="https://www.paypal.com/cgi-bin/webscr" method="post">

47
wise-webapp/src/main/webapp/jsp/login.jsp
View File

@ -12,31 +12,40 @@
}); });
</script> </script>
<div class="row"> <div class="row" id="login">
<div class="col-md-5" style="margin-top: 20px"> <div class="col-md-6" style="padding-top: 25px">
<h1><spring:message code="WELCOME_TO_WISEMAPPING"/></h1> <h1><spring:message code="WELCOME_TO_WISEMAPPING"/></h1>
<spring:message code="WELCOME_DETAILS"/> <spring:message code="WELCOME_DETAILS"/>
</div> </div>
<div id="login" class="fform col-md-6"> <div class="col-md-6">
<div class="row jumbotron" id="loginPanel">
<h1><spring:message code="SIGN_IN"/></h1> <h1><spring:message code="SIGN_IN"/></h1>
<form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal" id="loginForm"> <form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal"
id="loginForm">
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label" for="email"><spring:message code="EMAIL"/></label> <label class="col-md-3 control-label" for="email"><spring:message code="EMAIL"/>: </label>
<div class="col-md-10">
<input type='email' tabindex="1" id="email" name='j_username' required="required" class="form-control"/> <div class="col-md-9">
<input type='email' tabindex="1" id="email" name='j_username' required="required"
class="form-control"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label" for="password"><spring:message code="PASSWORD"/></label> <label class="col-md-3 control-label" for="password"><spring:message code="PASSWORD"/>: </label>
<div class="col-md-10">
<input type='password' tabindex="2" id="password" name='j_password' required="required" class="form-control"/> <div class="col-md-9">
<input type='password' tabindex="2" id="password" name='j_password' required="required"
class="form-control"/>
</div> </div>
</div> </div>
<div class="form-group" style="text-align: center"> <div class="form-group" style="text-align: center">
<div class="col-md-offset-2 col-md-10" style="text-align: center"> <div class="col-md-offset-2 col-md-10" style="text-align: center">
<button class="btn btn-primary" tabindex="4" data-loading-text="<spring:message code="SIGN_ING"/>"><spring:message code="SIGN_IN"/></button> <button class="btn btn-primary" tabindex="4"
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/> <label for="rememberme"><spring:message code="REMEMBER_ME"/></label> data-loading-text="<spring:message code="SIGN_ING"/>">
<spring:message code="SIGN_IN"/></button>
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/> <label
for="rememberme"><spring:message code="REMEMBER_ME"/></label>
</div> </div>
</div> </div>
<div class="form-group" style="text-align: center"> <div class="form-group" style="text-align: center">
@ -46,10 +55,10 @@
<c:if test="${not empty param.login_error}"> <c:if test="${not empty param.login_error}">
<c:choose> <c:choose>
<c:when test="${param.login_error == 3}"> <c:when test="${param.login_error == 3}">
<div class="alert alert-danger"><spring:message code="USER_INACTIVE"/></div> <div class="alert alert-warning"><spring:message code="USER_INACTIVE"/></div>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<div class="alert alert-danger"><spring:message code="LOGIN_ERROR"/></div> <div class="alert alert-warning"><spring:message code="LOGIN_ERROR"/></div>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:if> </c:if>
@ -57,9 +66,9 @@
</form> </form>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row">
<div id="register" class="col-md-10"> <div id="register" class="col-md-12">
<c:if test="${requestScope['security.type']=='db'}"> <c:if test="${requestScope['security.type']=='db'}">
<b><spring:message code="NOT_READY_A_USER"/></b> <b><spring:message code="NOT_READY_A_USER"/></b>
<spring:message code="NOT_READY_A_USER_MESSAGE"/> <spring:message code="NOT_READY_A_USER_MESSAGE"/>
@ -69,7 +78,8 @@
</c:if> </c:if>
<c:if test="${requestScope['security.openid.enabled']}"> <c:if test="${requestScope['security.openid.enabled']}">
<p> <p>
<spring:message code="LOGIN_USING_OPENID"/> <a href="/c/loginopenid"><b><spring:message code="HERE"/></b></a>. <spring:message code="LOGIN_USING_OPENID"/> <a href="/c/loginopenid"><b><spring:message
code="HERE"/></b></a>.
</p> </p>
</c:if> </c:if>
</div> </div>
@ -81,7 +91,8 @@
<div class="alert alert-info col-md-offset12"> <div class="alert alert-info col-md-offset12">
<span class="label label-danger"><spring:message code="WARNING"/></span> <spring:message <span class="label label-danger"><spring:message code="WARNING"/></span> <spring:message
code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
href="https://wisemapping.atlassian.net/wiki/display/WS/Database+Configuration"><spring:message code="HERE"/></a>. href="https://wisemapping.atlassian.net/wiki/display/WS/Database+Configuration"><spring:message
code="HERE"/></a>.
</div> </div>
</div> </div>
</c:if> </c:if>

12
wise-webapp/src/main/webapp/jsp/mindmapImport.jsp
View File

@ -9,22 +9,22 @@
<div class="errorMessage"></div> <div class="errorMessage"></div>
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<label for="mapFile" class="control-label col-sm-2 "><spring:message code="MIND_FILE"/>: </label> <label for="mapFile" class="control-label col-md-2 "><spring:message code="MIND_FILE"/>: </label>
<div class="col-sm-10"> <div class="col-md-10">
<input type="file" name="file" id="mapFile" required="required" class="form-control"/> <input type="file" name="file" id="mapFile" required="required" class="form-control"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="title" class="control-label col-sm-2 "><spring:message code="NAME"/>: </label> <label for="title" class="control-label col-md-2 "><spring:message code="NAME"/>: </label>
<div class="col-sm-10"> <div class="col-md-10">
<input type="text" id="title" name="title" required="required" <input type="text" id="title" name="title" required="required"
placeholder="<spring:message code="MAP_NAME_HINT"/>" placeholder="<spring:message code="MAP_NAME_HINT"/>"
class="form-control" maxlength="255"/> class="form-control" maxlength="255"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="description" class="control-label col-sm-2"><spring:message code="DESCRIPTION"/>: </label> <label for="description" class="control-label col-md-2"><spring:message code="DESCRIPTION"/>: </label>
<div class="col-sm-10"> <div class="col-md-10">
<textarea type="text" name="description" id="description" <textarea type="text" name="description" id="description"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="form-control" maxlength="255"></textarea> placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="form-control" maxlength="255"></textarea>
</div> </div>

225
wise-webapp/src/main/webapp/jsp/mindmapList.jsp
View File

@ -15,15 +15,11 @@
<script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script> <script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script>
<script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script> <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
<script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap-colorpicker.js"></script>
<script src="js/less.js" type="text/javascript"></script> <script src="js/less.js" type="text/javascript"></script>
<!--jQuery DataTables--> <!--jQuery DataTables-->
<script type="text/javascript" language="javascript" src="js/jquery.dataTables.min.js"></script> <script type="text/javascript" language="javascript" src="js/jquery.dataTables.min.js"></script>
<script type="text/javascript" language="javascript" src="js/mindmapList.js"></script> <script type="text/javascript" language="javascript" src="js/mindmapList.js"></script>
<script type="text/javascript" language="javascript" src="js/buttonActions.js"></script>
<script type="text/javascript" language="javascript" src="js/labelActions.js"></script>
<!-- Update timer plugging --> <!-- Update timer plugging -->
<script type="text/javascript" language="javascript" src="js/jquery.timeago.js"></script> <script type="text/javascript" language="javascript" src="js/jquery.timeago.js"></script>
@ -54,11 +50,11 @@
}, },
{ {
sTitle: "<spring:message code="NAME"/>", sTitle: "<spring:message code="NAME"/>",
sWidth:"430px", sWidth: "270px",
bUseRendered: false, bUseRendered: false,
mDataProp: "title", mDataProp: "title",
fnRender: function (obj) { fnRender: function (obj) {
return '<a class="mindmapName" value="'+ obj.aData.id +'" href="c/maps/' + obj.aData.id + '/edit">' + $('<span></span>').text(obj.aData.title).html() + '</a>' + labelTagsAsHtml(obj.aData.labels); return '<a href="c/maps/' + obj.aData.id + '/edit">' + $('<span></span>').text(obj.aData.title).html() + '</a>';
} }
}, },
{ {
@ -90,11 +86,9 @@
bStateSave: true bStateSave: true
}); });
$('#colorGroup').colorpicker();
// Customize search action ... // Customize search action ...
$('#mindmapListTable_filter').appendTo("#tableActions"); $('#mindmapListTable_filter').appendTo("#tableActions");
$('#mindmapListTable_filter input').addClass('input-medium search-query form-control'); $('#mindmapListTable_filter input').addClass('input-small search-query form-control');
$('#mindmapListTable_filter input').attr('placeholder', 'Search'); $('#mindmapListTable_filter input').attr('placeholder', 'Search');
$("#mindmapListTable_info").appendTo("#pageInfo"); $("#mindmapListTable_info").appendTo("#pageInfo");
@ -104,11 +98,9 @@
$('#mindmapListTable_length select').attr("style", "width:60px;"); $('#mindmapListTable_length select').attr("style", "width:60px;");
$('input:checkbox[id="selectAll"]').click( $('input:checkbox[id="selectAll"]').click(function () {
function () {
$("#mindmapListTable").dataTableExt.selectAllMaps(); $("#mindmapListTable").dataTableExt.selectAllMaps();
} });
);
// Hack for changing the pagination buttons ... // Hack for changing the pagination buttons ...
$('#nPageBtn').click(function () { $('#nPageBtn').click(function () {
@ -117,13 +109,6 @@
$('#pPageBtn').click(function () { $('#pPageBtn').click(function () {
$('#mindmapListTable_previous').click(); $('#mindmapListTable_previous').click();
}); });
//setting max heigth to ul filters...
var maxHeight = $(".row-fluid:not(:hidden)").height() - $("#footerContainer").height()*2 - 20;
$("#foldersContainer ul").css('overflow-y', 'scrollbar');
$("#foldersContainer ul").css('overflow-x', 'hidden');
$("#foldersContainer ul").height(maxHeight);
}); });
</script> </script>
</head> </head>
@ -133,55 +118,36 @@
<jsp:param name="showLogout" value="true"/> <jsp:param name="showLogout" value="true"/>
</jsp:include> </jsp:include>
<div class="container">
<div class="row hide" id="messagesPanel" style="margin-top: 20px"> <div class="row hide" id="messagesPanel" style="margin-top: 20px">
<div class="col-md-2"></div> <div class="alert alert-danger alert-block fade in col-md-8 col-md-offset-2">
<div class="alert alert-danger alert-block fade in col-md-8">
<strong><spring:message code="UNEXPECTED_ERROR"/></strong> <strong><spring:message code="UNEXPECTED_ERROR"/></strong>
<p><spring:message code="UNEXPECTED_ERROR_SERVER_ERROR"/></p> <p><spring:message code="UNEXPECTED_ERROR_SERVER_ERROR"/></p>
<div></div> <div></div>
</div> </div>
</div> </div>
<div class="row" style="min-height: 500px"> <div class="row">
<div class="col-md-1"></div>
<div class="col-md-2" id="foldersContainer"> <div class="col-md-2" id="foldersContainer">
<ul class="nav nav-list"> <ul class="nav nav-pills nav-stacked">
<li class="nav-header"><spring:message code="FILTERS"/></li> <li data-filter="all" class="active"><a href="#"><i
<li data-filter="all" class="active" style="display:none"> class="glyphicon glyphicon-inbox glyphicon-white"></i>
<a href="#"> <spring:message
<i class="glyphicon glyphicon-inbox glyphicon-white"></i> code="ALL_MAPS"/></a></li>
<spring:message code="ALL_MAPS"/> <li data-filter="my_maps"><a href="#"><i class="glyphicon glyphicon-user"></i> <spring:message
</a> code="MY_MAPS"/></a>
</li> </li>
<li data-filter="my_maps" style="display:none"> <li data-filter="shared_with_me"><a href="#"><i class="glyphicon glyphicon-share"></i> <spring:message
<a href="#"> code="SHARED_WITH_ME"/></a></li>
<i class="glyphicon glyphicon-user"></i> <li data-filter="starred"><a href="#"><i class="glyphicon glyphicon-star"></i> <spring:message
<spring:message code="MY_MAPS"/> code="STARRED"/></a></li>
</a> <li data-filter="public"><a href="#"><i class="glyphicon glyphicon-globe"></i> <spring:message
</li> code="PUBLIC_MAPS"/></a>
<li data-filter="shared_with_me" style="display:none">
<a href="#">
<i class="glyphicon glyphicon-share"></i>
<spring:message code="SHARED_WITH_ME"/>
</a>
</li>
<li data-filter="starred" style="display:none">
<a href="#">
<i class="glyphicon glyphicon-star"></i>
<spring:message code="STARRED"/>
</a>
</li>
<li data-filter="public" style="display:none">
<a href="#">
<i class="glyphicon glyphicon-globe"></i>
<spring:message code="PUBLIC_MAPS"/>
</a>
</li> </li>
</ul> </ul>
</div> </div>
<div class="buttonsToolbar btn-toolbar ${requestScope['google.ads.enabled']?'col-md-7':'col-md-8'}"> <div class="buttonsToolbar btn-toolbar ${requestScope['google.ads.enabled']?'col-md-9':'col-md-10'}">
<div id="tableActions"> <div id="tableActions">
<div id="pageInfo"></div> <div id="pageInfo"></div>
<div class="btn-group" id="pageButtons"> <div class="btn-group" id="pageButtons">
@ -191,39 +157,24 @@
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button id="newBtn" class="btn btn-primary"><i class="glyphicon glyphicon-file glyphicon-white"></i> <spring:message <button id="newBtn" class="btn btn-primary"><i class="glyphicon glyphicon-file glyphicon-white"></i>
<spring:message
code="NEW"/></button> code="NEW"/></button>
<button id="importBtn" class="btn btn-primary"><i class="glyphicon glyphicon-upload glyphicon-white"></i> <button id="importBtn" class="btn btn-primary"><i
class="glyphicon glyphicon-upload glyphicon-white"></i>
<spring:message code="IMPORT"/> <spring:message code="IMPORT"/>
</button> </button>
</div> </div>
<div class="btn-group">
<button id='addLabelButton' class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<i class="glyphicon glyphicon-tag glyphicon-white"></i>
<spring:message code="LABEL"/>
<span class="caret"></span>
</button>
<ul id="labelList" class="dropdown-menu">
<li id="createLabelBtn">
<a href="#" onclick="return false">
<i class="glyphicon glyphicon-plus"></i>
<spring:message code="CREATE"/>
</a>
</li>
</ul>
</div>
<div class="btn-group act-multiple" id="deleteBtn" style="display:none"> <div class="btn-group act-multiple" id="deleteBtn" style="display:none">
<button class="btn btn-primary"><i class="glyphicon glyphicon-trash glyphicon-white"></i> <spring:message <button class="btn btn-primary"><i class="glyphicon glyphicon-trash glyphicon-white"></i>
<spring:message
code="DELETE"/></button> code="DELETE"/></button>
</div> </div>
<div id="infoBtn" class="btn-group act-single" style="display:none"> <div id="infoBtn" class="btn-group act-single" style="display:none">
<button class="btn btn-primary"><i class="glyphicon glyphicon-exclamation-sign glyphicon-white"></i> <spring:message <button class="btn btn-primary"><i class="glyphicon glyphicon-exclamation-sign glyphicon-white"></i>
<spring:message
code="INFO"/></button> code="INFO"/></button>
</div> </div>
@ -234,22 +185,27 @@
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li id="duplicateBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-plus-sign"></i> <li id="duplicateBtn"><a href="#" onclick="return false"><i
class="glyphicon glyphicon-plus-sign"></i>
<spring:message code="DUPLICATE"/></a></li> <spring:message code="DUPLICATE"/></a></li>
<li id="renameBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-edit"></i> <spring:message <li id="renameBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-edit"></i>
<spring:message
code="RENAME"/></a></li> code="RENAME"/></a></li>
<li id="publishBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-globe"></i> <li id="publishBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-globe"></i>
<spring:message code="PUBLISH"/></a> <spring:message code="PUBLISH"/></a>
</li> </li>
<li id="shareBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-share"></i> <spring:message <li id="shareBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-share"></i>
<spring:message
code="SHARE"/></a></li> code="SHARE"/></a></li>
<li id="exportBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-download"></i> <li id="exportBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-download"></i>
<spring:message <spring:message
code="EXPORT"/></a> code="EXPORT"/></a>
</li> </li>
<li id="printBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-print"></i> <spring:message <li id="printBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-print"></i>
<spring:message
code="PRINT"/></a></li> code="PRINT"/></a></li>
<li id="historyBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-time"></i> <spring:message <li id="historyBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-time"></i>
<spring:message
code="HISTORY"/></a> code="HISTORY"/></a>
</li> </li>
</ul> </ul>
@ -279,6 +235,7 @@
</div> </div>
</div> </div>
<jsp:include page="footer.jsp"/> <jsp:include page="footer.jsp"/>
</div>
<div id="dialogsContainer"> <div id="dialogsContainer">
<!-- New map dialog --> <!-- New map dialog -->
@ -295,15 +252,21 @@
<form class="form-horizontal"> <form class="form-horizontal">
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label" for="newTitle"><spring:message code="NAME"/>:</label> <label class="col-md-3 control-label" for="newTitle"><spring:message code="NAME"/>:</label>
<div class="col-sm-8">
<input class="form-control" name="title" id="newTitle" type="text" required="required" placeholder="<spring:message code="MAP_NAME_HINT"/>" autofocus="autofocus" maxlength="255"/> <div class="col-md-8">
<input class="form-control" name="title" id="newTitle" type="text" required="required"
placeholder="<spring:message code="MAP_NAME_HINT"/>" autofocus="autofocus"
maxlength="255"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label" for="newDec"><spring:message code="DESCRIPTION"/>:</label> <label class="col-md-3 control-label" for="newDec"><spring:message
<div class="col-sm-8"> code="DESCRIPTION"/>:</label>
<input class="form-control" name="description" id="newDec" type="text" placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" maxlength="255"/>
<div class="col-md-8">
<input class="form-control" name="description" id="newDec" type="text"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" maxlength="255"/>
</div> </div>
</div> </div>
</fieldset> </fieldset>
@ -319,39 +282,6 @@
</div> </div>
</div> </div>
<!-- New label dialog -->
<div id="new-folder-dialog-modal" title="<spring:message code="ADD_NEW_LABEL"/>" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="NEW_LABEL_MSG"/></h3>
</div>
<div class="modal-body">
<div class="errorMessage"></div>
<form class="form-horizontal">
<fieldset>
<div class="control-group">
<label class="control-label" for="newLabelTitle"><spring:message code="NAME"/>:</label>
<input class="control" name="title" id="newLabelTitle" type="text" required="required"
placeholder="<spring:message code="LABEL_NAME_HINT"/>" autofocus="autofocus" maxlength="30"/>
</div>
<div id="colorGroup" class="input-group">
<label class="control-label" for="colorChooser"><spring:message code="COLOR"/>:</label>
<input class="form-control" name="color" id="colorChooser" type="text" style="display:none; width: 70px" required="required" value="#000000"/>
<!--hack, maybe there is a compatibility problem with bootstrap-->
<span class="input-group-addon" style="display: inline-block; position: relative; top: 5px; left: 5px"><i style="width: 43px;height: 18px;"></i></span>
</div>
</fieldset>
</form>
</div>
<div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message
code="SAVING"/>"><spring:message
code="CREATE"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div>
</div>
<!-- Duplicate map dialog --> <!-- Duplicate map dialog -->
<div id="duplicate-dialog-modal" class="modal fade"> <div id="duplicate-dialog-modal" class="modal fade">
<div class="modal-dialog"> <div class="modal-dialog">
@ -366,19 +296,22 @@
<form class="form-horizontal"> <form class="form-horizontal">
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<label for="title" class="col-sm-3 control-label"><spring:message code="NAME"/>: </label> <label for="title" class="col-md-3 control-label"><spring:message code="NAME"/>: </label>
<div class="col-sm-8">
<div class="col-md-8">
<input name="title" id="title" type="text" required="required" <input name="title" id="title" type="text" required="required"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" autofocus="autofocus" placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" autofocus="autofocus"
class="form-control" maxlength="255"/> class="form-control" maxlength="255"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="description" class="col-sm-3 control-label"><spring:message <label for="description" class="col-md-3 control-label"><spring:message
code="DESCRIPTION"/>: </label> code="DESCRIPTION"/>: </label>
<div class="col-sm-8">
<div class="col-md-8">
<input name="description" id="description" type="text" <input name="description" id="description" type="text"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="form-control" maxlength="255"/> placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="form-control"
maxlength="255"/>
</div> </div>
</div> </div>
</fieldset> </fieldset>
@ -406,16 +339,18 @@
<form class="form-horizontal"> <form class="form-horizontal">
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<label for="renTitle" class="col-sm-3 control-label"><spring:message code="NAME"/>: </label> <label for="renTitle" class="col-md-3 control-label"><spring:message code="NAME"/>: </label>
<div class="col-sm-8">
<div class="col-md-8">
<input name="title" id="renTitle" required="required" autofocus="autofocus" <input name="title" id="renTitle" required="required" autofocus="autofocus"
class="form-control" maxlength="255"/> class="form-control" maxlength="255"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="renDescription" class="col-sm-3 control-label"><spring:message <label for="renDescription" class="col-md-3 control-label"><spring:message
code="DESCRIPTION"/>:</label> code="DESCRIPTION"/>:</label>
<div class="col-sm-8">
<div class="col-md-8">
<input name="description" class="form-control" id="renDescription" maxlength="255"/> <input name="description" class="form-control" id="renDescription" maxlength="255"/>
</div> </div>
</div> </div>
@ -423,7 +358,8 @@
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>"><spring:message <button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>">
<spring:message
code="RENAME"/></button> code="RENAME"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button> <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div> </div>
@ -441,7 +377,8 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="alert alert-block"> <div class="alert alert-block">
<h4 class="alert-heading"><spring:message code="WARNING"/>!</h4><spring:message code="DELETE_MAPS_WARNING"/> <h4 class="alert-heading"><spring:message code="WARNING"/>!</h4><spring:message
code="DELETE_MAPS_WARNING"/>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
@ -454,25 +391,6 @@
</div> </div>
</div> </div>
<!-- Delete label dialog -->
<div id="delete-label-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="DELETE"/></h3>
</div>
<div class="modal-body">
<div class="alert alert-block">
<h4 class="alert-heading"><spring:message code="WARNING"/>!</h4><spring:message code="DELETE_LABELS_WARNING"/>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message
code="SAVING"/> ..."><spring:message
code="DELETE"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div>
</div>
<!-- Info map dialog --> <!-- Info map dialog -->
<div id="info-dialog-modal" class="modal fade"> <div id="info-dialog-modal" class="modal fade">
<div class="modal-dialog"> <div class="modal-dialog">
@ -590,6 +508,5 @@
</div> </div>
</div> </div>
</div>
</body> </body>
</html> </html>

7
wise-webapp/src/main/webapp/jsp/template.jsp
View File

@ -51,11 +51,10 @@
<jsp:param name="removeSignin" value="${requestScope.removeSignin}"/> <jsp:param name="removeSignin" value="${requestScope.removeSignin}"/>
</jsp:include> </jsp:include>
<div class="bodyContainer"> <div class="container">
<div class="row">
<div class="col-md-2"></div>
<div class="pageBodyContent col-md-8">
<div class="row"> <div class="row">
<div class="col-md-offset-1 col-md-10">
<div class="jumbotron" style="margin:40px 0 100px 0;padding: 10px 60px;">
<tiles:insertAttribute name="body"/> <tiles:insertAttribute name="body"/>
</div> </div>
</div> </div>

11
wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
View File

@ -9,8 +9,6 @@
}); });
</script> </script>
<div>
<div class="fform">
<h1> <h1>
<spring:message code="FORGOT_PASSWORD"/> <spring:message code="FORGOT_PASSWORD"/>
</h1> </h1>
@ -18,20 +16,15 @@
<p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p> <p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
<form:form method="post" commandName="resetPassword" class="form-horizontal"> <form:form method="post" commandName="resetPassword" class="form-horizontal">
<fieldset> <label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
<label for="email" class="col-sm-2 control-label"><spring:message code="EMAIL"/>: </label> <div class="col-md-5">
<div class="col-sm-5">
<input id="email" type="email" required="required" name="email" class="form-control"/> <input id="email" type="email" required="required" name="email" class="form-control"/>
</div> </div>
<input type="submit" value="<spring:message code="SEND_ME_A_NEW_PASSWORD"/>" class="btn btn-primary" <input type="submit" value="<spring:message code="SEND_ME_A_NEW_PASSWORD"/>" class="btn btn-primary"
data-loading-text="<spring:message code="SENDING"/>"/> data-loading-text="<spring:message code="SENDING"/>"/>
<input type="button" value="<spring:message code="CANCEL"/>" class="btn" <input type="button" value="<spring:message code="CANCEL"/>" class="btn"
onclick="window.location='<c:url value="c/maps/"/>'"/> onclick="window.location='<c:url value="c/maps/"/>'"/>
</fieldset>
</form:form> </form:form>
</br>
</div>
</div>
<div id="register"> <div id="register">
<b> <b>

46
wise-webapp/src/main/webapp/jsp/userRegistration.jsp
View File

@ -1,50 +1,52 @@
<%@page pageEncoding="UTF-8" %> <%@page pageEncoding="UTF-8" %>
<%@include file="/jsp/init.jsp" %> <%@include file="/jsp/init.jsp" %>
<div class="fform" >
<h1><spring:message code="USER_REGISTRATION"/></h1> <h1><spring:message code="USER_REGISTRATION"/></h1>
<p><spring:message code="REGISTRATION_TITLE_MSG"/></p> <p><spring:message code="REGISTRATION_TITLE_MSG"/></p>
<form:form method="post" commandName="user" class="form-horizontal"> <form:form method="post" commandName="user" class="form-horizontal">
<fieldset>
<div class="form-group"> <div class="form-group">
<label for="email" class="col-sm-2 control-label"><spring:message code="EMAIL"/>: </label> <label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
<div class="col-sm-5"> <div class="col-md-5">
<form:input path="email" id="email" type="email" required="required" class="form-control"/> <form:input path="email" id="email" type="email" required="required" class="form-control"/>
<form:errors path="email" cssClass="errorMsg"/> <form:errors path="email" cssClass="errorMsg"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="firstname" class="col-sm-2 control-label"><spring:message code="FIRSTNAME"/>: </label> <label for="firstname" class="col-md-2 control-label"><spring:message code="FIRSTNAME"/>: </label>
<div class="col-sm-5">
<div class="col-md-5">
<form:input path="firstname" id="firstname" required="required" class="form-control"/> <form:input path="firstname" id="firstname" required="required" class="form-control"/>
<form:errors path="firstname" cssClass="errorMsg"/> <form:errors path="firstname" cssClass="errorMsg"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="lastname" class="col-sm-2 control-label"><spring:message code="LASTNAME"/>: </label> <label for="lastname" class="col-md-2 control-label"><spring:message code="LASTNAME"/>: </label>
<div class="col-sm-5">
<div class="col-md-5">
<form:input path="lastname" id="lastname" required="required" class="form-control"/> <form:input path="lastname" id="lastname" required="required" class="form-control"/>
<form:errors path="lastname" cssClass="errorMsg"/> <form:errors path="lastname" cssClass="errorMsg"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password" class="col-sm-2 control-label"><spring:message code="PASSWORD"/>: </label> <label for="password" class="col-md-2 control-label"><spring:message code="PASSWORD"/>: </label>
<div class="col-sm-5">
<div class="col-md-5">
<form:password path="password" id="password" required="required" class="form-control"/> <form:password path="password" id="password" required="required" class="form-control"/>
<form:errors path="password" cssClass="errorMsg"/> <form:errors path="password" cssClass="errorMsg"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="retypePassword" class="col-sm-2 control-label"><spring:message code="RETYPE_PASSWORD"/>: </label> <label for="retypePassword" class="col-md-2 control-label"><spring:message
<div class="col-sm-5"> code="RETYPE_PASSWORD"/>: </label>
<div class="col-md-5">
<form:password path="retypePassword" id="retypePassword" class="form-control"/> <form:password path="retypePassword" id="retypePassword" class="form-control"/>
<form:errors path="retypePassword" cssClass="errorMsg"/> <form:errors path="retypePassword" cssClass="errorMsg"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-10 col-sm-offset-2"> <div class="col-md-10 col-md-offset-2">
<c:if test="${requestScope.captchaEnabled}"> <c:if test="${requestScope.captchaEnabled}">
${requestScope.captchaHtml} ${requestScope.captchaHtml}
<p> <p>
@ -53,27 +55,25 @@
</c:if> </c:if>
</div> </div>
</div> </div>
<div> <div class="form-group">
<p> <p>
<spring:message code="TERM_OF_THE_SERVICE"/> <spring:message code="TERM_OF_THE_SERVICE"/>
<spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="c/termsOfUse" <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/>
target="_blank"><spring:message <a href="c/termsOfUse" target="_blank"><spring:message code="HERE"/></a>.
code="HERE"/></a>.
<spring:message code="REGISTRATION_CLICK_ADVICE"/> <spring:message code="REGISTRATION_CLICK_ADVICE"/>
</p> </p>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-md-offset-2 col-md-10">
<input type="submit" value="<spring:message code="REGISTER"/>" <input type="submit" value="<spring:message code="REGISTER"/>"
data-loading-text="<spring:message code="REGISTER"/> ..." id="submitButton" data-loading-text="<spring:message code="REGISTER"/> ..." id="submitButton"
class="btn btn-primary"> class="btn btn-primary">
<input type="button" value="<spring:message code="CANCEL"/>" <input type="button" value="<spring:message code="CANCEL"/>"
onclick="window.location='c/<c:url value="maps/"/>'" class="btn"> onclick="window.location='c/<c:url value="maps/"/>'" class="btn">
<div>
<div>
</fieldset>
</form:form>
</div> </div>
</div>
</form:form>