We use cookies to ensure you get the best experience on our website
Domovská stránka Prehľadávať Pomoc
Registrovať Prihlásiť sa
0ct0pu5
/
fess
1
0
Fork 0
Súbory Issues 0 Pull requesty 0 Wiki
Prechádzať zdrojové kódy

Merge pull request #309 from kw-udon/issue288-dict

#288 dict
Shinsuke Sugaya 10 rokov pred
rodič
f98e164198 66b1cfd32c
commit
2813d0b94b
12 zmenil súbory, kde vykonal 1379 pridanie a 829 odobranie
Rozdelené zobrazenie Ukázať štatistiku rozdielnych dát
  1. 166 90
      src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp
  2. 102 56
      src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp
  3. 131 86
      src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp
  4. 51 1
      src/main/webapp/WEB-INF/view/admin/dict/synonym/error.jsp
  5. 125 125
      src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp
  6. 107 60
      src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp
  7. 162 87
      src/main/webapp/WEB-INF/view/admin/dict/userDict/confirm.jsp
  8. 102 56
      src/main/webapp/WEB-INF/view/admin/dict/userDict/download.jsp
  9. 139 96
      src/main/webapp/WEB-INF/view/admin/dict/userDict/edit.jsp
  10. 51 1
      src/main/webapp/WEB-INF/view/admin/dict/userDict/error.jsp
  11. 136 111
      src/main/webapp/WEB-INF/view/admin/dict/userDict/index.jsp
  12. 107 60
      src/main/webapp/WEB-INF/view/admin/dict/userDict/upload.jsp

+ 166 - 90
src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp
Zobraziť súbor 

@@ -1,112 +1,188 @@
 
-<%@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_synonym_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_synonym_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>
 
 
-		<h3>
 
+	<div class="content-wrapper">
 
+
 
+		<%-- Content Header --%>
 
+		<section class="content-header">
 
+		<h1>
 
 			<bean:message key="labels.dict_synonym_title" />
 
-		</h3>
 
+		</h1>
 
+		<ol class="breadcrumb">
 
+			<li><s:link href="index">
 
+			<bean:message key="labels.dict_synonym_list_link" />
 
+			</s:link></li>
 
+			<c:if test="${crudMode == 1}">
 
+			<li class="active"><a href="#"><bean:message key="labels.dict_synonym_link_create" /></a></li>
 
+			</c:if>
 
+			<c:if test="${crudMode == 2}">
 
+			<li class="active"><a href="#"><bean:message key="labels.dict_synonym_link_update" /></a></li>
 
+			</c:if>
 
+			<c:if test="${crudMode == 3}">
 
+			<li class="active"><a href="#"><bean:message key="labels.dict_synonym_link_delete" /></a></li>
 
+			</c:if>
 
+			<c:if test="${crudMode == 4}">
 
+			<li class="active"><a href="#"><bean:message key="labels.dict_synonym_link_confirm" /></a></li>
 
+			</c:if>
 
+		</ol>
 
+		</section>
 
 
-		<%-- Message: BEGIN --%>
 
-		<div>
 
-			<html:messages id="msg" message="true">
 
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
 
-			</html:messages>
 
-			<html:errors />
 
-		</div>
 
-		<%-- Message: END --%>
 
+		<section class="content">
 
 
-			<div>
 
-				<ul class="pills">
 
-					<li><s:link href="../index">
 
-							<bean:message key="labels.dict_list_link" />
 
-						</s:link></li>
 
-					<li><s:link href="index?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_synonym_list_link" />
 
-						</s:link></li>
 
+		<%-- Form --%>
 
+		<s:form>
 
+			<html:hidden property="crudMode" />
 
+			<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}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_synonym_link_create" /></a></li>
 
+						<bean:message key="labels.dict_synonym_link_create" />
 
 					</c:if>
 
 					<c:if test="${crudMode == 2}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_synonym_link_update" /></a></li>
 
+						<bean:message key="labels.dict_synonym_link_update" />
 
 					</c:if>
 
 					<c:if test="${crudMode == 3}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_synonym_link_delete" /></a></li>
 
+						<bean:message key="labels.dict_synonym_link_delete" />
 
 					</c:if>
 
 					<c:if test="${crudMode == 4}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_synonym_link_confirm" /></a></li>
 
+						<bean:message key="labels.dict_synonym_link_confirm" />
 
 					</c:if>
 
-					<li><s:link href="downloadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_synonym_link_download" />
 
-						</s:link></li>
 
-					<li><s:link href="uploadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_synonym_link_upload" />
 
-						</s:link></li>
 
-				</ul>
 
-			</div>
 
+					</h3>
 
+					<div class="box-tools pull-right">
 
+					<span class="label label-default">
 
+						<s:link href="../index">
 
+						<bean:message key="labels.dict_list_link" />
 
+						</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+						<s:link href="index?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_list_link" />
 
+						</s:link>
 
+					</span>
 
+					<c:if test="${crudMode == 1}">
 
+						<span class="label label-default">
 
+						<a href="#">
 
+							<bean:message key="labels.dict_synonym_link_create" />
 
+						</a>
 
+						</span>
 
+					</c:if>
 
+					<c:if test="${crudMode == 2}">
 
+						<span class="label label-default">
 
+						<a href="#">
 
+							<bean:message key="labels.dict_synonym_link_update" />
 
+						</a>
 
+						</span>
 
+					</c:if>
 
+					<c:if test="${crudMode == 3}">
 
+						<span class="label label-default">
 
+						<a href="#">
 
+							<bean:message key="labels.dict_synonym_link_delete" />
 
+						</a>
 
+						</span>
 
+					</c:if>
 
+					<c:if test="${crudMode == 4}">
 
+						<span class="label label-default">
 
+						<a href="#">
 
+							<bean:message key="labels.dict_synonym_link_confirm" />
 
+						</a>
 
+						</span>
 
+					</c:if>
 
+					<span class="label label-default">
 
+						<s:link href="downloadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_download" />
 
+						</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+						<s:link href="uploadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_upload" />
 
+						</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>
 
 
-		<%-- Confirm Form: BEGIN --%>
 
-		<s:form>
 
-			<html:hidden property="crudMode" />
 
-			<div>
 
-				<html:hidden property="dictId" />
 
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 
-					<html:hidden property="id" />
 
-				</c:if>
 
-				<table class="bordered-table zebra-striped" style="width: 500px;">
 
+					<%-- Form Fields --%>
 
+					<table class="table table-bordered">
 
 					<tbody>
 
 						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.dict_synonym_source" /></th>
 
-							<td>${f:br(f:h(inputs))}<html:hidden property="inputs" /></td>
 
+						<th style="col-xs-2">
 
+							<bean:message key="labels.dict_synonym_source" />
 
+						</th>
 
+						<td>${f:br(f:h(inputs))}<html:hidden property="inputs" /></td>
 
 						</tr>
 
 						<tr>
 
-							<th><bean:message key="labels.dict_synonym_target" /></th>
 
-							<td>${f:br(f:h(outputs))}<html:hidden property="outputs" /></td>
 
+						<th><bean:message key="labels.dict_synonym_target" /></th>
 
+						<td>${f:br(f:h(outputs))}<html:hidden property="outputs" /></td>
 
 						</tr>
 
 					</tbody>
 
-					<tfoot>
 
-						<tr>
 
-							<td colspan="2"><c:if test="${crudMode == 1}">
 
-									<input type="submit" class="btn small" name="create"
 
-										value="<bean:message key="labels.dict_synonym_button_create"/>" />
 
-									<input type="submit" class="btn small" name="editagain"
 
-										value="<bean:message key="labels.dict_synonym_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 2}">
 
-									<input type="submit" class="btn small" name="update"
 
-										value="<bean:message key="labels.dict_synonym_button_update"/>" />
 
-									<input type="submit" class="btn small" name="editagain"
 
-										value="<bean:message key="labels.dict_synonym_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 3}">
 
-									<input type="submit" class="btn small" name="delete"
 
-										value="<bean:message key="labels.dict_synonym_button_delete"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.dict_synonym_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 4}">
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.dict_synonym_button_back"/>" />
 
-									<input type="submit" class="btn small" name="editfromconfirm"
 
-										value="<bean:message key="labels.dict_synonym_button_edit"/>" />
 
