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

First corrections.

Browse Source 
Fix more styling issues.

Conflicts:
	wise-webapp/src/main/webapp/jsp/accountSettings.jsp
This commit is contained in:
Paulo Gustavo Veiga
2014-02-09 02:19:59 -03:00
parent 356ab4b1c1
commit 726ffcd817
32 changed files with 7768 additions and 6922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,24 +11,32 @@
<li><a href="#deleteAccountPanel" data-toggle="pill"><spring:message code="DELETE__ACCOUNT"/></a></li>
</ul>
<div class="tab-content">
<div class="tab-content" style="padding-top:15px;">
<div class="tab-pane fade ${principal.databaseSchema?'active in':''}" id="changeUserPanel">
<div id="changeInfoMsg" class="alert">
</div>
<form action="#" method="POST" id="changeUserForm">
<form action="#" method="POST" id="changeUserForm" class="form-horizontal">
<fieldset>
<label for="email"><strong><spring:message code="EMAIL"/>:</strong></label>
<input type="text" name="password" id="email" required="required" readonly="readonly"
value="${user.email}"/>
<label for="firstname"><strong><spring:message code="FIRSTNAME"/>:</strong></label>
<input type="text" name="firstname" id="firstname" required="required" value="${user.firstname}"/>
<label for="lastname"><strong><spring:message code="LASTNAME"/>:</strong></label>
<input type="text" name="lastname" id="lastname" required="required" value="${user.lastname}"/>
<div class="form-group">
<label for="email" class="col-sm-3 control-label"><strong><spring:message code="EMAIL"/>:</strong></label>
<div class="col-sm-8">
<input type="text" name="password" id="email" required="required" class="form-control" readonly="readonly" value="${user.email}"/>
</div>
</div>
<div class="form-group">
<label for="firstname" class="col-sm-3 control-label"><strong><spring:message code="FIRSTNAME"/>:</strong></label>
<div class="col-sm-8">
<input type="text" name="firstname" id="firstname" required="required" class="form-control" value="${user.firstname}"/>
</div>
</div>
<div class="form-group">
<label for="lastname" class="col-sm-3 control-label"><strong><spring:message code="LASTNAME"/>:</strong></label>
<div class="col-sm-8">
<input type="text" name="lastname" id="lastname" required="required" class="form-control" value="${user.lastname}"/>
</div>
</div>
<br/>
<input type="submit" id="changeUserInfoBtn" class="btn btn-primary"
value="<spring:message code="SAVE_CHANGES"/>"/>
<input type="submit" id="changeUserInfoBtn" class="btn btn-primary" class="form-control" value="<spring:message code="SAVE_CHANGES"/>"/>
</fieldset>
</form>
@@ -36,26 +44,34 @@
<div class="tab-pane fade" id="changePasswordPanel">
<div id="changePasswordMsg" class="alert">
</div>
<form action="#" method="POST" id="changePasswordForm">
<form action="#" method="POST" id="changePasswordForm" class="form-horizontal">
<fieldset>
<label for="password"><strong><spring:message code="NEW_PASSWORD"/>:</strong></label>
<input type="password" name="password" id="password" required="required"/>
<label for="repassword"><strong><spring:message code="CONFIRM_NEW_PASSWORD"/>:</strong></label>
<input type="password" name="password" id="repassword" required="required"/>
<div class="form-group">
<label for="password" class="col-sm-3 control-label"><strong><spring:message code="NEW_PASSWORD"/>:</strong></label>
<div class="col-sm-8">
<input type="password" name="password" id="password" required="required" class="form-control"/>
</div>
</div>
<div class="form-group">
<label for="repassword" class="col-sm-3 control-label"><strong><spring:message code="CONFIRM_NEW_PASSWORD"/>:</strong></label>
<div class="col-sm-8">
<input type="password" name="password" id="repassword" required="required" class="form-control"/>
</div>
</div>
<br/>
<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"/>"/>
</fieldset>
</form>
</div>
<div class="tab-pane fade ${principal.databaseSchema?'':'active in'}" id="languagePanel">
<div id="languageMsg" class="alert">
</div>
<form action="#" method="POST" id="languageForm">
<form action="#" method="POST" id="languageForm" class="form-horizontal">
<fieldset>
<label for="language"><strong><spring:message code="LANGUAGE"/>:</strong></label>
<select name="language" id="language">
<div class="form-group">
<label for="language" class="col-sm-3 control-label"><strong><spring:message code="LANGUAGE"/>:</strong></label>
<div class="col-sm-8">
<select name="language" id="language" class="form-control">
<option value="en">English</option>
<option value="es" <c:if test="${user.locale=='es'}">selected="selected" </c:if>>Spanish -
español
@@ -82,7 +98,8 @@
<option value="ca" <c:if test="${user.locale=='ca'}">selected="selected" </c:if>>Catalan -
català
</option>
</select>
</select></div>
</div>
<br/>
<input type="submit" id="changeLanguageBtn" class="btn btn-primary"
value="<spring:message code="CHANGE_LANGUAGE"/>"/>
@@ -90,7 +107,7 @@
</form>
</div>
<div class="tab-pane fade" id="deleteAccountPanel">
<div id="deleteAccountMsg" class="alert alert-error" 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">
<fieldset>
<input type="checkbox" name="confirmAccountDelete" id="accountMarkedForDelete" required="required"/>
@@ -130,18 +147,18 @@
var changePasswordMsg = $('#changePasswordMsg');
if (inputVal != rinputVal) {
// Password mismatch message ...
changePasswordMsg.removeClass('alert-info').addClass('alert-error').show();
changePasswordMsg.removeClass('alert-info').addClass('alert-danger').show();
changePasswordMsg.text('<spring:message code="PASSWORD_MISSMATCH"/>');
} else {
postChange(
"c/restful/account/password",
inputVal,
function() {
changePasswordMsg.removeClass('alert-error').addClass('alert-info').show();
changePasswordMsg.removeClass('alert-danger').addClass('alert-info').show();
changePasswordMsg.text('<spring:message code="CHANGE_PASSWORD_SUCCESS"/>');
},
function(textStatus) {
changePasswordMsg.removeClass('alert-info').addClass('alert-error').show();
changePasswordMsg.removeClass('alert-info').addClass('alert-danger').show();
changePasswordMsg.text(textStatus);
}
);
@@ -162,7 +179,7 @@
changeInfoMsg.text('<spring:message code="INFO_UPDATE_SUCCESS"/>');
},
function(textStatus) {
changeInfoMsg.removeClass('alert-info').addClass('alert-error').show();
changeInfoMsg.removeClass('alert-info').addClass('alert-danger').show();
changeInfoMsg.text(textStatus);
}
);
@@ -170,11 +187,11 @@
"c/restful/account/lastname",
lastname,
function() {
changeInfoMsg.removeClass('alert-error').addClass('alert-info').show();
changeInfoMsg.removeClass('alert-danger').addClass('alert-info').show();
changeInfoMsg.text('<spring:message code="INFO_UPDATE_SUCCESS"/>');
},
function(textStatus) {
changeInfoMsg.removeClass('alert-info').addClass('alert-error').show();
changeInfoMsg.removeClass('alert-info').addClass('alert-danger').show();
changeInfoMsg.text(textStatus);
}
);
@@ -189,11 +206,11 @@
"c/restful/account/locale",
locale,
function() {
languageMsg.removeClass('alert-error').addClass('alert-info').show();
languageMsg.removeClass('alert-danger').addClass('alert-info').show();
languageMsg.text('<spring:message code="INFO_UPDATE_SUCCESS"/>');
},
function(textStatus) {
languageMsg.removeClass('alert-info').addClass('alert-error').show();
languageMsg.removeClass('alert-info').addClass('alert-danger').show();
languageMsg.text(textStatus);
}
);
@@ -210,7 +227,7 @@
},
function(textStatus) {
var deleteAccountMsg = $('#deleteAccountMsg');
deleteAccountMsg.removeClass('alert-info').addClass('alert-error').show();
deleteAccountMsg.removeClass('alert-info').addClass('alert-danger').show();
deleteAccountMsg.text(textStatus);
},
'DELETE'

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

