mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-05 07:03:24 +01:00
Improve import layout.
This commit is contained in:
parent
fc1ee1ff2e
commit
a832d72bac
@ -163,7 +163,7 @@
|
||||
<definition name="importMap" extends="pageTemplate">
|
||||
<put name="title" value="IMPORT_MINDMAP"/>
|
||||
<put name="details" value="IMPORT_MINDMAP_INFO"/>
|
||||
<put name="body" value="/jsp/mindmapImportError.jsp"/>
|
||||
<put name="body" value="/jsp/mindmapImport.jsp"/>
|
||||
</definition>
|
||||
|
||||
<definition name="activationAccountConfirmation" extends="pageTemplate">
|
||||
|
@ -20,30 +20,29 @@
|
||||
|
||||
<form action="<c:url value='/c/j_spring_security_check'/>" method="POST">
|
||||
<fieldset>
|
||||
<label for="email">
|
||||
<spring:message code="EMAIL"/>
|
||||
<input type='email' tabindex="1" id="email" name='j_username' required="required"/>
|
||||
<label for="email"><spring:message code="EMAIL"/></label>
|
||||
<input type='email' tabindex="1" id="email" name='j_username' required="required"/>
|
||||
|
||||
<label for="password"><spring:message code="PASSWORD"/></label>
|
||||
<input type='password' tabindex="2" id="password" name='j_password' required="required"/>
|
||||
<label for="password"><spring:message code="PASSWORD"/></label>
|
||||
<input type='password' tabindex="2" id="password" name='j_password' required="required"/>
|
||||
|
||||
<c:if test="${not empty param.login_error}">
|
||||
<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>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<div class="alert alert-error"><spring:message code="LOGIN_ERROR"/></div>
|
||||
</c:otherwise>
|
||||
<c:when test="${param.login_error == 3}">
|
||||
<div class="alert alert-error"><spring:message code="USER_INACTIVE"/></div>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<div class="alert alert-error"><spring:message code="LOGIN_ERROR"/></div>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:if>
|
||||
</c:if>
|
||||
|
||||
<div class="form-inline">
|
||||
<input type="submit" class="btn btn-primary" value="<spring:message code="SIGN_IN"/>"
|
||||
data-toggle="button">
|
||||
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
|
||||
<label for="rememberme"><spring:message code="REMEMBER_ME"/></label>
|
||||
</div>
|
||||
<div class="form-inline">
|
||||
<input type="submit" class="btn btn-primary" value="<spring:message code="SIGN_IN"/>"
|
||||
data-toggle="button">
|
||||
<input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
|
||||
<label for="rememberme"><spring:message code="REMEMBER_ME"/></label>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
<a href="<c:url value="/c/forgotPassword.htm"/>"><spring:message code="FORGOT_PASSWORD"/></a>
|
||||
|
@ -1,43 +1,29 @@
|
||||
<%@ include file="/jsp/init.jsp" %>
|
||||
<div id="importContainer">
|
||||
|
||||
<div class="fform">
|
||||
<h1>
|
||||
<spring:message code="${requestScope.title}"/>
|
||||
</h1>
|
||||
|
||||
<p><spring:message code="${requestScope.details}"/></p>
|
||||
<form:form method="post" commandName="importMap" enctype="multipart/form-data">
|
||||
<table>
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<spring:message code="NAME"/>:
|
||||
</td>
|
||||
<td>
|
||||
<form:input path="title" id="title" tabindex="1"/>
|
||||
<form:errors path="title" cssClass="errorMsg"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<spring:message code="DESCRIPTION"/>:
|
||||
</td>
|
||||
<td>
|
||||
<form:input path="description" id="description" tabindex="2"/>
|
||||
<form:errors path="description" cssClass="errorMsg"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="formLabel">
|
||||
<span class="fieldRequired">*</span>
|
||||
<spring:message code="FREE_MIND_FILE"/>:
|
||||
</td>
|
||||
<td>
|
||||
<input type="file" name="mapFile"/>
|
||||
<form:errors path="mapFile" cssClass="errorMsg"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> </td>
|
||||
<td>
|
||||
<input type="submit" value="<spring:message code="IMPORT"/>" class="btn btn-primary">
|
||||
<input type="button" value="<spring:message code="CANCEL"/>" class="btn"
|
||||
onclick="window.location='/c/mymaps.htm'">
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<fieldset>
|
||||
<label for="title"><spring:message code="NAME"/></label>
|
||||
<form:input path="title" id="title" tabindex="1" required="required"/>
|
||||
<form:errors path="title" cssClass="errorMsg"/>
|
||||
|
||||
<label for="title"><spring:message code="DESCRIPTION"/></label>
|
||||
<form:input path="description" id="description" tabindex="2"/>
|
||||
<form:errors path="description" cssClass="errorMsg"/>
|
||||
|
||||
<label for="mapFile"><spring:message code="FREE_MIND_FILE"/></label>
|
||||
<input type="file" name="mapFile" id="mapFile"/>
|
||||
<form:errors path="mapFile" cssClass="errorMsg"/>
|
||||
</fieldset>
|
||||
|
||||
<input type="submit" value="<spring:message code="IMPORT"/>" class="btn btn-primary"/>
|
||||
<input type="button" value="<spring:message code="CANCEL"/>" class="btn"
|
||||
onclick="window.location='/c/mymaps.htm'">
|
||||
|
||||
</form:form>
|
||||
</div>
|
||||
|
@ -1,10 +0,0 @@
|
||||
<%@ include file="/jsp/init.jsp" %>
|
||||
|
||||
<h1>
|
||||
<spring:message code="${requestScope.title}"/>
|
||||
</h1>
|
||||
|
||||
<p style="font-weight:bold;">
|
||||
<spring:message code="${requestScope.details}"/>
|
||||
</p>
|
||||
<jsp:include page="/jsp/mindmapImport.jsp"/>
|
Loading…
Reference in New Issue
Block a user