-									<input type="submit" class="btn small" name="deletefromconfirm"
 
-										value="<bean:message key="labels.dict_synonym_button_delete"/>" />
 
-								</c:if></td>
 
-						</tr>
 
-					</tfoot>
 
-				</table>
 
+					</table>
 
+				</div>
 
+
 
+				<%-- Box Footer --%>
 
+				<div class="box-footer">
 
+					<c:if test="${crudMode == 1}">
 
+					<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.dict_synonym_button_back"/>" />
 
+					<input type="submit" class="btn btn-primary" name="create"
 
+					       value="<bean:message key="labels.dict_synonym_button_create"/>"
 
+					/>
 
+					</c:if>
 
+					<c:if test="${crudMode == 2}">
 
+					<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.dict_synonym_button_back"/>" />
 
+					<input type="submit" class="btn btn-primary" name="update"
 
+					       value="<bean:message key="labels.dict_synonym_button_update"/>"
 
+					/>
 
+					</c:if>
 
+					<c:if test="${crudMode == 3}">
 
+					<input type="submit" class="btn" name="back" value="<bean:message key="labels.dict_synonym_button_back"/>" />
 
+					<input type="submit" class="btn btn-primary" name="delete"
 
+					       value="<bean:message key="labels.dict_synonym_button_delete"/>"
 
+					/>
 
+					</c:if>
 
+					<c:if test="${crudMode == 4}">
 
+					<input type="submit" class="btn" name="back" value="<bean:message key="labels.dict_synonym_button_back"/>" />
 
+					<input type="submit" class="btn" name="editfromconfirm"
 
+					       value="<bean:message key="labels.dict_synonym_button_edit"/>"
 
+					/>
 
+					<input type="submit" class="btn" name="deletefromconfirm"
 
+					       value="<bean:message key="labels.dict_synonym_button_delete"/>"
 
+					/>
 
+					</c:if>
 
+				</div>
 
+				</div>
 
+			</div>
 
 			</div>
 
 		</s:form>
 
-		<%-- Confirm Form: BEGIN --%>
 
 
-	</tiles:put>
 
-</tiles:insert>
 
+		</section>
 
+	</div>
 
+
 
+	<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
 
+	</div>
 
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 
+</body>
 
+</html>

+ 102 - 56
src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp
Zobraziť súbor 

@@ -1,66 +1,112 @@
 
-<%@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_synonym_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_synonym_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>
 
 
-		<h3>
 
+	<div class="content-wrapper">
 
+
 
+		<%-- Content Header --%>
 
+		<section class="content-header">
 
+		<h1>
 
 			<bean:message key="labels.dict_synonym_title" />
 
-		</h3>
 
+		</h1>
 
+		<ol class="breadcrumb">
 
+			<li class="active"><s:link href="index">
 
+			<bean:message key="labels.dict_synonym_link_download" />
 
+			</s:link></li>
 
+		</ol>
 
+		</section>
 
 
-		<%-- Message: BEGIN --%>
 
-		<div>
 
-			<html:messages id="msg" message="true">
 
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
 
-			</html:messages>
 
-			<html:errors />
 
-		</div>
 
-		<%-- Message: END --%>
 
+		<section class="content">
 
 
-			<div>
 
-				<ul class="pills">
 
-					<li><s:link href="../index">
 
-							<bean:message key="labels.dict_list_link" />
 
-						</s:link></li>
 
-					<li><s:link href="index?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_synonym_list_link" />
 
-						</s:link></li>
 
-					<li><s:link href="createpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_synonym_link_create" />
 
-						</s:link></li>
 
-					<li class="active"><a href="#">
 
-							<bean:message key="labels.dict_synonym_link_download" />
 
-						</a></li>
 
-					<li><s:link href="uploadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_synonym_link_upload" />
 
-						</s:link></li>
 
-				</ul>
 
-			</div>
 
+		<div class="row">
 
+			<div class="col-md-12">
 
+			<div class="box">
 
+				<%-- Box Header --%>
 
+				<div class="box-header with-border">
 
+				<h3 class="box-title">
 
+					<bean:message key="labels.dict_synonym_link_download" />
 
+				</h3>
 
+				<div class="box-tools pull-right">
 
+					<span class="label label-default">
 
+					<s:link href="../index">
 
+						<bean:message key="labels.dict_list_link" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<a href="#">
 
+						<bean:message key="labels.dict_synonym_list_link" />
 
+					</a>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="createpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_create" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="downloadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_download" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="uploadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_upload" />
 
+					</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>
 
-			<div>
 
-				<html:hidden property="dictId" />
 
-				<table class="bordered-table zebra-striped" style="width: 500px;">
 
-					<tbody>
 
+				<%-- Edit Form: BEGIN --%>
 
+				<s:form>
 
+					<div>
 
+					<html:hidden property="dictId" />
 
+					<table class="table table-bordered table-striped">
 
+						<tbody>
 
 						<tr>
 
-							<th style="vertical-align: middle;">${f:h(filename)}</th>
 
-							<td style="width: 150px;text-align: center;"><input type="submit"
 
-								class="btn small" name="download"
 
-								value="<bean:message key="labels.dict_synonym_button_download"/>" />
 
+							<th style="">${f:h(filename)}</th>
 
+							<td style="form-control">
 
+							<input type="submit"
 
+								   class="btn small" name="download"
 
+								   value="<bean:message key="labels.dict_synonym_button_download"/>" />
 
 							</td>
 
 						</tr>
 
-					</tbody>
 
-				</table>
 
+						</tbody>
 
+					</table>
 
+					</div>
 
+				</s:form>
 
+				<%-- Edit Form: BEGIN --%>
 
+
 
+				</div>
 
 			</div>
 
-		</s:form>
 
-		<%-- Edit Form: BEGIN --%>
 
+			</div>
 
+		</div>
 
+
 
+		</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>

+ 131 - 86
src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp
Zobraziť súbor 

@@ -1,101 +1,146 @@
 
-<%@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_synonym_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_synonym_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">
 
 
-		<h3>
 
-			<bean:message key="labels.dict_synonym_title" />
 
-		</h3>
 
+	    <%-- Content Header --%>
 
+	    <section class="content-header">
 
+		<h1>
 
+		    <bean:message key="labels.dict_synonym_title" />
 
+		</h1>
 
+	    </section>
 
 
-		<%-- Message: BEGIN --%>
 
-		<div>
 
-			<html:messages id="msg" message="true">
 
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
 
-			</html:messages>
 
-			<html:errors />
 
-		</div>
 
-		<%-- Message: END --%>
 
+	    <section class="content">
 
 
-			<div>
 
-				<ul class="pills">
 
-					<li><s:link href="../index">
 
-							<bean:message key="labels.dict_list_link" />
 
-						</s:link></li>
 
-					<li><s:link href="index?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_synonym_list_link" />
 
-						</s:link></li>
 
+		<%-- Form --%>
 
+		<s:form>
 
+		    <html:hidden property="crudMode" />
 
+		    <html:hidden property="dictId" />
 
+		    <c:if test="${crudMode==2}">
 
+			<html:hidden property="id" />
 
+		    </c:if>
 
+		    <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.dict_synonym_link_create" />
 
+					</c:if>
 
+					<c:if test="${crudMode == 2}">
 
+					    <bean:message key="labels.dict_synonym_link_update" />
 
+					</c:if>
 
+				    </h3>
 
+				    <div class="box-tools pull-right">
 
+					<span class="label label-default">
 
+					    <s:link href="../index">
 
+						<bean:message key="labels.dict_list_link" />
 
+					    </s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					    <s:link href="index?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_list_link" />
 
+					    </s:link>
 
+					</span>
 
 					<c:if test="${crudMode == 1}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_synonym_link_create" /></a></li>
 
+					    <span class="label label-default">
 
+						<a href="#">
 
+						    <bean:message key="labels.dict_synonym_link_create" />
 
+						</a>
 
+					    </span>
 
 					</c:if>
 
 					<c:if test="${crudMode == 2}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_synonym_link_update" /></a></li>
 
+					    <span class="label label-default">
 
+						<a href="#">
 
+						    <bean:message key="labels.dict_synonym_link_update" />
 
+						</a>
 