@@ -27,12 +27,12 @@
});
</script>
<div class="span1 offset3">
<div class="col-md-1 col-md-offset-3">
<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>
<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 class="span1">
<div class="col-md-1">
<!-- Place this tag where you want the +1 button to render. -->
<div class="g-plusone" data-href="http://www.wisemapping.com"></div>
@@ -49,7 +49,7 @@
})();
</script>
</div>
<div class="span4">
<div class="col-md-4">
<p style="text-align: center;">
<a href="" id="feedbackBtn"><spring:message code="FEEDBACK"/></a> |
<a href="" id="reportIssueBtn"><spring:message code="REPORT_BUG"/></a> |
@@ -59,7 +59,7 @@
</p>
</div>
<div class="span1">
<div class="col-md-1">
<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"
@@ -69,7 +69,7 @@
value="-----BEGIN PKCS7-----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-----END PKCS7-----"/>
</form>
</div>
<div class="span1">
<div class="col-md-1">
<a href="https://www.w3.org/html/logo/">
<img src="images/html5-badge-h-graphics.png" width="66" height="32"
alt="HTML5 Powered with Graphics, 3D &amp; Effects"

18
wise-webapp/src/main/webapp/jsp/header.jsp
View File

@@ -14,15 +14,19 @@
%>
<div id="settings-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="ACCOUNT"/></h3>
</div>
<div class="modal-body">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="ACCOUNT"/></h3>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button class="btn btn-cancel"><spring:message code="CLOSE"/></button>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-cancel"><spring:message code="CLOSE"/></button>
</div>
</div>
<div id="header">

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

