From 6dbcd70c3d6e8f9684ac8567ef7006f704e0cf6b Mon Sep 17 00:00:00 2001 From: Valentin Gehrke Date: Thu, 21 Dec 2017 22:16:44 +0100 Subject: [PATCH 1/5] Hide pages that don't have a menutitle. --- _includes/menu.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/_includes/menu.html b/_includes/menu.html index 3eef7e7..6a28e32 100644 --- a/_includes/menu.html +++ b/_includes/menu.html @@ -1,8 +1,10 @@ {% for node in site.pages %} +{% if node.menutitle %} {% if node.url == page.url %} -
  • {{ node.menutitle }}
    • +
  • {{ node.menutitle | escape }}
    • {% else %} -
  • {{ node.menutitle }}
    • +
  • {{ node.menutitle | escape }}
    • +{% endif %} {% endif %} {% endfor %}
  • Git
    • From c15dc483b58f441c9c7e4566fa78e33450c0b53a Mon Sep 17 00:00:00 2001 From: Valentin Gehrke Date: Thu, 21 Dec 2017 22:17:07 +0100 Subject: [PATCH 2/5] Use relative paths for relative_url filter --- _includes/header.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 09afd53..54383d4 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -9,13 +9,13 @@ {{ page.title }} - Zom.bi - - + +
    - Zom.bi + Zom.bi

    The friendly neighborhood tech community

      {% include menu.html %} From e3e02a571ae4a21ebc977cabc85b8f6060ce9dfb Mon Sep 17 00:00:00 2001 From: Valentin Gehrke Date: Fri, 22 Dec 2017 07:02:28 +0100 Subject: [PATCH 3/5] Add license to footer --- _includes/footer.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/_includes/footer.html b/_includes/footer.html index 0551d02..2e8373d 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -5,7 +5,17 @@
      Zom.bi / - Design by bsod, Ranomier and madmaurice + Design by bsod, + Ranomier and + madmaurice + / + + Content and Design licensed under + Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Germany License +
      From 474ad8c5af891f45e4e815aad7059e8309a78eef Mon Sep 17 00:00:00 2001 From: Valentin Gehrke Date: Fri, 22 Dec 2017 20:35:38 +0100 Subject: [PATCH 4/5] Remove unnecessary whitespaces --- _includes/menu.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_includes/menu.html b/_includes/menu.html index 6a28e32..0d1ccea 100644 --- a/_includes/menu.html +++ b/_includes/menu.html @@ -1,11 +1,11 @@ -{% for node in site.pages %} -{% if node.menutitle %} -{% if node.url == page.url %} +{%- for node in site.pages -%} +{%- if node.menutitle -%} +{%- if node.url == page.url -%}
    • {{ node.menutitle | escape }}
      • -{% else %} +{%- else -%}
    • {{ node.menutitle | escape }}
      • -{% endif %} -{% endif %} -{% endfor %} +{%- endif -%} +{%- endif -%} +{%- endfor -%}
    • Git
    • Wiki
      • From 22a2f57ca74bdf999b8fe53df9ab876692be104c Mon Sep 17 00:00:00 2001 From: Valentin Gehrke Date: Sun, 24 Dec 2017 00:57:11 +0100 Subject: [PATCH 5/5] Gitlab CI Deployment --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..13002e5 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,14 @@ +stages: + - deploy + +deploy-master: + stage: deploy + tags: + - website + only: + - master + script: + - jekyll build + - rsync --recursive _site/ /srv/deploy/ + +