Skip to content

Commit

Permalink
Try making liquid strict (#232)
Browse files Browse the repository at this point in the history
* Remove errant .DS_Store file

* Ignore .DS_Store

* Create a list of organisations

* Add an org list

* Show number of PIDs per org

* Fix HTML issue, sort orgs by title

* Try and fix the PID count

* Try and fix issues

* Try again to fix issues

* Try yet again to fix issues

* Correct the urlpart

* Change to sort_natural, minor code tidy

* Try and fix the sorting

* Try again to fix the sorting

* Remove debugging

* Add a link to orgs page

* Install dependencies for Travis

* Create .travis.yml

* Add the Travis script

* Update the Ruby version

* Bump the Ruby version some more

* Switch back to the documented version

* Add the exclude

* Update based on jekyll/jekyll#5413

* Add github-pages Gem

* Add missing gems

* Add redcarpet

* Switch to tasks so we can run multiple CI tasks

* Switch to tasks

* Fix the matrix

* More matrix fixing

* Turn on more htmlproofer options

* Make the check less strict

* Don't bother complaining about extra jekyll tags

* Escape HTML entities

* Fix the email link

* Fix the link within the 404 page!

* Escape more HTML entities

* Remove an invalid site URL

* Cache ruby bundles

* Escape even more HTML entities

* Escape yet more HTML entities

* Escape more HTML entities and switch to a div

* Try and fix the errant paragraph item

* Add a Travis badge to the readme

* Update Gemfile

Adapted from https://github.com/lunaryorn/lunaryorn.github.io

* Update _config.yml

* Add some more checks to Travis

* Report GH Pages versions

* Tidy up, add redcarpet back in

* Try and stop the spurious paragraph tags

* Check Open Graph

* Make pid.codes an internal domain

* Ensure we've got the fixed html-proofer

* Use the original orgpath URL

* Ignore some broken URLs

* Try and fix the syntax issue

* Third try at fixing syntax

* Ignore another broken URL

* Alternative ignore of a specific URL

* Ignore the remaining URLs

* Update Instant Infrastructure URL

* Remove a redundant URL ignore

* Update some broken links

* Update links

* Remove more resolved links

* Force links in kramdown

* Format more links for kramdown

* Make more links clickable/add more site URLs

* Fix more URLs

* Fix some more URLs and ignore some others

* Fix the remaining broken link

* Fix the URL I missed

* Make Jekyll liquid processing strict, make general Jekyll processing verbose

* Try and fix the Liquid warning

* Try and fix more Liquid errors

* Fix more Liquid errors

* Switch to warn until we've fixed all the errors

* Switch back, warn doesn't actually log the errors :(

* Fix another error

* Revert and try another fix as it just breaks it

* Go verbose

* Revert and try another fix

* Revert and fix

* Assign and fix
  • Loading branch information
peternewman authored and Arachnid committed Mar 22, 2017
1 parent d1a7ef4 commit b37cbc3
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ share_stumbleupon: false
exclude: [vendor]
gems:
- jekyll-paginate
liquid:
error_mode: strict
verbose: true
markdown: kramdown
kramdown:
auto_ids: true
Expand Down
6 changes: 3 additions & 3 deletions _includes/data.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% assign vids = {{site.pages|where:"layout","vid"|sort:"url"}} %}
{% assign pids = {{site.pages|where:"layout","pid"|sort:"url"}} %}
{% assign orgs = {{site.pages|where:"layout","org"|sort:"url"}} %}
{% assign vids = site.pages|where:"layout","vid"|sort:"url" %}
{% assign pids = site.pages|where:"layout","pid"|sort:"url" %}
{% assign orgs = site.pages|where:"layout","org"|sort:"url" %}
2 changes: 1 addition & 1 deletion _includes/orgtable.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<thead>
<tr><th>Organisation</th><th>Number of PIDs</th></tr>
</thead>
{% assign sortedorgs = {{site.pages|where:"layout","org"|sort:"title"}} %}
{% assign sortedorgs = site.pages|where:"layout","org"|sort:"title" %}
{% for org in sortedorgs %}
{% assign urlparts = org.url|split:"/" %}
{% assign owner = urlparts[2] %}
Expand Down
2 changes: 1 addition & 1 deletion _layouts/pid.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% include data.html %}
{% capture orgpath %}/org/{{page.owner}}/{% endcapture %}
{% assign org = {{orgs|where:"url",orgpath|first}} %}
{% assign org = orgs|where:"url",orgpath|first %}
{% assign urlparts = page.url|split:"/" %}
{% assign vid = urlparts[1] %}
{% assign pid = urlparts[2] %}
Expand Down
2 changes: 1 addition & 1 deletion _layouts/vid.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% include data.html %}
{% assign org = {{orgs|where:"orgname",page.owner|first}} %}
{% assign org = orgs|where:"orgname",page.owner|first %}
{% assign urlparts = page.url|split:"/" %}
{% assign vid = urlparts[1] %}
<!DOCTYPE html>
Expand Down

0 comments on commit b37cbc3

Please sign in to comment.