+					    </span>
 
 					</c:if>
 
 					<c:if test="${crudMode == 3}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_synonym_link_delete" /></a></li>
 
+					    <span class="label label-default">
 
+						<a href="#">
 
+						    <bean:message key="labels.dict_synonym_link_delete" />
 
+						</a>
 
+					    </span>
 
 					</c:if>
 
 					<c:if test="${crudMode == 4}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_synonym_link_confirm" /></a></li>
 
+					    <span class="label label-default">
 
+						<a href="#">
 
+						    <bean:message key="labels.dict_synonym_link_confirm" />
 
+						</a>
 
+					    </span>
 
 					</c:if>
 
-					<li><s:link href="downloadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_synonym_link_download" />
 
-						</s:link></li>
 
-					<li><s:link href="uploadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_synonym_link_upload" />
 
-						</s:link></li>
 
-				</ul>
 
-			</div>
 
+					<span class="label label-default">
 
+					    <s:link href="downloadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_download" />
 
+					    </s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					    <s:link href="uploadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_upload" />
 
+					    </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>
 
-				<html:hidden property="dictId" />
 
-				<c:if test="${crudMode==2}">
 
-					<html:hidden property="id" />
 
-				</c:if>
 
-				<table class="bordered-table zebra-striped" style="width: 500px;">
 
-					<tbody>
 
-						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.dict_synonym_source" /></th>
 
-							<td><html:textarea property="inputs" rows="5" style="width:98%;" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th><bean:message
 
-									key="labels.dict_synonym_target" /></th>
 
-							<td><html:textarea property="outputs" rows="5" style="width:98%;" /></td>
 
-						</tr>
 
-					</tbody>
 
-					<tfoot>
 
-						<tr>
 
-							<td colspan="2"><c:if test="${crudMode == 1}">
 
-									<input type="submit" class="btn small" name="confirmfromcreate"
 
-										value="<bean:message key="labels.dict_synonym_button_create"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.dict_synonym_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 2}">
 
-									<input type="submit" class="btn small" name="confirmfromupdate"
 
-										value="<bean:message key="labels.dict_synonym_button_confirm"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.dict_synonym_button_back"/>" />
 
-								</c:if></td>
 
-						</tr>
 
-					</tfoot>
 
-				</table>
 
+				    <%-- Form Fields --%>
 
+				    <div class="form-group">
 
+					<label for="term"><bean:message key="labels.dict_synonym_source" /></label>
 
+					<html:textarea property="inputs" rows="5" styleClass="form-control" />
 
+				    </div>
 
+				    <div class="form-group">
 
+					<label for="outputs"><bean:message key="labels.dict_synonym_target" /></label>
 
+					<html:textarea property="outputs" rows="5" 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.key_match_button_back"/>" />
 
+					<input type="submit" class="btn btn-primary" name="confirmfromcreate"
 
+					       value="<bean:message key="labels.key_match_button_create"/>"
 
+										/>
 
+				    </c:if>
 
+				    <c:if test="${crudMode == 2}">
 
+					<input type="submit" class="btn" name="back" value="<bean:message key="labels.key_match_button_back"/>" />
 
+					<input type="submit" class="btn btn-primary" name="confirmfromupdate"
 
+					       value="<bean:message key="labels.key_match_button_confirm"/>"
 
+					/>
 
+				    </c:if>
 
+				</div>
 
+			    </div>
 
 			</div>
 
+		    </div>
 
 		</s:form>
 
-		<%-- Edit Form: BEGIN --%>
 
 
-	</tiles:put>
 
-</tiles:insert>
 
+	    </section>
 
+	</div>
 
+
 
+	<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
 
+    </div>
 
+    <jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 
+</body>
 
+</html>

+ 51 - 1
src/main/webapp/WEB-INF/view/admin/dict/synonym/error.jsp
Zobraziť súbor 

@@ -1,3 +1,53 @@
 
+<%@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_synonym_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">
 
+			<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_synonym_link_list" />
 
+						</s:link></li>
 
+				</ol>
 
+			</section>
 
+
 
+			<section class="content">
 
+
 
+				<div class="callout callout-danger lead">
 
+					<h4>Error</h4>
 
+					<p>
 
+						<html:errors />
 
+					</p>
 
+					<p>
 
+						<s:link href="index">
 
+							<bean:message key="labels.dict_synonym_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>
 
 <%@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_synonym_configuration" /></tiles:put>
 
 	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
 
@@ -8,7 +58,7 @@
 
 	<tiles:put name="body" type="string">
 
 
       <div id="main">
 
-      
+
 
 <html:errors/>
 
 <br/>
 
 <s:link href="../index"><bean:message key="labels.dict_button_back"/></s:link>

+ 125 - 125
src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp
Zobraziť súbor 

@@ -7,140 +7,140 @@
 
 </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>
 
+	<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">
 
+	<div class="content-wrapper">
 
 
-			<%-- Content Header --%>
 
-			<section class="content-header">
 
-				<h1>
 
-					<bean:message key="labels.dict_synonym_title" />
 
-				</h1>
 
-				<ol class="breadcrumb">
 
-					<li class="active"><s:link href="index">
 
-							<bean:message key="labels.dict_synonym_list_link" />
 
-						</s:link></li>
 
-				</ol>
 
-			</section>
 
+		<%-- Content Header --%>
 
+		<section class="content-header">
 
+		<h1>
 
+			<bean:message key="labels.dict_synonym_title" />
 
+		</h1>
 
+		<ol class="breadcrumb">
 
+			<li class="active"><s:link href="index">
 
+			<bean:message key="labels.dict_synonym_list_link" />
 
+			</s:link></li>
 
+		</ol>
 
+		</section>
 
 
-			<section class="content">
 
+		<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_synonym_list_link" />
 
-								</h3>
 
-								<div class="box-tools pull-right">
 
-										<span class="label label-default">
 
-												<s:link href="../index">
 
-														<bean:message key="labels.dict_list_link" />
 
-												</s:link>
 
-										</span>
 
-										<span class="label label-default">
 
-												<s:link href="#">
 
-														<bean:message key="labels.dict_synonym_list_link" />
 
-												</s:link>
 
-										</span>
 
-										<span class="label label-default">
 
-												<s:link href="createpage?dictId=${f:u(dictId)}">
 
-														<bean:message key="labels.dict_synonym_link_create" />
 
-												</s:link>
 
-										</span>
 
-										<span class="label label-default">
 
-												<s:link href="downloadpage?dictId=${f:u(dictId)}">
 
-														<bean:message key="labels.dict_synonym_link_download" />
 
-												</s:link>
 
-										</span>
 
-										<span class="label label-default">
 
-												<s:link href="uploadpage?dictId=${f:u(dictId)}">
 
-														<bean:message key="labels.dict_synonym_link_upload" />
 
-												</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="${synonymPager.allRecordCount == 0}">
 
-									<p class="alert-message warning">
 
-										<bean:message key="labels.list_could_not_find_crud_table" />
 
-									</p>
 
-								</c:if>
 
-								<c:if test="${synonymPager.allRecordCount > 0}">
 
-									<table class="table table-bordered table-striped">
 
-										<thead>
 
-												<tr>
 
-														<th> <bean:message key="labels.dict_synonym_source" /> </th>
 
-														<th> <bean:message key="labels.dict_synonym_target" /> </th>
 
-												</tr>
 
-										</thead>
 
-										<tbody>
 
-												<c:forEach var="data" varStatus="s" items="${synonymItemItems}">
 
-														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/${f:u(dictId)}/4/${f:u(data.id)}">
 
-																<td>${f:h(data.inputs)}</td>
 
-																<td>${f:h(data.outputs)}</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(synonymPager.currentPageNumber)}"
 
-										arg1="${f:h(synonymPager.allPageCount)}" arg2="${f:h(synonymPager.allRecordCount)}"
 
-									/></span>
 
-
 
-								<%-- Paging Navigation --%>
 
-								<ul class="pagination pagination-sm no-margin pull-right">
 
-									<c:if test="${synonymPager.existPrePage}">
 
-										<li class="prev"><s:link href="list/${synonymPager.currentPageNumber - 1}">
 
-												<bean:message key="labels.dict_link_prev_page" />
 
-											</s:link></li>
 
-									</c:if>
 
-									<c:if test="${!synonymPager.existPrePage}">
 
