Skip to content

Commit 83c32b0

Browse files
committed
Use relative urls everywhere.
1 parent b326fc8 commit 83c32b0

File tree

7 files changed

+29
-23
lines changed

7 files changed

+29
-23
lines changed

src/blogs.rs

+4
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ impl Blog {
111111
&self.prefix
112112
}
113113

114+
pub(crate) fn path_back_to_root(&self) -> PathBuf {
115+
self.prefix.components().map(|_| Path::new("../")).collect()
116+
}
117+
114118
pub(crate) fn posts(&self) -> &[Post] {
115119
&self.posts
116120
}

src/main.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl<'a> Generator<'a> {
120120
.map(|other_blog| {
121121
json!({
122122
"link_text": other_blog.link_text(),
123-
"url": PathBuf::from("/").join(other_blog.prefix()).join("index.html"),
123+
"url": other_blog.prefix().join("index.html"),
124124
})
125125
})
126126
.collect();
@@ -130,6 +130,7 @@ impl<'a> Generator<'a> {
130130
"parent": "layout",
131131
"blog": blog,
132132
"other_blogs": other_blogs,
133+
"root": blog.path_back_to_root(),
133134
});
134135
self.render_template(blog.prefix().join("index.html"), "index", data)?;
135136
Ok(())
@@ -152,6 +153,7 @@ impl<'a> Generator<'a> {
152153
"parent": "layout",
153154
"blog": blog,
154155
"post": post,
156+
"root": blog.path_back_to_root().join("../../../"),
155157
});
156158

157159
self.render_template(path.join(filename), &post.layout, data)?;

