Shunji Makino 10 роки тому
батько
коміт
f798800bfd

+ 79 - 48
src/main/webapp/WEB-INF/view/admin/searchList/confirmDelete.jsp

@@ -1,53 +1,84 @@
-<%@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.search_list_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="searchList" />
-	<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.search_list_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="searchList" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.search_list_title_confirm_delete" />
-		</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.search_list_title_confirm_delete" />
+				</h1>
+				<ol class="breadcrumb">
+					<li><s:link href="index">
+							<bean:message key="labels.search_list_title_confirm_delete" />
+						</s:link></li>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<s:form>
+										<html:hidden property="query" />
+										<div>
+											<table class="bordered-table zebra-striped">
+												<tbody>
+													<tr>
+														<th style="width: 100px;"><bean:message
+																key="labels.search_list_url" /></th>
+														<td style="width: 400px;">${f:h(url)}<html:hidden
+																property="docId" /></td>
+													</tr>
+												</tbody>
+												<tfoot>
+													<tr>
+														<td colspan="2"><input type="submit" class="btn small" name="delete"
+															value="<bean:message key="labels.crud_button_delete"/>" /> <input
+															type="submit" class="btn small" name="search"
+															value="<bean:message key="labels.crud_button_back"/>" /></td>
+													</tr>
+												</tfoot>
+											</table>
+										</div>
+									</s:form>
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
 		</div>
-		<%-- Message: END --%>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="query" />
-			<div>
-				<table class="bordered-table zebra-striped">
-					<tbody>
-						<tr>
-							<th style="width: 100px;"><bean:message
-									key="labels.search_list_url" /></th>
-							<td style="width: 400px;">${f:h(url)}<html:hidden
-									property="docId" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><input type="submit" class="btn small" name="delete"
-								value="<bean:message key="labels.crud_button_delete"/>" /> <input
-								type="submit" class="btn small" name="search"
-								value="<bean:message key="labels.crud_button_back"/>" /></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>

+ 170 - 128
src/main/webapp/WEB-INF/view/admin/searchList/index.jsp

@@ -1,136 +1,178 @@
-<%@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.search_list_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="searchList" />
-	<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.search_list_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="searchList" />
+		</jsp:include>
 
-		<%-- 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 id="header">
-			<s:form action="search" method="get">
-				<div class="input">
-					<html:text styleClass="query" property="query" title="Search"
-						size="50" maxlength="1000" />
-					<input class="btn" type="submit"
-						value="<bean:message key="labels.search"/>" name="search" />
-				</div>
-			</s:form>
-		</div>
-		<c:choose>
-			<c:when test="${allRecordCount == null}">
-				<div id="subheader"></div>
-				<div id="result">
-					<p>
-						<bean:message key="labels.search_list_index_page" />
-					</p>
-				</div>
-			</c:when>
-			<c:when test="${f:h(allRecordCount) != 0}">
-				<div id="subheader">
-					<p>
-						<bean:message key="labels.search_result_status"
-							arg0="${f:h(query)}" arg1="${f:h(allRecordCount)}"
-							arg2="${f:h(currentStartRecordNumber)}"
-							arg3="${f:h(currentEndRecordNumber)}" />
-						<c:if test="${execTime!=null}">
-							<bean:message key="labels.search_result_time"
-								arg0="${f:h(execTime)}" />
-						</c:if>
-					</p>
-				</div>
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.search_list_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.search_list_configuration" />
+						</s:link></li>
+				</ol>
+			</section>
 
-				<div id="result">
-					<div>
-						<ol>
-							<c:forEach var="doc" varStatus="s" items="${documentItems}">
-								<li>
-									<h3 class="title">
-										<a href="${doc.urlLink}">${f:h(doc.contentTitle)}</a>
-									</h3>
-									<div class="body">
-										${doc.contentDescription}
-										<div style="text-align: right;">
-											<c:if test="${!solrProcessRunning}">
-												<html:link
-													href="confirmDelete?query=${f:u(query)}&docId=${f:u(doc.docId)}&url=${f:u(doc.url)}">
-													<bean:message key="labels.search_list_delete_link" />
-												</html:link>
-											</c:if>
-											<c:if test="${solrProcessRunning}">
-												<bean:message key="labels.search_list_delete_link" />
-											</c:if>
-										</div>
+			<section class="content">
+
+				<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.search_list_configuration" />
+								</h3>
+								<s:form action="search" method="get">
+									<div class="input">
+										<html:text styleClass="query" property="query" title="Search" size="50" maxlength="1000" />
+										<input class="btn" type="submit" value="<bean:message key="labels.search"/>" name="search" />
 									</div>