-										<li class="prev disabled"><a href="#"><bean:message key="labels.dict_link_prev_page" /></a></li>
 
-									</c:if>
 
-									<c:forEach var="p" varStatus="s" items="${synonymPager.pageNumberList}">
 
-										<li <c:if test="${p == synonymPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
 
-										</li>
 
-									</c:forEach>
 
-									<c:if test="${synonymPager.existNextPage}">
 
-										<li class="next"><s:link href="list/${synonymPager.currentPageNumber + 1}">
 
-												<bean:message key="labels.dict_link_next_page" />
 
-											</s:link></li>
 
-									</c:if>
 
-									<c:if test="${!synonymPager.existNextPage}">
 
-										<li class="next disabled"><a href="#"><bean:message key="labels.dict_link_next_page" /></a></li>
 
-									</c:if>
 
-								</ul>
 
-
 
-							</div>
 
-						</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.dict_synonym_list_link" />
 
+				</h3>
 
+				<div class="box-tools pull-right">
 
+					<span class="label label-default">
 
+					<s:link href="../index">
 
+						<bean:message key="labels.dict_list_link" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<a href="#">
 
+						<bean:message key="labels.dict_synonym_list_link" />
 
+					</a>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="createpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_create" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="downloadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_download" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="uploadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_upload" />
 
+					</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="${synonymPager.allRecordCount == 0}">
 
+					<p class="alert-message warning">
 
+					<bean:message key="labels.list_could_not_find_crud_table" />
 
+					</p>
 
+				</c:if>
 
+				<c:if test="${synonymPager.allRecordCount > 0}">
 
+					<table class="table table-bordered table-striped">
 
+					<thead>
 
+						<tr>
 
+						<th> <bean:message key="labels.dict_synonym_source" /> </th>
 
+						<th> <bean:message key="labels.dict_synonym_target" /> </th>
 
+						</tr>
 
+					</thead>
 
+					<tbody>
 
+						<c:forEach var="data" varStatus="s" items="${synonymItemItems}">
 
+						<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/${f:u(dictId)}/4/${f:u(data.id)}">
 
+							<td>${f:h(data.inputs)}</td>
 
+							<td>${f:h(data.outputs)}</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(synonymPager.currentPageNumber)}"
 
+							arg1="${f:h(synonymPager.allPageCount)}" arg2="${f:h(synonymPager.allRecordCount)}"
 
+					  /></span>
 
 
-			</section>
 
+				<%-- Paging Navigation --%>
 
+				<ul class="pagination pagination-sm no-margin pull-right">
 
+					<c:if test="${synonymPager.existPrePage}">
 
+					<li class="prev"><s:link href="list/${synonymPager.currentPageNumber - 1}">
 
+						<bean:message key="labels.dict_link_prev_page" />
 
+					</s:link></li>
 
+					</c:if>
 
+					<c:if test="${!synonymPager.existPrePage}">
 
+					<li class="prev disabled"><a href="#"><bean:message key="labels.dict_link_prev_page" /></a></li>
 
+					</c:if>
 
+					<c:forEach var="p" varStatus="s" items="${synonymPager.pageNumberList}">
 
+					<li <c:if test="${p == synonymPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
 
+					</li>
 
+					</c:forEach>
 
+					<c:if test="${synonymPager.existNextPage}">
 
+					<li class="next"><s:link href="list/${synonymPager.currentPageNumber + 1}">
 
+						<bean:message key="labels.dict_link_next_page" />
 
+					</s:link></li>
 
+					</c:if>
 
+					<c:if test="${!synonymPager.existNextPage}">
 
+					<li class="next disabled"><a href="#"><bean:message key="labels.dict_link_next_page" /></a></li>
 
+					</c:if>
 
+				</ul>
 
+
 
+				</div>
 
+			</div>
 
+			</div>
 
 		</div>
 
 
-		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
 
+		</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>

+ 107 - 60
src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp
Zobraziť súbor 

@@ -1,76 +1,123 @@
 
-<%@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_synonym_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_synonym_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>
 
 
-		<h3>
 
+	<div class="content-wrapper">
 
+
 
+		<%-- Content Header --%>
 
+		<section class="content-header">
 
+		<h1>
 
 			<bean:message key="labels.dict_synonym_title" />
 
-		</h3>
 
+		</h1>
 
+		<ol class="breadcrumb">
 
+			<li class="active"><s:link href="index">
 
+			<bean:message key="labels.dict_synonym_link_upload" />
 
+			</s:link></li>
 
+		</ol>
 
+		</section>
 
 
-		<%-- Message: BEGIN --%>
 
-		<div>
 
-			<html:messages id="msg" message="true">
 
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
 
-			</html:messages>
 
-			<html:errors />
 
-		</div>
 
-		<%-- Message: END --%>
 
+		<section class="content">
 
 
-			<div>
 
-				<ul class="pills">
 
-					<li><s:link href="../index">
 
-							<bean:message key="labels.dict_list_link" />
 
-						</s:link></li>
 
-					<li><s:link href="index?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_synonym_list_link" />
 
-						</s:link></li>
 
-					<li><s:link href="createpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_synonym_link_create" />
 
-						</s:link></li>
 
-					<li><s:link href="downloadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_synonym_link_download" />
 
-						</s:link></li>
 
-					<li class="active"><a href="#">
 
-							<bean:message key="labels.dict_synonym_link_upload" />
 
-						</a></li>
 
-				</ul>
 
-			</div>
 
+		<div class="row">
 
+			<div class="col-md-12">
 
+			<div class="box">
 
+				<%-- Box Header --%>
 
+				<div class="box-header with-border">
 
+				<h3 class="box-title">
 
+					<bean:message key="labels.dict_synonym_link_upload" />
 
+				</h3>
 
+				<div class="box-tools pull-right">
 
+					<span class="label label-default">
 
+					<s:link href="../index">
 
+						<bean:message key="labels.dict_list_link" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<a href="#">
 
+						<bean:message key="labels.dict_synonym_list_link" />
 
+					</a>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="createpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_create" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="downloadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_download" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="uploadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_synonym_link_upload" />
 
+					</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 action="upload" enctype="multipart/form-data">
 
-			<div>
 
-				<html:hidden property="dictId" />
 
-				<table class="bordered-table zebra-striped" style="width: 500px;">
 
-					<tbody>
 
+				<%-- Edit Form: BEGIN --%>
 
+				<s:form action="upload" enctype="multipart/form-data">
 
+					<div>
 
+					<html:hidden property="dictId" />
 
+					<table class="table table-bordered table-striped" >
 
+						<tbody>
 
 						<tr>
 
 							<th colspan="2">${f:h(filename)}</th>
 
 						</tr>
 
 						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.dict_synonym_file" /></th>
 
-							<td><input type="file"
 
-										name="synonymFile" style="width: 98%;" /></td>
 
+							<th>
 
+							<bean:message key="labels.dict_synonym_file" />
 
+							</th>
 
+							<td>
 
+							<input type="file" name="synonymFile"  />
 
+							</td>
 
 						</tr>
 
-					</tbody>
 
-					<tfoot>
 
+						</tbody>
 
+						<tfoot>
 
 						<tr>
 
 							<td colspan="2">
 
-									<input type="submit" class="btn small" name="upload"
 
-										value="<bean:message key="labels.dict_synonym_button_upload"/>" />
 
+							<input type="submit" class="btn small" name="upload"
 
+								   value="<bean:message key="labels.dict_synonym_button_upload"/>" />
 
 							</td>
 
 						</tr>
 
-					</tfoot>
 
-				</table>
 
+						</tfoot>
 
+					</table>
 
+					</div>
 
+				</s:form>
 
+				<%-- Edit Form: BEGIN --%>
 
+
 
+				</div>
 
+			</div>
 
 			</div>
 
-		</s:form>
 
-		<%-- Edit Form: BEGIN --%>
 
+		</div>
 
+
 
+		</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>

+ 162 - 87
src/main/webapp/WEB-INF/view/admin/dict/userDict/confirm.jsp
Zobraziť súbor 

@@ -1,71 +1,134 @@
 
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
 
-	flush="true">
 
-	<tiles:put name="title">
 
-		<bean:message key="labels.dict_userdict_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_userdict_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>
 
 
-		<h3>
 
