0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #33

Browse source
This commit is contained in:
Shinsuke Sugaya 2014-01-31 19:07:22 +09:00
parent 82715dfecb
commit 1b88a10e07
12 changed files with 127 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/resources/application.properties
View file

@ -995,6 +995,7 @@ labels.design_file_errorFooter=Error Page (Footer)
labels.design_file_errorNotFound=Error Page (Not Found)
labels.design_file_errorSystem=Error Page (System Error)
labels.design_file_errorRedirect=Error Page (Redirect)
labels.design_file_errorBadRequest=Error Page (BadRequest)
labels.design_delete_confirmation=Do you want to delete it?
# view/admin/design/edit.jsp

1
src/main/resources/application_ja.properties
View file

@ -994,6 +994,7 @@ labels.design_file_errorFooter=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u30d5\u30c
labels.design_file_errorNotFound=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u30da\u30fc\u30b8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093)
labels.design_file_errorSystem=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc)
labels.design_file_errorRedirect=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u30ea\u30c0\u30a4\u30ec\u30af\u30c8)
labels.design_file_errorBadRequest=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u4e0d\u6b63\u306a\u30ea\u30af\u30a8\u30b9\u30c8)
labels.design_delete_confirmation=\u524a\u9664\u3057\u307e\u3059\u304b?
# view/admin/design/edit.jsp

8
src/main/resources/fess.dicon
View file

@ -80,6 +80,10 @@
<arg>"searchNoResult"</arg>
<arg>"searchNoResult.jsp"</arg>
</initMethod>
<initMethod name="addDesignJspFileName">
<arg>"help"</arg>
<arg>"help.jsp"</arg>
</initMethod>
<initMethod name="addDesignJspFileName">
<arg>"error"</arg>
<arg>"error.jsp"</arg>
@ -145,8 +149,8 @@
<arg>"error/redirect.jsp"</arg>
</initMethod>
<initMethod name="addDesignJspFileName">
<arg>"help"</arg>
<arg>"help.jsp"</arg>
<arg>"errorBadRequest"</arg>
<arg>"error/badRequest.jsp"</arg>
</initMethod>
</component>
<component name="crawlingSessionHelper" class="jp.sf.fess.helper.CrawlingSessionHelper">

35
src/main/webapp/WEB-INF/orig/view/error/badRequest.jsp Normal file
View file

@ -0,0 +1,35 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<!DOCTYPE html>
<% try{ %>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="content-style-type" content="text/css" />
<meta http-equiv="content-script-type" content="text/javascript" />
<title><bean:message key="labels.system_error_title" /></title>
<link href="${f:url('/css/style-base.css')}" rel="stylesheet"
type="text/css" />
<link href="${f:url('/css/style.css')}" rel="stylesheet"
type="text/css" />
</head>
<body>
<jsp:include page="header.jsp" />
<div class="container">
<div class="content">
<div class="center row">
<div class="span10">
<h2>
<bean:message key="labels.request_error_title" />
</h2>
<div class="errormessage"><bean:message key="labels.bad_request" /></div>
</div>
</div>
</div>
<jsp:include page="footer.jsp" />
</div>
<script type="text/javascript"
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
</body>
</html>
<% }catch(Exception e){ session.invalidate();}%>

8
src/main/webapp/WEB-INF/orig/view/error/header.jsp
View file

@ -59,11 +59,11 @@
<option value="">
<bean:message key="labels.search_result_select_sort" />
</option>
<html:option value="tstamp.asc">
<bean:message key="labels.search_result_sort_tstamp_asc" />
<html:option value="created.asc">
<bean:message key="labels.search_result_sort_created_asc" />
</html:option>
<html:option value="tstamp.desc">
<bean:message key="labels.search_result_sort_tstamp_desc" />
<html:option value="created.desc">
<bean:message key="labels.search_result_sort_created_desc" />
</html:option>
<html:option value="contentLength.asc">
<bean:message key="labels.search_result_sort_contentLength_asc" />

3
src/main/webapp/WEB-INF/orig/view/error/redirect.jsp
View file

