We use cookies to ensure you get the best experience on our website
Home Explore Help
Register Sign In
0ct0pu5
/
fess
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge pull request #295 from kw-udon/issue-288-label-role-overlapping

#288 labelType, roleType, overlappingHost
Shinsuke Sugaya 10 years ago
parent
916f7c3a40 f3e722716d
commit
a8f85b92c1
12 changed files with 1238 additions and 934 deletions
Split View Show Diff Stats
  1. 158 119
      src/main/webapp/WEB-INF/view/admin/labelType/confirm.jsp
  2. 124 102
      src/main/webapp/WEB-INF/view/admin/labelType/edit.jsp
  3. 46 16
      src/main/webapp/WEB-INF/view/admin/labelType/error.jsp
  4. 116 107
      src/main/webapp/WEB-INF/view/admin/labelType/index.jsp
  5. 130 92
      src/main/webapp/WEB-INF/view/admin/overlappingHost/confirm.jsp
  6. 104 79
      src/main/webapp/WEB-INF/view/admin/overlappingHost/edit.jsp
  7. 46 16
      src/main/webapp/WEB-INF/view/admin/overlappingHost/error.jsp
  8. 118 110
      src/main/webapp/WEB-INF/view/admin/overlappingHost/index.jsp
  9. 130 91
      src/main/webapp/WEB-INF/view/admin/roleType/confirm.jsp
  10. 105 79
      src/main/webapp/WEB-INF/view/admin/roleType/edit.jsp
  11. 46 16
      src/main/webapp/WEB-INF/view/admin/roleType/error.jsp
  12. 115 107
      src/main/webapp/WEB-INF/view/admin/roleType/index.jsp

+ 158 - 119
src/main/webapp/WEB-INF/view/admin/labelType/confirm.jsp
View File 

@@ -1,137 +1,176 @@
 
-<%@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.labeltype_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="labelType" />
 
-	<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.labeltype_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="labelType" />
 
+		</jsp:include>
 
 
-		<h3>
 
-			<bean:message key="labels.labeltype_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.labeltype_title_details" />
 
+				</h1>
 
+				<ol class="breadcrumb">
 
 					<li><s:link href="index">
 
 							<bean:message key="labels.labeltype_link_list" />
 
 						</s:link></li>
 
 					<c:if test="${crudMode == 1}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.labeltype_link_create" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_create" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 2}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.labeltype_link_update" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_update" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 3}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.labeltype_link_delete" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_delete" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 4}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.labeltype_link_confirm" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_confirm" /></a></li>
 
 					</c:if>
 
-				</ul>
 
-			</div>
 
+				</ol>
 
+			</section>
 
+
 
+			<section class="content">
 
 
-		<%-- 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" />
 
-				<table class="bordered-table zebra-striped">
 
-					<tbody>
 
-						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.labeltype_name" /></th>
 
-							<td>${f:h(name)}<html:hidden property="name" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th><bean:message key="labels.labeltype_value" /></th>
 
-							<td>${f:h(value)}<html:hidden property="value" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.labeltype_included_paths" /></th>
 
-							<td style="width: 345px; word-break: break-all;">${f:br(f:h(includedPaths))}<html:hidden
 
-									property="includedPaths" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.labeltype_excluded_paths" /></th>
 
-							<td style="width: 345px; word-break: break-all;">${f:br(f:h(excludedPaths))}<html:hidden
 
-									property="excludedPaths" /></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 />
 
+				<%-- 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.labeltype_link_create" />
 
+										</c:if>
 
+										<c:if test="${crudMode == 2}">
 
+											<bean:message key="labels.labeltype_link_update" />
 
 										</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.sortOrder" /></th>
 
-							<td>${f:h(sortOrder)}<html:hidden property="sortOrder" /></td>
 
-						</tr>
 
+										<c:if test="${crudMode == 3}">
 
+											<bean:message key="labels.labeltype_link_delete" />
 
+										</c:if>
 
+										<c:if test="${crudMode == 4}">
 
+											<bean:message key="labels.labeltype_link_confirm" />
 
+										</c:if>
 
+									</h3>
 
+									<div class="box-tools pull-right">
 
+										<span class="label label-default"><s:link href="index">
 
+												<bean:message key="labels.labeltype_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-3"><bean:message key="labels.labeltype_name" /></th>
 
+												<td>${f:h(name)}<html:hidden property="name" /></td>
 
+											</tr>
 
+											<tr>
 
+												<th><bean:message key="labels.labeltype_value" /></th>
 
+												<td>${f:h(value)}<html:hidden property="value" /></td>
 
+											</tr>
 
+											<tr>
 
+												<th><bean:message key="labels.labeltype_included_paths" /></th>
 
+												<td>${f:br(f:h(includedPaths))}<html:hidden property="includedPaths" /></td>
 
+											</tr>
 
+											<tr>
 
+												<th><bean:message key="labels.labeltype_excluded_paths" /></th>
 
+												<td>${f:br(f:h(excludedPaths))}<html:hidden property="excludedPaths" /></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.sortOrder" /></th>
 
+												<td>${f:h(sortOrder)}<html:hidden property="sortOrder" /></td>
 
+											</tr>
 
+										</tbody>
 
+									</table>
 
+								</div>
 
 
-					</tbody>
 
-					<tfoot>
 
-						<tr>
 
-							<td colspan="2"><c:if test="${crudMode == 1}">
 
-									<input type="submit" class="btn small" name="create"
 
-										value="<bean:message key="labels.labeltype_button_create"/>" />
 
-									<input type="submit" class="btn small" name="editagain"
 
-										value="<bean:message key="labels.labeltype_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 2}">
 
-									<input type="submit" class="btn small" name="update"
 
-										value="<bean:message key="labels.labeltype_button_update"/>" />
 
-									<input type="submit" class="btn small" name="editagain"
 
-										value="<bean:message key="labels.labeltype_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 3}">
 
-									<input type="submit" class="btn small" name="delete"
 
-										value="<bean:message key="labels.labeltype_button_delete"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.labeltype_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 4}">
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.labeltype_button_back"/>" />
 
-									<input type="submit" class="btn small" name="editfromconfirm"
 
-										value="<bean:message key="labels.labeltype_button_edit"/>" />
 
-									<input type="submit" class="btn small" name="deletefromconfirm"
 
-										value="<bean:message key="labels.labeltype_button_delete"/>" />
 
-								</c:if></td>
 
-						</tr>
 
-					</tfoot>
 
-				</table>
 
-			</div>
 
-		</s:form>
 
-		<%-- Confirm Form: BEGIN --%>
 
