Skip to content

Commit c003e77

Browse files
davorgbook
authored andcommitted
Support the use of a <base> element
1 parent 19aabc5 commit c003e77

File tree

5 files changed

+25
-11
lines changed

5 files changed

+25
-11
lines changed

.github/workflows/buildsite.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,19 @@ jobs:
2222

2323
- name: Install modules
2424
run: |
25-
cpanm --installdeps --notest .
25+
cpanm --installdeps --notest .
26+
27+
- name: Get repo name into environment
28+
run: |
29+
echo "REPO_NAME=${GITHUB_REPOSITORY#$GITHUB_REPOSITORY_OWNER/}" >> $GITHUB_ENV
2630
2731
- name: Create pages
2832
env:
2933
PERL5LIB: lib
3034
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3135
run: |
3236
mkdir -p web
33-
perl bin/build
37+
perl bin/build $REPO_NAME
3438
3539
- name: Update pages artifact
3640
uses: actions/upload-pages-artifact@v3

CNAME

Lines changed: 0 additions & 1 deletion
This file was deleted.

bin/build

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ my %status;
1717
my $outpath = './web';
1818
my $template_path = [ './ppcs', './docs', './in', './ttlib' ];
1919

20+
my $base = shift || $outpath;
21+
$base =~ s/^\.//;
22+
$base = "/$base" if $base !~ m|^/|;
23+
$base = "$base/" if $base !~ m|/$|;
24+
2025
my $provider = Template::Provider::Pandoc->new({
2126
INCLUDE_PATH => $template_path,
2227
});
@@ -27,6 +32,9 @@ my $tt = Template->new({
2732
OUTPUT_PATH => $outpath,
2833
RELATIVE => 1,
2934
WRAPPER => 'page.tt',
35+
VARIABLES => {
36+
base => $base,
37+
}
3038
});
3139

3240
for (<ppcs/*.md>) {

in/index.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<td>[% ppc.status | html %]</td>
2121
<td>[% ppc.author | html %]</td>
2222
<td>[% ppc.sponsor | html %]</td>
23-
<td><a href="/[% ppc.slug %]/">[% ppc.title | html %]</a></td>
23+
<td><a href="./[% ppc.slug %]/">[% ppc.title | html %]</a></td>
2424
</tr>
2525
[% END -%]
2626
</tbody>

ttlib/page.tt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<!doctype html>
22
<html lang="en" class="h-100">
33
<head>
4+
[% IF base -%]
5+
<base href="[% base %]">
6+
[% END -%]
47
<meta charset="utf-8">
58
<meta name="viewport" content="width=device-width, initial-scale=1">
69
<meta name="description" content="">
@@ -43,29 +46,29 @@
4346
<!-- Fixed navbar -->
4447
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
4548
<div class="container-fluid">
46-
<a class="navbar-brand" href="/">PPCs</a>
49+
<a class="navbar-brand" href="./">PPCs</a>
4750
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
4851
<span class="navbar-toggler-icon"></span>
4952
</button>
5053
<div class="collapse navbar-collapse" id="navbarCollapse">
5154
<ul class="navbar-nav me-auto mb-2 mb-md-0">
5255
<li class="nav-item">
53-
<a class="nav-link active" href="/">Home</a>
56+
<a class="nav-link active" href="./">Home</a>
5457
</li>
5558
<li class="nav-item">
56-
<a class="nav-link" href="/process/">Process</a>
59+
<a class="nav-link" href="./process/">Process</a>
5760
</li>
5861
<li class="nav-item">
59-
<a class="nav-link" href="/motivation/">Motivation</a>
62+
<a class="nav-link" href="./motivation/">Motivation</a>
6063
</li>
6164
<li class="nav-item">
62-
<a class="nav-link" href="/template/">Template</a>
65+
<a class="nav-link" href="./template/">Template</a>
6366
</li>
6467
<li class="nav-item">
65-
<a class="nav-link" href="/others/">Others</a>
68+
<a class="nav-link" href="./others/">Others</a>
6669
</li>
6770
<li class="nav-item">
68-
<a class="nav-link" href="/future/">Future</a>
71+
<a class="nav-link" href="./future/">Future</a>
6972
</li>
7073
</ul>
7174
</div>

0 commit comments

Comments
 (0)