Переглянути джерело

Merge pull request #294 from kw-udon/issue-288-dataConfig

#288 dataConfig
Shinsuke Sugaya 10 роки тому
батько
коміт
916f7c3a40

+ 195 - 148
src/main/webapp/WEB-INF/view/admin/dataConfig/confirm.jsp

@@ -1,164 +1,211 @@
-<%@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.data_crawling_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="dataConfig" />
-	<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.data_crawling_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="dataConfig" />
+		</jsp:include>
 
-      <div id="main">
+		<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 --%>
-
-<%-- Confirm Form: BEGIN --%>
-	<s:form>
-		<html:hidden property="crudMode"/>
-		<div>
-<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"/>
-<html:hidden property="sortOrder"/>
-		<h3><bean:message key="labels.data_crawling_title_confirm"/></h3>
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.data_crawling_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.data_crawling_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
-		<table class="bordered-table zebra-striped" style="width:500px;">
-			<tbody>
-                <c:if test="${id != null}"><tr>
-                    <th style="width:150px;"><bean:message key="labels.id" /></th>
-                    <td style="width:345px;word-break:break-all;">${f:h(id)}</td>
-                </tr></c:if>
-                <tr>
-                    <th style="width:150px;"><bean:message key="labels.name"/></th>
-                    <td style="width:345px;word-break:break-all;">${f:h(name)}<html:hidden property="name"/></td>
-                </tr>
-                <tr>
-                    <th style="width:150px;"><bean:message key="labels.handler_name"/></th>
-                	<td>
-<c:forEach var="hn" varStatus="s" items="${handlerNameItems}">
-<c:if test="${handlerName==hn.value}">
-${f:h(hn.label)}<br/>
-</c:if>
-</c:forEach>
-<html:hidden property="handlerName"/>
-                	</td>
-                </tr>
-                <tr>
-                    <th style="width:150px;"><bean:message key="labels.handler_parameter"/></th>
-                    <td style="width:345px;word-break:break-all;">${f:br(f:h(handlerParameter))}<html:hidden property="handlerParameter"/></td>
-                </tr>
-                <tr>
-                    <th style="width:150px;"><bean:message key="labels.handler_script"/></th>
-                    <td style="width:345px;word-break:break-all;">${f:br(f:h(handlerScript))}<html:hidden property="handlerScript"/></td>
-                </tr>
-                <tr>
-                    <th><bean:message key="labels.boost"/></th>
-                    <td>${f:h(boost)}<html:hidden property="boost"/></td>
-                </tr>
-                <tr>
-                	<th><bean:message key="labels.role_type" /></th>
-                	<td>
-<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
-<c:forEach var="rtid" varStatus="s" items="${roleTypeIds}">
-<c:if test="${rtid==rt.id}">
-${f:h(rt.name)}<br/>
-</c:if>
-</c:forEach>
-</c:forEach>
-<html:select property="roleTypeIds" multiple="true" style="display:none;">
-<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
-	<html:option value="${f:u(rt.id)}">${f:h(rt.name)}</html:option>
-</c:forEach>
-</html:select>
-                	</td>
-                </tr>                
-                <tr>
-                	<th><bean:message key="labels.label_type" /></th>
-                	<td>
-<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
-<c:forEach var="ltid" varStatus="s" items="${labelTypeIds}">
-<c:if test="${ltid==l.id}">
-${f:h(l.name)}<br/>
-</c:if>
-</c:forEach>
-</c:forEach>
-<html:select property="labelTypeIds" multiple="true" style="display:none;">
-<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
-	<html:option value="${f:u(l.id)}">${f:h(l.name)}</html:option>
-</c:forEach>
-</html:select>
-                	</td>
-                </tr>                
-				<tr>
-                    <th><bean:message key="labels.available"/></th>
-                    <td><html:hidden property="available"/>
-<c:if test="${available=='true'}"><bean:message key="labels.enabled"/></c:if>
-<c:if test="${available=='false'}"><bean:message key="labels.disabled"/></c:if>
-					</td>
-                </tr>
-			     
+				</ol>
+			</section>
 
