Keiichi Watanabe 10 years ago
parent
commit
3cfbc20755

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

@@ -1,19 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.dict_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="dict" />
-	<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.dict_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="dict" />
+		</jsp:include>
 
-      <div id="main">
-      
-<html:errors/>
-<br/>
-<s:link href="index"><bean:message key="labels.dict_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/dict/">
+							<bean:message key="labels.dict_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.dict_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>

+ 87 - 62
src/main/webapp/WEB-INF/view/admin/dict/index.jsp

@@ -1,63 +1,88 @@
-<%@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.dict_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="dict" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
-
-		<h3>
-			<bean:message key="labels.dict_list_title" />
-		</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 --%>
-
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.dict_list_link" /></a></li>
-				</ul>
-			</div>
-
-			<c:if test="${fn:length(dictFiles) == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${fn:length(dictFiles) > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center;width:70px;"><bean:message
-									key="labels.dictionary_type" /></th>
-							<th style="text-align: center;"><bean:message
-									key="labels.dictionary_name" /></th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s" items="${dictFiles}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td>${f:h(data.type)}</td>
-								<td><s:link href="${f:h(data.type)}/index?dictId=${f:h(data.id)}">${f:h(data.name)}</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-			</c:if>
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.dict_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="dict" />
+		</jsp:include>
+
+		<div class="content-wrapper">
+
+				<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.dict_list_title" />
+				</h1>
+			</section>
+
+			<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.dict_list_link" />
+								</h3>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<%-- Message --%>
+								<div>
+									<html:messages id="msg" message="true">
+										<div class="alert-message info">
+											<bean:write name="msg" ignore="true" />
+										</div>
+									</html:messages>
+									<html:errors />
+								</div>
+
+								<%-- List --%>
+								<c:if test="${fn:length(dictFiles) == 0}">
+									<p class="alert-message warning">
+										<bean:message key="labels.list_could_not_find_crud_table" />
+									</p>
+								</c:if>
+								<c:if test="${fn:length(dictFiles) > 0}">
+									<table class="table table-bordered table-striped">
+										<thead>
+											<tr>
+												<th><bean:message key="labels.dictionary_type" /></th>
+												<th><bean:message key="labels.dictionary_name" /></th>
+											</tr>
+										</thead>
+										<tbody>
+											<c:forEach var="data" varStatus="s" items="${dictFiles}">
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
+														<td>${f:h(data.type)}</td>
+														<td><s:link href="${f:h(data.type)}/index?dictId=${f:h(data.id)}">${f:h(data.name)}</s:link></td>
+												</tr>
+											</c:forEach>
+										</tbody>
+									</table>
+								</c:if>
+
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+							</div>
+						</div>
+					</div>
+				</div>
+
+			</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>