Skip to content

Commit 0a7421e

Browse files
author
Vladimir Kotal
authored
fix broken links in diff view (#3119)
fix broken links due to indentation fixes #3118
1 parent 26ccfce commit 0a7421e

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

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

Lines changed: 34 additions & 34 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) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
19+
Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
2020
Portions Copyright 2011 Jens Elkner.
2121
Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
2222
--%>
@@ -169,10 +169,10 @@ include file="mast.jsp"
169169
%></span><%
170170
} else {
171171
%> <span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
172-
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
173-
<%= QueryParameters.FORMAT_PARAM_EQ %><%= t.getAbbrev() %>&amp;
174-
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %><%= full ? '1' : '0'
175-
%>"><%= t.toString() %><%
172+
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
173+
<%= QueryParameters.FORMAT_PARAM_EQ %><%= t.getAbbrev() %>&amp;
174+
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %><%= full ? '1' : '0'%>"><%= t.toString() %>
175+
<%
176176
if (t == DiffType.OLD) {
177177
%> ( <%= data.rev[0] %> )<%
178178
} else if (t == DiffType.NEW) {
@@ -186,23 +186,23 @@ include file="mast.jsp"
186186
if (!full) {
187187
%>
188188
<span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
189-
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
190-
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
191-
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1">full</a></span>
189+
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
190+
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
191+
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1">full</a></span>
192192
<span class="active">compact</span><%
193193
} else {
194194
%>
195195
<span class="active">full</span>
196196
<span> <a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
197-
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
198-
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
199-
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>0">compact</a></span><%
197+
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
198+
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
199+
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>0">compact</a></span><%
200200
}
201201
%><span><a href="#" id="toggle-jumper">jumper</a></span>
202202
<span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
203-
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
204-
<%= QueryParameters.FORMAT_PARAM_EQ %><%= DiffType.TEXT %>&amp;
205-
action=download">download diff</a></span><%
203+
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
204+
<%= QueryParameters.FORMAT_PARAM_EQ %><%= DiffType.TEXT %>&amp;
205+
action=download">download diff</a></span><%
206206
%></div>
207207
</div>
208208

@@ -275,10 +275,10 @@ include file="mast.jsp"
275275
}
276276
%><br/>--- <b><%= cn2 - ln2 - 16
277277
%> unchanged lines hidden</b> (<a href="<%= reqURI
278-
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
279-
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
280-
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
281-
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>)
278+
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
279+
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
280+
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
281+
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>)
282282
--- <br/><br/><%
283283
ln2 = cn2 - 8;
284284
for (int j = ln2; j < cn2; j++) {
@@ -339,10 +339,10 @@ include file="mast.jsp"
339339
}
340340
%><br/>--- <b><%= cn1 - ln1 - 16
341341
%> unchanged lines hidden</b> (<a href="<%= reqURI
342-
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
343-
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
344-
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
345-
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>)
342+
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
343+
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
344+
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
345+
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>)
346346
--- <br/><br/><%
347347
ln1 = cn1 - 8;
348348
for (int j = ln1; j < cn1; j++) {
@@ -356,10 +356,10 @@ include file="mast.jsp"
356356
}
357357
%><br/>--- <b><%= cn2 - ln2 - 16
358358
%> unchanged lines hidden</b> (<a href="<%= reqURI
359-
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
360-
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
361-
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
362-
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>)
359+
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
360+
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
361+
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
362+
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>)
363363
--- <br/><br/><%
364364
ln2 = cn2 - 8;
365365
for (int j = ln2; j < cn2; j++) {
@@ -398,10 +398,10 @@ include file="mast.jsp"
398398
}
399399
%><br/>--- <b><%= cn1 - ln1 - 16
400400
%> unchanged lines hidden</b> (<a href="<%= reqURI
401-
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
402-
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
403-
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
404-
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%=ln1%>">view full</a>) --- <br/><br/><%
401+
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
402+
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
403+
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
404+
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%=ln1%>">view full</a>) --- <br/><br/><%
405405
ln1 = cn1 - 8;
406406
for (int j = ln1; j < cn1; j++) {
407407
%><i><%= ++ln1 %></i><%=
@@ -430,10 +430,10 @@ include file="mast.jsp"
430430
}
431431
%><br/>--- <b><%= cn2 - ln2 - 16
432432
%> unchanged lines hidden</b> (<a href="<%= reqURI
433-
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
434-
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
435-
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
436-
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>) --- <br/><br/><%
433+
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
434+
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
435+
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
436+
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1#<%= ln2 %>">view full</a>) --- <br/><br/><%
437437
ln2 = cn2 - 8;
438438
for (int j = ln2; j < cn2; j++) {
439439
%><i><%= ++ln2 %></i><%=

0 commit comments

Comments
 (0)