-			</tbody>
-			<tfoot>
-				<tr>
-					<td colspan="2">
-        <c:if test="${crudMode == 1}">
-            <input type="submit" class="btn small" name="create" value="<bean:message key="labels.data_crawling_button_create"/>"/>
-            <input type="submit" class="btn small" name="editagain" value="<bean:message key="labels.data_crawling_button_back"/>"/>
-        </c:if>
-        <c:if test="${crudMode == 2}">
-            <input type="submit" class="btn small" name="update" value="<bean:message key="labels.data_crawling_button_update"/>"/>
-            <input type="submit" class="btn small" name="editagain" value="<bean:message key="labels.data_crawling_button_back"/>"/>
-        </c:if>
-        <c:if test="${crudMode == 3}">
-            <input type="submit" class="btn small" name="delete" value="<bean:message key="labels.data_crawling_button_delete"/>"/>
-            <input type="submit" class="btn small" name="back" value="<bean:message key="labels.data_crawling_button_back"/>"/>
-        </c:if>
-        <c:if test="${crudMode == 4}">
-            <input type="submit" class="btn small" name="back" value="<bean:message key="labels.data_crawling_button_back"/>"/>
-            <input type="submit" class="btn small" name="editfromconfirm" value="<bean:message key="labels.data_crawling_button_edit"/>"/>
-            <input type="submit" class="btn small" name="deletefromconfirm" value="<bean:message key="labels.data_crawling_button_delete"/>"/>
-        </c:if>
-					</td>
-				</tr>
-			</tfoot>
-		</table>
-		</div>
-	</s:form>
-<%-- Confirm Form: BEGIN --%>
+			<section class="content">
 
-      </div>
+				<%-- 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" />
+					<html:hidden property="sortOrder"/>
+					<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.data_crawling_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.data_crawling_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.data_crawling_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.data_crawling_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.data_crawling_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>
+											<c:if test="${id != null}"><tr>
+												<th class="col-xs-3"><bean:message key="labels.id" /></th>
+												<td>${f:h(id)}</td>
+											</tr></c:if>
+											<tr>
+												<th class="col-xs-3"><bean:message key="labels.name" /></th>
+												<td>${f:h(name)}<html:hidden property="name" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.handler_name" /></th>
+												<td>
+													<c:forEach var="hn" varStatus="s" items="${handlerNameItems}">
+														<c:if test="${handlerName==hn.value}">
+															${f:h(hn.label)}<br/>
+														</c:if>
+													</c:forEach>
+													<html:hidden property="handlerName"/>
+												</td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.handler_parameter" /></th>
+												<td>${f:br(f:h(handlerParameter))}<html:hidden property="handlerParameter" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.handler_script" /></th>
+												<td>${f:br(f:h(handlerScript))}<html:hidden property="handlerScript" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.boost" /></th>
+												<td>${f:h(boost)}<html:hidden property="boost" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.role_type" /></th>
+													<td>
+														<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
+															<c:forEach var="rtid" varStatus="s" items="${roleTypeIds}">
+																<c:if test="${rtid==rt.id}">
+																	${f:h(rt.name)}<br/>
+																</c:if>
+															</c:forEach>
+														</c:forEach>
+														<html:select property="roleTypeIds" multiple="true" style="display:none;">
+															<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
+																<html:option value="${f:u(rt.id)}">${f:h(rt.name)}</html:option>
+															</c:forEach>
+														</html:select>
+													</td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.label_type" /></th>
+												<td>
+													<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
+														<c:forEach var="ltid" varStatus="s" items="${labelTypeIds}">
+															<c:if test="${ltid==l.id}">
+																${f:h(l.name)}<br/>
+															</c:if>
+														</c:forEach>
+													</c:forEach>
+													<html:select property="labelTypeIds" multiple="true" style="display:none;">
+														<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
+															<html:option value="${f:u(l.id)}">${f:h(l.name)}</html:option>
+														</c:forEach>
+													</html:select>
+												</td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.available"/></th>
+												<td><html:hidden property="available"/>
+													<c:if test="${available=='true'}"><bean:message key="labels.enabled"/></c:if>
+													<c:if test="${available=='false'}"><bean:message key="labels.disabled"/></c:if>
+												</td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.data_crawling_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.data_crawling_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.data_crawling_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.data_crawling_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.data_crawling_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.data_crawling_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.data_crawling_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.data_crawling_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.data_crawling_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</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>

