Skip to content

Commit aa18fa2

Browse files
ahornaceVladimir Kotal
ahornace
authored and
Vladimir Kotal
committed
Use header and footer html5 tags
1 parent d6b10fe commit aa18fa2

File tree

13 files changed

+47
-85
lines changed

13 files changed

+47
-85
lines changed

‎opengrok-web/src/main/webapp/eforbidden.jsp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
3232
3333
%><body>
3434
<div id="page">
35-
<div id="whole_header">
36-
<div id="header"><%@
37-
38-
include file="pageheader.jspf"
39-
40-
%></div>
41-
</div>
35+
<header id="whole_header">
36+
<%@include file="pageheader.jspf" %>
37+
</header>
4238
<h3 class="error">Error: access forbidden</h3>
4339
<p>The request was forbidden. This can be either file/directory permissions problem or insufficient authorization.</p>
4440
<%= PageConfig.get(request).getEnv().getIncludeFiles().getForbiddenIncludeFileContent(false) %>

‎opengrok-web/src/main/webapp/enoent.jsp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,15 @@ include file="httpheader.jspf"
3535
3636
%><body>
3737
<div id="page">
38-
<div id="whole_header">
39-
<div id="header"><%@
40-
41-
include file="pageheader.jspf"
42-
43-
%></div>
38+
<header id="whole_header">
39+
<%@include file="pageheader.jspf" %>
4440
<div id="Masthead">Error: file not found</div>
4541
<div id="sbar"><%@
4642
4743
include file="menu.jspf"
4844
4945
%></div>
50-
</div>
46+
</header>
5147
<%
5248
{
5349
PageConfig cfg = PageConfig.get(request);

‎opengrok-web/src/main/webapp/error.jsp

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1616
1717
CDDL HEADER END
1818
19-
Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
19+
Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
2020
Portions Copyright 2011 Jens Elkner.
2121
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2222
@@ -47,14 +47,9 @@ include file="httpheader.jspf"
4747
%>
4848
<body>
4949
<div id="page">
50-
<div id="whole_header">
51-
<div id="header">
52-
<%@
53-
54-
include file="pageheader.jspf"
55-
56-
%>
57-
</div>
50+
<header id="whole_header">
51+
<%@include file="pageheader.jspf" %>
52+
</header>
5853
<%
5954
{
6055
PageConfig cfg = PageConfig.get(request);

‎opengrok-web/src/main/webapp/foot.jspf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ org.opengrok.indexer.web.Prefix"
3939
{
4040
PageConfig cfg = PageConfig.get(request);
4141
Date dateForLastIndexRun = cfg.getEnv().getDateForLastIndexRun();
42-
42+
4343
%>
44-
<div id="footer">
44+
<footer id="footer">
4545
<p><a href="https://oracle.github.io/opengrok/" class="link-no-decoration"
4646
title="Served by OpenGrok (<%= Info.getVersion() %> - <%= Info.getShortRevision() %>)">
4747
<span id="served-by">served&nbsp;by&nbsp;</span><span class="logo logo-gray-color">{</span><span class="logo logo-blue-color">Open</span><span class="logo logo-gray-color">Grok</span>
@@ -56,7 +56,7 @@ org.opengrok.indexer.web.Prefix"
5656
}
5757
// #footer, #page:
5858
%>
59-
</div>
59+
</footer>
6060
</div>
6161
<%
6262
/**

‎opengrok-web/src/main/webapp/help.jsp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1616
1717
CDDL HEADER END
1818
19-
Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
19+
Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
2020
Portions Copyright 2011 Jens Elkner.
2121
Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
2222
--%>
@@ -40,14 +40,10 @@ include file="httpheader.jspf"
4040
%>
4141
<body>
4242
<div id="page">
43-
<div id="whole_header">
44-
<div id="header"><%@
45-
46-
include file="pageheader.jspf"
47-
48-
%></div>
43+
<header id="whole_header">
44+
<%@include file="pageheader.jspf" %>
4945
<div id="Masthead">Help page</div>
50-
</div>
46+
</header>
5147
<div id="sbar">
5248
<div id="menu"><%@
5349

‎opengrok-web/src/main/webapp/history.jsp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1818
1919
CDDL HEADER END
2020
21-
Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
21+
Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
2222
Portions Copyright 2011 Jens Elkner.
2323
Portions Copyright (c) 2018-2020, Chris Fraire <[email protected]>.
2424
--%>
@@ -117,18 +117,14 @@ include file="httpheader.jspf"
117117
document.pageReady.push(function() { pageReadyMast(); });
118118
/* ]]> */</script>
119119
<div id="page">
120-
<div id="whole_header">
121-
<div id="header">
120+
<header id="whole_header">
122121
<%
123122
}
124123
}
125124
{
126125
if (request.getAttribute("history.jsp-hist") != null) {
127-
%><%@
128-
129-
include file="pageheader.jspf"
130-
131126
%>
127+
<%@include file="pageheader.jspf" %>
132128
<%
133129
}
134130
}
@@ -148,7 +144,6 @@ include file="pageheader.jspf"
148144
// We have a lots of results to show: create a slider for them
149145
request.setAttribute("history.jsp-slider", Util.createSlider(start, max, totalHits, request));
150146
%>
151-
</div>
152147
<div id="Masthead">History log of
153148
<%= Util.breadcrumbPath(context + Prefix.XREF_P, path,'/',"",true,cfg.isDir()) %>
154149
(Results <b> <%= totalHits != 0 ? start + 1 : 0 %> – <%= thispage + start

‎opengrok-web/src/main/webapp/index.jsp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1616
1717
CDDL HEADER END
1818
19-
Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
19+
Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
2020
Portions Copyright 2011 Jens Elkner.
2121
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2222
@@ -44,19 +44,15 @@ include file="httpheader.jspf"
4444
4545
%><body>
4646
<div id="page">
47-
<div id="whole_header">
48-
<div id="header"><%@
49-
50-
include file="pageheader.jspf"
51-
52-
%></div>
47+
<header id="whole_header">
48+
<%@include file="pageheader.jspf" %>
5349
<div id="Masthead">OpenGrok search</div>
5450
<div id="sbar"><%@
5551
5652
include file="menu.jspf"
5753
5854
%></div>
59-
</div>
55+
</header>
6056
<div id="results">
6157
<%= PageConfig.get(request).getEnv().getIncludeFiles().getBodyIncludeFileContent(false) %>
6258
<% if (PageConfig.get(request).getEnv().getDisplayRepositories()) { %><%@

‎opengrok-web/src/main/webapp/mast.jsp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1818
1919
CDDL HEADER END
2020
21-
Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
21+
Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
2222
Portions Copyright 2011 Jens Elkner.
2323
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2424
@@ -82,13 +82,8 @@ include file="httpheader.jspf"
8282
document.pageReady.push(function() { pageReadyMast(); });
8383
/* ]]> */</script>
8484
<div id="page">
85-
<div id="whole_header">
86-
<div id="header"><%@
87-
88-
include file="pageheader.jspf"
89-
90-
%>
91-
</div>
85+
<header id="whole_header">
86+
<%@include file="pageheader.jspf" %>
9287
<div id="Masthead">
9388
<%
9489
{

‎opengrok-web/src/main/webapp/minisearch.jspf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ org.opengrok.indexer.web.Util"%><%
118118
document.domReady.push(function() { domReadyMenu(true); });
119119
/* ]]> */
120120
</script>
121-
</div>
121+
</header>
122122
<div id="content">
123123
<%
124124
}

‎opengrok-web/src/main/webapp/pageheader.jspf

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,21 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1616

1717
CDDL HEADER END
1818

19-
Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
19+
Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
2020

2121
--%><%@page import="org.opengrok.web.PageConfig"%>
2222
<%
2323
/* ---------------------- pageheader.jspf start --------------------- */
2424
{
2525
PageConfig cfg = PageConfig.get(request);
26-
%>
27-
<%= cfg.getEnv().getIncludeFiles().getHeaderIncludeFileContent(false) %>
28-
<%
26+
String headerContent = cfg.getEnv().getIncludeFiles().getHeaderIncludeFileContent(false);
27+
if (headerContent != null && !headerContent.isBlank()) {
28+
%>
29+
<div id="header">
30+
<%= headerContent %>
31+
</div>
32+
<%
33+
}
2934
}
3035
/* ---------------------- pageheader.jspf end --------------------- */
3136
%>

0 commit comments

Comments
 (0)