0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix scheduler

Browse source
This commit is contained in:
Ryo Kuramoto 2020-01-22 16:53:53 +09:00
parent 147ceb5103
commit b381c21e27
No known key found for this signature in database
GPG key ID: F7A69369FE4CDA37
3 changed files with 93 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler.jsp
View file

@ -14,17 +14,25 @@
<jsp:param name="menuType" value="scheduler" />
</jsp:include>
<div class="content-wrapper">
<section class="content-header">
<h1>
<la:message key="labels.scheduledjob_configuration" />
</h1>
<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
</section>
<div class="content-header">
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1>
<la:message key="labels.scheduledjob_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-primary">
<div class="card-header with-border">
<div class="card card-outline card-primary">
<div class="card-header">
<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
</div>
<!-- /.card-header -->
@ -48,15 +56,15 @@
<c:if test="${schedulerPager.allRecordCount > 0}">
<div class="row">
<div class="col-sm-12">
<table class="table table-bordered table-striped">
<table class="table table-bordered">
<thead>
<tr>
<th class="col-md-2 text-center"><la:message key="labels.scheduledjob_name" /></th>
<th class="col-md-2 text-center"><la:message
<th><la:message key="labels.scheduledjob_name" /></th>
<th class="text-center"><la:message
key="labels.scheduledjob_status" /></th>
<th class="col-md-2 text-center"><la:message
<th class="text-center"><la:message
key="labels.scheduledjob_target" /></th>
<th class="col-md-2 text-center"><la:message
<th><la:message
key="labels.scheduledjob_cronExpression" /></th>
</tr>
</thead>
@ -67,15 +75,15 @@
data-href="${contextPath}/admin/scheduler/details/4/${f:u(data.id)}">
<td>${f:h(data.name)}</td>
<td class="text-center"><c:if test="${data.running}">
<span class="label label-success"><la:message
<span class="badge bg-success"><la:message
key="labels.scheduledjob_running" /></span>
</c:if> <c:if test="${!data.running}">
<c:if test="${data.available}">
<span class="label label-primary"><la:message
<span class="badge bg-primary"><la:message
key="labels.scheduledjob_active" /></span>
</c:if>
<c:if test="${!data.available}">
<span class="label label-default"><la:message
<span class="badge badge-secondary"><la:message
key="labels.scheduledjob_nojob" /></span>
</c:if>
</c:if></td>

51
src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_details.jsp
View file

@ -14,12 +14,20 @@
<jsp:param name="menuType" value="scheduler" />
</jsp:include>
<div class="content-wrapper">
<section class="content-header">
<h1>
<la:message key="labels.scheduledjob_title_details" />
</h1>
<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
</section>
<div class="content-header">
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1>
<la:message key="labels.scheduledjob_title_details" />
</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">
<la:form action="/admin/scheduler/">
<la:hidden property="crudMode" />
@ -32,13 +40,13 @@
<div class="row">
<div class="col-md-12">
<div
class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
<%-- Box Header --%>
<div class="box-header with-border">
class="card card-outline <c:if test="${crudMode == 1}">card-success</c:if><c:if test="${crudMode == 2}">card-warning</c:if><c:if test="${crudMode == 3}">card-danger</c:if><c:if test="${crudMode == 4}">card-primary</c:if>">
<%-- Card Header --%>
<div class="card-header">
<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
</div>
<%-- Box Body --%>
<div class="box-body">
<%-- Card Body --%>
<div class="card-body">
<%-- Message --%>
<div>
<la:info id="msg" message="true">
@ -50,8 +58,7 @@
<table class="table table-bordered">
<tbody>
<tr>
<th class="col-xs-2"><la:message
key="labels.scheduledjob_name" /></th>
<th><la:message key="labels.scheduledjob_name" /></th>
<td>${f:h(name)}<la:hidden property="name" /></td>
</tr>
<tr>
@ -104,8 +111,8 @@
</tbody>
</table>
</div>
<!-- /.box-body -->
<div class="box-footer">
<!-- /.card-body -->
<div class="card-footer">
<button type="submit" class="btn btn-default" name="list" value="back">
<em class="fa fa-arrow-circle-left"></em>
<la:message key="labels.crud_button_back" />
@ -128,21 +135,21 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">
<la:message key="labels.crud_title_delete" />
</h4>
<button type="button" class="close" data-dismiss="modal"
aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<h4 class="modal-title">
<la:message key="labels.crud_title_delete" />
</h4>
</div>
<div class="modal-body">
<p>
<la:message key="labels.crud_delete_confirmation" />
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline pull-left"
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default"
data-dismiss="modal">
<la:message key="labels.crud_button_cancel" />
</button>
@ -173,9 +180,9 @@
</c:if>
</c:if>
</div>
<!-- /.box-footer -->
<!-- /.card-footer -->
</div>
<!-- /.box -->
<!-- /.card -->
</div>
</div>
</la:form>