+	<div class="content-wrapper">
 
+
 
+		<%-- Content Header --%>
 
+		<section class="content-header">
 
+		<h1>
 
 			<bean:message key="labels.dict_userdict_title" />
 
-		</h3>
 
+		</h1>
 
+		<ol class="breadcrumb">
 
+			<li><s:link href="index">
 
+			<bean:message key="labels.dict_userdict_list_link" />
 
+			</s:link></li>
 
+			<c:if test="${crudMode == 1}">
 
+			<li class="active"><a href="#"><bean:message key="labels.dict_userdict_link_create" /></a></li>
 
+			</c:if>
 
+			<c:if test="${crudMode == 2}">
 
+			<li class="active"><a href="#"><bean:message key="labels.dict_userdict_link_update" /></a></li>
 
+			</c:if>
 
+			<c:if test="${crudMode == 3}">
 
+			<li class="active"><a href="#"><bean:message key="labels.dict_userdict_link_delete" /></a></li>
 
+			</c:if>
 
+			<c:if test="${crudMode == 4}">
 
+			<li class="active"><a href="#"><bean:message key="labels.dict_userdict_link_confirm" /></a></li>
 
+			</c:if>
 
+		</ol>
 
+		</section>
 
 
-		<%-- Message: BEGIN --%>
 
-		<div>
 
-			<html:messages id="msg" message="true">
 
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
 
-			</html:messages>
 
-			<html:errors />
 
-		</div>
 
-		<%-- Message: END --%>
 
+		<section class="content">
 
 
-			<div>
 
-				<ul class="pills">
 
-					<li><s:link href="../index">
 
-							<bean:message key="labels.dict_list_link" />
 
-						</s:link></li>
 
-					<li><s:link href="index?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_list_link" />
 
-						</s:link></li>
 
+		<%-- Form --%>
 
+		<s:form>
 
+			<html:hidden property="crudMode" />
 
+			<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}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_userdict_link_create" /></a></li>
 
+						<bean:message key="labels.dict_userdict_link_create" />
 
 					</c:if>
 
 					<c:if test="${crudMode == 2}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_userdict_link_update" /></a></li>
 
+						<bean:message key="labels.dict_userdict_link_update" />
 
 					</c:if>
 
 					<c:if test="${crudMode == 3}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_userdict_link_delete" /></a></li>
 
+						<bean:message key="labels.dict_userdict_link_delete" />
 
 					</c:if>
 
 					<c:if test="${crudMode == 4}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_userdict_link_confirm" /></a></li>
 
+						<bean:message key="labels.dict_userdict_link_confirm" />
 
 					</c:if>
 
-					<li><s:link href="downloadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_link_download" />
 
-						</s:link></li>
 
-					<li><s:link href="uploadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_link_upload" />
 
-						</s:link></li>
 
-				</ul>
 
-			</div>
 
+					</h3>
 
+					<div class="box-tools pull-right">
 
+					<span class="label label-default">
 
+						<s:link href="../index">
 
+						<bean:message key="labels.dict_list_link" />
 
+						</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+						<s:link href="index?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_list_link" />
 
+						</s:link>
 
+					</span>
 
+					<c:if test="${crudMode == 1}">
 
+						<span class="label label-default">
 
+						<a href="#">
 
+							<bean:message key="labels.dict_userdict_link_create" />
 
+						</a>
 
+						</span>
 
+					</c:if>
 
+					<c:if test="${crudMode == 2}">
 
+						<span class="label label-default">
 
+						<a href="#">
 
+							<bean:message key="labels.dict_userdict_link_update" />
 
+						</a>
 
+						</span>
 
+					</c:if>
 
+					<c:if test="${crudMode == 3}">
 
+						<span class="label label-default">
 
+						<a href="#">
 
+							<bean:message key="labels.dict_userdict_link_delete" />
 
+						</a>
 
+						</span>
 
+					</c:if>
 
+					<c:if test="${crudMode == 4}">
 
+						<span class="label label-default">
 
+						<a href="#">
 
+							<bean:message key="labels.dict_userdict_link_confirm" />
 
+						</a>
 
+						</span>
 
+					</c:if>
 
+					<span class="label label-default">
 
+						<s:link href="downloadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_download" />
 
+						</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+						<s:link href="uploadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_upload" />
 
+						</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>
 
 
-		<%-- Confirm Form: BEGIN --%>
 
-		<s:form>
 
-			<html:hidden property="crudMode" />
 
-			<div>
 
-				<html:hidden property="dictId" />
 
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
 
-					<html:hidden property="id" />
 
-				</c:if>
 
-				<table class="bordered-table zebra-striped" style="width: 500px;">
 
-					<tbody>
 
+					<%-- Form Fields --%>
 
+					<table class="table table-bordered">
 
+					    <tbody>
 
 						<tr>
 
 							<th style="width: 150px;"><bean:message
 
 									key="labels.dict_userdict_token" /></th>
 
@@ -83,38 +146,50 @@
 
 							<th><bean:message key="labels.dict_userdict_pos" /></th>
 
 							<td>${f:h(pos)}<html:hidden property="pos" /></td>
 
 						</tr>
 
-					</tbody>
 
-					<tfoot>
 
-						<tr>
 
-							<td colspan="2"><c:if test="${crudMode == 1}">
 
-									<input type="submit" class="btn small" name="create"
 
-										value="<bean:message key="labels.dict_userdict_button_create"/>" />
 
-									<input type="submit" class="btn small" name="editagain"
 
-										value="<bean:message key="labels.dict_userdict_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 2}">
 
-									<input type="submit" class="btn small" name="update"
 
-										value="<bean:message key="labels.dict_userdict_button_update"/>" />
 
-									<input type="submit" class="btn small" name="editagain"
 
-										value="<bean:message key="labels.dict_userdict_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 3}">
 
-									<input type="submit" class="btn small" name="delete"
 
-										value="<bean:message key="labels.dict_userdict_button_delete"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.dict_userdict_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 4}">
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.dict_userdict_button_back"/>" />
 
-									<input type="submit" class="btn small" name="editfromconfirm"
 
-										value="<bean:message key="labels.dict_userdict_button_edit"/>" />
 
-									<input type="submit" class="btn small" name="deletefromconfirm"
 
-										value="<bean:message key="labels.dict_userdict_button_delete"/>" />
 
-								</c:if></td>
 
-						</tr>
 
-					</tfoot>
 
-				</table>
 
+					    </tbody>
 
+					</table>
 
+				</div>
 
+
 
+				<%-- Box Footer --%>
 
+				<div class="box-footer">
 
+					<c:if test="${crudMode == 1}">
 
+					<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.dict_userdict_button_back"/>" />
 
+					<input type="submit" class="btn btn-primary" name="create"
 
+					       value="<bean:message key="labels.dict_userdict_button_create"/>"
 
+					/>
 
+					</c:if>
 
+					<c:if test="${crudMode == 2}">
 
+					<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.dict_userdict_button_back"/>" />
 
+					<input type="submit" class="btn btn-primary" name="update"
 
+					       value="<bean:message key="labels.dict_userdict_button_update"/>"
 
+					/>
 
+					</c:if>
 
+					<c:if test="${crudMode == 3}">
 
+					<input type="submit" class="btn" name="back" value="<bean:message key="labels.dict_userdict_button_back"/>" />
 
+					<input type="submit" class="btn btn-primary" name="delete"
 
+					       value="<bean:message key="labels.dict_userdict_button_delete"/>"
 
+					/>
 
+					</c:if>
 
+					<c:if test="${crudMode == 4}">
 
+					<input type="submit" class="btn" name="back" value="<bean:message key="labels.dict_userdict_button_back"/>" />
 
+					<input type="submit" class="btn" name="editfromconfirm"
 
+					       value="<bean:message key="labels.dict_userdict_button_edit"/>"
 
+					/>
 
+					<input type="submit" class="btn" name="deletefromconfirm"
 
+					       value="<bean:message key="labels.dict_userdict_button_delete"/>"
 
+					/>
 
+					</c:if>
 
+				</div>
 
+				</div>
 
+			</div>
 
 			</div>
 
 		</s:form>
 
-		<%-- Confirm Form: BEGIN --%>
 
 
-	</tiles:put>
 
-</tiles:insert>
 
