Skip to content

Commit 2d0401b

Browse files
authored
Use absolute_url to ensure baseurl and url are included in internal links (#71)
1 parent 000785b commit 2d0401b

File tree

8 files changed

+133
-90
lines changed

8 files changed

+133
-90
lines changed

Gemfile.lock

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.2.1)
4+
activesupport (8.0.2)
55
base64
6+
benchmark (>= 0.3)
67
bigdecimal
78
concurrent-ruby (~> 1.0, >= 1.3.1)
89
connection_pool (>= 2.2.5)
@@ -12,35 +13,40 @@ GEM
1213
minitest (>= 5.1)
1314
securerandom (>= 0.3)
1415
tzinfo (~> 2.0, >= 2.0.5)
16+
uri (>= 0.13.1)
1517
addressable (2.8.7)
1618
public_suffix (>= 2.0.2, < 7.0)
1719
base64 (0.2.0)
18-
bigdecimal (3.1.8)
20+
benchmark (0.4.1)
21+
bigdecimal (3.2.2)
1922
coffee-script (2.4.1)
2023
coffee-script-source
2124
execjs
2225
coffee-script-source (1.12.2)
2326
colorator (1.1.0)
24-
commonmarker (0.23.10)
25-
concurrent-ruby (1.3.4)
26-
connection_pool (2.4.1)
27-
csv (3.3.0)
28-
dnsruby (1.72.2)
27+
commonmarker (0.23.11)
28+
concurrent-ruby (1.3.5)
29+
connection_pool (2.5.3)
30+
csv (3.3.5)
31+
dnsruby (1.72.4)
32+
base64 (~> 0.2.0)
33+
logger (~> 1.6.5)
2934
simpleidn (~> 0.2.1)
30-
drb (2.2.1)
35+
drb (2.2.3)
3136
em-websocket (0.5.3)
3237
eventmachine (>= 0.12.9)
3338
http_parser.rb (~> 0)
3439
ethon (0.16.0)
3540
ffi (>= 1.15.0)
3641
eventmachine (1.2.7)
37-
execjs (2.9.1)
38-
faraday (2.11.0)
39-
faraday-net_http (>= 2.0, < 3.4)
42+
execjs (2.10.0)
43+
faraday (2.13.1)
44+
faraday-net_http (>= 2.0, < 3.5)
45+
json
4046
logger
41-
faraday-net_http (3.3.0)
42-
net-http
43-
ffi (1.17.0)
47+
faraday-net_http (3.4.1)
48+
net-http (>= 0.5.0)
49+
ffi (1.17.2)
4450
forwardable-extended (2.6.0)
4551
gemoji (4.1.0)
4652
github-pages (232)
@@ -99,7 +105,7 @@ GEM
99105
activesupport (>= 2)
100106
nokogiri (>= 1.4)
101107
http_parser.rb (0.8.0)
102-
i18n (1.14.5)
108+
i18n (1.14.7)
103109
concurrent-ruby (~> 1.0)
104110
jekyll (3.10.0)
105111
addressable (~> 2.4)
@@ -211,6 +217,7 @@ GEM
211217
gemoji (>= 3, < 5)
212218
html-pipeline (~> 2.2)
213219
jekyll (>= 3.0, < 5.0)
220+
json (2.12.2)
214221
kramdown (2.4.0)
215222
rexml
216223
kramdown-parser-gfm (1.1.0)
@@ -219,15 +226,15 @@ GEM
219226
listen (3.9.0)
220227
rb-fsevent (~> 0.10, >= 0.10.3)
221228
rb-inotify (~> 0.9, >= 0.9.10)
222-
logger (1.6.0)
229+
logger (1.6.6)
223230
mercenary (0.3.6)
224-
mini_portile2 (2.8.8)
231+
mini_portile2 (2.8.9)
225232
minima (2.5.1)
226233
jekyll (>= 3.5, < 5.0)
227234
jekyll-feed (~> 0.9)
228235
jekyll-seo-tag (~> 2.1)
229-
minitest (5.25.1)
230-
net-http (0.4.1)
236+
minitest (5.25.5)
237+
net-http (0.6.0)
231238
uri
232239
nokogiri (1.18.8)
233240
mini_portile2 (~> 2.8.2)
@@ -242,9 +249,9 @@ GEM
242249
rb-fsevent (0.11.2)
243250
rb-inotify (0.11.1)
244251
ffi (~> 1.0)
245-
rexml (3.3.9)
252+
rexml (3.4.1)
246253
rouge (3.30.0)
247-
rubyzip (2.3.2)
254+
rubyzip (2.4.1)
248255
safe_yaml (1.0.5)
249256
sass (3.7.4)
250257
sass-listen (~> 4.0.0)
@@ -254,7 +261,7 @@ GEM
254261
sawyer (0.9.2)
255262
addressable (>= 2.3.5)
256263
faraday (>= 0.17.3, < 3)
257-
securerandom (0.3.1)
264+
securerandom (0.4.1)
258265
simpleidn (0.2.3)
259266
terminal-table (1.8.0)
260267
unicode-display_width (~> 1.1, >= 1.1.1)
@@ -263,8 +270,8 @@ GEM
263270
tzinfo (2.0.6)
264271
concurrent-ruby (~> 1.0)
265272
unicode-display_width (1.8.0)
266-
uri (0.13.2)
267-
webrick (1.8.2)
273+
uri (1.0.3)
274+
webrick (1.9.1)
268275

