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

Merge pull request #938 from jdeathe/issue/937

Browse source 
#937: Removes duplication of header.
This commit is contained in:
Shinsuke Sugaya 2017-03-21 22:09:48 +09:00 • committed by GitHub
commit fdca48cef4
21 changed files with 14 additions and 220 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java
View file

@ -348,9 +348,6 @@ public interface FessHtmlPath {
/** The path of the HTML: /error/error.jsp */
HtmlNext path_Error_ErrorJsp = new HtmlNext("/error/error.jsp");
/** The path of the HTML: /error/header.jsp */
HtmlNext path_Error_HeaderJsp = new HtmlNext("/error/header.jsp");
/** The path of the HTML: /error/notFound.jsp */
HtmlNext path_Error_NotFoundJsp = new HtmlNext("/error/notFound.jsp");

3
src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
View file

@ -1502,9 +1502,6 @@ public class FessLabels extends UserMessages {
/** The key of the message: Cache Page */
public static final String LABELS_design_file_cache = "{labels.design_file_cache}";
/** The key of the message: Error Page (Header) */
public static final String LABELS_design_file_errorHeader = "{labels.design_file_errorHeader}";
/** The key of the message: Error Page (Not Found) */
public static final String LABELS_design_file_errorNotFound = "{labels.design_file_errorNotFound}";

4
src/main/resources/fess.xml
View file

@ -63,10 +63,6 @@
<arg>"error"</arg>
<arg>"error/error.jsp"</arg>
</postConstruct>
<postConstruct name="addDesignJspFileName">
<arg>"errorHeader"</arg>
<arg>"error/header.jsp"</arg>
</postConstruct>
<postConstruct name="addDesignJspFileName">
<arg>"errorNotFound"</arg>
<arg>"error/notFound.jsp"</arg>

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

@ -491,7 +491,6 @@ labels.design_file_help=Help Page (Content)
labels.design_file_header=Header
labels.design_file_error=Search Error Page
labels.design_file_cache=Cache Page
labels.design_file_errorHeader=Error Page (Header)
labels.design_file_errorNotFound=Error Page (Not Found)
labels.design_file_errorSystem=Error Page (System Error)
labels.design_file_errorRedirect=Error Page (Redirect)

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

@ -491,7 +491,6 @@ labels.design_file_help=Help Page (Content)
labels.design_file_header=Header
labels.design_file_error=Search Error Page
labels.design_file_cache=Cache Page
labels.design_file_errorHeader=Error Page (Header)
labels.design_file_errorNotFound=Error Page (Not Found)
labels.design_file_errorSystem=Error Page (System Error)
labels.design_file_errorRedirect=Error Page (Redirect)

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

@ -484,7 +484,6 @@ labels.design_file_help=\u30d8\u30eb\u30d7\u30da\u30fc\u30b8 (\u30b3\u30f3\u30c6
labels.design_file_header=\u30d8\u30c3\u30c0\u30fc
labels.design_file_error=\u691c\u7d22\u30a8\u30e9\u30fc\u30da\u30fc\u30b8
labels.design_file_cache=\u30ad\u30e3\u30c3\u30b7\u30e5\u30da\u30fc\u30b8
labels.design_file_errorHeader=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u30d8\u30c3\u30c0\u30fc)
labels.design_file_errorNotFound=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\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)

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

@ -483,7 +483,6 @@ labels.design_file_help = \ub3c4\uc6c0\ub9d0 \ud398\uc774\uc9c0 (\ucee8\ud150\uc
labels.design_file_header = \ud5e4\ub354
labels.design_file_error = \uac80\uc0c9 \uc5d0\ub7ec \ud398\uc774\uc9c0
labels.design_file_cache = \uce90\uc2dc \ud398\uc774\uc9c0
labels.design_file_errorHeader = \uc5d0\ub7ec \ud398\uc774\uc9c0 (Header)
labels.design_file_errorNotFound = \uc5d0\ub7ec \ud398\uc774\uc9c0 (Not Found)
labels.design_file_errorSystem = \uc5d0\ub7ec \ud398\uc774\uc9c0 (\uc2dc\uc2a4\ud15c \uc624\ub958)
labels.design_file_errorRedirect = \uc5d0\ub7ec \ud398\uc774\uc9c0 (Redirect)

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

@ -484,7 +484,6 @@ labels.design_file_help=Help Page (Content)
labels.design_file_header=Header
labels.design_file_error=Search Error Page
labels.design_file_cache=Cache Page
labels.design_file_errorHeader=Error Page (Header)
labels.design_file_errorNotFound=Error Page (Not Found)
labels.design_file_errorSystem=Error Page (System Error)
labels.design_file_errorRedirect=Error Page (Redirect)

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

@ -15,7 +15,7 @@
rel="stylesheet" type="text/css" />
</head>
<body class="error">
<jsp:include page="header.jsp" />
<jsp:include page="../header.jsp" />
<div class="container">
<div class="content">
<div class="center row">

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

@ -14,7 +14,7 @@
rel="stylesheet" type="text/css" />
</head>
<body class="error">
<jsp:include page="header.jsp" />
<jsp:include page="../header.jsp" />
<div class="container">
<div class="content">
<div class="center row">

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

@ -1,94 +0,0 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<la:form action="/search" method="get" styleId="searchForm"
role="search">
${fe:facetForm()}${fe:geoForm()}
<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
<la:link styleClass="navbar-brand" href="/">
<img src="${fe:url('/images/logo-head.png')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
<div
class="search-box navbar-form col-lg-5 col-md-6 col-sm-6 col-xs-8"
role="search">
<div class="input-group">
<la:text property="q" maxlength="1000" styleId="query"
styleClass="form-control" autocomplete="off" />
<span class="input-group-btn">
<button type="submit" name="search" id="searchButton"
class="btn btn-primary">
<i class="fa fa-search"></i>
</button>
<button type="button" class="btn btn-default"
data-toggle="control-options" data-target="#searchOptions"
id="searchOptionsButton">
<i class="fa fa-cog"></i> <span class="sr-only"><la:message
key="labels.header_form_option_btn" /></span>
</button>
</span>
</div>
</div>
<ul class="nav navbar-nav hidden-xs-down pull-right">
<c:choose>
<c:when test="${!empty username && username != 'guest'}">
<li class="nav-item">
<div class="dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown"
href="#" role="button" aria-haspopup="true"
aria-expanded="false"> <i class="fa fa-user"></i>
<span>${username}</span>
</a>
<div class="dropdown-menu" aria-labelledby="userMenu">
<c:if test="${editableUser == true}">
<la:link href="/profile" styleClass="dropdown-item">
<la:message key="labels.profile" />
</la:link>
</c:if>
<c:if test="${adminUser == true}">
<la:link href="/admin" styleClass="dropdown-item">
<la:message key="labels.administration" />
</la:link>
</c:if>
<la:link href="/logout/" styleClass="dropdown-item">
<la:message key="labels.logout" />
</la:link>
</div>
</div>
</li>
</c:when>
<c:when test="${ pageLoginLink }">
<li class="nav-item"><la:link href="/login"
styleClass="nav-link " role="button" aria-haspopup="true"
aria-expanded="false">
<i class="fa fa-sign-in"></i>
<span><la:message key="labels.login" /></span>
</la:link></li>
</c:when>
</c:choose>
<li class="nav-item"><la:link href="/help" styleClass="nav-link" role="help" aria-haspopup="true"
aria-expanded="false">
<i class="fa fa-question-circle"></i>
<span><la:message key="labels.index_help" /></span>
</la:link></li>
</ul>
</nav>
<div id="searchOptions" class="control-options">
<div class="container">
<jsp:include page="../searchOptions.jsp" />
<div>
<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
<la:message key="labels.search_options_clear" />
</button>
<button type="submit" class="btn btn-primary">
<i class="fa fa-search"></i>
<la:message key="labels.search" />
</button>
<button type="button" class="btn btn-secondary pull-right"
data-toggle="control-options" data-target="#searchOptions"
id="searchOptionsCloseButton">
<i class="fa fa-times-circle"></i>
<la:message key="labels.search_options_close" />
</button>
</div>
</div>
</div>
</la:form>

2
src/main/webapp/WEB-INF/orig/view/error/notFound.jsp
View file

@ -14,7 +14,7 @@
rel="stylesheet" type="text/css" />
</head>
<body class="error">
<jsp:include page="header.jsp" />
<jsp:include page="../header.jsp" />
<div class="container">
<div class="content">
<div class="center row">

2
src/main/webapp/WEB-INF/orig/view/error/system.jsp
View file

@ -15,7 +15,7 @@
rel="stylesheet" type="text/css" />
</head>
<body class="error">
<jsp:include page="header.jsp" />
<jsp:include page="../header.jsp" />
<div class="container">
<div class="content">
<div class="center row">

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

@ -1,8 +1,8 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<la:form action="/search" method="get" styleId="searchForm"
role="search">
${fe:facetForm()}${fe:geoForm()}
<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
${fe:facetForm()}${fe:geoForm()}
<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
<la:link styleClass="navbar-brand" href="/">
<img src="${fe:url('/images/logo-head.png')}"
alt="<la:message key="labels.header_brand_name" />" />
@ -73,7 +73,7 @@ ${fe:facetForm()}${fe:geoForm()}
</nav>
<div id="searchOptions" class="control-options">
<div class="container">
<jsp:include page="searchOptions.jsp" />
<jsp:include page="/WEB-INF/view/searchOptions.jsp" />
<div>
<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
<la:message key="labels.search_options_clear" />

3
src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp
View file

@ -140,9 +140,6 @@
<la:option value="error">
<la:message key="labels.design_file_error" />
</la:option>
<la:option value="errorHeader">
<la:message key="labels.design_file_errorHeader" />
</la:option>
<la:option value="errorNotFound">
<la:message key="labels.design_file_errorNotFound" />
</la:option>

2
src/main/webapp/WEB-INF/view/error/badRequest.jsp
View file

@ -15,7 +15,7 @@
rel="stylesheet" type="text/css" />
</head>
<body class="error">
<jsp:include page="header.jsp" />
<jsp:include page="../header.jsp" />
<div class="container">
<div class="content">
<div class="center row">

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

@ -14,7 +14,7 @@
rel="stylesheet" type="text/css" />
</head>
<body class="error">
<jsp:include page="header.jsp" />
<jsp:include page="../header.jsp" />
<div class="container">
<div class="content">
<div class="center row">

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

@ -1,94 +0,0 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<la:form action="/search" method="get" styleId="searchForm"
role="search">
${fe:facetForm()}${fe:geoForm()}
<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
<la:link styleClass="navbar-brand" href="/">
<img src="${fe:url('/images/logo-head.png')}"
alt="<la:message key="labels.header_brand_name" />" />
</la:link>
<div
class="search-box navbar-form col-lg-5 col-md-6 col-sm-6 col-xs-8"
role="search">
<div class="input-group">
<la:text property="q" maxlength="1000" styleId="query"
styleClass="form-control" autocomplete="off" />
<span class="input-group-btn">
<button type="submit" name="search" id="searchButton"
class="btn btn-primary">
<i class="fa fa-search"></i>
</button>
<button type="button" class="btn btn-default"
data-toggle="control-options" data-target="#searchOptions"
id="searchOptionsButton">
<i class="fa fa-cog"></i> <span class="sr-only"><la:message
key="labels.header_form_option_btn" /></span>
</button>
</span>
</div>
</div>
<ul class="nav navbar-nav hidden-xs-down pull-right">
<c:choose>
<c:when test="${!empty username && username != 'guest'}">
<li class="nav-item">
<div class="dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown"
href="#" role="button" aria-haspopup="true"
aria-expanded="false"> <i class="fa fa-user"></i>
<span>${username}</span>
</a>
<div class="dropdown-menu" aria-labelledby="userMenu">
<c:if test="${editableUser == true}">
<la:link href="/profile" styleClass="dropdown-item">
<la:message key="labels.profile" />
</la:link>
</c:if>
<c:if test="${adminUser == true}">
<la:link href="/admin" styleClass="dropdown-item">
<la:message key="labels.administration" />
</la:link>
</c:if>
<la:link href="/logout/" styleClass="dropdown-item">
<la:message key="labels.logout" />
</la:link>
</div>
</div>
</li>
</c:when>
<c:when test="${ pageLoginLink }">
<li class="nav-item"><la:link href="/login"
styleClass="nav-link " role="button" aria-haspopup="true"
aria-expanded="false">
<i class="fa fa-sign-in"></i>
<span><la:message key="labels.login" /></span>
</la:link></li>
</c:when>
</c:choose>
<li class="nav-item"><la:link href="/help" styleClass="nav-link" role="help" aria-haspopup="true"
aria-expanded="false">
<i class="fa fa-question-circle"></i>
<span><la:message key="labels.index_help" /></span>
</la:link></li>
</ul>
</nav>
<div id="searchOptions" class="control-options">
<div class="container">
<jsp:include page="../searchOptions.jsp" />
<div>
<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
<la:message key="labels.search_options_clear" />
</button>
<button type="submit" class="btn btn-primary">
<i class="fa fa-search"></i>
<la:message key="labels.search" />
</button>
<button type="button" class="btn btn-secondary pull-right"
data-toggle="control-options" data-target="#searchOptions"
id="searchOptionsCloseButton">
<i class="fa fa-times-circle"></i>
<la:message key="labels.search_options_close" />
</button>
</div>
</div>
</div>
</la:form>

2
src/main/webapp/WEB-INF/view/error/notFound.jsp
View file

@ -14,7 +14,7 @@
rel="stylesheet" type="text/css" />
</head>
<body class="error">
<jsp:include page="header.jsp" />
<jsp:include page="../header.jsp" />
<div class="container">
<div class="content">
<div class="center row">

2
src/main/webapp/WEB-INF/view/error/system.jsp
View file

@ -15,7 +15,7 @@
rel="stylesheet" type="text/css" />
</head>
<body class="error">
<jsp:include page="header.jsp" />
<jsp:include page="../header.jsp" />
<div class="container">
<div class="content">
<div class="center row">

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

@ -1,8 +1,8 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<la:form action="/search" method="get" styleId="searchForm"
role="search">
${fe:facetForm()}${fe:geoForm()}
<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
${fe:facetForm()}${fe:geoForm()}
<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
<la:link styleClass="navbar-brand" href="/">
<img src="${fe:url('/images/logo-head.png')}"
alt="<la:message key="labels.header_brand_name" />" />
@ -73,7 +73,7 @@ ${fe:facetForm()}${fe:geoForm()}
</nav>
<div id="searchOptions" class="control-options">
<div class="container">
<jsp:include page="searchOptions.jsp" />
<jsp:include page="/WEB-INF/view/searchOptions.jsp" />
<div>
<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
<la:message key="labels.search_options_clear" />