Skip to content
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.

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

Fix deadlinks and tidy html #856

Merged
merged 1 commit into from
Sep 25, 2020
Merged

Fix deadlinks and tidy html #856

merged 1 commit into from
Sep 25, 2020

Conversation

Robinlovelace
Copy link
Member

Close #855

@Robinlovelace
Copy link
Member Author

I'm not 100% sure what the accessibility_body.html file was doing so have deleted it - did not seem to be linked to Jekyll. Was that an artifact of previous work @nikolai-b ?

Copy link
Member

@usr110 usr110 left a comment

Choose a reason for hiding this comment

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

Now seems to work fine; just tested it. Thanks @Robinlovelace for the fix. Great work!

One minor request, if I may (not related to this fix): would be nice if all external links are opened in a new tab. What do you think?

@usr110
Copy link
Member

usr110 commented Sep 24, 2020

@Robinlovelace
Copy link
Member Author

One minor request, if I may (not related to this fix): would be nice if all external links are opened in a new tab. What do you think?

Agreed. Unless @nikolai-b or anyone else disagrees, I'm in favour, especially after reading this.

@Robinlovelace
Copy link
Member Author

Also is this file https://github.com/npct/pct-shiny/blob/deadlinks-1/regions_www/tabs/accessibility.html
being used?

Good question. It seems it's a duplicate of this:

https://github.com/npct/pct-shiny/blob/deadlinks-1/regions_www/accessibility.html

Was that duplication intended with #851 @nikolai-b ?

@Robinlovelace
Copy link
Member Author

Updated response @usr110 (also cc @nikolai-b supporting Jekyll):

Also is this file https://github.com/npct/pct-shiny/blob/deadlinks-1/regions_www/tabs/accessibility.html
being used?

I think it is now, in the app.

@nikolai-b
Copy link
Contributor

I was planning on making the accessibility work from inside the shiny app, i.e.
http://npct0.vs.mythic-beasts.com/m/?r=isle-of-wight click the about tab then the Accessibility Statement then your taken out of the app. I was thinking of doing something clever using regions_www/tabs/accessibility.html and regions_www/tabs/accessibility_body.html but it only works if the Accessibility Statement is in the nav and now it isn't so 🤷. Both these files can be removed, thanks for spotting!

@usr110 are you able to get Jekyll working locally? No worries if not just that I've added a whole new tool and wanted to offer support it get it running if you need it.

@Robinlovelace
Copy link
Member Author

@nikolai-b do you want to get the accessibility statement working in the app? I suggest it's not worth it.

@nikolai-b
Copy link
Contributor

When it was in the nav I was going to (only a few minutes work) hence those files. No going to now.

P.S. I thought all the external links do open in a new tab.

@Robinlovelace
Copy link
Member Author

Robinlovelace commented Sep 24, 2020

Thanks for the clarification @nikolai-b. Looking forward to a review this PR, further fixes (I think external links is worth opening as a separate issue) and seeing #855 fixed on production soon. Good work on identifying, communicating and fixing issues in progress!

@usr110
Copy link
Member

usr110 commented Sep 25, 2020

I was planning on making the accessibility work from inside the shiny app, i.e.
http://npct0.vs.mythic-beasts.com/m/?r=isle-of-wight click the about tab then the Accessibility Statement then your taken out of the app. I was thinking of doing something clever using regions_www/tabs/accessibility.html and regions_www/tabs/accessibility_body.html but it only works if the Accessibility Statement is in the nav and now it isn't so 🤷. Both these files can be removed, thanks for spotting!

Great, thanks for the explanation. Can't we embed the whole statement as part of the about page? (Shared similar thoughts here: #848 (comment))

@usr110 are you able to get Jekyll working locally? No worries if not just that I've added a whole new tool and wanted to offer support it get it running if you need it.

After installing I followed the steps from here: https://github.com/npct/pct-shiny/blob/master/jekyll-static/README.md

it failed with

$ jekyll s -d ../regions_www
Traceback (most recent call last):
10: from C:/Ruby27-x64/bin/jekyll:23:in <main>' 9: from C:/Ruby27-x64/bin/jekyll:23:in load'
8: from C:/Ruby27-x64/lib/ruby/gems/2.7.0/gems/jekyll-4.1.1/exe/jekyll:11:in <top (required)>' 7: from C:/Ruby27-x64/lib/ruby/gems/2.7.0/gems/jekyll-4.1.1/lib/jekyll/plugin_manager.rb:52:in require_from_bundler'
6: from C:/Ruby27-x64/lib/ruby/2.7.0/bundler.rb:149:in setup' 5: from C:/Ruby27-x64/lib/ruby/2.7.0/bundler/runtime.rb:26:in setup'
4: from C:/Ruby27-x64/lib/ruby/2.7.0/bundler/runtime.rb:26:in map' 3: from C:/Ruby27-x64/lib/ruby/2.7.0/bundler/spec_set.rb:147:in each'
2: from C:/Ruby27-x64/lib/ruby/2.7.0/bundler/spec_set.rb:147:in each' 1: from C:/Ruby27-x64/lib/ruby/2.7.0/bundler/runtime.rb:31:in block in setup'
C:/Ruby27-x64/lib/ruby/2.7.0/bundler/runtime.rb:312:in check_for_activated_spec!': You have already activated em-websocket 0.5.2, but your Gemfile requires em-websocket 0.5.1. Prepending bundle exec` to your command may solve this. (Gem::LoadError)

P.S. I am completely new to Jekyll, so might be making a very basic error.

@Robinlovelace
Copy link
Member Author

@usr110 it failed first time for me too but worked eventually. BTW please can you review the PR, want to get the fix on production ASAP. We can tidy up later but atm there are deadlinks on the pct.bike which need fixing. 🔥 🚒

@usr110
Copy link
Member

usr110 commented Sep 25, 2020

@usr110 it failed first time for me too but worked eventually. BTW please can you review the PR, want to get the fix on production ASAP. We can tidy up later but atm there are deadlinks on the pct.bike which need fixing. 🔥 🚒

Understandable!

Re the fix, I think I've okayed it. Would you like to resolve opening the links in a new tab first or should we create another PR for it?

These are the two links:

Screenshot_2020-09-25 The Propensity to Cycle Tool Accessibility Statement(1)
Screenshot_2020-09-25 The Propensity to Cycle Tool Accessibility Statement

@usr110 usr110 self-requested a review September 25, 2020 11:57
@Robinlovelace
Copy link
Member Author

Would you like to resolve opening the links in a new tab first or should we create another PR for it?

Create a new PR I say to keep things modular and get this hotfix in.

@Robinlovelace Robinlovelace merged commit 48ef412 into master Sep 25, 2020
@Robinlovelace Robinlovelace deleted the deadlinks-1 branch September 25, 2020 12:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Link of organizations uses a dead link on accessibility statement
3 participants