+ 147 - 129
src/main/webapp/WEB-INF/view/admin/dataConfig/edit.jsp

@@ -1,147 +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.data_crawling_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="dataConfig" />
-	<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.data_crawling_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="dataConfig" />
+		</jsp:include>
 
-		<div id="main">
+		<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 --%>
-
-			<%-- Edit Form: BEGIN --%>
-			<s:form>
-				<html:hidden property="crudMode" />
-				<div>
-					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
-					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
-					<html:hidden property="sortOrder" />
-					<h3>
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
 						<bean:message key="labels.data_crawling_title_details" />
-					</h3>
-			<div>
-				<ul class="pills">
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.data_crawling_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
-					<table class="bordered-table zebra-striped">
-						<tbody>
-							<tr>
-								<th style="width: 150px;"><bean:message key="labels.name" /></th>
-								<td><html:text property="name"  styleClass="xlarge"/></td>
-							</tr>
-							<tr>
-								<th style="width: 150px;"><bean:message
-										key="labels.handler_name" /></th>
-								<td><html:select property="handlerName" size="1"
-										>
-										<c:forEach var="hn" varStatus="s" items="${handlerNameItems}">
-											<html:option value="${f:u(hn.value)}">${f:h(hn.label)}</html:option>
-										</c:forEach>
-									</html:select></td>
-							</tr>
-							<tr>
-								<th style="width: 150px;"><bean:message
-										key="labels.handler_parameter" /></th>
-								<td><html:textarea property="handlerParameter"
-										 rows="5" styleClass="xlarge"/></td>
-							</tr>
-							<tr>
-								<th style="width: 150px;"><bean:message
-										key="labels.handler_script" /></th>
-								<td><html:textarea property="handlerScript"
-										 rows="5" styleClass="xlarge"/></td>
-							</tr>
-							<tr>
-								<th><bean:message key="labels.boost" /></th>
-								<td><html:text property="boost" styleClass="xlarge" /></td>
-							</tr>
-							<tr>
-								<th><bean:message key="labels.role_type" /></th>
-								<td><html:select property="roleTypeIds" multiple="true"
-										styleClass="xlarge">
-										<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
-											<html:option value="${f:u(rt.id)}">${f:h(rt.name)}</html:option>
-										</c:forEach>
-									</html:select></td>
-							</tr>
-							<tr>
-								<th><bean:message key="labels.label_type" /></th>
-								<td><html:select property="labelTypeIds" multiple="true"
-										styleClass="xlarge">
-										<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
-											<html:option value="${f:u(l.id)}">${f:h(l.name)}</html:option>
-										</c:forEach>
-									</html:select></td>
-							</tr>
-							<tr>
-								<th><bean:message key="labels.available" /></th>
-								<td><html:select property="available" styleClass="small">
-										<html:option value="true">
-											<bean:message key="labels.enabled" />
-										</html:option>
-										<html:option value="false">
-											<bean:message key="labels.disabled" />
-										</html:option>
-									</html:select></td>
-							</tr>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder"/>
+					<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.data_crawling_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.data_crawling_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.data_crawling_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 --%>
+									<div class="form-group">
+										<label for="name"><bean:message key="labels.name" /></label>
+										<html:text property="name" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+											<label for="handlerName"><bean:message key="labels.handler_name" /></label>
+											<html:select property="handlerName" size="1" styleClass="form-control">
+													<c:forEach var="hn" varStatus="s" items="${handlerNameItems}">
+															<html:option value="${f:u(hn.value)}">${f:h(hn.label)}</html:option>
+													</c:forEach>
+											</html:select>
+									</div>
+									<div class="form-group">
+										<label for="handlerParameter"><bean:message key="labels.handler_parameter" /></label>
+										<html:textarea property="handlerParameter" styleClass="form-control" rows="5" />
+									</div>
+									<div class="form-group">
+										<label for="handlerScript"><bean:message key="labels.handler_script" /></label>
+										<html:textarea property="handlerScript" styleClass="form-control" rows="5" />
+									</div>
+									<div class="form-group">
+										<label for="boost"><bean:message key="labels.boost" /></label>
+										<html:text property="boost" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="roleTypeIds"><bean:message key="labels.role_type" /></label>
+										<html:select property="roleTypeIds" multiple="true" styleClass="form-control">
+											<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
+												<html:option value="${f:u(rt.id)}">${f:h(rt.name)}</html:option>
+											</c:forEach>
+										</html:select>
+									</div>
+									<div class="form-group">
+										<label for="roleTypeIds"><bean:message key="labels.label_type" /></label>
+										<html:select property="labelTypeIds" multiple="true" styleClass="form-control">
+											<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
+												<html:option value="${f:u(l.id)}">${f:h(l.name)}</html:option>
+											</c:forEach>
+										</html:select>
+									</div>
+									<div class="form-group">
+										<label for="available"><bean:message key="labels.available" /></label>
+										<html:select property="available" styleClass="form-control">
+											<html:option value="true">
+												<bean:message key="labels.enabled" />
+											</html:option>
+											<html:option value="false">
+												<bean:message key="labels.disabled" />
+											</html:option>
+										</html:select>
+									</div>
+								</div>
 