+								<%-- Box Footer --%>
 
+								<div class="box-footer">
 
+									<c:if test="${crudMode == 1}">
 
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.labeltype_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="create"
 
+											value="<bean:message key="labels.labeltype_button_create"/>"
 
+										/>
 
+									</c:if>
 
+									<c:if test="${crudMode == 2}">
 
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.labeltype_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="update"
 
+											value="<bean:message key="labels.labeltype_button_update"/>"
 
+										/>
 
+									</c:if>
 
+									<c:if test="${crudMode == 3}">
 
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.labeltype_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="delete"
 
+											value="<bean:message key="labels.labeltype_button_delete"/>"
 
+										/>
 
+									</c:if>
 
+									<c:if test="${crudMode == 4}">
 
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.labeltype_button_back"/>" />
 
+										<input type="submit" class="btn" name="editfromconfirm"
 
+											value="<bean:message key="labels.labeltype_button_edit"/>"
 
+										/>
 
+										<input type="submit" class="btn" name="deletefromconfirm"
 
+											value="<bean:message key="labels.labeltype_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>

+ 124 - 102
src/main/webapp/WEB-INF/view/admin/labelType/edit.jsp
View File 

@@ -1,120 +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.labeltype_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="labelType" />
 
-	<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.labeltype_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="labelType" />
 
+		</jsp:include>
 
 
-		<h3>
 
-			<bean:message key="labels.labeltype_title_details" />
 
-		</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.labeltype_title_details" />
 
+				</h1>
 
+				<ol class="breadcrumb">
 
 					<li><s:link href="index">
 
 							<bean:message key="labels.labeltype_link_list" />
 
 						</s:link></li>
 
 					<c:if test="${crudMode == 1}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.labeltype_link_create" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_create" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 2}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.labeltype_link_update" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_update" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 3}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.labeltype_link_delete" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_delete" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 4}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.labeltype_link_confirm" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_confirm" /></a></li>
 
 					</c:if>
 
-				</ul>
 
-			</div>
 
+				</ol>
 
+			</section>
 
+
 
+			<section class="content">
 
 
-		<%-- 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" />
 
-				<table class="bordered-table zebra-striped">
 
-					<tbody>
 
+				<%-- 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" />
 
+					<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.labeltype_link_create" />
 
+										</c:if>
 
+										<c:if test="${crudMode == 2}">
 
+											<bean:message key="labels.labeltype_link_update" />
 
+										</c:if>
 
+									</h3>
 
+									<div class="box-tools pull-right">
 
+										<span class="label label-default"><s:link href="index">
 
+												<bean:message key="labels.labeltype_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>
 
 
-						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.labeltype_name" /></th>
 
-							<td><html:text property="name" styleClass="xlarge" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th><bean:message key="labels.labeltype_value" /></th>
 
-							<td><html:text property="value" styleClass="xlarge" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.labeltype_included_paths" /></th>
 
-							<td><html:textarea property="includedPaths"
 
-									style="width:345px;" rows="5" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.labeltype_excluded_paths" /></th>
 
-							<td><html:textarea property="excludedPaths"
 
-									style="width:345px;" rows="5" /></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.sortOrder" /></th>
 
-							<td><html:text property="sortOrder"  styleClass="xlarge"/></td>
 
-						</tr>
 
+									<%-- Form Fields --%>
 
+									<div class="form-group">
 
+										<label for="name"><bean:message key="labels.labeltype_name" /></label>
 
+										<html:text property="name" styleClass="form-control" />
 
+									</div>
 
+									<div class="form-group">
 
+										<label for="paths"><bean:message key="labels.labeltype_value" /></label>
 
+										<html:text property="value" styleClass="form-control" />
 
+									</div>
 
+									<div class="form-group">
 
+										<label for="includedPaths"><bean:message key="labels.labeltype_included_paths" /></label>
 
+										<html:textarea property="includedPaths" styleClass="form-control" rows="5" />
 
+									</div>
 
+									<div class="form-group">
 
+										<label for="excludedPaths"><bean:message key="labels.labeltype_excluded_paths" /></label>
 
+										<html:textarea property="excludedPaths" styleClass="form-control" rows="5" />
 
+									</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="sortOrder"><bean:message key="labels.sortOrder" /></label>
 
+										<html:text property="sortOrder" styleClass="form-control" />
 
+									</div>
 
+								</div>
 
 
+								<%-- Box Footer --%>
 
+								<div class="box-footer">
 
+									<c:if test="${crudMode == 1}">
 
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.labeltype_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
 
+											value="<bean:message key="labels.labeltype_button_create"/>"
 
+										/>
 
+									</c:if>
 
+									<c:if test="${crudMode == 2}">
 
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.labeltype_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
 
+											value="<bean:message key="labels.labeltype_button_confirm"/>"
 
+										/>
 
+									</c:if>
 
+								</div>
 
+							</div>
 
+						</div>
 
+					</div>
 
+				</s:form>
 
 
+			</section>
 
+		</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.labeltype_button_create"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.labeltype_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 2}">
 
-									<input type="submit" class="btn small" name="confirmfromupdate"
 
-										value="<bean:message key="labels.labeltype_button_confirm"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.labeltype_button_back"/>" />
 
-								</c:if></td>
 
-						</tr>
 
-					</tfoot>
 
-				</table>
 
-			</div>
 
-		</s:form>
 
-		<%-- Edit Form: BEGIN --%>
 
-	</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>

+ 46 - 16
src/main/webapp/WEB-INF/view/admin/labelType/error.jsp
View File 

@@ -1,20 +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.labeltype_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="labelType" />
 
-	<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.labeltype_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="labelType" />
 
+		</jsp:include>
 
 
-      <div id="main">
 
-      
-<html:errors/>
 
-<br/>
 
-<s:link href="index"><bean:message key="labels.labeltype_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/labelType/">
 
+							<bean:message key="labels.labeltype_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.labeltype_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>

+ 116 - 107
src/main/webapp/WEB-INF/view/admin/labelType/index.jsp
View File 

@@ -1,116 +1,125 @@
 
-<%@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.labeltype_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="labelType" />
 
-	<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.labeltype_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="labelType" />
 
+		</jsp:include>
 
 
-		<h3>
 
-			<bean:message key="labels.labeltype_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 --%>
 
-
 
-		<%-- List: BEGIN --%>
 
-		<div class="list-table">
 
-			<div>
 
-				<ul class="pills">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.labeltype_link_list" /></a></li>
 
-					<li><s:link href="createpage">
 
-							<bean:message key="labels.labeltype_link_create_new" />
 
+			<%-- Content Header --%>
 