@@ -12,31 +12,28 @@
});
</script>
<div class="row-fluid">
<div class="span5" style="margin-top: 20px">
<div class="row">
<div class="col-md-5" style="margin-top: 20px">
<h1><spring:message code="WELCOME_TO_WISEMAPPING"/></h1>
<spring:message code="WELCOME_DETAILS"/>
</div>
<div id="login" class="fform span6">
<div id="login" class="fform col-md-6">
<h1><spring:message code="SIGN_IN"/></h1>
<form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal" id="loginForm">
<div class="control-group">
<label class="control-label" for="email"><spring:message code="EMAIL"/></label>
<div class="controls">
<input type='email' tabindex="1" id="email" name='j_username' required="required" class="span12"/>
<div class="form-group">
<label class="col-sm-2 control-label" for="email"><spring:message code="EMAIL"/></label>
<div class="col-md-12">
<input type='email' tabindex="1" id="email" name='j_username' required="required" class="form-control"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="password"><spring:message code="PASSWORD"/></label>
<div class="controls">
<input type='password' tabindex="2" id="password" name='j_password' required="required"
class="span12"/>
<div class="form-group">
<label class="col-sm-2 control-label" for="password"><spring:message code="PASSWORD"/></label>
<div class="col-md-12">
<input type='password' tabindex="2" id="password" name='j_password' required="required" class="form-control"/>
</div>
</div>
<div class="control-group" style="text-align: right">
<div class="form-group" style="text-align: right">
<label>
<button class="btn btn-primary" tabindex="4" data-loading-text="<spring:message code="SIGN_ING"/>">
@@ -50,14 +47,14 @@
</div>
</div>
<div class="control-group">
<div class="form-group">
<c:if test="${not empty param.login_error}">
<c:choose>
<c:when test="${param.login_error == 3}">
<div class="alert alert-error"><spring:message code="USER_INACTIVE"/></div>
<div class="alert alert-danger"><spring:message code="USER_INACTIVE"/></div>
</c:when>
<c:otherwise>
<div class="alert alert-error"><spring:message code="LOGIN_ERROR"/></div>
<div class="alert alert-danger"><spring:message code="LOGIN_ERROR"/></div>
</c:otherwise>
</c:choose>
</c:if>
@@ -67,7 +64,7 @@
</div>
<div class="row">
<div id="register" class="span12">
<div id="register" class="col-md-12">
<c:if test="${requestScope['security.type']=='db'}">
<b><spring:message code="NOT_READY_A_USER"/></b>
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
@@ -85,9 +82,9 @@
<c:if test="${isHsql== 'true'}">
<div class="row-fluid">
<div class="alert alert-info span offset12">
<span class="label label-important"><spring:message code="WARNING"/></span> <spring:message
<div class="row">
<div class="alert alert-info col-md-offset12">
<span class="label label-danger"><spring:message code="WARNING"/></span> <spring:message
code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
href="http://www.wisemapping.org/documentation/configu"><spring:message code="HERE"/></a>.
</div>

