Skip to content

Commit 794f32a

Browse files
idodeclaretarzanek
authored andcommitted
Use en dash for Results count. Fix to specify UTF-8 for jsps.
It's required for each page to specify UTF-8 or else NetBeans converts content to ISO-8859-1 -- even if an `include' file specifies UTF-8.
1 parent 7acae26 commit 794f32a

File tree

8 files changed

+24
-10
lines changed

8 files changed

+24
-10
lines changed

web/enoent.jsp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ CDDL HEADER END
1818
1919
Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
2020
Portions Copyright 2011 Jens Elkner.
21+
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2122
22-
--%><%@page session="false" errorPage="error.jsp" isErrorPage="true" import="
23+
--%>
24+
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
25+
<%@page session="false" errorPage="error.jsp" isErrorPage="true" import="
2326
org.opensolaris.opengrok.web.Prefix,
2427
org.opensolaris.opengrok.configuration.RuntimeEnvironment"
2528
%><%

web/error.jsp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1717
CDDL HEADER END
1818
1919
Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
20-
2120
Portions Copyright 2011 Jens Elkner.
21+
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2222
2323
--%>
24+
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
2425
<%@page import="javax.servlet.http.HttpServletResponse"%>
2526
<%@ page session="false" isErrorPage="true" import="
2627
java.io.PrintWriter,

web/help.jsp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1717
CDDL HEADER END
1818
1919
Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
20-
2120
Portions Copyright 2011 Jens Elkner.
21+
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2222
23-
--%><%@ page session="false" errorPage="error.jsp" import="
23+
--%>
24+
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
25+
<%@page session="false" errorPage="error.jsp" import="
2426
org.opensolaris.opengrok.web.PageConfig,
2527
org.opensolaris.opengrok.search.SearchEngine"
2628
%><%

web/history.jsp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Portions Copyright 2011 Jens Elkner.
2323
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2424
2525
--%>
26+
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
2627
<%@page import="org.opensolaris.opengrok.web.Util"%>
2728
<%@page import="org.opensolaris.opengrok.history.HistoryGuru"%>
2829
<%@page import="java.io.File"%>

web/index.jsp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1717
CDDL HEADER END
1818
1919
Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
20-
2120
Portions Copyright 2011 Jens Elkner.
21+
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2222
23-
--%><%@ page session="false" errorPage="error.jsp" %>
23+
--%>
24+
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
25+
<%@page session="false" errorPage="error.jsp" %>
2426
<%
2527
{
2628
PageConfig cfg = PageConfig.get(request);

web/mast.jsp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ CDDL HEADER END
2020
2121
Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
2222
Portions Copyright 2011 Jens Elkner.
23+
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2324
2425
--%><%--
2526
2627
After include you are here: /body/div#page/div#content/
2728
2829
--%>
30+
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
2931
<%@page import="org.json.simple.JSONArray"%>
3032
<%@page import="org.opensolaris.opengrok.configuration.messages.Message"%>
3133
<%@page import="java.util.SortedSet"%>

web/search.jsp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ CDDL HEADER END
2020
2121
Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
2222
Portions Copyright 2011 Jens Elkner.
23-
Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
23+
Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
2424
2525
--%>
26+
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
2627
<%@page import="javax.servlet.http.HttpServletResponse"%>
2728
<%@page session="false" errorPage="error.jsp" import="
2829
org.opensolaris.opengrok.search.Results,
@@ -207,7 +208,7 @@ include file="menu.jspf"
207208
%>
208209
<p class="pagetitle">Searched <b><%
209210
Util.htmlize(searchHelper.query.toString(), out);
210-
%></b> (Results <b> <%= start + 1 %> - <%= thispage + start
211+
%></b> (Results <b> <%= start + 1 %> <%= thispage + start
211212
%></b> of <b><%= totalHits %></b>) sorted by <%=
212213
searchHelper.order.getDesc() %></p><%
213214
if (slider.length() > 0) {

web/status.jsp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1919
CDDL HEADER END
2020
2121
Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
22-
2322
Portions Copyright 2011 Jens Elkner.
23+
Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
2424
25-
--%><%@page session="false" errorPage="error.jsp" import="
25+
--%>
26+
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
27+
<%@page session="false" errorPage="error.jsp" import="
2628
org.opensolaris.opengrok.configuration.RuntimeEnvironment,
2729
org.opensolaris.opengrok.web.Util"
2830
%><%

0 commit comments

Comments
 (0)