+			<section class="content-header">
 
+				<h1>
 
+					<bean:message key="labels.labeltype_configuration" />
 
+				</h1>
 
+				<ol class="breadcrumb">
 
+					<li class="active"><s:link href="index">
 
+							<bean:message key="labels.labeltype_link_list" />
 
 						</s:link></li>
 
-				</ul>
 
-			</div>
 
+				</ol>
 
+			</section>
 
 
-			<c:if test="${labelTypePager.allRecordCount == 0}">
 
-				<p class="alert-message warning">
 
-					<bean:message key="labels.list_could_not_find_crud_table" />
 
-				</p>
 
-			</c:if>
 
-			<c:if test="${labelTypePager.allRecordCount > 0}">
 
-				<table class="bordered-table zebra-striped">
 
-					<thead>
 
-						<tr>
 
-							<th style="text-align: center;"><bean:message
 
-									key="labels.labeltype_name" /></th>
 
+			<section class="content">
 
 
-							<th style="text-align: center; width: 200px;">&nbsp;</th>
 
-						</tr>
 
-					</thead>
 
-					<tbody>
 
-						<c:forEach var="data" varStatus="s" items="${labelTypeItems}">
 
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
 
-								<td>${f:h(data.name)}</td>
 
-								<td style="text-align: center;"><s:link
 
-										href="confirmpage/4/${f:u(data.id)}">
 
-										<bean:message key="labels.labeltype_link_details" />
 
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
 
-										<bean:message key="labels.labeltype_link_edit" />
 
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
 
-										<bean:message key="labels.labeltype_link_delete" />
 
-									</s:link></td>
 
-							</tr>
 
-						</c:forEach>
 
-					</tbody>
 
-				</table>
 
-				<%-- Page Navigation: BEGIN --%>
 
-				<div class="row center">
 
-					<div class="pagination">
 
-						<ul>
 
-							<c:if test="${labelTypePager.existPrePage}">
 
-								<li class="prev"><s:link
 
-										href="list/${labelTypePager.currentPageNumber - 1}">
 
-										<bean:message key="labels.labeltype_link_prev_page" />
 
-									</s:link></li>
 
-							</c:if>
 
-							<c:if test="${!labelTypePager.existPrePage}">
 
-								<li class="prev disabled"><a href="#"><bean:message
 
-											key="labels.labeltype_link_prev_page" /> </a></li>
 
-							</c:if>
 
-							<c:forEach var="p" varStatus="s"
 
-								items="${labelTypePager.pageNumberList}">
 
-								<li
 
-									<c:if test="${p == labelTypePager.currentPageNumber}">class="active"</c:if>>
 
-									<s:link href="list/${p}">${p}</s:link>
 
-								</li>
 
-							</c:forEach>
 
-							<c:if test="${labelTypePager.existNextPage}">
 
-								<li class="next"><s:link
 
-										href="list/${labelTypePager.currentPageNumber + 1}">
 
-										<bean:message key="labels.labeltype_link_next_page" />
 
-									</s:link></li>
 
-							</c:if>
 
-							<c:if test="${!labelTypePager.existNextPage}">
 
-								<li class="next disabled"><a href="#"><bean:message
 
-											key="labels.labeltype_link_next_page" /></a></li>
 
-							</c:if>
 
-						</ul>
 
-					</div>
 
-					<div>
 
-						<span><bean:message key="labels.pagination_page_guide_msg"
 
-								arg0="${f:h(labelTypePager.currentPageNumber)}"
 
-								arg1="${f:h(labelTypePager.allPageCount)}"
 
-								arg2="${f:h(labelTypePager.allRecordCount)}" /></span>
 
+				<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.labeltype_link_list" />
 
+								</h3>
 
+								<div class="box-tools pull-right">
 
+									<span class="label label-default"><s:link href="createpage">
 
+											<bean:message key="labels.labeltype_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>
 
+
 
+								<%-- List --%>
 
+								<c:if test="${labelTypePager.allRecordCount == 0}">
 
+									<p class="alert-message warning">
 
+										<bean:message key="labels.list_could_not_find_crud_table" />
 
+									</p>
 
+								</c:if>
 
+								<c:if test="${labelTypePager.allRecordCount > 0}">
 
+									<table class="table table-bordered table-striped">
 
+										<thead>
 
+											<tr>
 
+												<th><bean:message key="labels.labeltype_name" /></th>
 
+											</tr>
 
+										</thead>
 
+										<tbody>
 
+											<c:forEach var="data" varStatus="s" items="${labelTypeItems}">
 
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
 
+													<td>${f:h(data.name)}</td>
 
+												</tr>
 
+											</c:forEach>
 
+										</tbody>
 
+									</table>
 
+								</c:if>
 
+
 
+							</div>
 
+							<%-- Box Footer --%>
 
+							<div class="box-footer">
 
+								<%-- Paging Info --%>
 
+								<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(labelTypePager.currentPageNumber)}"
 
+										arg1="${f:h(labelTypePager.allPageCount)}" arg2="${f:h(labelTypePager.allRecordCount)}"
 
+									/></span>
 
+
 
+								<%-- Paging Navigation --%>
 
+								<ul class="pagination pagination-sm no-margin pull-right">
 
+									<c:if test="${labelTypePager.existPrePage}">
 
+										<li class="prev"><s:link href="list/${labelTypePager.currentPageNumber - 1}">
 
+												<bean:message key="labels.labeltype_link_prev_page" />
 
+											</s:link></li>
 
+									</c:if>
 
+									<c:if test="${!labelTypePager.existPrePage}">
 
+										<li class="prev disabled"><a href="#"><bean:message key="labels.labeltype_link_prev_page" /></a></li>
 
+									</c:if>
 
+									<c:forEach var="p" varStatus="s" items="${labelTypePager.pageNumberList}">
 
+										<li <c:if test="${p == labelTypePager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
 
+										</li>
 
+									</c:forEach>
 
+									<c:if test="${labelTypePager.existNextPage}">
 
+										<li class="next"><s:link href="list/${labelTypePager.currentPageNumber + 1}">
 
+												<bean:message key="labels.labeltype_link_next_page" />
 
+											</s:link></li>
 
+									</c:if>
 
+									<c:if test="${!labelTypePager.existNextPage}">
 
+										<li class="next disabled"><a href="#"><bean:message key="labels.labeltype_link_next_page" /></a></li>
 
+									</c:if>
 
+								</ul>
 
+
 
+							</div>
 
+						</div>
 
 					</div>
 
 				</div>
 
-				<%-- Page Navigation: END --%>
 