+		</section>
 
+	</div>
 
+
 
+	<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
 
+	</div>
 
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 
+</body>
 
+</html>

+ 102 - 56
src/main/webapp/WEB-INF/view/admin/dict/userDict/download.jsp
Zobraziť súbor 

@@ -1,66 +1,112 @@
 
-<%@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_userdict_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_userdict_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>
 
 
-		<h3>
 
+	<div class="content-wrapper">
 
+
 
+		<%-- Content Header --%>
 
+		<section class="content-header">
 
+		<h1>
 
 			<bean:message key="labels.dict_userdict_title" />
 
-		</h3>
 
+		</h1>
 
+		<ol class="breadcrumb">
 
+			<li class="active"><s:link href="index">
 
+			<bean:message key="labels.dict_userdict_link_download" />
 
+			</s:link></li>
 
+		</ol>
 
+		</section>
 
 
-		<%-- Message: BEGIN --%>
 
-		<div>
 
-			<html:messages id="msg" message="true">
 
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
 
-			</html:messages>
 
-			<html:errors />
 
-		</div>
 
-		<%-- Message: END --%>
 
+		<section class="content">
 
 
-			<div>
 
-				<ul class="pills">
 
-					<li><s:link href="../index">
 
-							<bean:message key="labels.dict_list_link" />
 
-						</s:link></li>
 
-					<li><s:link href="index?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_list_link" />
 
-						</s:link></li>
 
-					<li><s:link href="createpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_link_create" />
 
-						</s:link></li>
 
-					<li class="active"><a href="#">
 
-							<bean:message key="labels.dict_userdict_link_download" />
 
-						</a></li>
 
-					<li><s:link href="uploadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_link_upload" />
 
-						</s:link></li>
 
-				</ul>
 
-			</div>
 
+		<div class="row">
 
+			<div class="col-md-12">
 
+			<div class="box">
 
+				<%-- Box Header --%>
 
+				<div class="box-header with-border">
 
+				<h3 class="box-title">
 
+					<bean:message key="labels.dict_userdict_link_download" />
 
+				</h3>
 
+				<div class="box-tools pull-right">
 
+					<span class="label label-default">
 
+					<s:link href="../index">
 
+						<bean:message key="labels.dict_list_link" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<a href="#">
 
+						<bean:message key="labels.dict_userdict_list_link" />
 
+					</a>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="createpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_create" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="downloadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_download" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="uploadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_upload" />
 
+					</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>
 
-			<div>
 
-				<html:hidden property="dictId" />
 
-				<table class="bordered-table zebra-striped" style="width: 500px;">
 
-					<tbody>
 
+				<%-- Edit Form: BEGIN --%>
 
+				<s:form>
 
+					<div>
 
+					<html:hidden property="dictId" />
 
+					<table class="table table-bordered table-striped">
 
+						<tbody>
 
 						<tr>
 
-							<th style="vertical-align: middle;">${f:h(filename)}</th>
 
-							<td style="width: 150px;text-align: center;"><input type="submit"
 
-								class="btn small" name="download"
 
-								value="<bean:message key="labels.dict_userdict_button_download"/>" />
 
+							<th style="">${f:h(filename)}</th>
 
+							<td style="form-control">
 
+							<input type="submit"
 
+								   class="btn small" name="download"
 
+								   value="<bean:message key="labels.dict_userdict_button_download"/>" />
 
 							</td>
 
 						</tr>
 
-					</tbody>
 
-				</table>
 
+						</tbody>
 
+					</table>
 
+					</div>
 
+				</s:form>
 
+				<%-- Edit Form: BEGIN --%>
 
+
 
+				</div>
 
 			</div>
 
-		</s:form>
 
-		<%-- Edit Form: BEGIN --%>
 
+			</div>
 
+		</div>
 
+
 
+		</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>

+ 139 - 96
src/main/webapp/WEB-INF/view/admin/dict/userDict/edit.jsp
Zobraziť súbor 

@@ -1,111 +1,154 @@
 
-<%@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_userdict_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_userdict_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">
 
 
-		<h3>
 
-			<bean:message key="labels.dict_userdict_title" />
 
-		</h3>
 
+	    <%-- Content Header --%>
 
+	    <section class="content-header">
 
+		<h1>
 
+		    <bean:message key="labels.dict_userdict_title" />
 
+		</h1>
 
+	    </section>
 
 
-		<%-- Message: BEGIN --%>
 
-		<div>
 
-			<html:messages id="msg" message="true">
 
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
 
-			</html:messages>
 
-			<html:errors />
 
-		</div>
 
-		<%-- Message: END --%>
 
+	    <section class="content">
 
 
-			<div>
 
-				<ul class="pills">
 
-					<li><s:link href="../index">
 
-							<bean:message key="labels.dict_list_link" />
 
-						</s:link></li>
 
-					<li><s:link href="index?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_list_link" />
 
-						</s:link></li>
 
+		<%-- Form --%>
 
+		<s:form>
 
+		    <html:hidden property="crudMode" />
 
+		    <html:hidden property="dictId" />
 
+		    <c:if test="${crudMode==2}">
 
+			<html:hidden property="id" />
 
+		    </c:if>
 
+		    <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.dict_userdict_link_create" />
 
+					</c:if>
 
+					<c:if test="${crudMode == 2}">
 
+					    <bean:message key="labels.dict_userdict_link_update" />
 
+					</c:if>
 
+				    </h3>
 
+				    <div class="box-tools pull-right">
 
+					<span class="label label-default">
 
+					    <s:link href="../index">
 
+						<bean:message key="labels.dict_list_link" />
 
+					    </s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					    <s:link href="index?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_list_link" />
 
+					    </s:link>
 
+					</span>
 
 					<c:if test="${crudMode == 1}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_userdict_link_create" /></a></li>
 
+					    <span class="label label-default">
 
+						<a href="#">
 
+						    <bean:message key="labels.dict_userdict_link_create" />
 
+						</a>
 
+					    </span>
 
 					</c:if>
 
 					<c:if test="${crudMode == 2}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_userdict_link_update" /></a></li>
 
+					    <span class="label label-default">
 
+						<a href="#">
 
+						    <bean:message key="labels.dict_userdict_link_update" />
 
+						</a>
 
+					    </span>
 
 					</c:if>
 
 					<c:if test="${crudMode == 3}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_userdict_link_delete" /></a></li>
 
+					    <span class="label label-default">
 
+						<a href="#">
 
+						    <bean:message key="labels.dict_userdict_link_delete" />
 
+						</a>
 
+					    </span>
 
 					</c:if>
 
 					<c:if test="${crudMode == 4}">
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_userdict_link_confirm" /></a></li>
 
+					    <span class="label label-default">
 
+						<a href="#">
 
+						    <bean:message key="labels.dict_userdict_link_confirm" />
 
+						</a>
 
+					    </span>
 
 					</c:if>
 
-					<li><s:link href="downloadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_link_download" />
 
-						</s:link></li>
 
-					<li><s:link href="uploadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_link_upload" />
 
-						</s:link></li>
 
-				</ul>
 
-			</div>
 
+					<span class="label label-default">
 
+					    <s:link href="downloadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_download" />
 
+					    </s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					    <s:link href="uploadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_upload" />
 
+					    </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>
 
-				<html:hidden property="dictId" />
 
-				<c:if test="${crudMode==2}">
 
-					<html:hidden property="id" />
 
-				</c:if>
 
-				<table class="bordered-table zebra-striped" style="width: 500px;">
 
-					<tbody>
 
-						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.dict_userdict_token" /></th>
 
-							<td><html:text property="token" style="width:98%;" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th><bean:message
 
-									key="labels.dict_userdict_segmentation" /></th>
 
-							<td><html:text property="segmentation" style="width:98%;" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th><bean:message
 
-									key="labels.dict_userdict_reading" /></th>
 
-							<td><html:text property="reading" style="width:98%;" /></td>
 
-						</tr>
 
-						<tr>
 
-							<th><bean:message
 
-									key="labels.dict_userdict_pos" /></th>
 
-							<td><html:text property="pos" style="width:98%;" /></td>
 
-						</tr>
 
-					</tbody>
 
-					<tfoot>
 
-						<tr>
 
-							<td colspan="2"><c:if test="${crudMode == 1}">
 