269276
PLATFORMS
270277
ruby
@@ -274,7 +281,7 @@ DEPENDENCIES
274281
webrick
275282

276283
RUBY VERSION
277-
ruby 3.3.4p94
284+
ruby 3.4.2p28
278285

279286
BUNDLED WITH
280287
2.4.6

_includes/board-card.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{% for profile in include.list %}
22
<div class="profile">
33
<div class="profile_photo">
4-
<img alt="[image of {{ profile.firstname }} {{ profile.lastname }}]" src="/assets/img/developers/{{ profile.image }}">
4+
<img
5+
alt="[image of {{ profile.firstname }} {{ profile.lastname }}]"
6+
src="{{ "/assets/img/developers/" | append: profile.image | absolute_url }}">
57
</div>
68
<div class="profile_info">
79
<h3 class="boardmember_name">{{ profile.firstname }} {{ profile.lastname }}</h3>

_layouts/profile.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="card">
66
<h4 id="{{ page.nickname }}">{{ page.firstname }} {{ page.lastname }}</h4>
77
{% if page.image %}
8-
<img src="/assets/img/developers/{{ page.image }}">
8+
<img src="{{ "/assets/img/developers/" | append: page.image | absolute_url }}">
99
{% endif %}
1010
<ul>
1111
{% if page.irc %}

_layouts/release.html

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,27 @@
55
<ul>
66
{% if content != '' %}
77
<li><a href="#release-notes">Release Notes for Bugzilla {{ page.version }}</a></li>{% endif %}
8-
{% if page.advisory %}{% for advisory in page.advisory %}
9-
<li><a href="/security/{{ advisory.url }}/">Security Advisory for versions before {{ advisory.version }}</a></li>{% endfor %}{% endif %}
8+
{% if page.advisory %}
9+
{% for advisory in page.advisory %}
10+
<li>
11+
<a href="{{ "/security/" | append: advisory.url | absolute_url }}">
12+
Security Advisory for versions before {{ advisory.version }}
13+
</a>
14+
</li>
15+
{% endfor %}
16+
{% endif %}
1017
{% if page.branch %}
11-
<li><a href="/download/#v{{ page.branch | replace: '.', '' }}">Download Bugzilla {{ page.version }}</a></li>
12-
<li><a href="https://github.com/bugzilla/bugzilla/commits/release-{{ page.version }}">Complete changelogs since prior versions</a></li>{% endif %}
18+
<li>
19+
<a href="{{ "/download/#v" | append: page.branch | replace: '.', '' | absolute_url }}">
20+
Download Bugzilla {{ page.version }}
21+
</a>
22+
</li>
23+
<li>
24+
<a href="https://github.com/bugzilla/bugzilla/commits/release-{{ page.version }}">
25+
Complete changelogs since prior versions
26+
</a>
27+
</li>
28+
{% endif %}
1329
</ul>
1430

