Shunji Makino 10 年之前
父節點
當前提交
78f7f1fe27

+ 138 - 98
src/main/webapp/WEB-INF/view/admin/jobLog/confirm.jsp

@@ -1,113 +1,153 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.joblog_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="jobLog" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.joblog_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<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="menuType" value="jobLog" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.joblog_title_confirm" />
-		</h3>
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
+		<div class="content-wrapper">
 
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.joblog_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.joblog_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.joblog_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.joblog_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.joblog_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.joblog_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.joblog_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.joblog_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.joblog_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.joblog_link_confirm" /></a></li>
+					</c:if>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
 					</c:if>
-				</ul>
-			</div>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.joblog_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.joblog_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.joblog_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.joblog_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.joblog_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.joblog_jobName" /></th>
+												<td>${f:h(jobName)}<html:hidden property="jobName" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.joblog_jobStatus" /></th>
+												<td>${f:h(jobStatus)}<html:hidden property="jobStatus" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.joblog_target" /></th>
+												<td>${f:h(target)}<html:hidden property="target" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.joblog_startTime" /></th>
+												<td>${f:h(startTime)}<html:hidden property="startTime" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.joblog_endTime" /></th>
+												<td>${f:h(endTime)}<html:hidden property="endTime" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.joblog_scriptType" /></th>
+												<td>${f:h(scriptType)}<html:hidden property="scriptType" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.joblog_scriptData" /></th>
+												<td>${f:br(f:h(scriptData))}<html:hidden property="scriptData" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.joblog_scriptResult" /></th>
+												<td>${f:br(f:h(scriptResult))}<html:hidden property="scriptResult" /></td>
+											</tr>
+										</tbody>
+									</table>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="delete" value="<bean:message key="labels.joblog_button_delete"/>" />
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.joblog_button_back"/>" />
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.joblog_button_back"/>" />
+										<input type="submit" class="btn" name="deletefromconfirm" value="<bean:message key="labels.joblog_button_delete"/>" />
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
-				</c:if>
-				<table class="bordered-table zebra-striped">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.joblog_jobName" /></th>
-							<td>${f:h(jobName)}<html:hidden property="jobName" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.joblog_jobStatus" /></th>
-							<td style="text-transform: uppercase;">${f:h(jobStatus)}<html:hidden property="jobStatus" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.joblog_target" /></th>
-							<td>${f:h(target)}<html:hidden property="target" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.joblog_startTime" /></th>
-							<td>${f:h(startTime)}<html:hidden property="startTime" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.joblog_endTime" /></th>
-							<td>${f:h(endTime)}<html:hidden property="endTime" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.joblog_scriptType" /></th>
-							<td>${f:h(scriptType)}<html:hidden property="scriptType" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.joblog_scriptData" /></th>
-							<td>${f:br(f:h(scriptData))}<html:hidden property="scriptData" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.joblog_scriptResult" /></th>
-							<td>${f:br(f:h(scriptResult))}<html:hidden property="scriptResult" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.joblog_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.joblog_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.joblog_button_back"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.joblog_button_delete"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Confirm Form: BEGIN --%>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
 
-	</tiles:put>
-</tiles:insert>

+ 49 - 15
src/main/webapp/WEB-INF/view/admin/jobLog/error.jsp

@@ -1,16 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.joblog_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="jobLog" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.joblog_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<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="menuType" value="jobLog" />
+		</jsp:include>
 
-      <div id="main">
-<html:errors/>
-<br>
-<s:link href="index"><bean:message key="labels.crud_button_back"/></s:link>
-</div>
-	</tiles:put>
-</tiles:insert>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/jobLog/">
+							<bean:message key="labels.joblog_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.joblog_button_back" />
+						</s:link>
+					</p>
+				</div>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

+ 125 - 126
src/main/webapp/WEB-INF/view/admin/jobLog/index.jsp

@@ -1,139 +1,138 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.joblog_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="jobLog" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.joblog_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<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="menuType" value="jobLog" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.joblog_title_list" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.joblog_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.joblog_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.joblog_link_list" /></a></li>
-				</ul>
-			</div>
+			<section class="content">
 
-			<c:if test="${jobLogPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${jobLogPager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center;"><bean:message key="labels.joblog_jobName" /></th>
-							<th style="text-align: center;"><bean:message key="labels.joblog_jobStatus" /></th>
-							<th style="text-align: center;"><bean:message key="labels.joblog_startTime" /></th>
-							<th style="text-align: center;"><bean:message key="labels.joblog_endTime" /></th>
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.joblog_link_list" />
+								</h3>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<%-- Message --%>
+								<div>
+									<html:messages id="msg" message="true">
+										<div class="alert-message info">
+											<bean:write name="msg" ignore="true" />
+										</div>
+									</html:messages>
+									<html:errors />
+								</div>
 
