projects / rnaseq-cwl-training.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
use ndash as separator
[rnaseq-cwl-training.git] / _layouts / base.html
diff --git a/_layouts/base.html b/_layouts/base.html
index 8a2e4b5134a8857d377f6bd7c2e7bc3a2cfaf119..07a497272325c3263b50a1e0a91762417dcaa2d4 100644 (file)
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -1,20 +1,7 @@
 ---
 ---
-
-{% comment %}
-When rendering websites locally, `site.github.url` doesn't get resolved
-properly unless GitHub PAT are set up and available in the environment.
-This leads to warnings and errors when trying to serve the site locally.
-To work around this, we use the `jekyll.environment` variable which is set to
-`development` when rendering the site locally, and set to `production` on
-GitHub where `site.github.url` will be defined.
-{% endcomment %}
-
-{% if jekyll.environment == "development" %}
-{% assign search_domain_url = "" %}
-{% elsif jekyll.environment == "production" %}
-{% assign search_domain_url = site.github.url  %}
-{% endif %}
+{% include base_path.html %}
+{% include gh_variables.html %}
 
 <!doctype html>
 <html lang="en">
@@ -25,10 +12,10 @@ GitHub where `site.github.url` will be defined.
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!-- meta "search-domain" used for google site search function google_search() -->
     <meta name="search-domain" value="{{ search_domain_url }}">
-    <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap.css" />
-    <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap-theme.css" />
-    <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />
-    <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/syntax.css" />
+    <link rel="stylesheet" type="text/css" href="{{ relative_root_path }}/assets/css/bootstrap.css" />
+    <link rel="stylesheet" type="text/css" href="{{ relative_root_path }}/assets/css/bootstrap-theme.css" />
+    <link rel="stylesheet" type="text/css" href="{{ relative_root_path }}/assets/css/lesson.css" />
+    <link rel="stylesheet" type="text/css" href="{{ relative_root_path }}/assets/css/syntax.css" />
 
     {% include favicons.html %}
 
@@ -38,9 +25,16 @@ GitHub where `site.github.url` will be defined.
        <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
        <![endif]-->
-    <title>{{ site.title }}{% if page.title %}: {{ page.title }}{% endif %}</title>
+
+  <title>
+  {% if page.title %}{{ page.title }}{% endif %}{% if page.title and site.title %} &ndash; {% endif %}{% if site.title %}{{ site.title }}{% endif %}
+  </title>  
+
   </head>
   <body>
+
+    {% include life_cycle.html %}
+
     <div class="container">
       {% include navbar.html %}
 {{ content }}