-			</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>

+ 130 - 92
src/main/webapp/WEB-INF/view/admin/overlappingHost/confirm.jsp
View File 

@@ -1,110 +1,148 @@
 
-<%@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.overlapping_host_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="overlappingHost" />
 
-	<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.overlapping_host_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="overlapping_host" />
 
+		</jsp:include>
 
 
-		<h3>
 
-			<bean:message key="labels.overlapping_host_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 />
 
-		</div>
 
-		<%-- Message: END --%>
 
-
 
-			<div>
 
-				<ul class="pills">
 
+			<%-- Content Header --%>
 
+			<section class="content-header">
 
+				<h1>
 
+					<bean:message key="labels.overlapping_host_title_details" />
 
+				</h1>
 
+				<ol class="breadcrumb">
 
 					<li><s:link href="index">
 
 							<bean:message key="labels.overlapping_host_link_list" />
 
 						</s:link></li>
 
 					<c:if test="${crudMode == 1}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.overlapping_host_link_create" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_create" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 2}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.overlapping_host_link_update" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_update" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 3}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.overlapping_host_link_delete" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_delete" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 4}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.overlapping_host_link_confirm" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_confirm" /></a></li>
 
 					</c:if>
 
-				</ul>
 
-			</div>
 
+				</ol>
 
+			</section>
 
 
-		<%-- 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" />
 
-				<table class="bordered-table zebra-striped" style="width: 500px;">
 
-					<tbody>
 
+			<section class="content">
 
 
-						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.regular_name" /></th>
 
-							<td>${f:h(regularName)}<html:hidden property="regularName" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th><bean:message key="labels.overlapping_name" /></th>
 
-							<td>${f:h(overlappingName)}<html:hidden
 
-									property="overlappingName" /></td>
 
-						</tr>
 
+				<%-- 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.overlapping_host_link_create" />
 
+										</c:if>
 
+										<c:if test="${crudMode == 2}">
 
+											<bean:message key="labels.overlapping_host_link_update" />
 
+										</c:if>
 
+										<c:if test="${crudMode == 3}">
 
+											<bean:message key="labels.overlapping_host_link_delete" />
 
+										</c:if>
 
+										<c:if test="${crudMode == 4}">
 
+											<bean:message key="labels.overlapping_host_link_confirm" />
 
+										</c:if>
 
+									</h3>
 
+									<div class="box-tools pull-right">
 
+										<span class="label label-default"><s:link href="index">
 
+												<bean:message key="labels.overlapping_host_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-3"><bean:message key="labels.regular_name" /></th>
 
+												<td>${f:h(regularName)}<html:hidden property="regularName" /></td>
 
+											</tr>
 
+											<tr>
 
+												<th><bean:message key="labels.overlapping_name" /></th>
 
+												<td>${f:h(overlappingName)}<html:hidden property="overlappingName" /></td>
 
+											</tr>
 
+										</tbody>
 
+									</table>
 
+								</div>
 
 
-					</tbody>
 
-					<tfoot>
 
-						<tr>
 
-							<td colspan="2"><c:if test="${crudMode == 1}">
 
-									<input type="submit" class="btn small" name="create"
 
-										value="<bean:message key="labels.overlapping_host_button_create"/>" />
 
-									<input type="submit" class="btn small" name="editagain"
 
-										value="<bean:message key="labels.overlapping_host_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 2}">
 
-									<input type="submit" class="btn small" name="update"
 
-										value="<bean:message key="labels.overlapping_host_button_update"/>" />
 
-									<input type="submit" class="btn small" name="editagain"
 
-										value="<bean:message key="labels.overlapping_host_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 3}">
 
-									<input type="submit" class="btn small" name="delete"
 
-										value="<bean:message key="labels.overlapping_host_button_delete"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.overlapping_host_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 4}">
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.overlapping_host_button_back"/>" />
 
-									<input type="submit" class="btn small" name="editfromconfirm"
 
-										value="<bean:message key="labels.overlapping_host_button_edit"/>" />
 
-									<input type="submit" class="btn small" name="deletefromconfirm"
 
-										value="<bean:message key="labels.overlapping_host_button_delete"/>" />
 
-								</c:if></td>
 
-						</tr>
 
-					</tfoot>
 
-				</table>
 
-			</div>
 
-		</s:form>
 
-		<%-- Confirm Form: BEGIN --%>
 
+								<%-- Box Footer --%>
 
+								<div class="box-footer">
 
+									<c:if test="${crudMode == 1}">
 
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.overlapping_host_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="create"
 
+											value="<bean:message key="labels.overlapping_host_button_create"/>"
 
+										/>
 
+									</c:if>
 
+									<c:if test="${crudMode == 2}">
 
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.overlapping_host_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="update"
 
+											value="<bean:message key="labels.overlapping_host_button_update"/>"
 
+										/>
 
+									</c:if>
 
+									<c:if test="${crudMode == 3}">
 
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.overlapping_host_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="delete"
 
+											value="<bean:message key="labels.overlapping_host_button_delete"/>"
 
+										/>
 
+									</c:if>
 
+									<c:if test="${crudMode == 4}">
 
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.overlapping_host_button_back"/>" />
 
+										<input type="submit" class="btn" name="editfromconfirm"
 
+											value="<bean:message key="labels.overlapping_host_button_edit"/>"
 
+										/>
 
+										<input type="submit" class="btn" name="deletefromconfirm"
 
+											value="<bean:message key="labels.overlapping_host_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>

+ 104 - 79
src/main/webapp/WEB-INF/view/admin/overlappingHost/edit.jsp
View File 

@@ -1,97 +1,122 @@
 
-<%@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.overlapping_host_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="overlappingHost" />
 
-	<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.overlapping_host_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="overlappintHost" />
 
+		</jsp:include>
 
 
-		<h3>
 
-			<bean:message key="labels.overlapping_host_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 --%>
 
-
 
-			<div>
 
-				<ul class="pills">
 
+			<%-- Content Header --%>
 
+			<section class="content-header">
 
+				<h1>
 
+					<bean:message key="labels.overlapping_host_title_details" />
 
+				</h1>
 
+				<ol class="breadcrumb">
 
 					<li><s:link href="index">
 
 							<bean:message key="labels.overlapping_host_link_list" />
 
 						</s:link></li>
 
 					<c:if test="${crudMode == 1}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.overlapping_host_link_create" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_create" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 2}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.overlapping_host_link_update" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_update" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 3}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.overlapping_host_link_delete" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_delete" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 4}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.overlapping_host_link_confirm" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_confirm" /></a></li>
 
 					</c:if>
 