-									<input type="submit" class="btn small" name="confirmfromcreate"
 
-										value="<bean:message key="labels.dict_userdict_button_create"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.dict_userdict_button_back"/>" />
 
-								</c:if> <c:if test="${crudMode == 2}">
 
-									<input type="submit" class="btn small" name="confirmfromupdate"
 
-										value="<bean:message key="labels.dict_userdict_button_confirm"/>" />
 
-									<input type="submit" class="btn small" name="back"
 
-										value="<bean:message key="labels.dict_userdict_button_back"/>" />
 
-								</c:if></td>
 
-						</tr>
 
-					</tfoot>
 
-				</table>
 
+				    <%-- Form Fields --%>
 
+				    <div class="form-group">
 
+					<label for="token"><bean:message key="labels.dict_userdict_token" /></label>
 
+					<html:text property="token" styleClass="form-control" />
 
+				    </div>
 
+				    <div class="form-group">
 
+					<label for="segmentation"><bean:message key="labels.dict_userdict_segmentation" /></label>
 
+					<html:text property="segmentation" styleClass="form-control" />
 
+				    </div>
 
+				    <div class="form-group">
 
+					<label for="reading"><bean:message key="labels.dict_userdict_reading" /></label>
 
+					<html:text property="reading" styleClass="form-control" />
 
+				    </div>
 
+				    <div class="form-group">
 
+					<label for="pos"><bean:message key="labels.dict_userdict_pos" /></label>
 
+					<html:text property="pos" 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.key_match_button_back"/>" />
 
+					<input type="submit" class="btn btn-primary" name="confirmfromcreate"
 
+					       value="<bean:message key="labels.key_match_button_create"/>"
 
+										/>
 
+				    </c:if>
 
+				    <c:if test="${crudMode == 2}">
 
+					<input type="submit" class="btn" name="back" value="<bean:message key="labels.key_match_button_back"/>" />
 
+					<input type="submit" class="btn btn-primary" name="confirmfromupdate"
 
+					       value="<bean:message key="labels.key_match_button_confirm"/>"
 
+					/>
 
+				    </c:if>
 
+				</div>
 
+			    </div>
 
 			</div>
 
+		    </div>
 
 		</s:form>
 
-		<%-- Edit Form: BEGIN --%>
 
 
-	</tiles:put>
 
-</tiles:insert>
 
+	    </section>
 
+	</div>
 
+
 
+	<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
 
+    </div>
 
+    <jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 
+</body>
 
+</html>

+ 51 - 1
src/main/webapp/WEB-INF/view/admin/dict/userDict/error.jsp
Zobraziť súbor 

@@ -1,3 +1,53 @@
 
+<%@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_userdict_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">
 
+			<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_userdict_link_list" />
 
+						</s:link></li>
 
+				</ol>
 
+			</section>
 
+
 
+			<section class="content">
 
+
 
+				<div class="callout callout-danger lead">
 
+					<h4>Error</h4>
 
+					<p>
 
+						<html:errors />
 
+					</p>
 
+					<p>
 
+						<s:link href="index">
 
+							<bean:message key="labels.dict_userdict_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>
 
 <%@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_userdict_configuration" /></tiles:put>
 
 	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
 
@@ -8,7 +58,7 @@
 
 	<tiles:put name="body" type="string">
 
 
       <div id="main">
 
-      
+
 
 <html:errors/>
 
 <br/>
 
 <s:link href="../index"><bean:message key="labels.dict_button_back"/></s:link>

+ 136 - 111
src/main/webapp/WEB-INF/view/admin/dict/userDict/index.jsp
Zobraziť súbor 

@@ -1,127 +1,152 @@
 
-<%@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_userdict_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_userdict_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>
 
 
-		<h3>
 
-			<bean:message key="labels.dict_userdict_title" />
 
-		</h3>
 
+	<div class="content-wrapper">
 
 
-		<%-- Message: BEGIN --%>
 
-		<div>
 
-			<html:messages id="msg" message="true">
 
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
 
-			</html:messages>
 
-			<html:errors />
 
-		</div>
 
-		<%-- Message: END --%>
 
+		<%-- Content Header --%>
 
+		<section class="content-header">
 
+		<h1>
 
+			<bean:message key="labels.dict_userdict_title" />
 
+		</h1>
 
+		<ol class="breadcrumb">
 
+			<li class="active"><s:link href="index">
 
+			<bean:message key="labels.dict_userdict_list_link" />
 
+			</s:link></li>
 
+		</ol>
 
+		</section>
 
 
-		<%-- List: BEGIN --%>
 
-		<div class="list-table">
 
-			<div>
 
-				<ul class="pills">
 
-					<li><s:link href="../index">
 
-							<bean:message key="labels.dict_list_link" />
 
-						</s:link></li>
 
-					<li class="active"><a href="#"><bean:message
 
-								key="labels.dict_userdict_list_link" /></a></li>
 
-					<li><s:link href="createpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_link_create" />
 
-						</s:link></li>
 
-					<li><s:link href="downloadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_link_download" />
 
-						</s:link></li>
 
-					<li><s:link href="uploadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_link_upload" />
 
-						</s:link></li>
 
-				</ul>
 
-			</div>
 
+		<section class="content">
 
 
-			<c:if test="${userDictPager.allRecordCount == 0}">
 
-				<p class="alert-message warning">
 
+		<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_userdict_list_link" />
 
+				</h3>
 
+				<div class="box-tools pull-right">
 
+					<span class="label label-default">
 
+					<s:link href="../index">
 
+						<bean:message key="labels.dict_list_link" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<a href="#">
 
+						<bean:message key="labels.dict_userdict_list_link" />
 
+					</a>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="createpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_create" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="downloadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_download" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="uploadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_upload" />
 
+					</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="${userDictPager.allRecordCount == 0}">
 
+					<p class="alert-message warning">
 
 					<bean:message key="labels.list_could_not_find_crud_table" />
 
-				</p>
 
-			</c:if>
 
-			<c:if test="${userDictPager.allRecordCount > 0}">
 
-				<table class="bordered-table zebra-striped">
 
-					<thead>
 
+					</p>
 
+				</c:if>
 
+				<c:if test="${userDictPager.allRecordCount > 0}">
 
+					<table class="table table-bordered table-striped">
 
+					    <thead>
 
 						<tr>
 
-							<th style="text-align: left;"><bean:message
 
-									key="labels.dict_userdict_token" /></th>
 
-							<th style="text-align: left;"><bean:message
 
-									key="labels.dict_userdict_reading" /></th>
 
-							<th style="text-align: center; width: 200px;">&nbsp;</th>
 
+						<th>
 
+						    <bean:message
 
+						      key="labels.dict_userdict_token" /></th>
 
+						<th>
 
+						    <bean:message
 
+						      key="labels.dict_userdict_reading" /></th>
 
+						</tr>
 
 						</tr>
 
 					</thead>
 
 					<tbody>
 
 						<c:forEach var="data" varStatus="s" items="${userDictItemItems}">
 
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
 
-								<td>${f:h(data.token)}</td>
 
-								<td>${f:h(data.reading)}</td>
 
-								<td style="text-align: center;"><s:link
 
-										href="confirmpage/${f:u(dictId)}/4/${f:u(data.id)}">
 
-										<bean:message key="labels.dict_link_details" />
 
-									</s:link> <s:link href="editpage/${f:u(dictId)}/2/${f:u(data.id)}">
 
-										<bean:message key="labels.dict_link_edit" />
 
-									</s:link> <s:link href="deletepage/${f:u(dictId)}/3/${f:u(data.id)}">
 
-										<bean:message key="labels.dict_link_delete" />
 
-									</s:link></td>
 
-							</tr>
 
+						    <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/${f:u(dictId)}/4/${f:u(data.id)}">
 
+							<td>${f:h(data.token)}</td>
 
+							<td>${f:h(data.reading)}</td>
 
+						</tr>
 
 						</c:forEach>
 
 					</tbody>
 
-				</table>
 
-				<%-- Page Navigation: BEGIN --%>
 
-				<div class="row center">
 
-					<div class="pagination">
 
-						<ul>
 
-							<c:if test="${userDictPager.existPrePage}">
 
-								<li class="prev"><s:link
 
