Skip to content

Fix double-slashes in URLs and add trailing slash where appropriate #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 26, 2021
Merged

Fix double-slashes in URLs and add trailing slash where appropriate #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8657155
Templates: .Site.BaseURL to relURL function
jtc Jul 25, 2021
950f8cc
Content pages & shortcode: baseurl to relURL
jtc Jul 25, 2021
63f7430
Add trailing slash to page links
jtc Jul 25, 2021
4ec7ed4
Correct capitalisation of baseURL in config
jtc Jul 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Site settings
baseurl = "https://uqcs.org/"
baseURL = "https://uqcs.org/"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kind of a shame that Hugo breaks from the standard for not capitalising acronyms longer than two chars.

baseURL is correct in the Hugo sphere

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think by shame here Jack means "breath of fresh air"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

baseUrl is superior 👀

languageCode = "en-us"
title = "UQCS"

Expand Down
18 changes: 9 additions & 9 deletions content/about/_index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

{{< blocks/hero >}}
<div class="container has-text-centered ">
<img src="{{< baseurl >}}/img/logo/logo-long-white.svg" style="max-width: 400px;" />
<img src="{{< relURL "/img/logo/logo-long-white.svg" >}}" style="max-width: 400px;" />
</div>
<section class="section has-text-centered is-size-5">
<div class="columns is-centered">
Expand Down Expand Up @@ -66,29 +66,29 @@ <h1 class="title">What is UQCS?</h1>
<div class="column is-9-desktop">
<div class="tile is-ancestor">
<div class="tile is-parent">
<article class="tile is-child box button-box" href="{{< baseurl >}}/competitions">
<article class="tile is-child box button-box" href="{{< relURL "/competitions/" >}}">
<p class="title has-text-centered">Competitions</p>
<figure class="image is-256x256"
style="display: block; margin-left: auto; margin-right: auto;">
<img src="{{< baseurl >}}/img/media/competitions/code_jam.jpg">
<img src="{{< relURL "/img/media/competitions/code_jam.jpg" >}}">
</figure>
</article>
</div>
<div class="tile is-parent">
<article class="tile is-child box button-box" href="{{< baseurl >}}/community">
<article class="tile is-child box button-box" href="{{< relURL "/community/" >}}">
<p class="title has-text-centered">Community</p>
<figure class="image is-256x256"
style="display: block; margin-left: auto; margin-right: auto;">
<img src="{{< baseurl >}}/img/media/community.jpg">
<img src="{{< relURL "/img/media/community.jpg" >}}">
</figure>
</article>
</div>
<div class="tile is-parent">
<article class="tile is-child box button-box" href="{{< baseurl >}}/industry">
<article class="tile is-child box button-box" href="{{< relURL "/industry/" >}}">
<p class="title has-text-centered">Industry</p>
<figure class="image is-256x256"
style="display: block; margin-left: auto; margin-right: auto;">
<img src="{{< baseurl >}}/img/media/industry_panel.jpg">
<img src="{{< relURL "/img/media/industry_panel.jpg" >}}">
</figure>
</article>
</div>
Expand All @@ -99,15 +99,15 @@ <h1 class="title">What is UQCS?</h1>
<div class="column is-6-desktop is-8-tablet">
<div class="tile is-ancestor">
<div class="tile is-parent">
<article class="tile is-child box button-box has-text-centered" href="{{< baseurl >}}/constitution">
<article class="tile is-child box button-box has-text-centered" href="{{< relURL "/constitution/" >}}">
<p class="title has-text-centered">Constitution</p>
<span class="icon is-large has-text-dark">
<i class="fas fa-4x fa-book"></i>
</span>
</article>
</div>
<div class="tile is-parent">
<article class="tile is-child box button-box has-text-centered" href="{{< baseurl >}}/code-of-conduct">
<article class="tile is-child box button-box has-text-centered" href="{{< relURL "/code-of-conduct/" >}}">
<p class="title has-text-centered">Code of Conduct</p>
<span class="icon is-large has-text-dark">
<i class="fas fa-4x fa-gavel"></i>
Expand Down
4 changes: 2 additions & 2 deletions content/community/_index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1 class="title is-3">UQCS Community</h1>
<a href="https://djangogirls.org/">Django Girls</a> (a group photo of
which is pictured below!).</p>
<div class="block">
<img src="{{< baseurl >}}/img/media/django-girls.jpg" style="width: 100%" />
<img src="{{< relURL "/img/media/django-girls.jpg" >}}" style="width: 100%" />
</div>

