Jelajahi Sumber

minor jsp fixes

Shinsuke Sugaya 10 tahun lalu
induk
melakukan
de7cf57ffd

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/system/AdminSystemAction.java

@@ -72,9 +72,9 @@ public class AdminSystemAction extends FessAdminAction {
             // TODO
             // data.register("clusterName", );
             // data.register("clusterStatus", );
-            data.register("crawlerRunning", isCrawlerRunning());
-            data.register("runningSessionIds", getRunningSessionIds());
-        });
+                data.register("crawlerRunning", isCrawlerRunning());
+                data.register("runningSessionIds", getRunningSessionIds());
+            });
     }
 
     @Token(save = false, validate = true)

+ 1 - 0
src/main/resources/fess_label.properties

@@ -492,6 +492,7 @@ labels.crawling_session_button_delete=Delete
 labels.crawling_session_configuration=Crawling Session
 labels.crawling_session_search=Search
 labels.crawling_session_reset=Reset
+labels.crawling_session_link_list=List
 labels.crawling_session_link_details=Details
 labels.crawling_session_link_delete=Delete
 labels.crawling_session_prev_page=Prev

+ 1 - 0
src/main/resources/fess_label_en.properties

@@ -492,6 +492,7 @@ labels.crawling_session_button_delete=Delete
 labels.crawling_session_configuration=Crawling Session
 labels.crawling_session_search=Search
 labels.crawling_session_reset=Reset
+labels.crawling_session_link_list=List
 labels.crawling_session_link_details=Details
 labels.crawling_session_link_delete=Delete
 labels.crawling_session_prev_page=Prev

+ 1 - 0
src/main/resources/fess_label_ja.properties

@@ -492,6 +492,7 @@ labels.crawling_session_button_delete=\u524a\u9664
 labels.crawling_session_configuration=\u30af\u30ed\u30fc\u30eb\u60c5\u5831
 labels.crawling_session_search=\u691c\u7d22
 labels.crawling_session_reset=\u30ea\u30bb\u30c3\u30c8
+labels.crawling_session_link_list=\u4e00\u89a7
 labels.crawling_session_link_details=\u8a73\u7d30
 labels.crawling_session_link_delete=\u524a\u9664
 labels.crawling_session_prev_page=\u524d\u3078

+ 2 - 2
src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp

@@ -9,7 +9,7 @@
 	<div class="wrapper">
 		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuCategoryType" value="log" />
 			<jsp:param name="menuType" value="crawlingSession" />
 		</jsp:include>
 
@@ -18,7 +18,7 @@
 			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
-					<la:message key="labels.crawling_session_title_details" />
+					<la:message key="labels.crawling_session_title_confirm" />
 				</h1>
 				<ol class="breadcrumb">
 					<li><la:link href="index">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/crawlingsession/error.jsp

@@ -9,7 +9,7 @@
 	<div class="wrapper">
 		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuCategoryType" value="log" />
 			<jsp:param name="menuType" value="crawlingSession" />
 		</jsp:include>
 

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp

@@ -9,7 +9,7 @@
 	<div class="wrapper">
 		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuCategoryType" value="log" />
 			<jsp:param name="menuType" value="crawlingSession" />
 		</jsp:include>
 

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp

@@ -9,7 +9,7 @@
 	<div class="wrapper">
 		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuCategoryType" value="log" />
 			<jsp:param name="menuType" value="jobLog" />
 		</jsp:include>
 

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/joblog/error.jsp

@@ -9,7 +9,7 @@
 	<div class="wrapper">
 		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuCategoryType" value="log" />
 			<jsp:param name="menuType" value="jobLog" />
 		</jsp:include>
 

+ 3 - 3
src/main/webapp/WEB-INF/view/admin/joblog/index.jsp

@@ -9,7 +9,7 @@
 	<div class="wrapper">
 		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuCategoryType" value="log" />
 			<jsp:param name="menuType" value="jobLog" />
 		</jsp:include>
 
@@ -71,9 +71,9 @@
 												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/joblog/confirmpage/4/${f:u(data.id)}">
 													<td>${f:h(data.jobName)}</td>
 													<td>${f:h(data.jobStatus)}</td>
-													<td><fmt:formatDate value="${data.startTime}" pattern="yyyy-MM-dd'T'HH:mm:ss" /></td>
+													<td><fmt:formatDate value="${fe:date(data.startTime)}" pattern="yyyy-MM-dd'T'HH:mm:ss" /></td>
 													<td>
-														<c:if test="${data.endTime!=null}"><fmt:formatDate value="${data.endTime}" pattern="yyyy-MM-dd'T'HH:mm:ss" /></c:if>
+														<c:if test="${data.endTime!=null}"><fmt:formatDate value="${fe:date(data.endTime)}" pattern="yyyy-MM-dd'T'HH:mm:ss" /></c:if>
 														<c:if test="${data.endTime==null}"><la:message key="labels.none" /></c:if>
 													</td>
 													<td style="overflow-x: auto;">

+ 1 - 1
src/main/webapp/WEB-INF/view/admin/systeminfo/index.jsp

@@ -9,7 +9,7 @@
 	<div class="wrapper">
 		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuCategoryType" value="log" />
 			<jsp:param name="menuType" value="systemInfo" />
 		</jsp:include>