@ -15,6 +15,9 @@ if("systemError".equals(type)) {
} else if("logOut".equals(type)) {
redirectPage.append("/login/index?type=logout");
response.sendRedirect(redirectPage.toString());
} else if("badRequest".equals(type)) {
redirectPage.append("/error/badRequest");
response.sendRedirect(redirectPage.toString());
} else {
redirectPage.append("/error/notFound?url=");
redirectPage.append(java.net.URLEncoder.encode(requestUri , "UTF-8"));

27
src/main/webapp/WEB-INF/orig/view/header.jsp
View file

@ -9,7 +9,7 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
alt="<bean:message key="labels.header_brand_name" />" />
</s:link>
<div class="navbar-form pull-right">
<html:text property="query" maxlength="1000" styleId="query" />
<html:text property="query" maxlength="1000" styleId="query" autocomplete="off"/>
<button class="btn medium btn-primary" type="submit" name="search"
id="searchButton">
<i class="icon-search icon-white"></i><span class="hidden-phone"><bean:message
@ -63,11 +63,11 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
<option value="">
<bean:message key="labels.search_result_select_sort" />
</option>
<html:option value="tstamp.asc">
<bean:message key="labels.search_result_sort_tstamp_asc" />
<html:option value="created.asc">
<bean:message key="labels.search_result_sort_created_asc" />
</html:option>
<html:option value="tstamp.desc">
<bean:message key="labels.search_result_sort_tstamp_desc" />
<html:option value="created.desc">
<bean:message key="labels.search_result_sort_created_desc" />
</html:option>
<html:option value="contentLength.asc">
<bean:message key="labels.search_result_sort_contentLength_asc" />
@ -81,6 +81,23 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
<html:option value="lastModified.desc">
<bean:message key="labels.search_result_sort_lastModified_desc" />
</html:option>
<c:if test="${searchLogSupport}">
<html:option value="clickCount_l_x_dv.asc">
<bean:message key="labels.search_result_sort_clickCount_asc" />
</html:option>
<html:option value="clickCount_l_x_dv.desc">
<bean:message key="labels.search_result_sort_clickCount_desc" />
</html:option>
</c:if>
<c:if test="${favoriteSupport}">
<html:option value="favoriteCount_l_x_dv.asc">
<bean:message key="labels.search_result_sort_favoriteCount_asc" />
</html:option>
<html:option value="favoriteCount_l_x_dv.desc">
<bean:message
key="labels.search_result_sort_favoriteCount_desc" />
</html:option>
</c:if>
</html:select>
</div>
</div>

4
src/main/webapp/WEB-INF/orig/view/help.jsp
View file

@ -26,9 +26,11 @@
</p>
<jsp:include page="footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/help.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/help.js')}"></script>
</body>
</html>

33
src/main/webapp/WEB-INF/orig/view/index.jsp
View file

@ -52,7 +52,7 @@
<div class="clearfix">
<div class="input">
<html:text styleClass="query" property="query" size="50"
maxlength="1000" styleId="contentQuery" />
maxlength="1000" styleId="contentQuery" autocomplete="off" />
</div>
</div>
<c:if test="${fe:hswsize(null) != 0}">
@ -115,11 +115,11 @@
<option value="">
<bean:message key="labels.search_result_select_sort" />
</option>
<html:option value="tstamp.asc">
<bean:message key="labels.search_result_sort_tstamp_asc" />
<html:option value="created.asc">
<bean:message key="labels.search_result_sort_created_asc" />
</html:option>
<html:option value="tstamp.desc">
<bean:message key="labels.search_result_sort_tstamp_desc" />
<html:option value="created.desc">
<bean:message key="labels.search_result_sort_created_desc" />
</html:option>
<html:option value="contentLength.asc">
<bean:message
@ -137,6 +137,25 @@
<bean:message
key="labels.search_result_sort_lastModified_desc" />
</html:option>
<c:if test="${searchLogSupport}">
<html:option value="clickCount_l_x_dv.asc">
<bean:message
key="labels.search_result_sort_clickCount_asc" />
</html:option>
<html:option value="clickCount_l_x_dv.desc">
<bean:message
key="labels.search_result_sort_clickCount_desc" />
</html:option>
</c:if><c:if test="${favoriteSupport}">
<html:option value="favoriteCount_l_x_dv.asc">
<bean:message
key="labels.search_result_sort_favoriteCount_asc" />
</html:option>
<html:option value="favoriteCount_l_x_dv.desc">
<bean:message
key="labels.search_result_sort_favoriteCount_desc" />
</html:option>
</c:if>
</html:select>
</div>
</div>
@ -174,9 +193,11 @@
</div>
<jsp:include page="footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/index.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/index.js')}"></script>
</body>
</html>

4
src/main/webapp/WEB-INF/orig/view/search.jsp
View file

@ -45,9 +45,11 @@
</c:choose>
<jsp:include page="footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"
src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
</body>
</html>

38
src/main/webapp/WEB-INF/orig/view/searchResults.jsp
View file

@ -22,16 +22,14 @@
</div>
</c:if>
<div id="result" class="row content">
<input type="hidden" id="queryId" value="${f:u(queryId)}" /> <input
type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<input type="hidden" id="queryId" value="${f:u(queryId)}" />
<input type="hidden" id="rt" value="${f:u(rt)}" />
<div class="span8">
<ol>
<c:forEach var="doc" varStatus="s" items="${documentItems}">
<li id="result${s.index}">
<h3 class="title">
<a href="${doc.urlLink}" class="link">
${f:h(doc.contentTitle)} </a>
<a class="link" href="${doc.urlLink}" data-uri="${doc.urlLink}" data-id="${doc.docId}">${f:h(doc.contentTitle)}</a>
</h3>
<div class="body">
<div class="description">${doc.contentDescription}</div>
@ -42,30 +40,32 @@
<a href="#result${s.index}"><bean:message key="labels.search_result_more" /></a>
</div>
<div class="info">
<c:if test="${doc.tstamp!=null && doc.tstamp!=''}">
<bean:message key="labels.search_result_tstamp" />
<fmt:formatDate value="${fe:parseDate(doc.tstamp)}" type="BOTH" />
<span class="br-phone"></span>
<span class="hidden-phone">-</span>
<c:if test="${doc.created!=null && doc.created!=''}">
<c:set var="hasInfo" value="true"/>
<bean:message key="labels.search_result_created" />
<fmt:formatDate value="${fe:parseDate(doc.created)}" type="BOTH" />
</c:if>
<c:if test="${doc.lastModified!=null && doc.lastModified!=''}">
<c:if test="${hasInfo}"><span class="br-phone"></span><span class="hidden-phone">-</span></c:if><c:set var="hasInfo" value="true"/>
<bean:message key="labels.search_result_lastModified" />
<fmt:formatDate value="${fe:parseDate(doc.lastModified)}" type="BOTH" />
<span class="br-phone"></span>
<span class="br-tablet"></span>
<span class="hidden-phone hidden-tablet">-</span>
</c:if>
<c:if test="${doc.contentLength!=null && doc.contentLength!=''}">
<c:if test="${hasInfo}"><span class="br-phone"></span><span class="hidden-phone">-</span></c:if><c:set var="hasInfo" value="true"/>
<bean:message key="labels.search_result_size"
arg0="${f:h(doc.contentLength)}" />
<span class="br-phone"></span>
<span class="hidden-phone">-</span>
</c:if>
<c:if test="${searchLogSupport}">
<c:if test="${hasInfo}"><span class="br-phone"></span><span class="hidden-phone">-</span></c:if><c:set var="hasInfo" value="true"/>
<bean:message key="labels.search_click_count"
arg0="${f:h(doc.clickCount_l_x_dv)}" />
</c:if>
<c:if test="${favoriteSupport}">
<a href="#${doc.url}" class="favorite"><bean:message
key="labels.search_result_favorite" /></a>
<c:if test="${hasInfo}"><span class="br-phone"></span><span class="hidden-phone">-</span></c:if><c:set var="hasInfo" value="true"/>
<a href="#${doc.docId}" class="favorite"><bean:message
key="labels.search_result_favorite" /> (${f:h(doc.favoriteCount_l_x_dv)})</a>
<span class="favorited"><bean:message
key="labels.search_result_favorited" /></span>
key="labels.search_result_favorited"/> <span class="favorited-count">(${f:h(doc.favoriteCount_l_x_dv)})</span></span>
</c:if>
</div>
</div>
@ -82,10 +82,10 @@
<div class="well span3">
<ul class="nav nav-list">
<c:forEach var="fieldData" items="${facetResponse.fieldList}">
<c:if test="${fieldData.name == 'label'}">
<c:if test="${fieldData.name == 'label' && fieldData.valueCountMap.size() > 0}">
<li class="nav-header"><bean:message key="label.facet_label_title" /></li>
<c:forEach var="countEntry" items="${fieldData.valueCountMap}">
<c:if test="${countEntry.value != 0}">
<c:if test="${countEntry.value != 0 && fe:labelexists(countEntry.key)}">
<li><s:link
href="search?query=${f:u(query)}&additional=label:${f:u(countEntry.key)}${pagingQuery}${fe:facetQuery()}${fe:mltQuery()}${fe:geoQuery()}">
${f:h(fe:label(countEntry.key))} (${f:h(countEntry.value)})</s:link></li>

5
src/main/webapp/WEB-INF/view/admin/design/index.jsp
View file

@ -101,12 +101,12 @@
<th>
<html:select property="fileName" style="width:300px;">
<html:option value="index"><bean:message key="labels.design_file_index" /></html:option>
<html:option value="footer"><bean:message key="labels.design_file_footer" /></html:option>
<html:option value="help"><bean:message key="labels.design_file_help" /></html:option>
<html:option value="header"><bean:message key="labels.design_file_header" /></html:option>
<html:option value="footer"><bean:message key="labels.design_file_footer" /></html:option>
<html:option value="search"><bean:message key="labels.design_file_search" /></html:option>
<html:option value="searchResults"><bean:message key="labels.design_file_searchResults" /></html:option>
<html:option value="searchNoResult"><bean:message key="labels.design_file_searchNoResult" /></html:option>
<html:option value="help"><bean:message key="labels.design_file_help" /></html:option>
<html:option value="error"><bean:message key="labels.design_file_error" /></html:option>
<%-- Mobile --%>
<html:option value="mobileIndex"><bean:message key="labels.design_file_mobileIndex" /></html:option>
@ -126,6 +126,7 @@
<html:option value="errorNotFound"><bean:message key="labels.design_file_errorNotFound" /></html:option>
<html:option value="errorSystem"><bean:message key="labels.design_file_errorSystem" /></html:option>
<html:option value="errorRedirect"><bean:message key="labels.design_file_errorRedirect" /></html:option>
<html:option value="errorBadRequest"><bean:message key="labels.design_file_errorBadRequest" /></html:option>
</html:select>
</th>
<td style="text-align: center;">