-						</tbody>
-						<tfoot>
-							<tr>
-								<td colspan="2"><c:if test="${crudMode == 1}">
-										<input type="submit" class="btn small" name="confirmfromcreate"
-											value="<bean:message key="labels.data_crawling_button_create"/>" />
-										<input type="submit" class="btn small" name="back"
-											value="<bean:message key="labels.data_crawling_button_back"/>" />
-									</c:if> <c:if test="${crudMode == 2}">
-										<input type="submit" class="btn small" name="confirmfromupdate"
-											value="<bean:message key="labels.data_crawling_button_confirm"/>" />
-										<input type="submit" class="btn small" name="back"
-											value="<bean:message key="labels.data_crawling_button_back"/>" />
-									</c:if></td>
-							</tr>
-						</tfoot>
-					</table>
-				</div>
-			</s:form>
-			<%-- Edit Form: BEGIN --%>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.data_crawling_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.data_crawling_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.data_crawling_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.data_crawling_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
 
+			</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>

+ 47 - 16
src/main/webapp/WEB-INF/view/admin/dataConfig/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.data_crawling_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="dataConfig" />
-	<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.data_crawling_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="dataConfig" />
+		</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/dataConfig/">
+							<bean:message key="labels.data_crawling_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.data_crawling_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>

+ 123 - 115
src/main/webapp/WEB-INF/view/admin/dataConfig/index.jsp

@@ -1,126 +1,134 @@
-<%@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.data_crawling_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="dataConfig" />
-	<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.data_crawling_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="dataConfig" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.data_crawling_title_details" />
-		</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.data_crawling_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.data_crawling_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-		<%-- List: BEGIN --%>
+			<section class="content">
 
-		<div class="list-table">
-			<div>
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.data_crawling_link_create_new" />
-						</s:link></li>
-				</ul>
-			</div>
+				<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.data_crawling_link_list" />
+								</h3>
+								<div class="box-tools pull-right">
+									<span class="label label-default"><s:link href="createpage">
+											<bean:message key="labels.data_crawling_link_create_new" />
+										</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>
 
-			<c:if test="${dataConfigPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${dataConfigPager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center; width: 250px;"><bean:message
-									key="labels.name" /></th>
-							<th style="text-align: center;"><bean:message
-									key="labels.available" /></th>
-							<th style="text-align: center; width: 150px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s"
-							items="${dataConfigItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
+								<%-- List --%>
+								<c:if test="${dataConfigPager.allRecordCount == 0}">
+									<p class="alert-message warning">
+										<bean:message key="labels.list_could_not_find_crud_table" />
+									</p>
+								</c:if>
+								<c:if test="${dataConfigPager.allRecordCount > 0}">
+									<table class="table table-bordered table-striped">
+										<thead>
+											<tr>
+												<th><bean:message key="labels.name" /></th>
+												<th><bean:message key="labels.available" /></th>
+											</tr>
+										</thead>
+										<tbody>
+											<c:forEach var="data" varStatus="s" items="${dataConfigItems}">
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+													<td>${f:h(data.name)}</td>
+													<td style="text-align: center;">
+														<c:if test="${data.available=='true'}">
+															<bean:message key="labels.enabled" />
+														</c:if> <c:if test="${data.available=='false'}">
+															<bean:message key="labels.disabled" />
+														</c:if>
+													</td>
+												</tr>
+											</c:forEach>
+										</tbody>
+									</table>
+								</c:if>
 