-				</ul>
 
-			</div>
 
+				</ol>
 
+			</section>
 
 
-		<%-- 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" />
 
-				<table class="bordered-table zebra-striped" style="width: 500px;">
 
-					<tbody>
 
+			<section class="content">
 
 
-						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.regular_name" /></th>
 
-							<td><html:text property="regularName" style="width:98%" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th><bean:message key="labels.overlapping_name" /></th>
 
-							<td><html:text property="overlappingName" style="width:98%" /></td>
 
-						</tr>
 
+				<%-- 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.overlapping_host_link_create" />
 
+										</c:if>
 
+										<c:if test="${crudMode == 2}">
 
+											<bean:message key="labels.overlapping_host_link_update" />
 
+										</c:if>
 
+									</h3>
 
+									<div class="box-tools pull-right">
 
+										<span class="label label-default"><s:link href="index">
 
+												<bean:message key="labels.overlapping_host_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="regularName"><bean:message key="labels.regular_name" /></label>
 
+										<html:text property="regularName" styleClass="form-control" />
 
+									</div>
 
+									<div class="form-group">
 
+										<label for="overlappingName"><bean:message key="labels.overlapping_name" /></label>
 
+										<html:text property="overlappingName" styleClass="form-control" />
 
+									</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.overlapping_host_button_create"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.overlapping_host_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 2}">
 
-									<input type="submit" class="btn small" name="confirmfromupdate"
 
-										value="<bean:message key="labels.overlapping_host_button_confirm"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.overlapping_host_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.overlapping_host_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
 
+											value="<bean:message key="labels.overlapping_host_button_create"/>"
 
+										/>
 
+									</c:if>
 
+									<c:if test="${crudMode == 2}">
 
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.overlapping_host_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
 
+											value="<bean:message key="labels.overlapping_host_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>

+ 46 - 16
src/main/webapp/WEB-INF/view/admin/overlappingHost/error.jsp
View File 

@@ -1,20 +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.overlapping_host_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="fileoverlappingHost" />
 
-	<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.overlapping_host_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="overlappintHost" />
 
+		</jsp:include>
 
 
-      <div id="main">
 
-      
-<html:errors/>
 
-<br>
 
-<s:link href="index"><bean:message key="labels.overlapping_host_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/overlappingHost/">
 
+							<bean:message key="labels.overlapping_host_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.overlapping_host_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>

+ 118 - 110
src/main/webapp/WEB-INF/view/admin/overlappingHost/index.jsp
View File 

@@ -1,119 +1,127 @@
 
-<%@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.overlapping_host_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="overlappingHost" />
 
-	<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.overlapping_host_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="overlappingHost" />
 
+		</jsp:include>
 
 
-		<h3>
 
-			<bean:message key="labels.overlapping_host_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 --%>
 
-
 
-		<%-- List: BEGIN --%>
 
-		<div class="list-table">
 
-			<div>
 
-				<ul class="pills">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.overlapping_host_link_list" /></a></li>
 
-					<li><s:link href="createpage">
 
-							<bean:message key="labels.overlapping_host_link_create_new" />
 
+			<%-- Content Header --%>
 
+			<section class="content-header">
 
+				<h1>
 
+					<bean:message key="labels.overlapping_host_configuration" />
 
+				</h1>
 
+				<ol class="breadcrumb">
 
+					<li class="active"><s:link href="index">
 
+							<bean:message key="labels.overlapping_host_link_list" />
 
 						</s:link></li>
 
-				</ul>
 
-			</div>
 
+				</ol>
 
+			</section>
 
 
-			<c:if test="${overlappingHostPager.allRecordCount == 0}">
 
-				<p class="alert-message warning">
 
-					<bean:message key="labels.list_could_not_find_crud_table" />
 
-				</p>
 
-			</c:if>
 
-			<c:if test="${overlappingHostPager.allRecordCount > 0}">
 
-				<table class="bordered-table zebra-striped">
 
-					<thead>
 
-						<tr>
 
-							<th style="text-align: center;"><bean:message
 
-									key="labels.regular_name" /></th>
 
-							<th style="text-align: center;"><bean:message
 
-									key="labels.overlapping_name" /></th>
 
-							<th style="text-align: center;">&nbsp;</th>
 
-						</tr>
 
-					</thead>
 
-					<tbody>
 
-						<c:forEach var="data" varStatus="s"
 
-							items="${overlappingHostItems}">
 
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
 
-								<td>${f:h(data.regularName)}</td>
 
-								<td>${f:h(data.overlappingName)}</td>
 
-								<td style="text-align: center;"><s:link
 
-										href="confirmpage/4/${f:u(data.id)}">
 
-										<bean:message key="labels.overlapping_host_link_details" />
 
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
 
-										<bean:message key="labels.overlapping_host_link_edit" />
 
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
 
-										<bean:message key="labels.overlapping_host_link_delete" />
 
-									</s:link></td>
 
-							</tr>
 
-						</c:forEach>
 
-					</tbody>
 
-				</table>
 
-				<%-- Page Navigation: BEGIN --%>
 
-				<div class="row center">
 
-					<div class="pagination">
 
-						<ul>
 
-							<c:if test="${overlappingHostPager.existPrePage}">
 
-								<li class="prev"><s:link
 
-										href="list/${overlappingHostPager.currentPageNumber - 1}">
 
-										<bean:message key="labels.overlapping_host_link_prev_page" />
 
-									</s:link></li>
 
-							</c:if>
 
-							<c:if test="${!overlappingHostPager.existPrePage}">
 
-								<li class="prev disabled"><a href="#"><bean:message
 
-											key="labels.overlapping_host_link_prev_page" /></a></li>
 
-							</c:if>
 
-							<c:forEach var="p" varStatus="s"
 
-								items="${overlappingHostPager.pageNumberList}">
 
-								<li
 
-									<c:if test="${p == overlappingHostPager.currentPageNumber}">class="active"</c:if>>
 
-									<s:link href="list/${p}">${p}</s:link>
 
-								</li>
 
-							</c:forEach>
 
-							<c:if test="${overlappingHostPager.existNextPage}">
 
-								<li class="next"><s:link
 
-										href="list/${overlappingHostPager.currentPageNumber + 1}">
 
-										<bean:message key="labels.overlapping_host_link_next_page" />
 
-									</s:link></li>
 
-							</c:if>
 
-							<c:if test="${!overlappingHostPager.existNextPage}">
 
-								<li class="next disabled"><a href="#"><bean:message
 
-											key="labels.overlapping_host_link_next_page" /></a></li>
 
-							</c:if>
 
-						</ul>
 