-										href="list/${f:u(dictId)}/${userDictPager.currentPageNumber - 1}">
 
-										<bean:message key="labels.dict_link_prev_page" />
 
-									</s:link></li>
 
-							</c:if>
 
-							<c:if test="${!userDictPager.existPrePage}">
 
-								<li class="prev disabled"><a href="#"><bean:message
 
-											key="labels.dict_link_prev_page" /></a></li>
 
-							</c:if>
 
-							<c:forEach var="p" varStatus="s"
 
-								items="${userDictPager.pageNumberList}">
 
-								<li
 
-									<c:if test="${p == userDictPager.currentPageNumber}">class="active"</c:if>>
 
-									<s:link href="list/${f:u(dictId)}/${p}">${p}</s:link>
 
-								</li>
 
-							</c:forEach>
 
-							<c:if test="${userDictPager.existNextPage}">
 
-								<li class="next"><s:link
 
-										href="list/${f:u(dictId)}/${userDictPager.currentPageNumber + 1}">
 
-										<bean:message key="labels.dict_link_next_page" />
 
-									</s:link></li>
 
-							</c:if>
 
-							<c:if test="${!userDictPager.existNextPage}">
 
-								<li class="next disabled"><a href="#"><bean:message
 
-											key="labels.dict_link_next_page" /></a></li>
 
-							</c:if>
 
-						</ul>
 
-					</div>
 
+					</table>
 
+				</c:if>
 
+				</div>
 
+				<%-- Box Footer --%>
 
+				<div class="box-footer">
 
+				<%-- Paging Info --%>
 
+				<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(userDictPager.currentPageNumber)}"
 
+							arg1="${f:h(userDictPager.allPageCount)}" arg2="${f:h(userDictPager.allRecordCount)}"
 
+					  /></span>
 
+
 
+				<%-- Paging Navigation --%>
 
+				<ul class="pagination pagination-sm no-margin pull-right">
 
+					<c:if test="${userDictPager.existPrePage}">
 
+					<li class="prev"><s:link href="list/${userDictPager.currentPageNumber - 1}">
 
+						<bean:message key="labels.dict_link_prev_page" />
 
+					</s:link></li>
 
+					</c:if>
 
+					<c:if test="${!userDictPager.existPrePage}">
 
+					<li class="prev disabled"><a href="#"><bean:message key="labels.dict_link_prev_page" /></a></li>
 
+					</c:if>
 
+					<c:forEach var="p" varStatus="s" items="${userDictPager.pageNumberList}">
 
+					<li <c:if test="${p == userDictPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
 
+					</li>
 
+					</c:forEach>
 
+					<c:if test="${userDictPager.existNextPage}">
 
+					<li class="next"><s:link href="list/${userDictPager.currentPageNumber + 1}">
 
+						<bean:message key="labels.dict_link_next_page" />
 
+					</s:link></li>
 
+					</c:if>
 
+					<c:if test="${!userDictPager.existNextPage}">
 
+					<li class="next disabled"><a href="#"><bean:message key="labels.dict_link_next_page" /></a></li>
 
+					</c:if>
 
+				</ul>
 
 
-					<div>
 
-						<span><bean:message key="labels.pagination_page_guide_msg"
 
-								arg0="${f:h(userDictPager.currentPageNumber)}"
 
-								arg1="${f:h(userDictPager.allPageCount)}"
 
-								arg2="${f:h(userDictPager.allRecordCount)}" /></span>
 
-					</div>
 
 				</div>
 
-				<%-- Page Navigation: END --%>
 
-			</c:if>
 
+			</div>
 
+			</div>
 
 		</div>
 
-		<%-- List: END --%>
 
 
-	</tiles:put>
 
-</tiles:insert>
 
+		</section>
 
+	</div>
 
+
 
+	<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
 
+	</div>
 
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 
+</body>
 
+</html>

+ 107 - 60
src/main/webapp/WEB-INF/view/admin/dict/userDict/upload.jsp
Zobraziť súbor 

@@ -1,76 +1,123 @@
 
-<%@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_userdict_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_userdict_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>
 
 
-		<h3>
 
+	<div class="content-wrapper">
 
+
 
+		<%-- Content Header --%>
 
+		<section class="content-header">
 
+		<h1>
 
 			<bean:message key="labels.dict_userdict_title" />
 
-		</h3>
 
+		</h1>
 
+		<ol class="breadcrumb">
 
+			<li class="active"><s:link href="index">
 
+			<bean:message key="labels.dict_userdict_link_upload" />
 
+			</s:link></li>
 
+		</ol>
 
+		</section>
 
 
-		<%-- Message: BEGIN --%>
 
-		<div>
 
-			<html:messages id="msg" message="true">
 
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
 
-			</html:messages>
 
-			<html:errors />
 
-		</div>
 
-		<%-- Message: END --%>
 
+		<section class="content">
 
 
-			<div>
 
-				<ul class="pills">
 
-					<li><s:link href="../index">
 
-							<bean:message key="labels.dict_list_link" />
 
-						</s:link></li>
 
-					<li><s:link href="index?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_list_link" />
 
-						</s:link></li>
 
-					<li><s:link href="createpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_link_create" />
 
-						</s:link></li>
 
-					<li><s:link href="downloadpage?dictId=${f:u(dictId)}">
 
-							<bean:message key="labels.dict_userdict_link_download" />
 
-						</s:link></li>
 
-					<li class="active"><a href="#">
 
-							<bean:message key="labels.dict_userdict_link_upload" />
 
-						</a></li>
 
-				</ul>
 
-			</div>
 
+		<div class="row">
 
+			<div class="col-md-12">
 
+			<div class="box">
 
+				<%-- Box Header --%>
 
+				<div class="box-header with-border">
 
+				<h3 class="box-title">
 
+					<bean:message key="labels.dict_userdict_link_upload" />
 
+				</h3>
 
+				<div class="box-tools pull-right">
 
+					<span class="label label-default">
 
+					<s:link href="../index">
 
+						<bean:message key="labels.dict_list_link" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<a href="#">
 
+						<bean:message key="labels.dict_userdict_list_link" />
 
+					</a>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="createpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_create" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="downloadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_download" />
 
+					</s:link>
 
+					</span>
 
+					<span class="label label-default">
 
+					<s:link href="uploadpage?dictId=${f:u(dictId)}">
 
+						<bean:message key="labels.dict_userdict_link_upload" />
 
+					</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 action="upload" enctype="multipart/form-data">
 
-			<div>
 
-				<html:hidden property="dictId" />
 
-				<table class="bordered-table zebra-striped" style="width: 500px;">
 
-					<tbody>
 
+				<%-- Edit Form: BEGIN --%>
 
+				<s:form action="upload" enctype="multipart/form-data">
 
+					<div>
 
+					<html:hidden property="dictId" />
 
+					<table class="table table-bordered table-striped" >
 
+						<tbody>
 
 						<tr>
 
 							<th colspan="2">${f:h(filename)}</th>
 
 						</tr>
 
 						<tr>
 
-							<th style="width: 150px;"><bean:message
 
-									key="labels.dict_userdict_file" /></th>
 
-							<td><input type="file"
 
-										name="userDictFile" style="width: 98%;" /></td>
 
+							<th>
 
+							<bean:message key="labels.dict_userdict_file" />
 
+							</th>
 
+							<td>
 
+							<input type="file" name="userdictFile"  />
 
+							</td>
 
 						</tr>
 
-					</tbody>
 
-					<tfoot>
 
+						</tbody>
 
+						<tfoot>
 
 						<tr>
 
 							<td colspan="2">
 
-									<input type="submit" class="btn small" name="upload"
 
-										value="<bean:message key="labels.dict_userdict_button_upload"/>" />
 
+							<input type="submit" class="btn small" name="upload"
 
+								   value="<bean:message key="labels.dict_userdict_button_upload"/>" />
 
 							</td>
 
 						</tr>
 
-					</tfoot>
 
-				</table>
 
+						</tfoot>
 
+					</table>
 
+					</div>
 
+				</s:form>
 
+				<%-- Edit Form: BEGIN --%>
 
+
 
+				</div>
 
+			</div>
 
 			</div>
 
-		</s:form>
 
-		<%-- Edit Form: BEGIN --%>
 
+		</div>
 
+
 
+		</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