From 3cb7916f9f3042d637108b178dbddde4b2684c5b Mon Sep 17 00:00:00 2001 From: Joel Hedlund Date: Fri, 27 Oct 2017 16:19:35 +0200 Subject: [PATCH] Make github and local forks render "correctly". (#67) --- _activities/neic2017.md | 2 +- _activities/nicest.md | 2 -- _activities/nlpl.md | 2 -- _activities/office.md | 2 +- _activities/poco.md | 3 +-- _includes/about.html | 26 +++++++++---------- _includes/activities.html | 6 ++--- _includes/activity.html | 14 +++++----- _includes/api.html | 6 ++--- _includes/baseurl | 1 + _includes/conditional_baseurl | 1 + _includes/course-mobility.html | 4 +-- _includes/events-past.html | 4 +-- _includes/events.html | 4 +-- _includes/footer.html | 2 +- _includes/generic.html | 2 +- _includes/head.html | 10 +++---- _includes/header.html | 13 +++++++--- _includes/index.html | 18 ++++++------- _includes/js.html | 14 +++++----- _includes/news.html | 8 +++--- _includes/open-positions.html | 4 +-- _includes/people.html | 8 +++--- _includes/person.html | 8 +++--- _includes/post.html | 2 +- _includes/publications.html | 2 +- _includes/training-past.html | 4 +-- _includes/training-upcoming.html | 4 +-- _includes/training.html | 22 ++++++++-------- _includes/travel-grant.html | 4 +-- _people/andreas-solberg.md | 4 +-- ...ssions-on-e-infrastructure-in-trondheim.md | 6 ++--- ...-06-10-do-we-make-the-best-use-of-prace.md | 2 +- ...-conference-13-16-may-2013-in-trondheim.md | 2 +- ...orage-and-computation-on-sensitive-data.md | 2 +- ...c-is-seeking-an-sgas-software-developer.md | 2 +- ...013-08-23-bms-project-proposal-workshop.md | 2 +- ...a-project-leader-for-sensitive-bms-data.md | 2 +- ...c-project-leader-for-sensitive-bms-data.md | 2 +- ...-nordic-countries-continue-to-use-prace.md | 6 ++--- ...-delicate-balance-securing-sharing-data.md | 4 +-- _posts/2014-04-30-neic-2015-conference.md | 2 +- ...-neic-seeking-input-on-new-funding-plan.md | 2 +- _posts/2014-09-10-dejan-joins-xt.md | 4 +-- _posts/2014-09-10-nordforsk-arc-funding.md | 4 +-- .../2014-09-19-rob-pennington-joins-neic.md | 4 +-- _posts/2014-09-24-small-files-big-impact.md | 4 +-- _posts/2014-09-25-let-it-grow.md | 4 +-- .../2014-10-16-nordic-accounting-workshop.md | 4 +-- ...dline-project-manager-eiscat-3d-support.md | 4 +-- ...014-10-28-neic-2020-co-funding-proposal.md | 4 +-- ...0-30-thomas-roblitz-new-env-coordinator.md | 4 +-- _posts/2014-11-05-tryggve-is-underway.md | 6 ++--- _posts/2014-11-26-opening-in-the-couds.md | 4 +-- _posts/2014-11-28-glenna-has-started.md | 4 +-- .../2015-01-07-neic2015-registration-open.md | 4 +-- ...1-25-john-white-leads-eiscat-3d-support.md | 4 +-- _posts/2015-02-03-all-hands-meeting-2015.md | 6 ++--- ...5-03-31-neic-is-looking-for-wlcg-expert.md | 4 +-- _posts/2015-04-22-13-days-left.md | 4 +-- ...rastructure-collaboration-on-the-agenda.md | 4 +-- _posts/2015-05-08-cognitus-2015.md | 4 +-- _posts/2015-05-22-large-turnout.md | 4 +-- ...9-josep-flix-engaged-as-wlcg-specialist.md | 4 +-- _posts/2015-06-16-new-neic-board-appointed.md | 6 ++--- ...-infrastructure-for-nordic-biodiversity.md | 4 +-- ...esearchers-use-supercomputing-resources.md | 6 ++--- ...ration-on-the-eiscat_3d-einfrastructure.md | 4 +-- ...nfrastructures-for-wild-animal-research.md | 4 +-- ...ccounting-system-for-grid-&-hpc-systems.md | 2 +- _posts/2016-01-27-NeIC2017.md | 2 +- _posts/2016-03-22-glenna-f2f-demos.md | 2 +- _posts/2016-05-25-joint-nordic-training.md | 2 +- _posts/2016-07-05-nordic-model.md | 4 +-- ...-neic-coordinators-and-project-managers.md | 2 +- ...9-13-neic-is-seeking-storage-specialist.md | 2 +- _posts/2016-11-29-Resource-sharing-PM.md | 2 +- _posts/2016-11-29-Trainingcoordinator.md | 2 +- ...genetics-and-environment-across-borders.md | 4 +-- ...13-tryggve-takes-care-of-sensitive-data.md | 4 +-- ...kka-new-administrative-area-coordinator.md | 6 ++--- ...kiewicz-new-appointed-executive-manager.md | 4 +-- ...7-02-07-NeIC2017-registrations-now-open.md | 4 +-- ...w-report-ethical-review-data-protection.md | 2 +- ...better-software-leads-to-better-science.md | 8 +++--- _posts/2017-04-07-studying-dark-matter.md | 4 +-- ...age-for-the-worlds-largest-data-volumes.md | 4 +-- _posts/2017-04-26-Tryggve2-announcement.md | 4 +-- ...john-white-new-dellingr-project-manager.md | 4 +-- _posts/2017-05-09-open-positions-at-neic.md | 2 +- _posts/2017-06-14-neic-2017.md | 8 +++--- ...building-a-cloud-for-nordic-reserachers.md | 4 +-- ...06-27-saving-lives-with-a-secure-system.md | 8 +++--- .../2017-07-03-neic-welcomes-its-new-chair.md | 4 +-- ...chandan-basu-new-nicest-project-manager.md | 4 +-- api.md | 1 + 96 files changed, 227 insertions(+), 224 deletions(-) create mode 100644 _includes/baseurl create mode 100644 _includes/conditional_baseurl diff --git a/_activities/neic2017.md b/_activities/neic2017.md index 00b2d173..0f0b345c 100644 --- a/_activities/neic2017.md +++ b/_activities/neic2017.md @@ -3,7 +3,7 @@ layout: master include: activity name: NeIC 2017 Conference type: Project -leader: pal-pettersen +leader: kine-nordstokka phase: Conclusion start: 2015-08-01 end: 2017-12-31 diff --git a/_activities/nicest.md b/_activities/nicest.md index 0499b4ad..ddb4ef5b 100644 --- a/_activities/nicest.md +++ b/_activities/nicest.md @@ -12,8 +12,6 @@ outreach: https://wiki.neic.no/wiki/Earth_system_modeling#Outreach documents: - text: Work plan url: https://wiki.neic.no/wiki/File:20161125_NeIC_ESM_work_plan_approved.pdf - - text: Collaboration agreement - url: N/A links: - url: https://wiki.neic.no/wiki/Earth_system_modeling text: External wiki diff --git a/_activities/nlpl.md b/_activities/nlpl.md index fb3adf3f..2195d1e2 100644 --- a/_activities/nlpl.md +++ b/_activities/nlpl.md @@ -14,8 +14,6 @@ outcome-statements: documents: - text: Work plan url: https://wiki.neic.no/wiki/File:20161220_NeIC_NLPL_workplan_approved.pdf - - text: Collaboration agreement - url: N/A links: - url: https://wiki.neic.no/wiki/Nordic_Language_Processing_Laboratory text: External wiki diff --git a/_activities/office.md b/_activities/office.md index 43a64ed5..86e7baac 100644 --- a/_activities/office.md +++ b/_activities/office.md @@ -6,7 +6,7 @@ type: Operations leader: gudmund-host start: 2012-01-01 results: N/A -outreach: ../../events/ +outreach: /events documents: - text: Strategy 2016-2020 url: https://wiki.neic.no/wiki/NeIC_Strategy_2016-2020 diff --git a/_activities/poco.md b/_activities/poco.md index d51bf430..3c9c4eae 100644 --- a/_activities/poco.md +++ b/_activities/poco.md @@ -10,7 +10,6 @@ end: 2020-12-31 results: https://wiki.neic.no/wiki/Pool_Competencies#Documents outreach: N/A documents: - - text: Project Humanities, Digital Competences - text: Strategy 2016-2020 url: /about/#strategy-and-focus groups: @@ -26,5 +25,5 @@ groups: Pool competencies is a focus area under the NeIC 2016-2020 strategy. The pool competencies working group is working to map out the competencies that are present or needed among the Nordic e-infrastructure providers and key -stakeholders, starting within the area of [training](/training/) and currently +stakeholders, starting within the area of [training](../training) and currently expanding to other areas starting with data management. diff --git a/_includes/about.html b/_includes/about.html index 6485ce19..7c373e70 100644 --- a/_includes/about.html +++ b/_includes/about.html @@ -1,4 +1,4 @@ -
+
@@ -18,7 +18,7 @@

WHAT IS NEIC?

-
+

OUR VISION

@@ -31,7 +31,7 @@

OUR VISION

-
history +
history
@@ -119,17 +119,17 @@

ORGANISATION

NeIC is a joint initiative between the Nordic countries, hosted by NordForsk since 1. January 2012. NordForsk appoints the NeIC Board based on - nominations by the national e-infrastructure provider organisations. These + nominations by the national e-infrastructure provider organisations. These strategic partner organisation are CSC (Finland), SNIC (Sweden), UNINETT Sigma2 - (Norway), DeIC (Denmark) and RH Net (Iceland). The NeIC Board consists of one + (Norway), DeIC (Denmark) and RH Net (Iceland). The NeIC Board consists of one representative from each of these.

- The NordForsk Board has delegated to the NeIC Board the authority to make strategic - decisions regarding computing and data-storage infrastructure and react on upcoming + The NordForsk Board has delegated to the NeIC Board the authority to make strategic + decisions regarding computing and data-storage infrastructure and react on upcoming opportunities. This includes allocating budget, implementing the organisation structure - as well as prioritising and coordinating Nordic collaboration projects. The NeIC Board - develops and maintains a strategy for NeIC. The NeIC Board recommends the NeIC Director + as well as prioritising and coordinating Nordic collaboration projects. The NeIC Board + develops and maintains a strategy for NeIC. The NeIC Board recommends the NeIC Director to be appointed by NordForsk.

@@ -146,13 +146,13 @@

ORGANISATION

-
organisation
+
organisation
-
+

OUR VALUES

@@ -165,7 +165,7 @@

OUR VALUES

-
+

Publications

diff --git a/_includes/activities.html b/_includes/activities.html index 1a49a38e..13db48df 100644 --- a/_includes/activities.html +++ b/_includes/activities.html @@ -1,4 +1,4 @@ -
+
@@ -21,7 +21,7 @@

ACTIVITIES

@@ -41,7 +41,7 @@

PAST ACTIVITIES

diff --git a/_includes/activity.html b/_includes/activity.html index 8b7668c2..6bd6f909 100644 --- a/_includes/activity.html +++ b/_includes/activity.html @@ -2,7 +2,7 @@ {% assign leader_path = "_people/" | append: page.leader | append: ".md" %} {% assign leader = site.people | where:"path", leader_path | first %} -
+
@@ -28,17 +28,17 @@

{{ page.type }}

LEADER: - {{ leader.name }} + {{ leader.name }}

{% unless page.results == "N/A" %}

- Results + Results

{% endunless %} {% unless page.outreach == "N/A" %}

- Outreach + Outreach

{% endunless %} @@ -46,7 +46,7 @@

{{ page.type }}

LINKS:

{% for link in page.links %}

- {{ link.text | default: link.url }} + {{ link.text | default: link.url }} {% if link.description %} - {{ link.description }}{% endif %}

{% endfor %} @@ -56,7 +56,7 @@

{{ page.type }}

DOCUMENTS

{% for link in page.documents %}

- {{ link.text | default: link.url }} + {{ link.text | default: link.url }} {% if link.description %} - {{ link.description }}{% endif %}

{% endfor %} @@ -191,7 +191,7 @@

PEOPLE

{% else %}

{% endif %} - {{ person.name }}, {{ person.country }}{% if person_group[1].role %}, {{ person_group[1].role }}{% endif %} + {{ person.name }}, {{ person.country }}{% if person_group[1].role %}, {{ person_group[1].role }}{% endif %}

{% assign person_on_top = false %} {% endif %} diff --git a/_includes/api.html b/_includes/api.html index 326005e3..96310e65 100644 --- a/_includes/api.html +++ b/_includes/api.html @@ -1,4 +1,4 @@ -
+
@@ -11,11 +11,11 @@

Versions

API v1.0

- activities.json + activities.json - Informaton on NeIC activities in JSON format

- people.json + people.json - Informaton on people involved with NeIC in JSON format

diff --git a/_includes/baseurl b/_includes/baseurl new file mode 100644 index 00000000..2265d1cc --- /dev/null +++ b/_includes/baseurl @@ -0,0 +1 @@ +{% if site.github.owner_name != 'neicnordic' %}{{ site.baseurl }}{% endif %} \ No newline at end of file diff --git a/_includes/conditional_baseurl b/_includes/conditional_baseurl new file mode 100644 index 00000000..c7ce63ce --- /dev/null +++ b/_includes/conditional_baseurl @@ -0,0 +1 @@ +{% assign firstchar = include.url|slice:0 %}{% assign secondchar = include.url|slice:1 %}{% if firstchar == '/' and secondchar != '/' %}{% include baseurl %}{% endif %}{{ include.url | default: include.default }} \ No newline at end of file diff --git a/_includes/course-mobility.html b/_includes/course-mobility.html index ba81ff01..24f748e1 100644 --- a/_includes/course-mobility.html +++ b/_includes/course-mobility.html @@ -1,11 +1,11 @@ -
+

COURSE MOBILITY

-

The open call for course mobility proposals is part of the
Ratatosk
Mobility Enhancement Programme.

+

The open call for course mobility proposals is part of the
Ratatosk
Mobility Enhancement Programme.

diff --git a/_includes/events-past.html b/_includes/events-past.html index 1ce1d718..d87598c3 100644 --- a/_includes/events-past.html +++ b/_includes/events-past.html @@ -1,4 +1,4 @@ -
+
@@ -49,7 +49,7 @@

ALL EVENTS

participates in or simply wants to advertize. You may also want to look for - upcoming + upcoming events.

diff --git a/_includes/events.html b/_includes/events.html index 1fe734e1..916bdd3b 100644 --- a/_includes/events.html +++ b/_includes/events.html @@ -1,4 +1,4 @@ -
+
@@ -49,7 +49,7 @@

ALL EVENTS

participates in or simply wants to advertize. You may also want to look for - past + past events.

diff --git a/_includes/footer.html b/_includes/footer.html index 0b08065a..4d21b3a1 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -39,7 +39,7 @@

ADDRESS

- footer + footer
diff --git a/_includes/generic.html b/_includes/generic.html index d1906107..75533c07 100644 --- a/_includes/generic.html +++ b/_includes/generic.html @@ -1,4 +1,4 @@ -
+
diff --git a/_includes/head.html b/_includes/head.html index c5a31861..f2e78f7c 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -4,7 +4,7 @@ - + {% if page.collection %} {% assign title = page.name %} @@ -15,8 +15,8 @@ {{ title }} - NeIC web - - - - + + + + diff --git a/_includes/header.html b/_includes/header.html index 1de89531..8f7d3ccf 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,9 +1,14 @@ -
+
{% else %} - + {{ item.text }} {% endif %} diff --git a/_includes/index.html b/_includes/index.html index c821a0d8..ecfb774a 100644 --- a/_includes/index.html +++ b/_includes/index.html @@ -16,7 +16,7 @@

About Us

technical experts from academic high-performance computing centres across the Nordic countries.

- Read More + Read More
@@ -25,7 +25,7 @@

ACTIVITIES

@@ -39,7 +39,7 @@

ACTIVITIES

-
+
@@ -68,7 +68,7 @@

-
+

OUR MISSION:

@@ -101,20 +101,20 @@

LATEST NEWS

{% assign left_news = true %} {% endif %} -
+
-
+
-

{{ post.title }}

+

{{ post.title }}

{{ post.date | date: "%Y-%m-%d" }}

{{ post.summary }}

- read more » + read more »
{% endif %} {% endfor %} - See more News + See more News
diff --git a/_includes/js.html b/_includes/js.html index 56b89195..37ba494c 100644 --- a/_includes/js.html +++ b/_includes/js.html @@ -1,15 +1,15 @@ - + - + - - + + - - + + - +