1531
{% if content != '' %}

blog/index.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
<div class="eighty">
3838
{% for post in paginator.posts %}
3939
<div class="card">
40-
<a class="date muted" href="{{ post.url }}">{{ post.date | date: '%d. %B %Y' }}</a>
40+
<a class="date muted" href="{{ post.url | absolute_url }}">
41+
{{ post.date | date: '%d. %B %Y' }}
42+
</a>
4143
<h1 class="title" id="{{ post.id }}">{{ post.title }}</h1>
4244
{% include authors.html authors=post.author %}
4345
{{ post.content }}

docs.html

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -46,118 +46,118 @@
4646
<tr><td><b>Bugzilla 4.4.14</b></td>
4747
<td><i>(deprecated old stable)<br>(end-of-life 2025/01/03)</i></td>
4848
<td>
49-
<a href="4.4/en/html/">[Online HTML]</a>
50-
<a href="4.4/en/pdf/Bugzilla-Guide.pdf">[PDF]</a>
51-
<a href="4.4/en/txt/Bugzilla-Guide.txt">[Text]</a>
49+
<a href="{{ "4.4/en/html/" | absolute_url }}">[Online HTML]</a>
50+
<a href="{{ "4.4/en/pdf/Bugzilla-Guide.pdf" | absolute_url }}">[PDF]</a>
51+
<a href="{{ "4.4/en/txt/Bugzilla-Guide.txt" | absolute_url }}">[Text]</a>
5252
</td>
5353
<td>
54-
<a href="4.4/en/html/api/">[APIs, including XML-RPC and JSON-RPC]</a>
54+
<a href="{{ "4.4/en/html/api/" | absolute_url }}">[APIs, including XML-RPC and JSON-RPC]</a>
5555
</td>
5656
</tr>
5757

