Shunji Makino 10 éve
szülő
commit
2fdc23bec5

+ 137 - 72
src/main/webapp/WEB-INF/view/admin/crawlingSession/confirm.jsp

@@ -1,77 +1,142 @@
-<%@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.crawling_session_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="crawlingSession" />
-	<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.crawling_session_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="crawlingSession" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.crawling_session_title_confirm" />
-		</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 />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.crawling_session_title_details" />
+				</h1>
+				<ol class="breadcrumb">
+					<li><s:link href="index">
+							<bean:message key="labels.crawling_session_link_list" />
+						</s:link></li>
+					<c:if test="${crudMode == 1}">
+						<li class="active"><a href="#"><bean:message key="labels.crawling_session_link_create" /></a></li>
+					</c:if>
+					<c:if test="${crudMode == 2}">
+						<li class="active"><a href="#"><bean:message key="labels.crawling_session_link_update" /></a></li>
+					</c:if>
+					<c:if test="${crudMode == 3}">
+						<li class="active"><a href="#"><bean:message key="labels.crawling_session_link_delete" /></a></li>
+					</c:if>
+					<c:if test="${crudMode == 4}">
+						<li class="active"><a href="#"><bean:message key="labels.crawling_session_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>
+					<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.crawling_session_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.crawling_session_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.crawling_session_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.crawling_session_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.crawling_session_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><bean:message key="labels.crawling_session_session_id" /></th>
+												<td><html:link href="${f:url('/admin/searchList/search')}?query=segment:${f:u(sessionId)}">${f:h(sessionId)}</html:link>
+													<html:hidden property="sessionId" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.crawling_session_name" /></th>
+												<td>${f:h(sessionId)}</td>
+											</tr>
+											<c:forEach var="info" items="${crawlingSessionInfoItems}">
+												<tr>
+													<th>${f:h(info.keyMsg)}</th>
+													<td>${f:h(info.value)}</td>
+												</tr>
+											</c:forEach>
+										</tbody>
+									</table>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn small" name="back" value="<bean:message key="labels.crawling_session_button_back"/>" />
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn small" name="back" value="<bean:message key="labels.crawling_session_button_back"/>" />
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn small" name="delete" value="<bean:message key="labels.crawling_session_button_delete"/>" />
+										<input type="submit" class="btn small" name="back" value="<bean:message key="labels.crawling_session_button_back"/>" />
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn small" name="back" value="<bean:message key="labels.crawling_session_button_back"/>" />
+										<input type="submit" class="btn small" name="deletefromconfirm" value="<bean:message key="labels.crawling_session_button_delete"/>" />
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
 		</div>
-		<%-- Message: END --%>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<html:hidden property="id" />
-				<table class="bordered-table zebra-striped">
-					<tbody>
-						<tr>
-							<th><bean:message key="labels.crawling_session_session_id" /></th>
-							<td><html:link
-									href="${f:url('/admin/searchList/search')}?query=segment:${f:u(sessionId)}">${f:h(sessionId)}</html:link>
-								<html:hidden property="sessionId" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.crawling_session_name" /></th>
-							<td>${f:h(sessionId)}</td>
-						</tr>
-						<c:forEach var="info" items="${crawlingSessionInfoItems}">
-							<tr>
-								<th>${f:h(info.keyMsg)}</th>
-								<td>${f:h(info.value)}</td>
-							</tr>
-						</c:forEach>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.crawling_session_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.crawling_session_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.crawling_session_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.crawling_session_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.crawling_session_button_back"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.crawling_session_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>

+ 47 - 16
src/main/webapp/WEB-INF/view/admin/crawlingSession/error.jsp

@@ -1,19 +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.crawling_session_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="crawlingSession" />
-	<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.crawling_session_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="crawlingSession" />
+		</jsp:include>
 
-      <div id="main">
-      
-<html:errors/>
-<br>
-<s:link href="index"><bean:message key="labels.crud_button_back"/></s:link>
+		<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/crawlingSession/">
+							<bean:message key="labels.crawling_session_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-      </div>
+			<section class="content">
 
-	</tiles:put>
-</tiles:insert>
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.crawling_session_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>

+ 152 - 146
src/main/webapp/WEB-INF/view/admin/crawlingSession/index.jsp

