fix crawling info details page

This commit is contained in:
Kaoru FUZITA 2015-11-17 18:21:31 +09:00
parent a2a397df45
commit ba4ece2f5d
3 changed files with 125 additions and 56 deletions

View file

@ -1112,8 +1112,8 @@ public class FessLabels extends ActionMessages {
/** The key of the message: Reset */
public static final String LABELS_crawling_session_reset = "{labels.crawling_session_reset}";
/** The key of the message: List */
public static final String LABELS_crawling_session_link_list = "{labels.crawling_session_link_list}";
/** The key of the message: Crawling Information */
public static final String LABELS_crawling_session_link_top = "{labels.crawling_session_link_top}";
/** The key of the message: Details */
public static final String LABELS_crawling_session_link_details = "{labels.crawling_session_link_details}";
@ -1136,6 +1136,48 @@ public class FessLabels extends ActionMessages {
/** The key of the message: Cancel */
public static final String LABELS_crawling_session_delete_all_cancel = "{labels.crawling_session_delete_all_cancel}";
/** The key of the message: Crawler start time */
public static final String LABELS_crawling_session_CrawlerStartTime = "{labels.crawling_session_CrawlerStartTime}";
/** The key of the message: Crawler end time */
public static final String LABELS_crawling_session_CrawlerEndTime = "{labels.crawling_session_CrawlerEndTime}";
/** The key of the message: Crawler exec time */
public static final String LABELS_crawling_session_CrawlerExecTime = "{labels.crawling_session_CrawlerExecTime}";
/** The key of the message: Crawler status */
public static final String LABELS_crawling_session_CrawlerStatus = "{labels.crawling_session_CrawlerStatus}";
/** The key of the message: Crawl exec time (Web/File system) */
public static final String LABELS_crawling_session_WebFsCrawlExecTime = "{labels.crawling_session_WebFsCrawlExecTime}";
/** The key of the message: Crawl start time (Web/File system) */
public static final String LABELS_crawling_session_WebFsCrawlStartTime = "{labels.crawling_session_WebFsCrawlStartTime}";
/** The key of the message: Crawl end time (Web/File system) */
public static final String LABELS_crawling_session_WebFsCrawlEndTime = "{labels.crawling_session_WebFsCrawlEndTime}";
/** The key of the message: Index exec time (Web/File system) */
public static final String LABELS_crawling_session_WebFsIndexExecTime = "{labels.crawling_session_WebFsIndexExecTime}";
/** The key of the message: Index size (Web/File system) */
public static final String LABELS_crawling_session_WebFsIndexSize = "{labels.crawling_session_WebFsIndexSize}";
/** The key of the message: Crawl exec time (Data store) */
public static final String LABELS_crawling_session_DataCrawlExecTime = "{labels.crawling_session_DataCrawlExecTime}";
/** The key of the message: Crawl start time (Data store) */
public static final String LABELS_crawling_session_DataCrawlStartTime = "{labels.crawling_session_DataCrawlStartTime}";
/** The key of the message: Crawl end time (Data store) */
public static final String LABELS_crawling_session_DataCrawlEndTime = "{labels.crawling_session_DataCrawlEndTime}";
/** The key of the message: Index exec time (Data store) */
public static final String LABELS_crawling_session_DataIndexExecTime = "{labels.crawling_session_DataIndexExecTime}";
/** The key of the message: Index size (Data store) */
public static final String LABELS_crawling_session_DataIndexSize = "{labels.crawling_session_DataIndexSize}";
/** The key of the message: Web Authentication */
public static final String LABELS_web_authentication_configuration = "{labels.web_authentication_configuration}";
@ -1621,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 */
/** 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 */

View file

@ -368,7 +368,7 @@ labels.crawling_session_button_delete=Delete
labels.crawling_session_configuration=Crawling Info
labels.crawling_session_search=Search
labels.crawling_session_reset=Reset
labels.crawling_session_link_list=List
labels.crawling_session_link_top=Crawling Information
labels.crawling_session_link_details=Details
labels.crawling_session_session_id_search=Session ID
labels.crawling_session_session_id=Session ID
@ -376,6 +376,20 @@ labels.crawling_session_created_time=Created
labels.crawling_session_delete_all_link=Delete All
labels.crawling_session_delete_all_confirmation=Do you really want to delete all?
labels.crawling_session_delete_all_cancel=Cancel
labels.crawling_session_CrawlerStartTime=Crawler start time
labels.crawling_session_CrawlerEndTime=Crawler end time
labels.crawling_session_CrawlerExecTime=Crawler exec time
labels.crawling_session_CrawlerStatus=Crawler status
labels.crawling_session_WebFsCrawlExecTime=Crawl exec time (Web/File system)
labels.crawling_session_WebFsCrawlStartTime=Crawl start time (Web/File system)
labels.crawling_session_WebFsCrawlEndTime=Crawl end time (Web/File system)
labels.crawling_session_WebFsIndexExecTime=Index exec time (Web/File system)
labels.crawling_session_WebFsIndexSize=Index size (Web/File system)
labels.crawling_session_DataCrawlExecTime=Crawl exec time (Data store)
labels.crawling_session_DataCrawlStartTime=Crawl start time (Data store)
labels.crawling_session_DataCrawlEndTime=Crawl end time (Data store)
labels.crawling_session_DataIndexExecTime=Index exec time (Data store)
labels.crawling_session_DataIndexSize=Index size (Data store)
labels.web_authentication_configuration=Web Authentication
labels.web_authentication_list_hostname=Hostname
labels.web_authentication_list_web_crawling_config=Config Name
@ -538,7 +552,7 @@ labels.scheduledjob_crawler=Crawler Job
labels.scheduledjob_running=Running
labels.scheduledjob_active=Active
labels.scheduledjob_nojob=-
labels.scheduledjob_button_start=Start
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

View file

@ -13,28 +13,22 @@
<jsp:param name="menuCategoryType" value="log" />
<jsp:param name="menuType" value="crawlingSession" />
</jsp:include>
<div class="content-wrapper">
<%-- Content Header --%>
<section class="content-header">
<h1>
<la:message key="labels.crawling_session_title_confirm" />
</h1>
<ol class="breadcrumb">
<li><la:link href="/admin/crawlinginfo">
<la:message key="labels.crawling_session_link_list" />
<la:message key="labels.crawling_session_link_top" />
</la:link></li>
<c:if test="${crudMode == 4}">
<li class="active"><a href="#"><la:message
key="labels.crawling_session_link_details" /></a></li>
<li class="active"><la:message
key="labels.crawling_session_link_details" /></li>
</c:if>
</ol>
</section>
<section class="content">
<%-- Form --%>
<la:form action="/admin/crawlinginfo/">
<la:hidden property="crudMode" />
<c:if test="${crudMode==4}">
@ -44,11 +38,29 @@
<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">
<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
<h3 class="box-title">
<c:if test="${crudMode == 1}">
<la:message key="labels.crawling_session_link_create" />
</c:if>
<c:if test="${crudMode == 2}">
<la:message key="labels.crawling_session_link_update" />
</c:if>
<c:if test="${crudMode == 3}">
<la:message key="labels.crawling_session_link_delete" />
</c:if>
<c:if test="${crudMode == 4}">
<la:message key="labels.crawling_session_link_details" />
</c:if>
</h3>
<div class="btn-group pull-right">
<la:link href="/admin/crawlinginfo"
styleClass="btn btn-primary btn-xs">
<la:message key="labels.crawling_session_link_top" />
</la:link>
</div>
</div>
<%-- Box Body --%>
<!-- /.box-header -->
<div class="box-body">
<%-- Message --%>
<div>
@ -57,14 +69,14 @@
</la:info>
<la:errors />
</div>
<%-- Form Fields --%>
<table class="table table-bordered">
<tbody>
<tr>
<th><la:message
key="labels.crawling_session_session_id" /></th>
<td><a href="${f:url('/admin/searchlist/search')}?query=segment:${f:u(sessionId)}">${f:h(sessionId)}</a>
<td><a
href="${f:url('/admin/searchlist/search')}?query=segment:${f:u(sessionId)}">${f:h(sessionId)}</a>
<la:hidden property="sessionId" /></td>
</tr>
<c:forEach var="info" items="${crawlingSessionInfoItems}">
@ -75,63 +87,64 @@
</c:forEach>
</tbody>
</table>
</div>
<%-- Box Footer --%>
<!-- /.box-header -->
<div class="box-footer">
<c:if test="${crudMode == 4}">
<button type="submit" class="btn" name="back"
value="<la:message key="labels.crawling_session_button_back" />">
<i class="fa fa-arrow-circle-left"></i>
<la:message key="labels.crawling_session_button_back" />
</button>
<button type="button" class="btn btn-danger" name="delete"
data-toggle="modal" data-target="#confirmToDelete"
value="<la:message key="labels.crawling_session_button_delete" />">
<i class="fa fa-trash"></i>
<la:message key="labels.crawling_session_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 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>
</c:if>
</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>