-					</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.overlapping_host_link_list" />
 
+								</h3>
 
+								<div class="box-tools pull-right">
 
+									<span class="label label-default"><s:link href="createpage">
 
+											<bean:message key="labels.overlapping_host_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>
 
 
-					<div>
 
-						<span><bean:message key="labels.pagination_page_guide_msg"
 
-								arg0="${f:h(overlappingHostPager.currentPageNumber)}"
 
-								arg1="${f:h(overlappingHostPager.allPageCount)}"
 
-								arg2="${f:h(overlappingHostPager.allRecordCount)}" /></span>
 
+								<%-- List --%>
 
+								<c:if test="${overlappingHostPager.allRecordCount == 0}">
 
+									<p class="alert-message warning">
 
+										<bean:message key="labels.list_could_not_find_crud_table" />
 
+									</p>
 
+								</c:if>
 
+								<c:if test="${overlappingHostPager.allRecordCount > 0}">
 
+									<table class="table table-bordered table-striped">
 
+										<thead>
 
+											<tr>
 
+												<th><bean:message key="labels.regular_name" /></th>
 
+												<th><bean:message key="labels.overlapping_name" /></th>
 
+											</tr>
 
+										</thead>
 
+										<tbody>
 
+											<c:forEach var="data" varStatus="s" items="${overlappingHostItems}">
 
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
 
+													<td>${f:h(data.regularName)}</td>
 
+													<td>${f:h(data.overlappingName)}</td>
 
+												</tr>
 
+											</c:forEach>
 
+										</tbody>
 
+									</table>
 
+								</c:if>
 
+
 
+							</div>
 
+							<%-- Box Footer --%>
 
+							<div class="box-footer">
 
+								<%-- Paging Info --%>
 
+								<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(overlappingHostPager.currentPageNumber)}"
 
+										arg1="${f:h(overlappingHostPager.allPageCount)}" arg2="${f:h(overlappingHostPager.allRecordCount)}"
 
+									/></span>
 
+
 
+								<%-- Paging Navigation --%>
 
+								<ul class="pagination pagination-sm no-margin pull-right">
 
+									<c:if test="${overlappingHostPager.existPrePage}">
 
+										<li class="prev"><s:link href="list/${overlappingHostPager.currentPageNumber - 1}">
 
+												<bean:message key="labels.overlapping_host_link_prev_page" />
 
+											</s:link></li>
 
+									</c:if>
 
+									<c:if test="${!overlappingHostPager.existPrePage}">
 
+										<li class="prev disabled"><a href="#"><bean:message key="labels.overlapping_host_link_prev_page" /></a></li>
 
+									</c:if>
 
+									<c:forEach var="p" varStatus="s" items="${overlappingHostPager.pageNumberList}">
 
+										<li <c:if test="${p == overlappingHostPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
 
+										</li>
 
+									</c:forEach>
 
+									<c:if test="${overlappingHostPager.existNextPage}">
 
+										<li class="next"><s:link href="list/${overlappingHostPager.currentPageNumber + 1}">
 
+												<bean:message key="labels.overlapping_host_link_next_page" />
 
+											</s:link></li>
 
+									</c:if>
 
+									<c:if test="${!overlappingHostPager.existNextPage}">
 
+										<li class="next disabled"><a href="#"><bean:message key="labels.overlapping_host_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>

+ 130 - 91
src/main/webapp/WEB-INF/view/admin/roleType/confirm.jsp
View File 

@@ -1,109 +1,148 @@
 
-<%@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.roletype_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="roleType" />
 
-	<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.roletype_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="roletype" />
 
+		</jsp:include>
 
 
-		<h3>
 
-			<bean:message key="labels.roletype_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 />
 
-		</div>
 
-		<%-- Message: END --%>
 
-
 
-			<div>
 
-				<ul class="pills">
 
+			<%-- Content Header --%>
 
+			<section class="content-header">
 
+				<h1>
 
+					<bean:message key="labels.roletype_title_details" />
 
+				</h1>
 
+				<ol class="breadcrumb">
 
 					<li><s:link href="index">
 
 							<bean:message key="labels.roletype_link_list" />
 
 						</s:link></li>
 
 					<c:if test="${crudMode == 1}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.roletype_link_create" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_create" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 2}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.roletype_link_update" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_update" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 3}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.roletype_link_delete" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_delete" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 4}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.roletype_link_confirm" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_confirm" /></a></li>
 
 					</c:if>
 
-				</ul>
 
-			</div>
 
+				</ol>
 
+			</section>
 
 
-		<%-- 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" />
 
-				<table class="bordered-table zebra-striped" style="width: 500px;">
 
-					<tbody>
 
+			<section class="content">
 
 
-						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.roletype_name" /></th>
 
-							<td>${f:h(name)}<html:hidden property="name" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th><bean:message key="labels.roletype_value" /></th>
 
-							<td>${f:h(value)}<html:hidden property="value" /></td>
 
-						</tr>
 
+				<%-- 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.roletype_link_create" />
 
+										</c:if>
 
+										<c:if test="${crudMode == 2}">
 
+											<bean:message key="labels.roletype_link_update" />
 
+										</c:if>
 
+										<c:if test="${crudMode == 3}">
 
+											<bean:message key="labels.roletype_link_delete" />
 
+										</c:if>
 
+										<c:if test="${crudMode == 4}">
 
+											<bean:message key="labels.roletype_link_confirm" />
 
+										</c:if>
 
+									</h3>
 
+									<div class="box-tools pull-right">
 
+										<span class="label label-default"><s:link href="index">
 
+												<bean:message key="labels.roletype_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-3"><bean:message key="labels.roletype_name" /></th>
 
+												<td>${f:h(name)}<html:hidden property="name" /></td>
 
+											</tr>
 
+											<tr>
 
+												<th><bean:message key="labels.roletype_value" /></th>
 
+												<td>${f:h(value)}<html:hidden property="value" /></td>
 
+											</tr>
 
+										</tbody>
 
+									</table>
 
+								</div>
 
 
-					</tbody>
 
-					<tfoot>
 
-						<tr>
 
-							<td colspan="2"><c:if test="${crudMode == 1}">
 
-									<input type="submit" class="btn small" name="create"
 
-										value="<bean:message key="labels.roletype_button_create"/>" />
 
-									<input type="submit" class="btn small" name="editagain"
 
-										value="<bean:message key="labels.roletype_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 2}">
 
-									<input type="submit" class="btn small" name="update"
 
-										value="<bean:message key="labels.roletype_button_update"/>" />
 
-									<input type="submit" class="btn small" name="editagain"
 