-								<td>${f:h(data.name)}</td>
-								<td style="text-align: center;"><c:if
-										test="${data.available=='true'}">
-										<bean:message key="labels.enabled" />
-									</c:if> <c:if test="${data.available=='false'}">
-										<bean:message key="labels.disabled" />
-									</c:if></td>
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+								<%-- Paging Info --%>
+								<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(dataConfigPager.currentPageNumber)}"
+										arg1="${f:h(dataConfigPager.allPageCount)}" arg2="${f:h(dataConfigPager.allRecordCount)}"
+									/></span>
 
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.data_crawling_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.data_crawling_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.data_crawling_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${dataConfigPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${fileConfigPager.currentPageNumber - 1}">
-										<bean:message key="labels.data_crawling_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!dataConfigPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.data_crawling_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${dataConfigPager.pageNumberList}">
-								<li
-									<c:if test="${p == dataConfigPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${dataConfigPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${dataConfigPager.currentPageNumber + 1}">
-										<bean:message key="labels.data_crawling_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!dataConfigPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.data_crawling_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(dataConfigPager.currentPageNumber)}"
-								arg1="${f:h(dataConfigPager.allPageCount)}"
-								arg2="${f:h(dataConfigPager.allRecordCount)}" /></span>
+								<%-- Paging Navigation --%>
+								<ul class="pagination pagination-sm no-margin pull-right">
+									<c:if test="${dataConfigPager.existPrePage}">
+										<li class="prev"><s:link href="list/${dataConfigPager.currentPageNumber - 1}">
+												<bean:message key="labels.data_crawling_link_prev_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!dataConfigPager.existPrePage}">
+										<li class="prev disabled"><a href="#"><bean:message key="labels.data_crawling_link_prev_page" /></a></li>
+									</c:if>
+									<c:forEach var="p" varStatus="s" items="${dataConfigPager.pageNumberList}">
+										<li <c:if test="${p == dataConfigPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+										</li>
+									</c:forEach>
+									<c:if test="${dataConfigPager.existNextPage}">
+										<li class="next"><s:link href="list/${dataConfigPager.currentPageNumber + 1}">
+												<bean:message key="labels.data_crawling_link_next_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!dataConfigPager.existNextPage}">
+										<li class="next disabled"><a href="#"><bean:message key="labels.data_crawling_link_next_page" /></a></li>
+									</c:if>
+								</ul>
+
+							</div>
+						</div>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
+
+			</section>
 		</div>
-		<%-- List: END --%>
 
-	</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>
+

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

@@ -50,6 +50,7 @@
 					</c:if>
 					<html:hidden property="createdBy" />
 					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder"/>
 					<div class="row">
 						<div class="col-md-12">
 							<div class="box">
@@ -230,4 +231,3 @@
 	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 </body>
 </html>
-

+ 2 - 2
src/main/webapp/WEB-INF/view/admin/fileConfig/edit.jsp

@@ -50,6 +50,7 @@
 					</c:if>
 					<html:hidden property="createdBy" />
 					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder"/>
 					<div class="row">
 						<div class="col-md-12">
 							<div class="box">
@@ -82,7 +83,7 @@
 									</div>
 
 									<%-- Form Fields --%>
-									
+
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="name"><bean:message key="labels.name" /></label>
@@ -192,4 +193,3 @@
 	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 </body>
 </html>
-

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

@@ -50,6 +50,7 @@
 					</c:if>
 					<html:hidden property="createdBy" />
 					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder"/>
 					<div class="row">
 						<div class="col-md-12">
 							<div class="box">
@@ -234,4 +235,3 @@
 	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 </body>
 </html>
-

+ 2 - 2
src/main/webapp/WEB-INF/view/admin/webConfig/edit.jsp

@@ -10,7 +10,7 @@
 		<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="keyMatch" />
+			<jsp:param name="menuType" value="webConfig" />
 		</jsp:include>
 
 		<div class="content-wrapper">
@@ -50,6 +50,7 @@
 					</c:if>
 					<html:hidden property="createdBy" />
 					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder"/>
 					<div class="row">
 						<div class="col-md-12">
 							<div class="box">
@@ -194,4 +195,3 @@
 	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 </body>
 </html>
-