fix #2410 alignment fixes
This commit is contained in:
Shinsuke Sugaya
parent
cb47bd59b5
commit
1c9d6566e4
3 changed files with 148 additions and 160 deletions
|
|
@ -69,7 +69,7 @@ public class AdminEsreqAction extends FessAdminAction {
|
|||
@Secured({ ROLE })
|
||||
public ActionResponse upload(final UploadForm form) {
|
||||
validate(form, messages -> {}, () -> asListHtml(null));
|
||||
verifyToken(() -> asListHtml(() -> saveToken()));
|
||||
verifyTokenKeep(() -> asListHtml(() -> saveToken()));
|
||||
|
||||
String header = null;
|
||||
final StringBuilder buf = new StringBuilder(1000);
|
||||
|
|
|
|||
|
|
@ -1,81 +1,71 @@
|
|||
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %><!DOCTYPE html>
|
||||
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title><la:message key="labels.admin_brand_title"/> | <la:message
|
||||
key="labels.esreq_configuration"/></title>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title><la:message key="labels.admin_brand_title" /> | <la:message
|
||||
key="labels.esreq_configuration" /></title>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
|
||||
</head>
|
||||
<body class="hold-transition sidebar-mini">
|
||||
<div class="wrapper">
|
||||
<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
|
||||
<jsp:param name="menuCategoryType" value="system"/>
|
||||
<jsp:param name="menuType" value="wizard"/>
|
||||
</jsp:include>
|
||||
<div class="content-wrapper">
|
||||
<div class="content-header">
|
||||
<div class="container-fluid">
|
||||
<div class="row mb-2">
|
||||
<div class="col-sm-6">
|
||||
<h1>
|
||||
<la:message key="labels.esreq_configuration"/>
|
||||
</h1>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<section class="content">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="card card-outline card-primary">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">
|
||||
<la:message key="labels.esreq_configuration"/>
|
||||
</h3>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<%-- Message --%>
|
||||
<div>
|
||||
<la:info id="msg" message="true">
|
||||
<div class="alert alert-info">${msg}</div>
|
||||
</la:info>
|
||||
<la:errors/>
|
||||
</div>
|
||||
<%-- List --%>
|
||||
<div class="data-wrapper">
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<c:if test="${editable}">
|
||||
<la:form action="/admin/esreq/upload/" enctype="multipart/form-data"
|
||||
styleClass="form-inline">
|
||||
<div class="form-group row">
|
||||
<label for="requestFile"> <la:message
|
||||
key="labels.esreq_request_file"/>
|
||||
</label>
|
||||
<input id="requestFile" type="file" name="requestFile"
|
||||
class="form-control-file"/>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-success" name="upload">
|
||||
<em class="fa fa-upload"></em>
|
||||
<la:message key="labels.esreq_button_upload"/>
|
||||
</button>
|
||||
</la:form></c:if>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
|
||||
</div>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
|
||||
<div class="wrapper">
|
||||
<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
|
||||
<jsp:param name="menuCategoryType" value="system" />
|
||||
<jsp:param name="menuType" value="esreq" />
|
||||
</jsp:include>
|
||||
<div class="content-wrapper">
|
||||
<div class="content-header">
|
||||
<div class="container-fluid">
|
||||
<div class="row mb-2">
|
||||
<div class="col-sm-6">
|
||||
<h1>
|
||||
<la:message key="labels.esreq_configuration" />
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<section class="content">
|
||||
<la:form action="/admin/esreq/upload/" enctype="multipart/form-data">
|
||||
<div class="col-md-12">
|
||||
<la:info id="msg" message="true">
|
||||
<div class="alert alert-info">${msg}</div>
|
||||
</la:info>
|
||||
<la:errors />
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="card card-outline card-primary">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">
|
||||
<la:message key="labels.esreq_configuration" />
|
||||
</h3>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="form-group row">
|
||||
<label for="requestFile" class="col-sm-3 text-sm-right col-form-label"><la:message
|
||||
key="labels.esreq_request_file"
|
||||
/></label>
|
||||
<div class="col-sm-9">
|
||||
<input id="requestFile" type="file" name="requestFile" class="form-control-file" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<c:if test="${editable}">
|
||||
<button type="submit" class="btn btn-primary" name="upload">
|
||||
<em class="fa fa-upload"></em>
|
||||
<la:message key="labels.esreq_button_upload" />
|
||||
</button>
|
||||
</c:if>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</la:form>
|
||||
</section>
|
||||
</div>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
|
||||
</div>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,90 +1,88 @@
|
|||
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %><!DOCTYPE html>
|
||||
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title><la:message key="labels.admin_brand_title"/> | <la:message
|
||||
key="labels.upgrade_title_configuration"/></title>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
|
||||
<meta charset="UTF-8">
|
||||
<title><la:message key="labels.admin_brand_title" /> | <la:message
|
||||
key="labels.upgrade_title_configuration" /></title>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
|
||||
</head>
|
||||
<body class="hold-transition sidebar-mini">
|
||||
<div class="wrapper">
|
||||
<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
|
||||
<jsp:param name="menuCategoryType" value="system"/>
|
||||
<jsp:param name="menuType" value="wizard"/>
|
||||
</jsp:include>
|
||||
<div class="content-wrapper">
|
||||
<div class="content-header">
|
||||
<div class="container-fluid">
|
||||
<div class="row mb-2">
|
||||
<div class="col-sm-6">
|
||||
<h1>
|
||||
<la:message key="labels.upgrade_title_configuration"/>
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<section class="content">
|
||||
<div class="row">
|
||||
<la:form action="/admin/upgrade/">
|
||||
<%-- Message: BEGIN --%>
|
||||
<div class="col-md-12">
|
||||
<la:info id="msg" message="true">
|
||||
<div class="alert alert-info">${msg}</div>
|
||||
</la:info>
|
||||
<la:errors/>
|
||||
</div>
|
||||
<%-- Message: END --%>
|
||||
<div class="col-md-12">
|
||||
<div class="card card-outline card-primary">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">
|
||||
<la:message key="labels.upgrade_data_migration"/>
|
||||
</h3>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="form-group row">
|
||||
<label for="targetVersion" class="col-sm-3 text-sm-right col-form-label"><la:message
|
||||
key="labels.target_version"/></label>
|
||||
<div class="col-sm-9">
|
||||
<la:errors property="targetVersion"/>
|
||||
<la:select styleId="targetVersion" property="targetVersion"
|
||||
styleClass="form-control">
|
||||
<la:option value="12.0">12.0</la:option>
|
||||
<la:option value="12.1">12.1</la:option>
|
||||
<la:option value="12.2">12.2</la:option>
|
||||
<la:option value="12.3">12.3</la:option>
|
||||
<la:option value="12.4">12.4</la:option>
|
||||
<la:option value="12.5">12.5</la:option>
|
||||
<la:option value="12.6">12.6</la:option>
|
||||
<la:option value="12.7">12.7</la:option>
|
||||
<la:option value="13.0">13.0</la:option>
|
||||
<la:option value="13.1">13.1</la:option>
|
||||
<la:option value="13.2">13.2</la:option>
|
||||
<la:option value="13.3">13.3</la:option>
|
||||
<la:option value="13.4">13.4</la:option>
|
||||
<la:option value="13.5">13.5</la:option>
|
||||
</la:select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<button type="submit" class="btn btn-primary ${f:h(editableClass)}"
|
||||
name="upgradeFrom"
|
||||
value="<la:message key="labels.upgrade_start_button"/>">
|
||||
<em class="fa fa-arrow-circle-right"></em>
|
||||
<la:message key="labels.upgrade_start_button"/>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</la:form>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
|
||||
</div>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
|
||||
<div class="wrapper">
|
||||
<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
|
||||
<jsp:param name="menuCategoryType" value="system" />
|
||||
<jsp:param name="menuType" value="upgrade" />
|
||||
</jsp:include>
|
||||
<div class="content-wrapper">
|
||||
<div class="content-header">
|
||||
<div class="container-fluid">
|
||||
<div class="row mb-2">
|
||||
<div class="col-sm-6">
|
||||
<h1>
|
||||
<la:message key="labels.upgrade_title_configuration" />
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<section class="content">
|
||||
<la:form action="/admin/upgrade/">
|
||||
<%-- Message: BEGIN --%>
|
||||
<div class="col-md-12">
|
||||
<la:info id="msg" message="true">
|
||||
<div class="alert alert-info">${msg}</div>
|
||||
</la:info>
|
||||
<la:errors />
|
||||
</div>
|
||||
<%-- Message: END --%>
|
||||
<div class="col-md-12">
|
||||
<div class="card card-outline card-primary">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">
|
||||
<la:message key="labels.upgrade_data_migration" />
|
||||
</h3>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="form-group row">
|
||||
<label for="targetVersion" class="col-sm-3 text-sm-right col-form-label"><la:message
|
||||
key="labels.target_version"
|
||||
/></label>
|
||||
<div class="col-sm-9">
|
||||
<la:errors property="targetVersion" />
|
||||
<la:select styleId="targetVersion" property="targetVersion" styleClass="form-control">
|
||||
<la:option value="12.0">12.0</la:option>
|
||||
<la:option value="12.1">12.1</la:option>
|
||||
<la:option value="12.2">12.2</la:option>
|
||||
<la:option value="12.3">12.3</la:option>
|
||||
<la:option value="12.4">12.4</la:option>
|
||||
<la:option value="12.5">12.5</la:option>
|
||||
<la:option value="12.6">12.6</la:option>
|
||||
<la:option value="12.7">12.7</la:option>
|
||||
<la:option value="13.0">13.0</la:option>
|
||||
<la:option value="13.1">13.1</la:option>
|
||||
<la:option value="13.2">13.2</la:option>
|
||||
<la:option value="13.3">13.3</la:option>
|
||||
<la:option value="13.4">13.4</la:option>
|
||||
<la:option value="13.5">13.5</la:option>
|
||||
</la:select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<button type="submit" class="btn btn-primary ${f:h(editableClass)}" name="upgradeFrom"
|
||||
value="<la:message key="labels.upgrade_start_button"/>"
|
||||
>
|
||||
<em class="fa fa-arrow-circle-right"></em>
|
||||
<la:message key="labels.upgrade_start_button" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</la:form>
|
||||
</section>
|
||||
</div>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
|
||||
</div>
|
||||
<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue