Make github and local forks render "correctly". (#67)

neicnordic · Oct 27, 2017 · 3cb7916 · 3cb7916
1 parent 7d3519e
commit 3cb7916
Show file tree

Hide file tree

Showing 96 changed files with 227 additions and 224 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-<section class="single-pagebanner" style="background-image: url(/assets/images/about-banner.png);">
+<section class="single-pagebanner" style="background-image: url({% include baseurl %}/assets/images/about-banner.png);">
 </section>
 
 <section class="green-box-block-about">
@@ -18,7 +18,7 @@ <h2>WHAT IS NEIC?</h2>
   </div>
 </section>
 
-<section class="mission" style="background-image: url(/assets/images/our-vision-bg.png);">
+<section class="mission" style="background-image: url({% include baseurl %}/assets/images/our-vision-bg.png);">
   <div class="container">
     <div class="mission-data">
       <h1 class="om-head">OUR VISION</h1>
@@ -31,7 +31,7 @@ <h1 class="om-head">OUR VISION</h1>
   <div class="container">
     <div class="col-md-4 col-sm-4">
       <div class="row">
-        <div class="history-image"><img src="/assets/images/history.png" alt="history" />
+        <div class="history-image"><img src="{% include baseurl %}/assets/images/history.png" alt="history" />
         </div>
       </div>
     </div>
@@ -119,17 +119,17 @@ <h2>ORGANISATION</h2>
       <p>
         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.
       </p>
       <p>
-        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.
       </p>
       <p>
@@ -146,13 +146,13 @@ <h2>ORGANISATION</h2>
       </p>
     </div>
     <div class="right-org">
-      <div class="image-block"><img src="/assets/images/organisation.png" alt="organisation" /></div>
+      <div class="image-block"><img src="{% include baseurl %}/assets/images/organisation.png" alt="organisation" /></div>
     </div>
     <div class="clearfix"></div>
   </div>
 </section>
 
-<section class="mission" style="background-image: url(/assets/images/our-values-bg.png);">
+<section class="mission" style="background-image: url({% include baseurl %}/assets/images/our-values-bg.png);">
   <div class="container">
     <div class="mission-data">
       <h1 class="om-head">OUR VALUES</h1>
@@ -165,7 +165,7 @@ <h1 class="om-head">OUR VALUES</h1>
   <div class="container">
     <div class="col-md-12">
       <div class="row">
-        <div class="left-pub" style="background-image: url(/assets/images/publications.png);"></div>
+        <div class="left-pub" style="background-image: url({% include baseurl %}/assets/images/publications.png);"></div>
         <div class="right-pub">
           <h2>Publications</h2>
           <ul class="pub-list">
@@ -190,7 +190,7 @@ <h4 class="pub-title"><a :href="event.url" v-text="event.title.toUpperCase()"></
 
           </ul>
           <div class="btn-block">
-            <a href="/about/publications/" class="btn with-border white-hover-btn">SEE ALL</a>
+            <a href="{% include baseurl %}/about/publications/" class="btn with-border white-hover-btn">SEE ALL</a>
             <a href="https://wiki.neic.no" class="btn with-border white-hover-btn">GO TO WIKI</a>
           </div>
         </div>

diff --git a/_includes/activities.html b/_includes/activities.html
@@ -1,4 +1,4 @@
-<section class="single-pagebanner" style="background-image: url(/assets/images/act-banner.png);">
+<section class="single-pagebanner" style="background-image: url({% include baseurl %}/assets/images/act-banner.png);">
 </section>
 
 <section class="activities">
@@ -21,7 +21,7 @@ <h2>ACTIVITIES</h2>
                       <ul class="linl-list">
                         {% for activity in site.activities %}
                           {% if activity.finished %}{% continue %}{% endif %}
-                          <li><a href="{{ activity.url }}">{{ activity.name }}</a></li>
+                          <li><a href="{% include baseurl %}{{ activity.url }}">{{ activity.name }}</a></li>
                         {% endfor %}
                       </ul>
               </div>
@@ -41,7 +41,7 @@ <h2>PAST ACTIVITIES</h2>
                       <ul class="linl-list">
                               {% for activity in site.activities %}
                                 {% unless activity.finished %}{% continue %}{% endunless %}
-                                <li><a href="{{ activity.url }}">{{ activity.name }}</a></li>
+                                <li><a href="{% include baseurl %}{{ activity.url }}">{{ activity.name }}</a></li>
                               {% endfor %}
                       </ul>
                       </div>

diff --git 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 %}
 
-<section class="single-pagebanner" style="background-image: url(/assets/images/sin-act-banner.png);">
+<section class="single-pagebanner" style="background-image: url({% include baseurl %}/assets/images/sin-act-banner.png);">
 </section>
 
 <section class="wys-editer single-activities">
@@ -28,25 +28,25 @@ <h2>{{ page.type }}</h2>
             </p>
             <p class="no-space">
               <b>LEADER:</b>
-              <span class="color"><b><a href="{{ leader.url }}">{{ leader.name }}</a></b></span>
+              <span class="color"><b><a href="{% include baseurl %}{{ leader.url }}">{{ leader.name }}</a></b></span>
             </p>
 
             {% unless page.results == "N/A" %}
               <p class="top">
-                <span class="color"><b><a href="{{ page.results | default: "#results" }}">Results</a></b></span>
+                <span class="color"><b><a href="{% include conditional_baseurl url=page.results default="#results" %}">Results</a></b></span>
               </p>
             {% endunless %}
             {% unless page.outreach == "N/A" %}
               <p class="no-space">
-                <span class="color"><b><a href="{{ page.outreach | default: "#outreach" }}">Outreach</a></b></span>
+                <span class="color"><b><a href="{% include conditional_baseurl url=page.outreach default="#outreach" %}">Outreach</a></b></span>
               </p>
             {% endunless %}
 
             {% if page.links %}
               <p class="top"><b>LINKS:</b></p>
               {% for link in page.links %}
                 <p class="no-space">
-                  <span class="color"><b><a href="{{ link.url }}">{{ link.text | default: link.url }}</a></b></span>
+                  <span class="color"><b><a href="{% include conditional_baseurl url=link.url %}">{{ link.text | default: link.url }}</a></b></span>
                   {% if link.description %} - {{ link.description }}{% endif %}
                 </p>
               {% endfor %}
@@ -56,7 +56,7 @@ <h2>{{ page.type }}</h2>
               <p class="top"><b>DOCUMENTS</b></p>
               {% for link in page.documents %}
                 <p class="no-space">
-                  <span class="color"><b><a href="{{ link.url }}">{{ link.text | default: link.url }}</a></b></span>
+                  <span class="color"><b><a href="{% include conditional_baseurl url=link.url %}">{{ link.text | default: link.url }}</a></b></span>
                   {% if link.description %} - {{ link.description }}{% endif %}
                 </p>
               {% endfor %}
@@ -191,7 +191,7 @@ <h2>PEOPLE</h2>
                           {% else %}
                             <p>
                           {% endif %}
-                            <a href="{{ person.url }}" class="hover-blue">{{ person.name }}</a>, {{ person.country }}{% if person_group[1].role %}, {{ person_group[1].role }}{% endif %}
+                            <a href="{% include baseurl %}{{ person.url }}" class="hover-blue">{{ person.name }}</a>, {{ person.country }}{% if person_group[1].role %}, {{ person_group[1].role }}{% endif %}
                           </p>
                           {% assign person_on_top = false %}
                         {% endif %}

diff --git a/_includes/api.html b/_includes/api.html
@@ -1,4 +1,4 @@
-<section class="single-pagebanner" style="background-image: url(/assets/images/api-banner.png);">
+<section class="single-pagebanner" style="background-image: url({% include baseurl %}/assets/images/api-banner.png);">
 </section>
 
 <section class="api-section">
@@ -11,11 +11,11 @@
         <h2>Versions</h2>
         <h5>API v1.0</h5>
         <p class="no-space">
-          <span class="color"><a href="/api/1.0/activities.json">activities.json</a></span>
+          <span class="color"><a href="{% include baseurl %}/api/1.0/activities.json">activities.json</a></span>
           - Informaton on NeIC activities in JSON format
         </p>
         <p class="no-space">
-          <span class="color"><a href="/api/1.0/people.json">people.json</a></span>
+          <span class="color"><a href="{% include baseurl %}/api/1.0/people.json">people.json</a></span>
           - Informaton on people involved with NeIC in JSON format
         </p>
       </div>

diff --git a/_includes/baseurl b/_includes/baseurl
@@ -0,0 +1 @@
+{% if site.github.owner_name != 'neicnordic' %}{{ site.baseurl }}{% endif %}
diff --git a/_includes/conditional_baseurl 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 }}
diff --git a/_includes/course-mobility.html b/_includes/course-mobility.html
@@ -1,11 +1,11 @@
-<section class="single-pagebanner" style="background-image: url(/assets/images/training-banner.png);">
+<section class="single-pagebanner" style="background-image: url({% include baseurl %}/assets/images/training-banner.png);">
 </section>
 
 <section class="green-box-block">
   <div class="container">
     <div class="green-box">
       <h2>COURSE MOBILITY</h2>
-	    <p>The open call for course mobility proposals is part of the<br /><a href="/ratatosk" class="btn white-hover-btn">Ratatosk</a><br />Mobility Enhancement Programme.</p>
+	    <p>The open call for course mobility proposals is part of the<br /><a href="{% include baseurl %}/ratatosk" class="btn white-hover-btn">Ratatosk</a><br />Mobility Enhancement Programme.</p>
       </div>
   </div>
 </section>

diff --git a/_includes/events-past.html b/_includes/events-past.html
@@ -1,4 +1,4 @@
-<section class="single-pagebanner" style="background-image: url(/assets/images/upcom-banner.png);">
+<section class="single-pagebanner" style="background-image: url({% include baseurl %}/assets/images/upcom-banner.png);">
 </section>
 
 <section class="publications">
