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

Conflicts:
	wise-webapp/src/main/webapp/jsp/mindmapList.jsp
This commit is contained in:
Ezequiel Bergamaschi 2014-02-14 03:54:36 -03:00
commit 8462e54293
10 changed files with 126 additions and 96 deletions

View File

@ -169,7 +169,6 @@ web2d.peer.svg.TextPeer = new Class({
computedWidth = 10; computedWidth = 10;
} }
console.log("Final result:"+computedWidth);
var width = parseInt(computedWidth); var width = parseInt(computedWidth);
width = width + this._font.getWidthMargin(); width = width + this._font.getWidthMargin();

View File

@ -1,5 +1,5 @@
@import "compatibility.less"; @import "compatibility.less";
@import "css/libraries/moodialog/css/MooDialog.css"; @import "libraries/moodialog/css/MooDialog.css";
/********************************************************************************/ /********************************************************************************/
/* Header & Toolbar Styles */ /* Header & Toolbar Styles */
/********************************************************************************/ /********************************************************************************/

View File

@ -125,4 +125,9 @@ div#headerActions {
div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited { div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited {
color: white; color: white;
} }
#dialogMainForm label
{
font-weight:normal;
}

View File

@ -55,8 +55,6 @@ div#pageContainer {
} }
#loginPanel h1 { #loginPanel h1 {
color: #ffffff; color: #00008b;
} }

View File