72
src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_edit.jsp
View file

@ -14,12 +14,20 @@
<jsp:param name="menuType" value="scheduler" />
</jsp:include>
<div class="content-wrapper">
<section class="content-header">
<h1>
<la:message key="labels.scheduledjob_title_details" />
</h1>
<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
</section>
<div class="content-header">
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1>
<la:message key="labels.scheduledjob_title_details" />
</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">
<la:form action="/admin/scheduler/" styleClass="form-horizontal">
<la:hidden property="crudMode" />
@ -32,52 +40,52 @@
<div class="row">
<div class="col-md-12">
<div
class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
<div class="box-header with-border">
class="card card-outline <c:if test="${crudMode == 1}">card-success</c:if><c:if test="${crudMode == 2}">card-warning</c:if>">
<div class="card-header with-border">
<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
</div>
<!-- /.box-header -->
<div class="box-body">
<!-- /.card-header -->
<div class="card-body">
<div>
<la:info id="msg" message="true">
<div class="alert alert-info">${msg}</div>
</la:info>
<la:errors property="_global" />
</div>
<div class="form-group">
<label for="name" class="col-sm-3 control-label"><la:message
<div class="form-group row">
<label for="name" class="col-sm-3 col-form-label"><la:message
key="labels.scheduledjob_name" /></label>
<div class="col-sm-9">
<la:errors property="name" />
<la:text styleId="name" property="name" styleClass="form-control" />
</div>
</div>
<div class="form-group">
<label for="target" class="col-sm-3 control-label"><la:message
<div class="form-group row">
<label for="target" class="col-sm-3 col-form-label"><la:message
key="labels.scheduledjob_target" /></label>
<div class="col-sm-9">
<la:errors property="target" />
<la:text styleId="target" property="target" styleClass="form-control" />
</div>
</div>
<div class="form-group">
<label for="cronExpression" class="col-sm-3 control-label"><la:message
<div class="form-group row">
<label for="cronExpression" class="col-sm-3 col-form-label"><la:message
key="labels.scheduledjob_cronExpression" /></label>
<div class="col-sm-9">
<la:errors property="cronExpression" />
<la:text styleId="cronExpression" property="cronExpression" styleClass="form-control" />
</div>
</div>
<div class="form-group">
<label for="scriptType" class="col-sm-3 control-label"><la:message
<div class="form-group row">
<label for="scriptType" class="col-sm-3 col-form-label"><la:message
key="labels.scheduledjob_scriptType" /></label>
<div class="col-sm-9">
<la:errors property="scriptType" />
<la:text styleId="scriptType" property="scriptType" styleClass="form-control" />
</div>
</div>
<div class="form-group">
<label for="scriptData" class="col-sm-3 control-label"><la:message
<div class="form-group row">
<label for="scriptData" class="col-sm-3 col-form-label"><la:message
key="labels.scheduledjob_scriptData" /></label>
<div class="col-sm-9">
<la:errors property="scriptData" />
@ -85,8 +93,8 @@
rows="5" />
</div>
</div>
<div class="form-group">
<label for="jobLogging" class="col-sm-3 control-label"><la:message
<div class="form-group row">
<label for="jobLogging" class="col-sm-3 col-form-label"><la:message
key="labels.scheduledjob_jobLogging" /></label>
<div class="col-sm-9">
<la:errors property="jobLogging" />
@ -97,8 +105,8 @@
</div>
</div>
</div>
<div class="form-group">
<label for="crawler" class="col-sm-3 control-label"><la:message
<div class="form-group row">
<label for="crawler" class="col-sm-3 col-form-label"><la:message
key="labels.scheduledjob_crawler" /></label>
<div class="col-sm-9">
<la:errors property="crawler" />
@ -109,8 +117,8 @@
</div>
</div>
</div>
<div class="form-group">
<label for="available" class="col-sm-3 control-label"><la:message
<div class="form-group row">
<label for="available" class="col-sm-3 col-form-label"><la:message
key="labels.scheduledjob_status" /></label>
<div class="col-sm-9">
<la:errors property="available" />
@ -121,8 +129,8 @@
</div>
</div>
</div>
<div class="form-group">
<label for="sortOrder" class="col-sm-3 control-label"><la:message
<div class="form-group row">
<label for="sortOrder" class="col-sm-3 col-form-label"><la:message
key="labels.sortOrder" /></label>
<div class="form-inline col-sm-9">
<la:errors property="sortOrder" />
@ -132,13 +140,13 @@
</div>
</div>
</div>
<!-- /.box-body -->
<div class="box-footer">
<!-- /.card-body -->
<div class="card-footer">
<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
</div>
<!-- /.box-footer -->
<!-- /.card-footer -->
</div>
<!-- /.box -->
<!-- /.card -->
</div>
</div>
</la:form>