-										value="<bean:message key="labels.roletype_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 3}">
 
-									<input type="submit" class="btn small" name="delete"
 
-										value="<bean:message key="labels.roletype_button_delete"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.roletype_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 4}">
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.roletype_button_back"/>" />
 
-									<input type="submit" class="btn small" name="editfromconfirm"
 
-										value="<bean:message key="labels.roletype_button_edit"/>" />
 
-									<input type="submit" class="btn small" name="deletefromconfirm"
 
-										value="<bean:message key="labels.roletype_button_delete"/>" />
 
-								</c:if></td>
 
-						</tr>
 
-					</tfoot>
 
-				</table>
 
-			</div>
 
-		</s:form>
 
-		<%-- Confirm Form: BEGIN --%>
 
+								<%-- Box Footer --%>
 
+								<div class="box-footer">
 
+									<c:if test="${crudMode == 1}">
 
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.roletype_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="create"
 
+											value="<bean:message key="labels.roletype_button_create"/>"
 
+										/>
 
+									</c:if>
 
+									<c:if test="${crudMode == 2}">
 
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.roletype_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="update"
 
+											value="<bean:message key="labels.roletype_button_update"/>"
 
+										/>
 
+									</c:if>
 
+									<c:if test="${crudMode == 3}">
 
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.roletype_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="delete"
 
+											value="<bean:message key="labels.roletype_button_delete"/>"
 
+										/>
 
+									</c:if>
 
+									<c:if test="${crudMode == 4}">
 
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.roletype_button_back"/>" />
 
+										<input type="submit" class="btn" name="editfromconfirm"
 
+											value="<bean:message key="labels.roletype_button_edit"/>"
 
+										/>
 
+										<input type="submit" class="btn" name="deletefromconfirm"
 
+											value="<bean:message key="labels.roletype_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>

+ 105 - 79
src/main/webapp/WEB-INF/view/admin/roleType/edit.jsp
View File 

@@ -1,96 +1,122 @@
 
-<%@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.roletype_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="roleType" />
 
-	<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.roletype_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="roleType" />
 
+		</jsp:include>
 
 
-		<h3>
 
-			<bean:message key="labels.roletype_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 --%>
 
-
 
-			<div>
 
-				<ul class="pills">
 
+			<%-- Content Header --%>
 
+			<section class="content-header">
 
+				<h1>
 
+					<bean:message key="labels.roletype_title_details" />
 
+				</h1>
 
+				<ol class="breadcrumb">
 
 					<li><s:link href="index">
 
 							<bean:message key="labels.roletype_link_list" />
 
 						</s:link></li>
 
 					<c:if test="${crudMode == 1}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.roletype_link_create" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_create" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 2}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.roletype_link_update" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_update" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 3}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.roletype_link_delete" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_delete" /></a></li>
 
 					</c:if>
 
 					<c:if test="${crudMode == 4}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.roletype_link_confirm" /></a></li>
 
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_confirm" /></a></li>
 
+					</c:if>
 
+				</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>
 
-				</ul>
 
-			</div>
 
+					<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.roletype_link_create" />
 
+										</c:if>
 
+										<c:if test="${crudMode == 2}">
 
+											<bean:message key="labels.roletype_link_update" />
 
+										</c:if>
 
+									</h3>
 
+									<div class="box-tools pull-right">
 
+										<span class="label label-default"><s:link href="index">
 
+												<bean:message key="labels.roletype_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>
 
 
-		<%-- 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" />
 
-				<table class="bordered-table zebra-striped" style="width: 500px;">
 
-					<tbody>
 
+									<%-- Form Fields --%>
 
+									<div class="form-group">
 
+										<label for="name"><bean:message key="labels.roletype_name" /></label>
 
+										<html:text property="name" styleClass="form-control" />
 
+									</div>
 
+									<div class="form-group">
 
+										<label for="value"><bean:message key="labels.roletype_value" /></label>
 
+										<html:text property="value" styleClass="form-control" />
 
+									</div>
 
 
-						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.roletype_name" /></th>
 
-							<td><html:text property="name" style="width:98%;" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th><bean:message key="labels.roletype_value" /></th>
 
-							<td><html:text property="value" style="width:98%;" /></td>
 
-						</tr>
 
+								<%-- Box Footer --%>
 
+								<div class="box-footer">
 
+									<c:if test="${crudMode == 1}">
 
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.roletype_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
 
+											value="<bean:message key="labels.roletype_button_create"/>"
 
+										/>
 
+									</c:if>
 
+									<c:if test="${crudMode == 2}">
 
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.roletype_button_back"/>" />
 
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
 
+											value="<bean:message key="labels.roletype_button_confirm"/>"
 
+										/>
 
+									</c:if>
 
+								</div>
 
+							</div>
 
+						</div>
 
+					</div>
 
+				</s:form>
 
 
-					</tbody>
 
-					<tfoot>
 
-						<tr>
 
-							<td colspan="2"><c:if test="${crudMode == 1}">
 
-									<input type="submit" class="btn small" name="confirmfromcreate"
 
-										value="<bean:message key="labels.roletype_button_create"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.roletype_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 2}">
 
-									<input type="submit" class="btn small" name="confirmfromupdate"
 
-										value="<bean:message key="labels.roletype_button_confirm"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.roletype_button_back"/>" />
 
-								</c:if></td>
 
-						</tr>
 
-					</tfoot>
 
-				</table>
 
-			</div>
 
-		</s:form>
 
-		<%-- Edit Form: BEGIN --%>
 
+			</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>

+ 46 - 16
src/main/webapp/WEB-INF/view/admin/roleType/error.jsp
View File 

@@ -1,20 +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.roletype_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="roleType" />
 
-	<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.roletype_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="roleType" />
 
+		</jsp:include>
 
 
-      <div id="main">
 
-      
-<html:errors/>
 
-<br/>
 
-<s:link href="index"><bean:message key="labels.roletype_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/roleType/">
 
+							<bean:message key="labels.roletype_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.roletype_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>

+ 115 - 107
src/main/webapp/WEB-INF/view/admin/roleType/index.jsp
View File 

@@ -1,117 +1,125 @@
 
-<%@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.roletype_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="roleType" />
 
-	<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.roletype_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="roleType" />
 
+		</jsp:include>
 
 
-		<h3>
 
-			<bean:message key="labels.roletype_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 --%>
 
-
 
-		<%-- List: BEGIN --%>
 
-		<div class="list-table">
 
-			<div>
 
-				<ul class="pills">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.roletype_link_list" /></a></li>
 
-					<li><s:link href="createpage">
 