<h3> How can I get involved?</h3>
Expand All @@ -37,7 +37,7 @@ <h3> How can I get involved?</h3>
<p>When opportunities to join the committee/subcommittee come up, they'll be widely advertised on UQCS’s
social media and in the weekly newsletters we send out to our members (so stay in touch!).
All of this is not a comprehensive list to get involved in UQCS by any means; if you would like to be
involved in the running of the club, reach out to one of our <a href="{{< baseurl >}}/about/">friendly
involved in the running of the club, reach out to one of our <a href="{{< relURL "/about/" >}}">friendly
committee members</a>.</p>

<h4>Giving talks</h4>
Expand Down
2 changes: 1 addition & 1 deletion content/competitions/codejam-2020.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div class="block">
<a href="https://www.facebook.com/events/659245534649313/">
<img src="{{< baseurl >}}/img/media/competitions/codejam_2020_banner.png" style="width: 100%" />
<img src="{{< relURL "/img/media/competitions/codejam_2020_banner.png" >}}" style="width: 100%" />
</a>
</div>

Expand Down
2 changes: 1 addition & 1 deletion content/competitions/hackathon-2020.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<div class="block">
<a href="https://www.facebook.com/events/2858423371101933/">
<img src="{{< baseurl >}}/img/media/competitions/hackathon_2020_banner.png" style="width: 100%" />
<img src="{{< relURL "/img/media/competitions/hackathon_2020_banner.png" >}}" style="width: 100%" />
</a>
</div>

Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/hero.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<!-- Hero content: will be in the middle -->
<div class="hero-body">
<div class="container has-text-centered block">
<img src="{{ .Site.BaseURL }}/img/logo/logo-long-white.svg" height="200" width="400"/>
<img src="{{ "/img/logo/logo-long-white.svg" | relURL }}" height="200" width="400"/>
</div>
<p class="is-centred uqcs-blurb" >
UQCS is a student society, run by students, for students. We engage with a broad range of student interests, from digital design to software engineering. We're an inclusive club focused on developing the next generation of innovators, through twice-weekly events spanning educational, social, and industry emphases. Our membership spans undergraduates, postgraduates, recent graduates, and alumni.
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<div class="column is-8">
<nav class="navbar is-dark">
<div class="navbar-brand">
<a href="{{ .Site.BaseURL }}" class="navbar-item is-paddingless">
<img src="{{ .Site.BaseURL }}/img/logo/logo.svg" class="image is-64x64" style="max-height: 2.5rem;"/>
<a href="{{ "/" | relURL }}" class="navbar-item is-paddingless">
<img src="{{ "/img/logo/logo.svg" | relURL }}" class="image is-64x64" style="max-height: 2.5rem;"/>
</a>
<a role="button" class="navbar-burger burger" aria-label="menu" aria-expanded="false"
data-target="uqcsNavBar">
Expand Down
12 changes: 6 additions & 6 deletions layouts/partials/nav/navbar-end.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{{ "<!-- Navbar End -->" | safeHTML }}

<a class="navbar-item" href="{{ .Site.BaseURL }}/about">
<a class="navbar-item" href="{{ "/about/" | relURL }}">
About
</a>
<a class="navbar-item" href="{{ .Site.BaseURL }}/talks">
<a class="navbar-item" href="{{ "/talks/" | relURL }}">
Talks
</a>
<a class="navbar-item" href="{{ .Site.BaseURL }}/showcase">
<a class="navbar-item" href="{{ "/showcase/" | relURL }}">
Showcase
</a>
<a class="navbar-item" href="{{ .Site.BaseURL }}/events">
<a class="navbar-item" href="{{ "/events/" | relURL }}">
Events
</a>
<a class="navbar-item" href="{{ .Site.BaseURL }}/connect">
<a class="navbar-item" href="{{ "/connect/" | relURL }}">
Connect
</a>
<a class="navbar-item" href="{{ .Site.BaseURL }}/lambda">
<a class="navbar-item" href="{{ "/lambda/" | relURL }}">
Why Lambda?
</a>

Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/sponsor-banner.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</div>

<!-- object tag enables links inside the SVG image -->
<object type="image/svg+xml" data="{{ .Site.BaseURL }}/img/sponsors/all_sponsors.svg">
<object type="image/svg+xml" data="{{ "/img/sponsors/all_sponsors.svg" | relURL }}">
Sponsor Banner
</object>
</div>
Expand Down
1 change: 0 additions & 1 deletion layouts/shortcodes/baseurl.html
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions layouts/shortcodes/relURL.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ index .Params 0 | relURL }}