5858
<tr>
5959
<td colspan="4" align="center" style="color: red">Releases below this line are no longer supported</td>
6060
</tr>
61-
61+
6262
<tr><td>Bugzilla 4.2.16</td>
6363
<td></td>
6464
<td>
65-
<a href="4.2/en/html/">[Online HTML]</a>
66-
<a href="4.2/en/pdf/Bugzilla-Guide.pdf">[PDF]</a>
67-
<a href="4.2/en/txt/Bugzilla-Guide.txt">[Text]</a>
65+
<a href="{{ "4.2/en/html/" | absolute_url }}">[Online HTML]</a>
66+
<a href="{{ "4.2/en/pdf/Bugzilla-Guide.pdf" | absolute_url }}">[PDF]</a>
67+
<a href="{{ "4.2/en/txt/Bugzilla-Guide.txt" | absolute_url }}">[Text]</a>
6868
</td>
6969
<td>
70-
<a href="4.2/en/html/api/">[APIs, including XML-RPC and JSON-RPC]</a>
70+
<a href="{{ "4.2/en/html/api/" | absolute_url }}">[APIs, including XML-RPC and JSON-RPC]</a>
7171
</td>
7272
</tr>
7373
<tr><td>Bugzilla 4.0.18</td>
7474
<td></td>
7575
<td>
76-
<a href="4.0/en/html/">[Online HTML]</a>
77-
<a href="4.0/en/pdf/Bugzilla-Guide.pdf">[PDF]</a>
78-
<a href="4.0/en/txt/Bugzilla-Guide.txt">[Text]</a>
76+
<a href="{{ "4.0/en/html/" | absolute_url }}">[Online HTML]</a>
77+
<a href="{{ "4.0/en/pdf/Bugzilla-Guide.pdf" | absolute_url }}">[PDF]</a>
78+
<a href="{{ "4.0/en/txt/Bugzilla-Guide.txt" | absolute_url }}">[Text]</a>
7979
</td>
8080
<td>
81-
<a href="4.0/en/html/api/">[APIs, including XML-RPC and JSON-RPC]</a>
81+
<a href="{{ "4.0/en/html/api/" | absolute_url }}">[APIs, including XML-RPC and JSON-RPC]</a>
8282
</td>
8383
</tr>
8484
<tr><td>Bugzilla 3.6.13</td>
8585
<td></td>
8686
<td>
87-
<a href="3.6/en/html/">[Online HTML]</a>
88-
<a href="3.6/en/pdf/Bugzilla-Guide.pdf">[PDF]</a>
89-
<a href="3.6/en/txt/Bugzilla-Guide.txt">[Text]</a>
87+
<a href="{{ "3.6/en/html/" | absolute_url }}">[Online HTML]</a>
88+
<a href="{{ "3.6/en/pdf/Bugzilla-Guide.pdf" | absolute_url }}">[PDF]</a>
89+
<a href="{{ "3.6/en/txt/Bugzilla-Guide.txt" | absolute_url }}">[Text]</a>
9090
</td>
9191
<td>
92-
<a href="3.6/en/html/api/">[APIs, including XML-RPC and JSON-RPC]</a>
92+
<a href="{{ "3.6/en/html/api/" | absolute_url }}">[APIs, including XML-RPC and JSON-RPC]</a>
9393
</td>
9494
</tr>
9595
<tr><td>Bugzilla 3.4.14</td>
9696
<td></td>
9797
<td>
98-
<a href="3.4/en/html/">[Online HTML]</a>
99-
<a href="3.4/en/pdf/Bugzilla-Guide.pdf">[PDF]</a>
100-
<a href="3.4/en/txt/Bugzilla-Guide.txt">[Text]</a>
98+
<a href="{{ "3.4/en/html/" | absolute_url }}">[Online HTML]</a>
99+
<a href="{{ "3.4/en/pdf/Bugzilla-Guide.pdf" | absolute_url }}">[PDF]</a>
100+
<a href="{{ "3.4/en/txt/Bugzilla-Guide.txt" | absolute_url }}">[Text]</a>
101101
</td>
102102
<td>
103-
<a href="3.4/en/html/api/">[APIs, including XML-RPC and JSON-RPC]</a>
103+
<a href="{{ "3.4/en/html/api/" | absolute_url }}">[APIs, including XML-RPC and JSON-RPC]</a>
104104
</td>
105105
</tr>
106106
<tr><td>Bugzilla 3.2.10</td>
107107
<td></td>
108108
<td>
109-
<a href="3.2/en/html/">[Online HTML]</a>
110-
<a href="3.2/en/pdf/Bugzilla-Guide.pdf">[PDF]</a>
111-
<a href="3.2/en/txt/Bugzilla-Guide.txt">[Text]</a>
109+
<a href="{{ "3.2/en/html/" | absolute_url }}">[Online HTML]</a>
110+
<a href="{{ "3.2/en/pdf/Bugzilla-Guide.pdf" | absolute_url }}">[PDF]</a>
111+
<a href="{{ "3.2/en/txt/Bugzilla-Guide.txt" | absolute_url }}">[Text]</a>
112112
</td>
113113
<td>
114-
<a href="3.2/en/html/api/">[APIs, including XML-RPC and JSON-RPC]</a>
114+
<a href="{{ "3.2/en/html/api/" | absolute_url }}">[APIs, including XML-RPC and JSON-RPC]</a>
115115
</td>
116116
</tr>
117117
<tr><td>Bugzilla 3.0.11</td>
118118
<td></td>
119119
<td>
120-
<a href="3.0/html/">[Online HTML]</a>
121-
<a href="3.0/pdf/Bugzilla-Guide.pdf">[PDF]</a>
122-
<a href="3.0/txt/Bugzilla-Guide.txt">[Text]</a>
120+
<a href="{{ "3.0/html/" | absolute_url }}">[Online HTML]</a>
121+
<a href="{{ "3.0/pdf/Bugzilla-Guide.pdf" | absolute_url }}">[PDF]</a>
122+
<a href="{{ "3.0/txt/Bugzilla-Guide.txt" | absolute_url }}">[Text]</a>
123123
</td>
124124
<td>
125-
<a href="3.0/html/api/">[APIs, including XML-RPC and JSON-RPC]</a>
125+
<a href="{{ "3.0/html/api/" | absolute_url }}">[APIs, including XML-RPC and JSON-RPC]</a>
126126
</td>
127127
</tr>
128128
<tr><td>Bugzilla 2.22.7</td>
129129
<td></td>
130130
<td>
131-
<a href="2.22/html/">[Online HTML]</a>
132-
<a href="2.22/pdf/Bugzilla-Guide.pdf">[PDF]</a>
133-
<a href="2.22/txt/Bugzilla-Guide.txt">[Text]</a>
131+
<a href="{{ "2.22/html/" | absolute_url }}">[Online HTML]</a>
132+
<a href="{{ "2.22/pdf/Bugzilla-Guide.pdf" | absolute_url }}">[PDF]</a>
133+
<a href="{{ "2.22/txt/Bugzilla-Guide.txt" | absolute_url }}">[Text]</a>
134134
</td>
135135
<td></td>
136136
</tr>
137137
<tr><td>Bugzilla 2.20.7</td>
138138
<td></td>
139139
<td>
140-
<a href="2.20/html/">[Online HTML]</a>
141-
<a href="2.20/pdf/Bugzilla-Guide.pdf">[PDF]</a>
142-
<a href="2.20/txt/Bugzilla-Guide.txt">[Text]</a>
140+
<a href="{{ "2.20/html/" | absolute_url }}">[Online HTML]</a>
141+
<a href="{{ "2.20/pdf/Bugzilla-Guide.pdf" | absolute_url }}">[PDF]</a>
142+
<a href={{ "2.20/txt/Bugzilla-Guide.txt" | absolute_url }}"">[Text]</a>
143143
</td>
144144
<td></td>
145145
</tr>
146146
<tr><td>Bugzilla 2.18.6</td>
147147
<td></td>
148-
<td>
149-
<a href="2.18/html/">[Online HTML]</a>
150-
<a href="2.18/pdf/Bugzilla-Guide.pdf">[PDF]</a>
151-
<a href="2.18/txt/Bugzilla-Guide.txt">[Text]</a>
148+
<td>
149+
<a href="{{ "2.18/html/" | absolute_url }}">[Online HTML]</a>
150+
<a href="{{ "2.18/pdf/Bugzilla-Guide.pdf" | absolute_url }}">[PDF]</a>
151+
<a href="{{ "2.18/txt/Bugzilla-Guide.txt" | absolute_url }}">[Text]</a>
152152
</td>
153153
<td></td>
154154
</tr>
155155
<tr><td>Bugzilla 2.16.11</td>
156156
<td></td>
157157
<td>
158-
<a href="2.16/html/">[Online HTML]</a>
159-
<a href="2.16/pdf/Bugzilla-Guide.pdf">[PDF]</a>
160-
<a href="2.16/txt/Bugzilla-Guide.txt">[Text]</a>
158+
<a href="{{ "2.16/html/" | absolute_url }}">[Online HTML]</a>
159+
<a href="{{ "2.16/pdf/Bugzilla-Guide.pdf" | absolute_url }}">[PDF]</a>
160+
<a href="{{ "2.16/txt/Bugzilla-Guide.txt" | absolute_url }}">[Text]</a>
161161
</td>
162162
<td></td>
163163
</tr>

0 commit comments

Comments
 (0)