Skip to content

Fix baseurl references and broken links to protests on country page #10

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

Open
lts-andrewnk wants to merge 2 commits into
base: cassandra-mobile
Choose a base branch
from
Open

Fix baseurl references and broken links to protests on country page #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75e2db3
Fix baseurl references
lts-andrewnk Dec 9, 2021
39f3fd4
Fix broken links by referencing correct column
lts-andrewnk Dec 9, 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
6 changes: 3 additions & 3 deletions data_to_map/map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ def patches(plot, div, patch_data):
tap = TapTool(
renderers=[render],
callback=OpenURL(
url='/spa/@perma'
url='/@perma'
)
)
plot.add_tools(tap)
Expand Down Expand Up @@ -447,7 +447,7 @@ def points(plot, div, point_source):
// `baseurlPrefix` will need to match whatever
// baseurl Jekyll's _config.yml file specifies...
// pretty awkward, but I see no obvious alternative.
var baseurlPrefix = '/spa/'
var baseurlPrefix = '/'

var protestName = baseurlPrefix + features['perma'][protest];

Expand Down Expand Up @@ -715,7 +715,7 @@ def point_plot(self, tile_url, tile_attribution='MapTiler'):
// `baseurlPrefix` will need to match whatever
// baseurl Jekyll's _config.yml file specifies...
// pretty awkward, but I see no obvious alternative.
var baseurlPrefix = '/spa/'
var baseurlPrefix = '/'

var protestName = baseurlPrefix + features['perma'][i];

Expand Down
2 changes: 1 addition & 1 deletion docs/_includes/country-map.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/_includes/map.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/_includes/protest-map.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/_layouts/country.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h3>PROTESTS</h3>
<section class="spa-overflow">
{% for protest in site.data.protests %}
{% if protest['Country Name'] == page.title %}
<article class="spa-country-intro spa-protest-result"><a class="spa-protest-result" target="_blank" href="{{site.baseurl}}/protests/{{ protest['Protest Name'] }}">
<article class="spa-country-intro spa-protest-result"><a class="spa-protest-result" target="_blank" href="{{site.baseurl}}/protests/{{ protest['unique-key'] | downcase | replace: ' ', '' }}">
<h4 style="padding:0px; margin:0px">{{ protest['Protest Name'] }}</h4><br>
{% if protest['date'] %}
{{ protest['date'] }} <br>
Expand Down