@@ -49,7 +49,7 @@ <h2>ALL EVENTS</h2>
         participates in or simply wants to advertize.
 
         You may also want to look for
-        <a href="/events/">upcoming
+        <a href="{% include baseurl %}/events/">upcoming
         events</a>.
         </p>
 

diff --git a/_includes/events.html b/_includes/events.html
@@ -1,4 +1,4 @@
-<section class="single-pagebanner" style="background-image: url(/assets/images/upcom-banner.png);">
+<section class="single-pagebanner" style="background-image: url({% include baseurl %}/assets/images/upcom-banner.png);">
 </section>
 
 <section class="publications">
@@ -49,7 +49,7 @@ <h2>ALL EVENTS</h2>
         participates in or simply wants to advertize.
 
         You may also want to look for
-        <a href="/events/past/">past
+        <a href="{% include baseurl %}/events/past/">past
         events</a>.
         </p>
 

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -39,7 +39,7 @@ <h4>ADDRESS</h4>
     <div class="col-md-6 col-sm-4">
       <div class="row">
         <div class="footer-img">
-          <a href="https://www.nordforsk.org"><img src="/assets/images/footer-logo.png" alt="footer" /></a>
+          <a href="https://www.nordforsk.org"><img src="{% include baseurl %}/assets/images/footer-logo.png" alt="footer" /></a>
         </div>
       </div>
     </div>

diff --git a/_includes/generic.html b/_includes/generic.html
@@ -1,4 +1,4 @@
-<section class="single-pagebanner" style="background-image: url(/assets/images/api-banner.png);">
+<section class="single-pagebanner" style="background-image: url({% include baseurl %}/assets/images/api-banner.png);">
 </section>
 
 <section class="api-section">

diff --git a/_includes/head.html b/_includes/head.html
@@ -4,7 +4,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="description" content="">
   <meta name="author" content="">
-  <link rel="shortcut icon" href="/assets/ico/favicon.ico">
+  <link rel="shortcut icon" href="{% include baseurl %}/assets/ico/favicon.ico">
 
   {% if page.collection %}
     {% assign title = page.name %}
@@ -15,8 +15,8 @@
   <title>{{ title }} - NeIC web</title>
 
   <link href="https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i" rel="stylesheet">
-  <link href="/assets/css/neic-styles.css" rel="stylesheet">
-  <link href="/assets/css/vue-cloaking.css" rel="stylesheet">
-  <link href="/assets/css/bootstrap-3.3.7.min.css" rel="stylesheet">
-  <link href="/assets/css/responsive.css" rel="stylesheet">
+  <link href="{% include baseurl %}/assets/css/neic-styles.css" rel="stylesheet">
+  <link href="{% include baseurl %}/assets/css/vue-cloaking.css" rel="stylesheet">
+  <link href="{% include baseurl %}/assets/css/bootstrap-3.3.7.min.css" rel="stylesheet">
+  <link href="{% include baseurl %}/assets/css/responsive.css" rel="stylesheet">
 </head>
diff --git a/_includes/header.html b/_includes/header.html
@@ -1,9 +1,14 @@
-<header>
+<header {% if site.github.owner_name != 'neicnordic' %}style="background: #d4892d"{% endif %}>
   <div class="container">
     <div class="col-md-12">
       <div class="row">
         <div class="navbar-header logo">
-          <a class="navbar-brand" href="/"><img src="/assets/images/logo.png" alt="Logo" /></a>
+          <a class="navbar-brand" href="{% include baseurl %}/"><img src="{% include baseurl %}/assets/images/logo.png" alt="Logo" /></a>
+          {% if site.github.owner_name != 'neicnordic' %}
+            <b>This is not the official NeIC website.</b> This site is for testing and development.<br/>
+            Do not expect information on here to be accurate, nor all things to work right.<br/>
+            The official NeIC website is at <a href="https://neic.no">https://neic.no</a>.
+          {% endif %}
         </div>
         <div id="menu">
           <a class="menu right-side collapsed" data-parent="#menu" data-toggle="collapse" href="#mainmenu"><span>Menu</span></a>
@@ -30,12 +35,12 @@
                          aria-labelledby="sub-menu-h{{ forloop.index }}">
                       <ul class="sub-menu-list">
                         {% for i in item.links %}
-                          <li><a href="{{ i.url }}">{{ i.text }}</a></li>
+                          <li><a href="{% include conditional_baseurl url=i.url %}">{{ i.text }}</a></li>
                         {% endfor %}
                       </ul>
                     </div>
                   {% else %}
-                    <a href="{{ item.url }}" class="sub-menu-item no-collapse">
+                    <a href="{% include conditional_baseurl url=item.url %}" class="sub-menu-item no-collapse">
                       {{ item.text }}
                     </a>
                   {% endif %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{% if site.github.owner_name != 'neicnordic' %}{{ site.baseurl }}{% endif %}
Original file line number	Diff line number	Diff line change
		@@ -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 }}