src/styles/fonts.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $format-names: (
7070
@function urls($filename, $range, $extensions) {
7171
$urls: ();
7272
@each $extension in $extensions {
73-
$url: url('/fonts/#{$extension}/#{$filename}.#{$range}.#{$extension}');
73+
$url: url('../fonts/#{$extension}/#{$filename}.#{$range}.#{$extension}');
7474
$format: format(map-get($format-names, $extension));
7575

7676
$urls: append($urls, $url $format, comma);

templates/footer.hbs

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
<div class="four columns mt3 mt0-l">
2323
<h4>Social</h4>
2424
<div class="flex flex-row flex-wrap">
25-
<a href="https://twitter.com/rustlang" target="_blank" rel="noopener" alt="twitter link"><img src="/images/twitter.svg" alt="twitter logo" title="Twitter"/></a>
26-
<a href="https://www.youtube.com/channel/UCaYhcUwRBNscFNUKTjgPFiA" target="_blank" rel="noopener" alt="youtube link"><img style="padding-top: 6px; padding-bottom:6px" src="/images/youtube.svg" alt="youtube logo" title="YouTube"/></a>
27-
<a href="https://discord.gg/rust-lang" target="_blank" rel="noopener" alt="discord link"><img src="/images/discord.svg" alt="discord logo" title="Discord"/></a>
28-
<a href="https://github.com/rust-lang" target="_blank" rel="noopener" alt="github link"><img src="/images/github.svg" alt="github logo" title="GitHub"/></a>
25+
<a href="https://twitter.com/rustlang" target="_blank" rel="noopener" alt="twitter link"><img src="{{root}}images/twitter.svg" alt="twitter logo" title="Twitter"/></a>
26+
<a href="https://www.youtube.com/channel/UCaYhcUwRBNscFNUKTjgPFiA" target="_blank" rel="noopener" alt="youtube link"><img style="padding-top: 6px; padding-bottom:6px" src="{{root}}images/youtube.svg" alt="youtube logo" title="YouTube"/></a>
27+
<a href="https://discord.gg/rust-lang" target="_blank" rel="noopener" alt="discord link"><img src="{{root}}images/discord.svg" alt="discord logo" title="Discord"/></a>
28+
<a href="https://github.com/rust-lang" target="_blank" rel="noopener" alt="github link"><img src="{{root}}images/github.svg" alt="github logo" title="GitHub"/></a>
2929
</div>
3030
<h4 class="mt4 mb3">RSS</h4>
3131
<ul>
32-
<li><a href="/feed.xml">Main Blog</a></li>
33-
<li><a href="/inside-rust/feed.xml">"Inside Rust" Blog</a></li>
32+
<li><a href="{{root}}feed.xml">Main Blog</a></li>
33+
<li><a href="{{root}}inside-rust/feed.xml">"Inside Rust" Blog</a></li>
3434
</ul>
3535
</div>
3636

@@ -43,4 +43,4 @@
4343
</footer>
4444

4545
<!-- scripts -->
46-
<script src="/scripts/highlight.js"></script>
46+
<script src="{{root}}scripts/highlight.js"></script>

templates/headers.hbs

+10-10
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
<meta property="og:locale" content="en_US" />
1515

1616
<!-- styles -->
17-
<link rel="stylesheet" href="/styles/vendor.css"/>
18-
<link rel="stylesheet" href="/styles/fonts.css"/>
19-
<link rel="stylesheet" href="/styles/app.css"/>
20-
<link rel="stylesheet" href="/styles/highlight.css"/>
17+
<link rel="stylesheet" href="{{root}}styles/vendor.css"/>
18+
<link rel="stylesheet" href="{{root}}styles/fonts.css"/>
19+
<link rel="stylesheet" href="{{root}}styles/app.css"/>
20+
<link rel="stylesheet" href="{{root}}styles/highlight.css"/>
2121

2222
<!-- favicon -->
23-
<link rel="apple-touch-icon" sizes="180x180" href="/images/apple-touch-icon.png">
24-
<link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png">
25-
<link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png">
26-
<link rel="icon" type="image/svg+xml" href="/images/favicon.svg">
27-
<link rel="manifest" href="/images/site.webmanifest">
28-
<link rel="mask-icon" href="/images/safari-pinned-tab.svg" color="#5bbad5">
23+
<link rel="apple-touch-icon" sizes="180x180" href="{{root}}images/apple-touch-icon.png">
24+
<link rel="icon" type="image/png" sizes="16x16" href="{{root}}images/favicon-16x16.png">
25+
<link rel="icon" type="image/png" sizes="32x32" href="{{root}}images/favicon-32x32.png">
26+
<link rel="icon" type="image/svg+xml" href="{{root}}images/favicon.svg">
27+
<link rel="manifest" href="{{root}}images/site.webmanifest">
28+
<link rel="mask-icon" href="{{root}}images/safari-pinned-tab.svg" color="#5bbad5">
2929
<meta name="msapplication-TileColor" content="#00aba9">
3030
<meta name="theme-color" content="#ffffff">
3131

templates/index.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<p>
1111
<b>See also:</b>
1212
{{#each other_blogs}}
13-
<a href="{{url}}">{{link_text}}</a>
13+
<a href="{{../root}}{{url}}">{{link_text}}</a>
1414
{{/each}}
1515
</p>
1616
</div>
@@ -28,7 +28,7 @@
2828
</tr>{{/if}}
2929
<tr>
3030
<td class="tr o-60 pr4 pr5-l bn">{{month_name month}}&nbsp;{{day}}</td>
31-
<td class="bn"><a href="/{{../blog.prefix}}{{url}}">{{title}}</a></td>
31+
<td class="bn"><a href="{{url}}">{{title}}</a></td>
3232
</tr>
3333
{{/each}}
3434
</table>

templates/nav.hbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<nav class="flex flex-row justify-center justify-end-l items-center flex-wrap ph2 pl3-ns pr4-ns">
22
<div class="brand flex-auto w-100 w-auto-l self-start tc tl-l">
3-
<a href="/{{blog.prefix}}">
4-
<img class="v-mid ml0-l" alt="Rust Logo" src="/images/rust-logo-blk.svg">
3+
<a href="{{root}}{{blog.prefix}}">
4+
<img class="v-mid ml0-l" alt="Rust Logo" src="{{root}}images/rust-logo-blk.svg">
55
<span class="dib ml1 ml0-l">{{blog.title}}</span>
66
</a>
77
</div>

0 commit comments

Comments
 (0)