-								</li>
-							</c:forEach>
-						</ol>
-					</div>
-				</div>
+								</s:form>
+							</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>
 
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${existPrePage}">
-								<li class="prev"><s:link
-										href="prev?query=${f:u(query)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}&labelTypeValue=${f:u(labelTypeValue)}"><bean:message
-											key="labels.prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="pageNumber" varStatus="s"
-								items="${pageNumberList}">
-								<li
-									<c:if test="${pageNumber == currentPageNumber}">class="active"</c:if>>
-									<s:link
-										href="move?query=${f:u(query)}&pn=${f:u(pageNumber)}&num=${f:u(pageSize)}&labelTypeValue=${f:u(labelTypeValue)}">${f:h(pageNumber)}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${existNextPage}">
-								<li class="next<c:if test="${!existNextPage}"> disabled</c:if>">
-									<s:link
-										href="next?query=${f:u(query)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}&labelTypeValue=${f:u(labelTypeValue)}">
-										<bean:message key="labels.next_page" />
-								</s:link>
-								</li>
-							</c:if>
-							<c:if test="${!existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
-					<div>
-						<span> ${currentPageNumber}/${allPageCount}
-							(${allRecordCount}) </span>
+								<%-- List --%>
+								<c:choose>
+									<c:when test="${allRecordCount == null}">
+										<div id="subheader"></div>
+										<div id="result">
+											<p>
+												<bean:message key="labels.search_list_index_page" />
+											</p>
+										</div>
+									</c:when>
+									<c:when test="${f:h(allRecordCount) != 0}">
+										<div id="subheader">
+											<p>
+												<bean:message key="labels.search_result_status"
+													arg0="${f:h(query)}" arg1="${f:h(allRecordCount)}"
+													arg2="${f:h(currentStartRecordNumber)}"
+													arg3="${f:h(currentEndRecordNumber)}" />
+												<c:if test="${execTime!=null}">
+													<bean:message key="labels.search_result_time"
+														arg0="${f:h(execTime)}" />
+												</c:if>
+											</p>
+										</div>
+						
+										<div id="result">
+											<div>
+												<ol>
+													<c:forEach var="doc" varStatus="s" items="${documentItems}">
+														<li>
+															<h3 class="title">
+																<a href="${doc.urlLink}">${f:h(doc.contentTitle)}</a>
+															</h3>
+															<div class="body">
+																${doc.contentDescription}
+																<div style="text-align: right;">
+																	<c:if test="${!solrProcessRunning}">
+																		<html:link
+																			href="confirmDelete?query=${f:u(query)}&docId=${f:u(doc.docId)}&url=${f:u(doc.url)}">
+																			<bean:message key="labels.search_list_delete_link" />
+																		</html:link>
+																	</c:if>
+																	<c:if test="${solrProcessRunning}">
+																		<bean:message key="labels.search_list_delete_link" />
+																	</c:if>
+																</div>
+															</div>
+														</li>
+													</c:forEach>
+												</ol>
+											</div>
+										</div>
+						
+										<div class="row center">
+											<div class="pagination">
+												<ul>
+													<c:if test="${existPrePage}">
+														<li class="prev"><s:link
+																href="prev?query=${f:u(query)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}&labelTypeValue=${f:u(labelTypeValue)}"><bean:message
+																	key="labels.prev_page" />
+															</s:link></li>
+													</c:if>
+													<c:if test="${!existPrePage}">
+														<li class="prev disabled"><a href="#"><bean:message
+																	key="labels.prev_page" /></a></li>
+													</c:if>
+													<c:forEach var="pageNumber" varStatus="s"
+														items="${pageNumberList}">
+														<li
+															<c:if test="${pageNumber == currentPageNumber}">class="active"</c:if>>
+															<s:link
+																href="move?query=${f:u(query)}&pn=${f:u(pageNumber)}&num=${f:u(pageSize)}&labelTypeValue=${f:u(labelTypeValue)}">${f:h(pageNumber)}</s:link>
+														</li>
+													</c:forEach>
+													<c:if test="${existNextPage}">
+														<li class="next<c:if test="${!existNextPage}"> disabled</c:if>">
+															<s:link
+																href="next?query=${f:u(query)}&pn=${f:u(currentPageNumber)}&num=${f:u(pageSize)}&labelTypeValue=${f:u(labelTypeValue)}">
+																<bean:message key="labels.next_page" />
+														</s:link>
+														</li>
+													</c:if>
+													<c:if test="${!existNextPage}">
+														<li class="next disabled"><a href="#"><bean:message
+																	key="labels.next_page" /></a></li>
+													</c:if>
+												</ul>
+											</div>
+											<div>
+												<span> ${currentPageNumber}/${allPageCount}
+													(${allRecordCount}) </span>
+											</div>
+										</div>
+									</c:when>
+									<c:otherwise>
+										<div id="subheader"></div>
+										<div id="result">
+											<p>
+												<bean:message key="labels.did_not_match"
+													arg0="${f:h(query)}" />
+											</p>
+										</div>
+									</c:otherwise>
+								</c:choose>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+
+							</div>
+						</div>
 					</div>
 				</div>
-			</c:when>
-			<c:otherwise>
-				<div id="subheader"></div>
-				<div id="result">
-					<p>
-						<bean:message key="labels.did_not_match"
-							arg0="${f:h(query)}" />
-					</p>
-				</div>
-			</c:otherwise>
-		</c:choose>
 
-	</tiles:put>
-</tiles:insert>
+			</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>
+