@@ -1,159 +1,165 @@
-<%@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.crawling_session_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="crawlingSession" />
-	<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.crawling_session_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="crawlingSession" />
+		</jsp:include>
 
+		<div class="content-wrapper">
 
-		<h3>
-			<bean:message key="labels.crawling_session_title" />
-		</h3>
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.crawling_session_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.crawling_session_title" />
+						</s:link></li>
+				</ol>
+			</section>
 
-		<%-- 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 --%>
-
-		<%-- Search: BEGIN --%>
-		<s:form>
-			<div class="row">
-				<div class="span12">
-					<label for="sessionIdSearchBtn"><bean:message
-							key="labels.crawling_session_session_id_search" /></label>
-					<html:text styleId="sessionIdSearchBtn"
-						property="searchParams.sessionId"></html:text>
-					<input type="submit" class="btn small primary" name="search"
-						value="<bean:message key="labels.crawling_session_search"/>" /> <input
-						type="submit" class="btn small" name="reset"
-						value="<bean:message key="labels.crawling_session_reset"/>" />
-				</div>
-			</div>
-		</s:form>
-		<%-- Search: END --%>
+			<section class="content">
 
-		<%-- List: BEGIN --%>
-		<div class="row" style="margin-top: 5px;">
-			<c:if test="${crawlingSessionPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${crawlingSessionPager.allRecordCount > 0}">
+				<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.crawling_session_title" />
+								</h3>
+							</div>
+							<s:form>
+								<div>
+									<label for="sessionIdSearchBtn"><bean:message
+											key="labels.crawling_session_session_id_search" /></label>
+									<html:text styleId="sessionIdSearchBtn"
+										property="searchParams.sessionId"></html:text>
+									<input type="submit" class="btn small primary" name="search"
+										value="<bean:message key="labels.crawling_session_search"/>" /> <input
+										type="submit" class="btn small" name="reset"
+										value="<bean:message key="labels.crawling_session_reset"/>" />
+								</div>
+							</s:form>
+							<%-- 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>
 
-				<div class="span12">
-					<table class="bordered-table zebra-striped">
-						<thead>
-							<tr>
-								<th style="text-align: center; width: 150px;"><bean:message
-										key="labels.crawling_session_session_id" /></th>
-								<th style="text-align: center; width: 180px;"><bean:message
-										key="labels.crawling_session_created_time" /></th>
-								<th style="text-align: center; width: 180px;"><bean:message
-										key="labels.crawling_session_expired_time" /></th>
+								<%-- List --%>
+								<c:if test="${crawlingSessionPager.allRecordCount == 0}">
+									<p class="alert-message warning">
+										<bean:message key="labels.list_could_not_find_crud_table" />
+									</p>
+								</c:if>
+								<c:if test="${crawlingSessionPager.allRecordCount > 0}">
+									<table class="table table-bordered table-striped">
+										<thead>
+											<tr>
+												<th><bean:message key="labels.crawling_session_session_id" /></th>
+												<th><bean:message key="labels.crawling_session_created_time" /></th>
+												<th><bean:message key="labels.crawling_session_expired_time" /></th>
+											</tr>
+										</thead>
+										<tbody>
+											<c:forEach var="data" varStatus="s" items="${crawlingSessionItems}">
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+													<td>${f:h(data.sessionId)}</td>
+													<td>${f:h(data.createdTime)}</td>
+													<td>
+														<c:if test="${data.expiredTime==null}"><bean:message key="labels.none" /></c:if>
+														<c:if test="${data.expiredTime!=null}">${f:h(data.expiredTime)}</c:if>
+													</td>
+													<td style="overflow-x: auto;>
+														<s:link href="confirmpage/4/${f:u(data.id)}">
+															<bean:message key="labels.crawling_session_link_details" />
+														</s:link>
+														<s:link href="deletepage/3/${f:u(data.id)}">
+															<bean:message key="labels.crawling_session_link_delete" />
+														</s:link>
+													</td>
+												</tr>
+											</c:forEach>
+										</tbody>
+									</table>
+								</c:if>
 
