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

fix delete action at joblog page

Browse source
This commit is contained in:
Kaoru FUZITA 2015-11-19 17:25:32 +09:00
parent 44e67424a5
commit f2736631ff
3 changed files with 59 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
View file

@ -1663,7 +1663,7 @@ public class FessLabels extends ActionMessages {
/** The key of the message: - */
public static final String LABELS_scheduledjob_nojob = "{labels.scheduledjob_nojob}";
/** The key of the message: Start Now */
/** The key of the message: Start now */
public static final String LABELS_scheduledjob_button_start = "{labels.scheduledjob_button_start}";
/** The key of the message: Stop */

2
src/main/resources/fess_label.properties
View file

@ -552,7 +552,7 @@ labels.scheduledjob_crawler=Crawler Job
labels.scheduledjob_running=Running
labels.scheduledjob_active=Active
labels.scheduledjob_nojob=-
labels.scheduledjob_button_start=Start Now
labels.scheduledjob_button_start=Start now
labels.scheduledjob_button_stop=Stop
labels.scheduledjob_script_template=return container.getComponent("crawlJob").execute(executor, [{0}] as String[],[{1}] as String[],[{2}] as String[], "");
labels.joblog_button_back=Back

103
src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp
View file

@ -13,20 +13,21 @@
<jsp:param name="menuCategoryType" value="log" />
<jsp:param name="menuType" value="jobLog" />
</jsp:include>
<div class="content-wrapper">
<%-- Content Header --%>
<section class="content-header">
<h1>
<la:message key="labels.joblog_title_details" />
</h1>
<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
<ol class="breadcrumb">
<li><la:link href="/admin/crawlinginfo">
<la:message key="labels.joblog_link_list" />
</la:link></li>
<li class="active"><la:message
key="labels.joblog_link_details" /></li>
</ol>
</section>
<section class="content">
<%-- Form --%>
<la:form action="/admin/joblog/">
<la:hidden property="crudMode" />
<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
@ -36,30 +37,19 @@
<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">
<h3 class="box-title">
<c:if test="${crudMode == 1}">
<la:message key="labels.joblog_link_create" />
</c:if>
<c:if test="${crudMode == 2}">
<la:message key="labels.joblog_link_update" />
</c:if>
<c:if test="${crudMode == 3}">
<la:message key="labels.joblog_link_delete" />
</c:if>
<c:if test="${crudMode == 4}">
<la:message key="labels.joblog_link_details" />
</c:if>
<la:message key="labels.joblog_link_details" />
</h3>
<div class="btn-group pull-right">
<la:link href="/admin/joblog"
styleClass="btn btn-primary btn-xs">
<i class="fa fa-th-list"></i>
<la:message key="labels.joblog_link_list" />
</la:link>
</div>
</div>
<%-- Box Body --%>
<!-- /.box-header -->
<div class="box-body">
<%-- Message --%>
<div>
@ -68,7 +58,6 @@
</la:info>
<la:errors />
</div>
<%-- Form Fields --%>
<table class="table table-bordered">
<tbody>
@ -109,40 +98,62 @@
</tr>
</tbody>
</table>
</div>
<%-- Box Footer --%>
<!-- /.box-body -->
<div class="box-footer">
<c:if test="${crudMode == 3}">
<button type="submit" class="btn btn-danger" name="delete"
value="<la:message key="labels.joblog_button_delete" />">
<la:message key="labels.joblog_button_delete" />
</button>
<button type="submit" class="btn" name="back"
value="<la:message key="labels.joblog_button_back" />">
<la:message key="labels.joblog_button_back" />
</button>
</c:if>
<c:if test="${crudMode == 4}">
<button type="submit" class="btn" name="back"
value="<la:message key="labels.joblog_button_back" />">
<la:message key="labels.joblog_button_back" />
</button>
<button type="submit" class="btn btn-danger"
name="deletefromconfirm"
value="<la:message key="labels.joblog_button_delete" />">
<la:message key="labels.joblog_button_delete" />
</button>
</c:if>
<button type="submit" class="btn" name="back"
value="<la:message key="labels.joblog_button_back" />">
<i class="fa fa-arrow-circle-left"></i>
<la:message key="labels.joblog_button_back" />
</button>
<button type="button" class="btn btn-danger" name="delete"
data-toggle="modal" data-target="#confirmToDelete"
value="<la:message key="labels.joblog_button_delete" />">
<i class="fa fa-trash"></i>
<la:message key="labels.joblog_button_delete" />
</button>
<div class="modal modal-danger fade" id="confirmToDelete"
tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<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"
data-dismiss="modal">
<la:message key="labels.crud_button_cancel" />
</button>
<button type="submit" class="btn btn-outline btn-danger"
name="delete"
value="<la:message key="labels.crud_button_delete" />">
<i class="fa fa-trash"></i>
<la:message key="labels.crud_button_delete" />
</button>
</div>
</div>
</div>
</div>
</div>
<!-- /.box-footer -->
</div>
<!-- /.box -->
</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>