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

Merge pull request #935 from jdeathe/issue/934

Browse source 
#934 - Removes duplication of footer.
This commit is contained in:
Shinsuke Sugaya 2017-03-20 16:22:37 +09:00 • committed by GitHub
commit 34a985a766
23 changed files with 14 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1505,9 +1505,6 @@ public class FessLabels extends UserMessages {
/** 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 (Footer) */
public static final String LABELS_design_file_errorFooter = "{labels.design_file_errorFooter}";
/** 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

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

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

@ -492,7 +492,6 @@ 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_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)

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

@ -492,7 +492,6 @@ 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_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)

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

@ -485,7 +485,6 @@ 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_errorFooter=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8 (\u30d5\u30c3\u30bf\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

@ -484,7 +484,6 @@ 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_errorFooter = \uc5d0\ub7ec \ud398\uc774\uc9c0 (Footer)
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

@ -485,7 +485,6 @@ 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_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)

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

@ -27,7 +27,7 @@
</div>
</div>
</div>
<jsp:include page="footer.jsp" />
<jsp:include page="../footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"

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

@ -31,7 +31,7 @@
</div>
</div>
</div>
<jsp:include page="footer.jsp" />
<jsp:include page="../footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"

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

@ -1,8 +0,0 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<footer class="bd-footer text-muted" role="contentinfo">
<div id="footer" class="container center">
<p>
<la:message key="labels.footer.copyright" />
</p>
</div>
</footer>

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

@ -29,7 +29,7 @@
</div>
</div>
</div>
<jsp:include page="footer.jsp" />
<jsp:include page="../footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"

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

@ -27,7 +27,7 @@
</div>
</div>
</div>
<jsp:include page="footer.jsp" />
<jsp:include page="../footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"

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

@ -1,6 +1,6 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<footer class="bd-footer text-muted" role="contentinfo">
<div id="footer" class="center">
<div id="footer" class="container center">
<p>
<la:message key="labels.footer.copyright" />
</p>

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

@ -84,15 +84,7 @@
<!-- /.login-box-body -->
</div>
<!-- /.login-box -->
<footer class="footer bd-footer text-muted" role="contentinfo">
<div class="container center">
<p class="text-muted">
<la:message key="labels.footer.copyright" />
</p>
</div>
</footer>
<jsp:include page="../footer.jsp" />
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>

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

@ -98,15 +98,7 @@
<!-- /.login-box-body -->
</div>
<!-- /.login-box -->
<footer class="footer bd-footer text-muted" role="contentinfo">
<div class="container center">
<p class="text-muted">
<la:message key="labels.footer.copyright" />
</p>
</div>
</footer>
<jsp:include page="../footer.jsp" />
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>

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

@ -27,7 +27,7 @@
</div>
</div>
</div>
<jsp:include page="footer.jsp" />
<jsp:include page="../footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"

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

@ -31,7 +31,7 @@
</div>
</div>
</div>
<jsp:include page="footer.jsp" />
<jsp:include page="../footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"

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

@ -1,8 +0,0 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<footer class="bd-footer text-muted" role="contentinfo">
<div id="footer" class="container center">
<p>
<la:message key="labels.footer.copyright" />
</p>
</div>
</footer>

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

@ -29,7 +29,7 @@
</div>
</div>
</div>
<jsp:include page="footer.jsp" />
<jsp:include page="../footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"

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

@ -27,7 +27,7 @@
</div>
</div>
</div>
<jsp:include page="footer.jsp" />
<jsp:include page="../footer.jsp" />
</div>
<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
<script type="text/javascript"

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

@ -1,6 +1,6 @@
<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
<footer class="bd-footer text-muted" role="contentinfo">
<div id="footer" class="center">
<div id="footer" class="container center">
<p>
<la:message key="labels.footer.copyright" />
</p>

10
src/main/webapp/WEB-INF/view/login/index.jsp
View file

@ -84,15 +84,7 @@
<!-- /.login-box-body -->
</div>
<!-- /.login-box -->
<footer class="footer bd-footer text-muted" role="contentinfo">
<div class="container center">
<p class="text-muted">
<la:message key="labels.footer.copyright" />
</p>
</div>
</footer>
<jsp:include page="../footer.jsp" />
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>

10
src/main/webapp/WEB-INF/view/profile/index.jsp
View file

@ -98,15 +98,7 @@
<!-- /.login-box-body -->
</div>
<!-- /.login-box -->
<footer class="footer bd-footer text-muted" role="contentinfo">
<div class="container center">
<p class="text-muted">
<la:message key="labels.footer.copyright" />
</p>
</div>
</footer>
<jsp:include page="../footer.jsp" />
<input type="hidden" id="contextPath" value="${contextPath}" />
<script type="text/javascript"
src="${fe:url('/js/jquery-2.2.4.min.js')}"></script>