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

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>