-							<th style="text-align: center; width: 100px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s" items="${jobLogItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td>${f:h(data.jobName)}</td>
-								<td style="text-align: center;text-transform: uppercase;">${f:h(data.jobStatus)}</td>
-								<td style="text-align: center;"><fmt:formatDate value="${data.startTime}" pattern="yyyy-MM-dd'T'HH:mm:ss" /></td>
-								<td style="text-align: center;">
-									<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}"><bean:message key="labels.none" /></c:if>
-								</td>
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.joblog_link_details" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.joblog_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
+								<%-- List --%>
+								<c:if test="${jobLogPager.allRecordCount == 0}">
+									<p class="alert-message warning">
+										<bean:message key="labels.list_could_not_find_crud_table" />
+									</p>
+								</c:if>
+								<c:if test="${jobLogPager.allRecordCount > 0}">
+									<table class="table table-bordered table-striped">
+										<thead>
+											<tr>
+												<th><bean:message key="labels.joblog_jobName" /></th>
+												<th><bean:message key="labels.joblog_jobStatus" /></th>
+												<th><bean:message key="labels.joblog_startTime" /></th>
+												<th><bean:message key="labels.joblog_endTime" /></th>
+											</tr>
+										</thead>
+										<tbody>
+											<c:forEach var="data" varStatus="s" items="${jobLogItems}">
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="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>
+														<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}"><bean:message key="labels.none" /></c:if>
+													</td>
+													<td style="overflow-x: auto;>
+														<s:link href="confirmpage/4/${f:u(data.id)}">
+															<bean:message key="labels.joblog_link_details" />
+														</s:link>
+														<s:link href="deletepage/3/${f:u(data.id)}">
+															<bean:message key="labels.joblog_link_delete" />
+														</s:link>
+													</td>
+												</tr>
+											</c:forEach>
+										</tbody>
+									</table>
+								</c:if>
 
-				<div class="span12 center">
-<script>
-<!--
-function confirmToDeleteAll() {
-	if (confirm('<bean:message key="labels.joblog_delete_all_confirmation"/>')) {
-		return true;
-	} else {
-		return false;
-	}
-}
-// -->
-</script>
-					<s:link href="deleteall" onclick="return confirmToDeleteAll();"
-						styleClass="btn">
-						<bean:message key="labels.joblog_delete_all_link" />
-					</s:link>
-				</div>
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+								<%-- Paging Info --%>
+								<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(jobLogPager.currentPageNumber)}"
+										arg1="${f:h(jobLogPager.allPageCount)}" arg2="${f:h(jobLogPager.allRecordCount)}"
+									/></span>
 
+								<%-- Paging Navigation --%>
+								<ul class="pagination pagination-sm no-margin pull-right">
+									<c:if test="${jobLogPager.existPrePage}">
+										<li class="prev"><s:link href="list/${jobLogPager.currentPageNumber - 1}">
+												<bean:message key="labels.joblog_link_prev_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!jobLogPager.existPrePage}">
+										<li class="prev disabled"><a href="#"><bean:message key="labels.joblog_link_prev_page" /></a></li>
+									</c:if>
+									<c:forEach var="p" varStatus="s" items="${jobLogPager.pageNumberList}">
+										<li <c:if test="${p == jobLogPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+										</li>
+									</c:forEach>
+									<c:if test="${jobLogPager.existNextPage}">
+										<li class="next"><s:link href="list/${jobLogPager.currentPageNumber + 1}">
+												<bean:message key="labels.joblog_link_next_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!jobLogPager.existNextPage}">
+										<li class="next disabled"><a href="#"><bean:message key="labels.joblog_link_next_page" /></a></li>
+									</c:if>
+								</ul>
 
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${jobLogPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${jobLogPager.currentPageNumber - 1}">
-										<bean:message key="labels.joblog_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!jobLogPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.joblog_link_prev_page" /> </a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${jobLogPager.pageNumberList}">
-								<li
-									<c:if test="${p == jobLogPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${jobLogPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${jobLogPager.currentPageNumber + 1}">
-										<bean:message key="labels.joblog_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!jobLogPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.joblog_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(jobLogPager.currentPageNumber)}"
-								arg1="${f:h(jobLogPager.allPageCount)}"
-								arg2="${f:h(jobLogPager.allRecordCount)}" /></span>
+							</div>
+						</div>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
+
+			</section>
 		</div>
-		<%-- List: END --%>
 
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
 
-	</tiles:put>
-</tiles:insert>