8
wise-webapp/src/main/webapp/jsp/loginOpenId.jsp
View File

@@ -22,12 +22,12 @@
});
});
</script>
<div class="row-fluid" style="padding: 10px 0px">
<div class="row" style="padding: 10px 0px">
<h1><spring:message code="OPENID_LOGIN"/></h1>
<spring:message code="LOGING_OPENID_DETAILS"/>
</div>
<div class="row-fluid">
<div id="login" class="fform span8">
<div class="row">
<div id="login" class="fform col-md-8">
<form action="/c/j_spring_openid_security_check" method="get" id="openid_form">
<input type="hidden" name="action" value="verify"/>
<fieldset>
@@ -48,7 +48,7 @@
</form>
<!-- /Simple OpenID Selector -->
</div>
<div class="span4" style="background-color: #FFEFC6;padding: 10px">
<div class="col-md-4" style="background-color: #FFEFC6;padding: 10px">
<spring:message code="WHY_OPENID"/>
</div>
</div>

2
wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
View File

@@ -78,7 +78,7 @@
<p id="exportInfo">
<span class="label label-important">Warning</span> <spring:message code="EXPORT_FORMAT_RESTRICTIONS"/>
<span class="label label-danger">Warning</span> <spring:message code="EXPORT_FORMAT_RESTRICTIONS"/>
</p>

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

@@ -8,17 +8,17 @@
<form method="POST" enctype="multipart/form-data" action="#" id="dialogMainForm" class="form-horizontal">
<div class="errorMessage"></div>
<fieldset>
<div class="control-group">
<div class="form-group">
<label for="mapFile" class="control-label"><spring:message code="MIND_FILE"/>: </label>
<input type="file" name="file" id="mapFile" required="required" class="control"/>
</div>
<div class="control-group">
<div class="form-group">
<label for="title" class="control-label"><spring:message code="NAME"/>: </label>
<input type="text" id="title" name="title" required="required"
placeholder="<spring:message code="MAP_NAME_HINT"/>"
class="control" maxlength="255"/>
</div>
<div class="control-group">
<div class="form-group">
<label for="description" class="control-label"><spring:message code="DESCRIPTION"/>: </label>
<textarea type="text" name="description" id="description"
@@ -69,7 +69,7 @@
// Mark the field with errors ...
var message = fieldErrors[fieldName];
var inputField = $("#dialogMainForm input[name='" + fieldName + "']");
$("#dialogMainForm").find(".errorMessage").text(message).addClass("alert alert-error");
$("#dialogMainForm").find(".errorMessage").text(message).addClass("alert alert-danger");
inputField.parent().addClass('error');
}
}
@@ -77,7 +77,7 @@
if (globalErrors) {
for (var error in globalErrors) {
// Mark the field with errors ...
$("#dialogMainForm").find(".errorMessage").text(error).addClass("alert alert-error");
$("#dialogMainForm").find(".errorMessage").text(error).addClass("alert alert-danger");
inputField.parent().addClass('error');
}
}

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