-								<th style="text-align: center; width: 100px;">&nbsp;</th>
-							</tr>
-						</thead>
-						<tbody>
-							<c:forEach var="data" varStatus="s"
-								items="${crawlingSessionItems}">
-								<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-									<td style="text-align: center;"><html:link
-											href="${f:url('/admin/searchList/search')}?query=segment:${f:u(data.sessionId)}">${f:h(data.sessionId)}</html:link></td>
-									<td style="text-align: center;">${f:h(data.createdTime)}</td>
-									<td style="text-align: center;">
-										<c:if test="${data.expiredTime==null}"><bean:message key="labels.none" /></c:if>
-										<c:if test="${data.expiredTime!=null}">${f:h(data.expiredTime)}</c:if>
-									</td>
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+								<div class="span12 center">
+									<script>
+							<!--
+								function confirmToDeleteAll() {
+									if (confirm('<bean:message key="labels.crawling_session_delete_all_confirmation"/>')) {
+										return true;
+									} else {
+										return false;
+									}
+								}
+							// -->
+							</script>
+									<s:link href="deleteall" onclick="return confirmToDeleteAll();"
+										styleClass="btn">
+										<bean:message key="labels.crawling_session_delete_all_link" />
+									</s:link>
+								</div>
+								<%-- Paging Info --%>
+								<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(crawlingSessionPager.currentPageNumber)}"
+										arg1="${f:h(crawlingSessionPager.allPageCount)}" arg2="${f:h(crawlingSessionPager.allRecordCount)}"
+									/></span>
 
+								<%-- Paging Navigation --%>
+								<ul class="pagination pagination-sm no-margin pull-right">
+									<c:if test="${crawlingSessionPager.existPrePage}">
+										<li class="prev"><s:link href="list/${crawlingSessionPager.currentPageNumber - 1}">
+												<bean:message key="labels.crud_link_prev_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!crawlingSessionPager.existPrePage}">
+										<li class="prev disabled"><a href="#"><bean:message key="labels.crud_link_prev_page" /></a></li>
+									</c:if>
+									<c:forEach var="p" varStatus="s" items="${crawlingSessionPager.pageNumberList}">
+										<li <c:if test="${p == crawlingSessionPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+										</li>
+									</c:forEach>
+									<c:if test="${crawlingSessionPager.existNextPage}">
+										<li class="next"><s:link href="list/${crawlingSessionPager.currentPageNumber + 1}">
+												<bean:message key="labels.crud_link_next_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!crawlingSessionPager.existNextPage}">
+										<li class="next disabled"><a href="#"><bean:message key="labels.crud_link_next_page" /></a></li>
+									</c:if>
+								</ul>
 
-									<td  style="text-align: center;"><s:link
-											href="confirmpage/4/${f:u(data.id)}">
-											<bean:message key="labels.crawling_session_link_details" />
-										</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-											<bean:message key="labels.crawling_session_link_delete" />
-										</s:link></td>
-								</tr>
-							</c:forEach>
-						</tbody>
-					</table>
-				</div>
-
-				<div class="span12 center">
-					<script>
-			<!--
-				function confirmToDeleteAll() {
-					if (confirm('<bean:message key="labels.crawling_session_delete_all_confirmation"/>')) {
-						return true;
-					} else {
-						return false;
-					}
-				}
-			// -->
-			</script>
-					<s:link href="deleteall" onclick="return confirmToDeleteAll();"
-						styleClass="btn">
-						<bean:message key="labels.crawling_session_delete_all_link" />
-					</s:link>
-				</div>
-
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${crawlingSessionPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${crawlingSessionPager.currentPageNumber - 1}">
-										<bean:message key="labels.crud_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!crawlingSessionPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.crud_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${crawlingSessionPager.pageNumberList}">
-								<li
-									<c:if test="${p == crawlingSessionPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${crawlingSessionPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${crawlingSessionPager.currentPageNumber + 1}">
-										<bean:message key="labels.crud_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!crawlingSessionPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.crud_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
-					<div class="span12">
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(crawlingSessionPager.currentPageNumber)}"
-								arg1="${f:h(crawlingSessionPager.allPageCount)}"
-								arg2="${f:h(crawlingSessionPager.allRecordCount)}" /></span>
+							</div>
+						</div>
 					</div>
-					<%-- Page Navigation: END --%>
-
 				</div>
-			</c:if>
-		</div>
-		<%-- List: END --%>
 
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<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>