-							<bean:message key="labels.roletype_link_create_new" />
 
+			<%-- Content Header --%>
 
+			<section class="content-header">
 
+				<h1>
 
+					<bean:message key="labels.roletype_configuration" />
 
+				</h1>
 
+				<ol class="breadcrumb">
 
+					<li class="active"><s:link href="index">
 
+							<bean:message key="labels.roletype_link_list" />
 
 						</s:link></li>
 
-				</ul>
 
-			</div>
 
+				</ol>
 
+			</section>
 
 
-			<c:if test="${roleTypePager.allRecordCount == 0}">
 
-				<p class="alert-message warning">
 
-					<bean:message key="labels.list_could_not_find_crud_table" />
 
-				</p>
 
-			</c:if>
 
-			<c:if test="${roleTypePager.allRecordCount > 0}">
 
-				<table class="bordered-table zebra-striped">
 
-					<thead>
 
-						<tr>
 
-							<th style="text-align: center;"><bean:message
 
-									key="labels.roletype_name" /></th>
 
+			<section class="content">
 
 
-							<th style="text-align: center; width: 200px;">&nbsp;</th>
 
-						</tr>
 
-					</thead>
 
-					<tbody>
 
-						<c:forEach var="data" varStatus="s" items="${roleTypeItems}">
 
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
 
-								<td>${f:h(data.name)}</td>
 
-								<td style="text-align: center;"><s:link
 
-										href="confirmpage/4/${f:u(data.id)}">
 
-										<bean:message key="labels.roletype_link_details" />
 
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
 
-										<bean:message key="labels.roletype_link_edit" />
 
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
 
-										<bean:message key="labels.roletype_link_delete" />
 
-									</s:link></td>
 
-							</tr>
 
-						</c:forEach>
 
-					</tbody>
 
-				</table>
 
-				<%-- Page Navigation: BEGIN --%>
 
-				<div class="row center">
 
-					<div class="pagination">
 
-						<ul>
 
-							<c:if test="${roleTypePager.existPrePage}">
 
-								<li class="prev"><s:link
 
-										href="list/${roleTypePager.currentPageNumber - 1}">
 
-										<bean:message key="labels.roletype_link_prev_page" />
 
-									</s:link></li>
 
-							</c:if>
 
-							<c:if test="${!roleTypePager.existPrePage}">
 
-								<li class="prev disabled"><a href="#"><bean:message
 
-											key="labels.roletype_link_prev_page" /></a></li>
 
-							</c:if>
 
-							<c:forEach var="p" varStatus="s"
 
-								items="${roleTypePager.pageNumberList}">
 
-								<li
 
-									<c:if test="${p == roleTypePager.currentPageNumber}">class="active"</c:if>>
 
-									<s:link href="list/${p}">${p}</s:link>
 
-								</li>
 
-							</c:forEach>
 
-							<c:if test="${roleTypePager.existNextPage}">
 
-								<li class="next"><s:link
 
-										href="list/${roleTypePager.currentPageNumber + 1}">
 
-										<bean:message key="labels.roletype_link_next_page" />
 
-									</s:link></li>
 
-							</c:if>
 
-							<c:if test="${!roleTypePager.existNextPage}">
 
-								<li class="next disabled"><a href="#"><bean:message
 
-											key="labels.roletype_link_next_page" /></a></li>
 
-							</c:if>
 
-						</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.roletype_link_list" />
 
+								</h3>
 
+								<div class="box-tools pull-right">
 
+									<span class="label label-default"><s:link href="createpage">
 
+											<bean:message key="labels.roletype_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>
 
+
 
+								<%-- List --%>
 
+								<c:if test="${roleTypePager.allRecordCount == 0}">
 
+									<p class="alert-message warning">
 
+										<bean:message key="labels.list_could_not_find_crud_table" />
 
+									</p>
 
+								</c:if>
 
+								<c:if test="${roleTypePager.allRecordCount > 0}">
 
+									<table class="table table-bordered table-striped">
 
+										<thead>
 
+											<tr>
 
+												<th><bean:message key="labels.roletype_name" /></th>
 
+											</tr>
 
+										</thead>
 
+										<tbody>
 
+											<c:forEach var="data" varStatus="s" items="${roleTypeItems}">
 
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
 
+													<td>${f:h(data.name)}</td>
 
+												</tr>
 
+											</c:forEach>
 
+										</tbody>
 
+									</table>
 
+								</c:if>
 
 
-					<div>
 
-						<span><bean:message key="labels.pagination_page_guide_msg"
 
-								arg0="${f:h(roleTypePager.currentPageNumber)}"
 
-								arg1="${f:h(roleTypePager.allPageCount)}"
 
-								arg2="${f:h(roleTypePager.allRecordCount)}" /></span>
 
+							</div>
 
+							<%-- Box Footer --%>
 
+							<div class="box-footer">
 
+								<%-- Paging Info --%>
 
+								<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(roleTypePager.currentPageNumber)}"
 
+										arg1="${f:h(roleTypePager.allPageCount)}" arg2="${f:h(roleTypePager.allRecordCount)}"
 
+									/></span>
 
+
 
+								<%-- Paging Navigation --%>
 
+								<ul class="pagination pagination-sm no-margin pull-right">
 
+									<c:if test="${roleTypePager.existPrePage}">
 
+										<li class="prev"><s:link href="list/${roleTypePager.currentPageNumber - 1}">
 
+												<bean:message key="labels.roletype_link_prev_page" />
 
+											</s:link></li>
 
+									</c:if>
 
+									<c:if test="${!roleTypePager.existPrePage}">
 
+										<li class="prev disabled"><a href="#"><bean:message key="labels.roletype_link_prev_page" /></a></li>
 
+									</c:if>
 
+									<c:forEach var="p" varStatus="s" items="${roleTypePager.pageNumberList}">
 
+										<li <c:if test="${p == roleTypePager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
 
+										</li>
 
+									</c:forEach>
 
+									<c:if test="${roleTypePager.existNextPage}">
 
+										<li class="next"><s:link href="list/${roleTypePager.currentPageNumber + 1}">
 
+												<bean:message key="labels.roletype_link_next_page" />
 
+											</s:link></li>
 
+									</c:if>
 
+									<c:if test="${!roleTypePager.existNextPage}">
 
+										<li class="next disabled"><a href="#"><bean:message key="labels.roletype_link_next_page" /></a></li>
 
+									</c:if>
 
+								</ul>
 
+
 
+							</div>
 
+						</div>
 
 					</div>
 
 				</div>
 
-				<%-- Page Navigation: END --%>
 
-			</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>

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5