@@ -6,11 +6,8 @@
<html lang="en">
<head>
<base href="${requestScope['site.baseurl']}/">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title><spring:message code="SITE.TITLE"/> - <spring:message code="MY_WISEMAPS"/></title>
<!--[if lt IE 9]>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<![endif]-->
<link rel="icon" href="images/favicon.ico" type="image/x-icon"/>
<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon"/>
@@ -28,7 +25,6 @@
<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">
$(function () {
$('#mindmapListTable').dataTable({
@@ -122,37 +118,34 @@
<jsp:param name="showLogout" value="true"/>
</jsp:include>
<div class="row-fluid hide" id="messagesPanel" style="margin-top: 20px">
<div class="span2"></div>
<div class="alert alert-error alert-block fade in span8">
<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">
<strong><spring:message code="UNEXPECTED_ERROR"/></strong>
<p><spring:message code="UNEXPECTED_ERROR_SERVER_ERROR"/></p>
<div></div>
</div>
</div>
<div class="row-fluid" style="min-height: 500px">
<div class="row" style="min-height: 500px">
<div class="span1"></div>
<div class="span2" id="foldersContainer">
<div class="col-md-1"></div>
<div class="col-md-2" id="foldersContainer">
<ul class="nav nav-list">
<li class="nav-header"><spring:message code="FILTERS"/></li>
<li data-filter="all" class="active"><a href="#"><i class="icon-inbox icon-white"></i> <spring:message
<li data-filter="all" class="active"><a href="#"><i class="glyphicon glyphicon-inbox glyphicon-white"></i> <spring:message
code="ALL_MAPS"/></a></li>
<li data-filter="my_maps"><a href="#"><i class="icon-user"></i> <spring:message code="MY_MAPS"/></a>
<li data-filter="my_maps"><a href="#"><i class="glyphicon glyphicon-user"></i> <spring:message code="MY_MAPS"/></a>
</li>
<li data-filter="shared_with_me"><a href="#"><i class="icon-share"></i> <spring:message
<li data-filter="shared_with_me"><a href="#"><i class="glyphicon glyphicon-share"></i> <spring:message
code="SHARED_WITH_ME"/></a></li>
<li data-filter="starred"><a href="#"><i class="icon-star"></i> <spring:message code="STARRED"/></a>
</li>
<li data-filter="public"><a href="#"><i class="icon-globe"></i> <spring:message code="PUBLIC_MAPS"/></a>
<li data-filter="starred"><a href="#"><i class="glyphicon glyphicon-star"></i> <spring:message code="STARRED"/></a></li>
<li data-filter="public"><a href="#"><i class="glyphicon glyphicon-globe"></i> <spring:message code="PUBLIC_MAPS"/></a>
</li>
</ul>
</div>
<div class="buttonsToolbar btn-toolbar ${requestScope['google.ads.enabled']?'span7':'span8'}">
<div class="buttonsToolbar btn-toolbar ${requestScope['google.ads.enabled']?'col-md-7':'col-md-8'}">
<div id="tableActions">
<div id="pageInfo"></div>
<div class="btn-group" id="pageButtons">
@@ -162,46 +155,46 @@
</div>
<div class="btn-group">
<button id="newBtn" class="btn btn-primary"><i class="icon-file icon-white"></i> <spring:message
<button id="newBtn" class="btn btn-primary"><i class="glyphicon glyphicon-file glyphicon-white"></i> <spring:message
code="NEW"/></button>
<button id="importBtn" class="btn btn-primary"><i class="icon-upload icon-white"></i>
<button id="importBtn" class="btn btn-primary"><i class="glyphicon glyphicon-upload glyphicon-white"></i>
<spring:message code="IMPORT"/>
</button>
</div>
<div class="btn-group act-multiple" id="deleteBtn" style="display:none">
<button class="btn btn-primary"><i class="icon-trash icon-white"></i> <spring:message
<button class="btn btn-primary"><i class="glyphicon glyphicon-trash glyphicon-white"></i> <spring:message
code="DELETE"/></button>
</div>
<div id="infoBtn" class="btn-group act-single" style="display:none">
<button class="btn btn-primary"><i class="icon-exclamation-sign icon-white"></i> <spring:message
<button class="btn btn-primary"><i class="glyphicon glyphicon-exclamation-sign glyphicon-white"></i> <spring:message
code="INFO"/></button>
</div>
<div id="actionsBtn" class="btn-group act-single" style="display:none">
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<i class="icon-asterisk icon-white"></i> <spring:message code="MORE"/>
<i class="glyphicon glyphicon-asterisk glyphicon-white"></i> <spring:message code="MORE"/>
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li id="duplicateBtn"><a href="#" onclick="return false"><i class="icon-plus-sign"></i>
<li id="duplicateBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-plus-sign"></i>
<spring:message code="DUPLICATE"/></a></li>
<li id="renameBtn"><a href="#" onclick="return false"><i class="icon-edit"></i> <spring:message
<li id="renameBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-edit"></i> <spring:message
code="RENAME"/></a></li>
<li id="publishBtn"><a href="#" onclick="return false"><i class="icon-globe"></i>
<li id="publishBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-globe"></i>
<spring:message code="PUBLISH"/></a>
</li>
<li id="shareBtn"><a href="#" onclick="return false"><i class="icon-share"></i> <spring:message
<li id="shareBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-share"></i> <spring:message
code="SHARE"/></a></li>
<li id="exportBtn"><a href="#" onclick="return false"><i class="icon-download"></i>
<li id="exportBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-download"></i>
<spring:message
code="EXPORT"/></a>
</li>
<li id="printBtn"><a href="#" onclick="return false"><i class="icon-print"></i> <spring:message
<li id="printBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-print"></i> <spring:message
code="PRINT"/></a></li>
<li id="historyBtn"><a href="#" onclick="return false"><i class="icon-time"></i> <spring:message
<li id="historyBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-time"></i> <spring:message
code="HISTORY"/></a>
</li>
</ul>
@@ -212,7 +205,7 @@
<div id="tableFooter" class="form-inline"></div>
</div>
<div class="span1" style="padding-top:25px">
<div class="col-md-1" style="padding-top:25px">
<c:if test="${requestScope['google.ads.enabled']}">
<script type="text/javascript"><!--
google_ad_client = "ca-pub-7564778578019285";
@@ -235,208 +228,261 @@
<div id="dialogsContainer">
<!-- New map dialog -->
<div id="new-dialog-modal" title="<spring:message code="ADD_NEW_MAP"/>" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="NEW_MAP_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="newTitle"><spring:message code="NAME"/>:</label>
<input class="control" name="title" id="newTitle" type="text" required="required"
placeholder="<spring:message code="MAP_NAME_HINT"/>" autofocus="autofocus" maxlength="255"/>
</div>
<div class="control-group">
<label class="control-label" for="newDec"><spring:message code="DESCRIPTION"/>:</label>
<input class="control" name="description" id="newDec" type="text"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" maxlength="255"/>
</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 class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="NEW_MAP_MSG"/></h3>
</div>
<div class="modal-body">
<div class="errorMessage"></div>
<form class="form-horizontal">
<fieldset>
<div class="form-group">
<label class="col-sm-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>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" for="newDec"><spring:message code="DESCRIPTION"/>:</label>
<div class="col-sm-8">
<input class="form-control" name="description" id="newDec" type="text" placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" maxlength="255"/>
</div>
</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>
</div>
</div>
<!-- Duplicate map dialog -->
<div id="duplicate-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3 id="dupDialogTitle"></h3>
</div>
<div class="modal-body">
<div class="errorMessage"></div>
<form class="form-horizontal">
<fieldset>
<div class="control-group">
<label for="title" class="control-label"><spring:message code="NAME"/>: </label>
<input name="title" id="title" type="text" required="required"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" autofocus="autofocus"
class="control" maxlength="255"/>
</div>
<div class="control-group">
<label for="description" class="control-label"><spring:message
code="DESCRIPTION"/>: </label>
<input name="description" id="description" type="text"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="control" maxlength="255"/>
</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="DUPLICATE"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3 id="dupDialogTitle"></h3>
</div>
<div class="modal-body">
<div class="errorMessage"></div>
<form class="form-horizontal">
<fieldset>
<div class="form-group">
<label for="title" class="col-sm-3 control-label"><spring:message code="NAME"/>: </label>
<div class="col-sm-8">
<input name="title" id="title" type="text" required="required"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" autofocus="autofocus"
class="form-control" maxlength="255"/>
</div>
</div>
<div class="form-group">
<label for="description" class="col-sm-3 control-label"><spring:message
code="DESCRIPTION"/>: </label>
<div class="col-sm-8">
<input name="description" id="description" type="text"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="form-control" maxlength="255"/>
</div>
</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="DUPLICATE"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div>
</div>
</div>
</div>
<!-- Rename map dialog -->
<div id="rename-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3 id="renameDialogTitle"><spring:message code="RENAME"/></h3>
</div>
<div class="modal-body">
<div class="errorMessage"></div>
<form class="form-horizontal">
<fieldset>
<div class="control-group">
<label for="renTitle" class="control-label"><spring:message code="NAME"/>: </label>
<input name="title" id="renTitle" required="required" autofocus="autofocus"
class="control" maxlength="255"/>
</div>
<div class="control-group">
<label for="renDescription" class="control-label"><spring:message
code="DESCRIPTION"/>:</label>
<input name="description" class="control" id="renDescription" maxlength="255"/>
</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="RENAME"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3 id="renameDialogTitle"><spring:message code="RENAME"/></h3>
</div>
<div class="modal-body">
<div class="errorMessage"></div>
<form class="form-horizontal">
<fieldset>
<div class="form-group">
<label for="renTitle" class="col-sm-3 control-label"><spring:message code="NAME"/>: </label>
<div class="col-sm-8">
<input name="title" id="renTitle" required="required" autofocus="autofocus"
class="form-control" maxlength="255"/>
</div>
</div>
<div class="form-group">
<label for="renDescription" class="col-sm-3 control-label"><spring:message
code="DESCRIPTION"/>:</label>
<div class="col-sm-8">
<input name="description" class="form-control" id="renDescription" maxlength="255"/>
</div>
</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="RENAME"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div>
</div>
</div>
</div>
<!-- Delete map dialog -->
<div id="delete-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="DELETE_MINDMAP"/></h3>
</div>
<div class="modal-body">
<div class="alert alert-block">
<h4 class="alert-heading"><spring:message code="WARNING"/>!</h4><spring:message code="DELETE_MAPS_WARNING"/>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="DELETE_MINDMAP"/></h3>
</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 class="modal-body">
<div class="alert alert-block">
<h4 class="alert-heading"><spring:message code="WARNING"/>!</h4><spring:message code="DELETE_MAPS_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>
</div>
</div>
<!-- Info map dialog -->
<div id="info-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="INFO"/></h3>
</div>
<div class="modal-body">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="INFO"/></h3>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CLOSE"/></button>
</div>
<div class="modal-footer">
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CLOSE"/></button>
</div>
</div>
</div>
</div>
<!-- Publish Dialog Config -->
<div id="publish-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="PUBLISH"/></h3>
</div>
<div class="modal-body">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="PUBLISH"/></h3>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>...">
<spring:message code="ACCEPT"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>...">
<spring:message code="ACCEPT"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div>
</div>
</div>
</div>
<!-- Export Dialog Config -->
<div id="export-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="EXPORT"/></h3>
</div>
<div class="modal-body">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="EXPORT"/></h3>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="Exporting..."><spring:message
code="EXPORT"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="Exporting..."><spring:message
code="EXPORT"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div>
</div>
</div>
</div>
<!-- Import Dialog Config -->
<div id="import-dialog-modal" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="IMPORT"/></h3>
</div>
<div class="modal-body">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="IMPORT"/></h3>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message
code="IMPORTING"/>"><spring:message
code="IMPORT"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message
code="IMPORTING"/>"><spring:message
code="IMPORT"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div>
</div>
</div>
</div>
<!-- Share Dialog Config -->
<div id="share-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="SHARE"/></h3>
</div>
<div class="modal-body">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="SHARE"/></h3>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>">
<spring:message code="ACCEPT"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>">
<spring:message code="ACCEPT"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div>
</div>
</div>
</div>
<!-- History Dialog Config -->
<div id="history-dialog-modal" class="modal fade">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="HISTORY"/></h3>
</div>
<div class="modal-body">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal">x</button>
<h3><spring:message code="HISTORY"/></h3>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CLOSE"/></button>
</div>
</div>
<div class="modal-footer">
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CLOSE"/></button>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

8
wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp
View File

@@ -18,7 +18,7 @@
</label>
</form>
<p><span class="label label-important"> <spring:message code="WARNING"/></span> <spring:message code="PUBLISH_DETAILS"/>
<p><span class="label label-danger"> <spring:message code="WARNING"/></span> <spring:message code="PUBLISH_DETAILS"/>
</p>
<div id="publishPanel">
@@ -34,13 +34,13 @@
<div id="wizardContainer">
<form class="form-inline" action="#">
<label for="frameWidth"><spring:message code="FRAME_WIDTH"/>:</label>
<input type="number" id="frameWidth" name="frameWidth" value="600" class="span2" min="0"/>
<input type="number" id="frameWidth" name="frameWidth" value="600" class="col-md-2" min="0"/>
<label for="frameHeight"><spring:message code="FRAME_HEIGHT"/>:</label>
<input type="number" id="frameHeight" name="frameHeight" value="400" class="span2" min="0"/>
<input type="number" id="frameHeight" name="frameHeight" value="400" class="col-md-2" min="0"/>
<label for="mapZoom"><spring:message code="ZOOM"/> %:</label>
<input type="number" id="mapZoom" name="mapZoom" value="80" class="span2" min="10" max="200"
<input type="number" id="mapZoom" name="mapZoom" value="80" class="col-md-2" min="10" max="200"
step="10"/>
</form>
</div>

4
wise-webapp/src/main/webapp/jsp/mindmapShare.jsp
View File

@@ -52,13 +52,13 @@
</div>
<div class="well">
<div id="errorMsg" class="alert alert-error"></div>
<div id="errorMsg" class="alert alert-danger"></div>
<div>
<p><strong><spring:message code="ADD_PEOPLE"/>:</strong></p>
<input type="text" id="collabEmails" name="collabEmails"
placeholder="<spring:message code="COLLABORATORS_SEPARATED_BY_COMA"/>" class="span1"/>
placeholder="<spring:message code="COLLABORATORS_SEPARATED_BY_COMA"/>" class="col-md-1"/>
<div class="btn-group" id="roleBtn">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="CAN_EDIT"/>

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

@@ -11,7 +11,7 @@
<html>
<head>
<base href="${requestScope['site.baseurl']}/">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="author" content="WiseMapping">
<meta name="publisher" content="WiseMapping Open Source">
<meta name="keywords"
@@ -51,9 +51,9 @@
</jsp:include>
<div class="bodyContainer">
<div class="row-fluid">
<div class="span2"></div>
<div class="pageBodyContent span8">
<div class="row">
<div class="col-md-2"></div>
<div class="pageBodyContent col-md-8">
<tiles:insertAttribute name="body"/>
</div>
<c:if test="${requestScope['google.ads.enabled']}">