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

modify error page

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-08-29 07:12:35 +09:00
parent aa9cfdaff4
commit fc8b85d1e3
5 changed files with 64 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/org/codelibs/fess/app/web/RootAction.java
View file

@ -38,8 +38,7 @@ public class RootAction extends FessSearchAction {
searchAvailable();
return asHtml(path_IndexJsp).renderWith(data -> {
buildLabelParams(data, form.fields);
buildUserParams(data);
buildLabelParams(form.fields);
buildInitParams();
});
}

44
src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
View file

@ -107,6 +107,25 @@ public abstract class FessSearchAction extends FessBaseAction {
super.setupHtmlData(runtime);
runtime.registerData("osddLink", openSearchHelper.hasOpenSearchFile());
runtime.registerData("helpPage", viewHelper.getPagePath("common/help"));
List<Map<String, String>> labelTypeItems = labelTypeHelper.getLabelTypeItemList();
runtime.registerData("labelTypeItems", labelTypeItems);
runtime.registerData("displayLabelTypeItems", labelTypeItems != null && !labelTypeItems.isEmpty());
Locale locale = request.getLocale();
if (locale == null) {
locale = Locale.ENGLISH;
}
runtime.registerData("langItems", systemHelper.getLanguageItems(locale));
final HttpSession session = request.getSession(false);
if (session != null) {
final Object obj = session.getAttribute(SSCConstants.USER_INFO);
if (obj instanceof LoginInfo) {
final LoginInfo loginInfo = (LoginInfo) obj;
runtime.registerData("username", loginInfo.getUsername());
}
}
}
protected void searchAvailable() {
@ -117,11 +136,9 @@ public abstract class FessSearchAction extends FessBaseAction {
}
}
protected List<Map<String, String>> buildLabelParams(RenderData data, SearchParamMap fields) {
protected void buildLabelParams(SearchParamMap fields) {
// label
List<Map<String, String>> labelTypeItems = labelTypeHelper.getLabelTypeItemList();
data.register("labelTypeItems", labelTypeItems);
data.register("displayLabelTypeItems", labelTypeItems != null && !labelTypeItems.isEmpty());
if (!labelTypeItems.isEmpty() && !fields.containsKey(FessSearchAction.LABEL_FIELD)) {
final String defaultLabelValue = crawlerProperties.getProperty(Constants.DEFAULT_LABEL_VALUE_PROPERTY, StringUtil.EMPTY);
@ -148,27 +165,6 @@ public abstract class FessSearchAction extends FessBaseAction {
}
}
request.setAttribute(Constants.LABEL_VALUE_MAP, labelMap);
return labelTypeItems;
}
protected void buildUserParams(RenderData data) {
Locale locale = request.getLocale();
if (locale == null) {
locale = Locale.ENGLISH;
}
data.register("langItems", systemHelper.getLanguageItems(locale));
final HttpSession session = request.getSession(false);
if (session != null) {
final Object obj = session.getAttribute(SSCConstants.USER_INFO);
if (obj instanceof LoginInfo) {
final LoginInfo loginInfo = (LoginInfo) obj;
data.register("username", loginInfo.getUsername());
}
}
}
protected void buildInitParams() {

3
src/main/java/org/codelibs/fess/app/web/help/HelpAction.java
View file

@ -41,8 +41,7 @@ public class HelpAction extends FessSearchAction {
@Execute
public HtmlResponse help(HelpForm form) {
return asHtml(path_HelpJsp).renderWith(data -> {
buildLabelParams(data, form.fields);
buildUserParams(data);
buildLabelParams(form.fields);
buildInitParams();
});
}

5
src/main/java/org/codelibs/fess/app/web/search/SearchAction.java
View file

@ -144,10 +144,9 @@ public class SearchAction extends FessSearchAction {
return asHtml(path_SearchJsp).renderWith(data -> {
updateSearchParams(form);
List<Map<String, String>> labelTypeItems = buildLabelParams(data, form.fields);
buildUserParams(data);
buildLabelParams(form.fields);
doSearchInternal(data, form);
data.register("displayQuery", getDisplayQuery(form, labelTypeItems));
data.register("displayQuery", getDisplayQuery(form, labelTypeHelper.getLabelTypeItemList()));
data.register("pagingQuery", getPagingQuery(form));
});
}

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

@ -1,14 +1,14 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<la:form action="/search" method="get">
<form action="${contextPath}/search" method="get">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<la:link styleClass="brand" href="/">
<a class="brand" href="${contextPath}/">
<img src="${f:url('/images/logo-head.gif')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
</a>
<div class="navbar-form pull-right">
<la:text property="query" maxlength="1000" styleId="query" />
<input type="text" name="query" maxlength="1000" id="query" />
<button class="btn medium btn-primary" type="submit" name="search"
id="searchButton">
<la:message key="labels.search" />
@ -34,63 +34,63 @@
<label for="contentNum"><la:message
key="labels.index_num" /></label>
<div class="input">
<html:select property="num" styleId="contentNum"
styleClass="span4" style="display:block;">
<select name="num" id="contentNum"
class="span4" style="display:block;">
<option value="">
<la:message key="labels.search_result_select_num" />
</option>
<html:option value="10">10</html:option>
<html:option value="20">20</html:option>
<html:option value="30">30</html:option>
<html:option value="40">40</html:option>
<html:option value="50">50</html:option>
<html:option value="100">100</html:option>
</html:select>
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
<option value="40">40</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
</div>
</div>
<div class="clearfix">
<label for="contentSort"><la:message
key="labels.index_sort" /></label>
<div class="input">
<html:select property="sort" styleId="contentSort"
styleClass="span4" style="display:block;">
<select name="sort" id="contentSort"
class="span4" style="display:block;">
<option value="">
<la:message key="labels.search_result_select_sort" />
</option>
<html:option value="created.asc">
<option value="created.asc">
<la:message key="labels.search_result_sort_created_asc" />
</html:option>
<html:option value="created.desc">
</option>
<option value="created.desc">
<la:message key="labels.search_result_sort_created_desc" />
</html:option>
<html:option value="contentLength.asc">
</option>
<option value="contentLength.asc">
<la:message key="labels.search_result_sort_contentLength_asc" />
</html:option>
<html:option value="contentLength.desc">
</option>
<option value="contentLength.desc">
<la:message key="labels.search_result_sort_contentLength_desc" />
</html:option>
<html:option value="lastModified.asc">
</option>
<option value="lastModified.asc">
<la:message key="labels.search_result_sort_lastModified_asc" />
</html:option>
<html:option value="lastModified.desc">
</option>
<option value="lastModified.desc">
<la:message key="labels.search_result_sort_lastModified_desc" />
</html:option>
</html:select>
</option>
</select>
</div>
</div>
<div class="clearfix">
<label for="contentLang"><la:message
key="labels.index_lang" /></label>
<div class="input">
<html:select property="lang"
styleId="langSearchOption" multiple="true"
styleClass="span4">
<select name="lang"
id="langSearchOption" multiple="true"
class="span4">
<c:forEach var="item" items="${langItems}">
<html:option value="${f:u(item.value)}">
<option value="${f:u(item.value)}">
${f:h(item.label)}
</html:option>
</option>
</c:forEach>
</html:select>
</select>
</div>
</div>
<c:if test="${displayLabelTypeItems}">
@ -98,14 +98,14 @@
<label for="contentLabelType"><la:message
key="labels.index_label" /></label>
<div class="input">
<html:select property="fields.label" styleId="contentLabelType"
multiple="true" styleClass="span4">
<select name="fields.label" id="contentLabelType"
multiple="true" class="span4">
<c:forEach var="item" items="${labelTypeItems}">
<html:option value="${f:u(item.value)}">
<option value="${f:u(item.value)}">
${f:h(item.label)}
</html:option>
</option>
</c:forEach>
</html:select>
</select>
</div>
</div>
</c:if>
@ -120,5 +120,5 @@
</button>
</div>
</div>
</la:form>
</form>