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'