@ -8,62 +8,78 @@
<li><a href="#changePasswordPanel" data-toggle="pill"><spring:message code="SECURITY"/></a></li> <li><a href="#changePasswordPanel" data-toggle="pill"><spring:message code="SECURITY"/></a></li>
</c:if> </c:if>
<li><a href="#languagePanel" data-toggle="pill"><spring:message code="LANGUAGE"/></a></li> <li><a href="#languagePanel" data-toggle="pill"><spring:message code="LANGUAGE"/></a></li>
<li><a href="#deleteAccountPanel" data-toggle="pill"><spring:message code="DELETE__ACCOUNT"/></a></li> <c:if test="${principal.databaseSchema}">
<li><a href="#deleteAccountPanel" data-toggle="pill"><spring:message code="DELETE__ACCOUNT"/></a></li>
</c:if>
</ul> </ul>
<div class="tab-content" style="padding-top:15px;"> <div class="tab-content" style="padding-top:15px;">
<div class="tab-pane fade ${principal.databaseSchema?'active in':''}" id="changeUserPanel"> <div class="tab-pane fade ${principal.databaseSchema?'active in':''}" id="changeUserPanel">
<div id="changeInfoMsg" class="alert"> <div id="changeInfoMsg" class="alert"></div>
</div>
<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-md-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-md-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-md-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-md-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"
</div> value="${user.firstname}"/>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="lastname" class="col-md-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-md-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-md-offset-8 col-md-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"
<div> value="<spring:message code="SAVE_CHANGES"/>"/>
</div>
</div> </div>
</fieldset> </fieldset>
</form> </form>
</div> </div>
<div class="tab-pane fade" id="changePasswordPanel"> <div class="tab-pane fade" id="changePasswordPanel">
<div id="changePasswordMsg" class="alert"> <div id="changePasswordMsg" class="alert">
</div> </div>
<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-md-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-md-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-md-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-md-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-md-offset-8 col-md-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>
</fieldset> </fieldset>
@ -74,49 +90,56 @@
</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-md-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-md-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 -
español español
</option> </option>
<option value="fr" <c:if test="${user.locale=='fr'}">selected="selected" </c:if>>French - <option value="fr" <c:if test="${user.locale=='fr'}">selected="selected" </c:if>>French -
français français
</option> </option>
<option value="de" <c:if test="${user.locale=='de'}">selected="selected" </c:if>>German - <option value="de" <c:if test="${user.locale=='de'}">selected="selected" </c:if>>German -
Deutsch Deutsch
</option> </option>
<option value="it" <c:if test="${user.locale=='it'}">selected="selected" </c:if>>Italian - <option value="it" <c:if test="${user.locale=='it'}">selected="selected" </c:if>>Italian -
italiano italiano
</option> </option>
<option value="pt_BR" <c:if test="${user.locale=='pt_BR'}">selected="selected" </c:if>> <option value="pt_BR" <c:if test="${user.locale=='pt_BR'}">selected="selected" </c:if>>
Portuguese Portuguese
(Brazil) - português (Brasil) (Brazil) - português (Brasil)
</option> </option>
<option value="zh_CN" <c:if test="${user.locale=='zh_CN'}">selected="selected" </c:if>>Chinese <option value="zh_CN" <c:if test="${user.locale=='zh_CN'}">selected="selected" </c:if>>
(Simplified Han) - 中文(简体中文) Chinese
</option> (Simplified Han) - 中文(简体中文)
<option value="zh_TW" <c:if test="${user.locale=='zh_TW'}">selected="selected" </c:if>>Chinese </option>
(Traditional Han) - 中文 (繁體中文) <option value="zh_TW" <c:if test="${user.locale=='zh_TW'}">selected="selected" </c:if>>
</option> Chinese
<option value="ca" <c:if test="${user.locale=='ca'}">selected="selected" </c:if>>Catalan - (Traditional Han) - 中文 (繁體中文)
català </option>
</option> <option value="ca" <c:if test="${user.locale=='ca'}">selected="selected" </c:if>>Catalan -
</select></div> català
</div> </option>
<div class="form-group"> </select></div>
<div class="col-md-offset-8 col-md-2"> </div>
<input type="submit" id="changeLanguageBtn" class="btn btn-primary" value="<spring:message code="CHANGE_LANGUAGE"/>"/> <div class="form-group">
</div> <div class="col-md-offset-8 col-md-2">
<input type="submit" id="changeLanguageBtn" class="btn btn-primary"
value="<spring:message code="CHANGE_LANGUAGE"/>"/>
</div> </div>
</div>
</form> </form>
</div> </div>
<div class="tab-pane fade" id="deleteAccountPanel"> <div class="tab-pane fade" id="deleteAccountPanel">
<div id="deleteAccountMsg" class="alert alert-danger" style="display: block;"><spring:message code="WARNING_DELETE_USER"/></div> <div id="deleteAccountMsg" class="alert alert-danger" style="display: block;"><spring:message
code="WARNING_DELETE_USER"/></div>
<form action="#" method="POST" id="deleteAccountForm"> <form action="#" method="POST" id="deleteAccountForm">
<div class="form-group" style="text-align:right"> <div class="form-group" style="text-align:right">
<input type="checkbox" name="confirmAccountDelete" id="accountMarkedForDelete" required="required"/> <input type="submit" id="deleteAccountBtn" class="btn btn-primary" value="<spring:message code="DELETE__ACCOUNT"/>"/> <input type="checkbox" name="confirmAccountDelete" id="accountMarkedForDelete" required="required"/>
<input type="submit" id="deleteAccountBtn" class="btn btn-primary"
value="<spring:message code="DELETE__ACCOUNT"/>"/>
</div> </div>
</form> </form>
</div> </div>
@ -157,11 +180,11 @@
postChange( postChange(
"c/restful/account/password", "c/restful/account/password",
inputVal, inputVal,
function() { function () {
changePasswordMsg.removeClass('alert-danger').addClass('alert-info').show(); changePasswordMsg.removeClass('alert-danger').addClass('alert-info').show();
changePasswordMsg.text('<spring:message code="CHANGE_PASSWORD_SUCCESS"/>'); changePasswordMsg.text('<spring:message code="CHANGE_PASSWORD_SUCCESS"/>');
}, },
function(textStatus) { function (textStatus) {
changePasswordMsg.removeClass('alert-info').addClass('alert-danger').show(); changePasswordMsg.removeClass('alert-info').addClass('alert-danger').show();
changePasswordMsg.text(textStatus); changePasswordMsg.text(textStatus);
} }
@ -177,12 +200,12 @@
postChange( postChange(
"c/restful/account/firstname", "c/restful/account/firstname",
firstname, firstname,
function() { function () {
var changeInfoMsg = $('#changeInfoMsg'); var changeInfoMsg = $('#changeInfoMsg');
changeInfoMsg.removeClass('alert-error').addClass('alert-info').show(); changeInfoMsg.removeClass('alert-error').addClass('alert-info').show();
changeInfoMsg.text('<spring:message code="INFO_UPDATE_SUCCESS"/>'); changeInfoMsg.text('<spring:message code="INFO_UPDATE_SUCCESS"/>');
}, },
function(textStatus) { function (textStatus) {
changeInfoMsg.removeClass('alert-info').addClass('alert-danger').show(); changeInfoMsg.removeClass('alert-info').addClass('alert-danger').show();
changeInfoMsg.text(textStatus); changeInfoMsg.text(textStatus);
} }
@ -190,11 +213,11 @@
postChange( postChange(
"c/restful/account/lastname", "c/restful/account/lastname",
lastname, lastname,
function() { function () {
changeInfoMsg.removeClass('alert-danger').addClass('alert-info').show(); changeInfoMsg.removeClass('alert-danger').addClass('alert-info').show();
changeInfoMsg.text('<spring:message code="INFO_UPDATE_SUCCESS"/>'); changeInfoMsg.text('<spring:message code="INFO_UPDATE_SUCCESS"/>');
}, },
function(textStatus) { function (textStatus) {
changeInfoMsg.removeClass('alert-info').addClass('alert-danger').show(); changeInfoMsg.removeClass('alert-info').addClass('alert-danger').show();
changeInfoMsg.text(textStatus); changeInfoMsg.text(textStatus);
} }
@ -209,11 +232,11 @@
postChange( postChange(
"c/restful/account/locale", "c/restful/account/locale",
locale, locale,
function() { function () {
languageMsg.removeClass('alert-danger').addClass('alert-info').show(); languageMsg.removeClass('alert-danger').addClass('alert-info').show();
languageMsg.text('<spring:message code="INFO_UPDATE_SUCCESS"/>'); languageMsg.text('<spring:message code="INFO_UPDATE_SUCCESS"/>');
}, },
function(textStatus) { function (textStatus) {
languageMsg.removeClass('alert-info').addClass('alert-danger').show(); languageMsg.removeClass('alert-info').addClass('alert-danger').show();
languageMsg.text(textStatus); languageMsg.text(textStatus);
} }
@ -226,10 +249,10 @@
postChange( postChange(
"c/restful/account", "c/restful/account",
locale, locale,
function() { function () {
window.location.href = "/c/logout" window.location.href = "/c/logout"
}, },
function(textStatus) { function (textStatus) {
var deleteAccountMsg = $('#deleteAccountMsg'); var deleteAccountMsg = $('#deleteAccountMsg');
deleteAccountMsg.removeClass('alert-info').addClass('alert-danger').show(); deleteAccountMsg.removeClass('alert-info').addClass('alert-danger').show();
deleteAccountMsg.text(textStatus); deleteAccountMsg.text(textStatus);

View File

@ -21,14 +21,15 @@
<meta http-equiv="X-UA-Compatible" content="chrome=1"> <meta http-equiv="X-UA-Compatible" content="chrome=1">
<![endif]--> <![endif]-->
<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.min.js"></script>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap-responsive.min.css"/>
<script type="text/javascript" language="javascript" src="js/jquery.timeago.js"></script> <script type="text/javascript" language="javascript" src="js/jquery.timeago.js"></script>
<script type="text/javascript" language="javascript" src="js/jquery.timeago.${locale}.js"></script> <script type="text/javascript" language="javascript" src="js/jquery.timeago.${locale}.js"></script>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="css/pageHeaders.css"/>
<body> <body>
<div style="padding-top:20px"> <div style="padding:10px">
<tiles:insertAttribute name="body"/> <tiles:insertAttribute name="body"/>
</div> </div>
</body> </body>

View File

@ -33,7 +33,7 @@
<label for="svg"> <label for="svg">
<input type="radio" id="svg" name="exportFormat" value="svg"/> <input type="radio" id="svg" name="exportFormat" value="svg"/>
<strong><spring:message code="SVG_EXPORT_FORMAT"/></strong><br/> <strong><spring:message code="SVG_EXPORT_FORMAT"/></strong><br/>
<spring:message code="SVG_EXPORT_FORMAT_DETAILS"/> <spring:message code="SVG_EXPORT_FORMAT_DETAILS"/><br/>
</label> </label>
<label for="pdf"> <label for="pdf">
@ -51,7 +51,7 @@
<option value='png'>PNG</option> <option value='png'>PNG</option>
<option value='jpg'>JPEG</option> <option value='jpg'>JPEG</option>
</select> </select>
</label> </label><br/>
<label for="txt"> <label for="txt">
<input type="radio" name="exportFormat" value="txt" id="txt"/> <input type="radio" name="exportFormat" value="txt" id="txt"/>
@ -59,11 +59,11 @@
<spring:message code="TXT_EXPORT_FORMAT_DETAILS"/> <spring:message code="TXT_EXPORT_FORMAT_DETAILS"/>
</label> </label>
<label for="xls"> </br><label for="xls">
<input type="radio" name="exportFormat" value="xls" id="xls"/> <input type="radio" name="exportFormat" value="xls" id="xls"/>
<strong><spring:message code="XLS_EXPORT_FORMAT"/></strong><br/> <strong><spring:message code="XLS_EXPORT_FORMAT"/></strong><br/>
<spring:message code="XLS_EXPORT_FORMAT_DETAILS"/> <spring:message code="XLS_EXPORT_FORMAT_DETAILS"/>
</label> </label><br/>
<label for="odt"> <label for="odt">
<input type="radio" name="exportFormat" value="odt" id="odt"/> <input type="radio" name="exportFormat" value="odt" id="odt"/>

View File

@ -7,6 +7,8 @@
<head> <head>
<base href="${requestScope['site.baseurl']}/"> <base href="${requestScope['site.baseurl']}/">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title><spring:message code="SITE.TITLE"/> - <spring:message code="MY_WISEMAPS"/></title> <title><spring:message code="SITE.TITLE"/> - <spring:message code="MY_WISEMAPS"/></title>
<link rel="icon" href="images/favicon.ico" type="image/x-icon"/> <link rel="icon" href="images/favicon.ico" type="image/x-icon"/>
<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon"/> <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon"/>
@ -14,7 +16,7 @@
<link rel="stylesheet/less" type="text/css" href="css/mindmapList.less"/> <link rel="stylesheet/less" type="text/css" href="css/mindmapList.less"/>
<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.min.js"></script>
<script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap-colorpicker.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>
@ -210,8 +212,7 @@
<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> <button class="btn btn-primary"><i class="glyphicon glyphicon-exclamation-sign glyphicon-white"></i>
<spring:message <spring:message code="INFO"/></button>
code="INFO"/></button>
</div> </div>
<div id="actionsBtn" class="btn-group act-single" style="display:none"> <div id="actionsBtn" class="btn-group act-single" style="display:none">
@ -247,7 +248,7 @@
</ul> </ul>
</div> </div>
<div id="map-table"> <div id="map-table">
<table class="table" id="mindmapListTable"></table> <table class="table table-hover" id="mindmapListTable"></table>
</div> </div>
<div id="tableFooter" class="form-inline"></div> <div id="tableFooter" class="form-inline"></div>

View File

@ -12,6 +12,7 @@
<head> <head>
<base href="${requestScope['site.baseurl']}/"> <base href="${requestScope['site.baseurl']}/">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content="WiseMapping"> <meta name="author" content="WiseMapping">
<meta name="publisher" content="WiseMapping Open Source"> <meta name="publisher" content="WiseMapping Open Source">
<meta name="keywords" <meta name="keywords"
@ -41,7 +42,7 @@
<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon"/> <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon"/>
<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.min.js"></script>
<script src="js/less.js" type="text/javascript"></script> <script src="js/less.js" type="text/javascript"></script>
</head> </head>
<body> <body>
@ -58,26 +59,28 @@
<tiles:insertAttribute name="body"/> <tiles:insertAttribute name="body"/>
</div> </div>
</div> </div>
<c:if test="${requestScope['google.ads.enabled']}"> <div class="col-md-1" style="padding-top:25px">
<div class="row" style="text-align: center;margin: 5px"> <c:if test="${requestScope['google.ads.enabled']}">
<script type="text/javascript"><!-- <script type="text/javascript"><!--
google_ad_client = "ca-pub-7564778578019285"; google_ad_client = "ca-pub-7564778578019285";
/* WiseMapping Login */ /* WiseMapping Mindmap List */
google_ad_slot = "2192653431"; google_ad_slot = "4071968444";
google_ad_width = 728; google_ad_width = 120;
google_ad_height = 90; google_ad_height = 600;
//--> //-->
</script> </script>
<script type="text/javascript" <div style="margin-top:5px;">
src="https://pagead2.googlesyndication.com/pagead/show_ads.js"> <script type="text/javascript"
</script> src="https://pagead2.googlesyndication.com/pagead/show_ads.js">
</div> </script>
</c:if> </div>
</c:if>
</div>
</div> </div>
</div> </div>
<jsp:include page="footer.jsp"/> <jsp:include page="footer.jsp"/>
</div> </div>
</body> </body>
</html> </html>