Merge branch 'master' into drafts

Guillaume Charest · web-flow · commit 92a236459823 · 2019-07-31T22:21:50.000-04:00
diff --git a/CONTRIBUTING.MD b/CONTRIBUTING.MD
@@ -15,29 +15,29 @@ Please note that we will get to your comment as soon as possible but we can't co
 
 In this document you will find the following sections:
 
-1. [Instructions](#Instructions)
-2. [Cloning The Project Locally](#Cloning-The-Project-Locally)
-3. [Continuous Integration Testing](#Continuous-Integration-Testing)
-   1. [CI Tests Using Docker](#CI-Tests-Using-Docker)
-   2. [CI Tests Using NPM](#CI-Tests-Using-NPM)
-   3. [Types Of Tests](#Types-Of-Tests)
-4. [Local Website](#Local-Website)
-5. [Jekyll Pages](#Jekyll-Pages)
-   1. [Layout](#Layout)
-   2. [Title](#Title)
-   3. [Ref](#Ref)
-   4. [Lang](#Lang)
-   5. [Status](#Status)
-   6. [Permalink](#Permalink)
-6. [Jekyll Blog Posts](#Jekyll-Blog-Posts)
-   1. [Post Layout](#Post-Layout)
-   2. [Author](#Author)
-   3. [Date](#Date)
-   4. [Last Modified](#Last-Modified)
-7. [Jekyll Draft Blog Posts](#Jekyll-Draft-Blog-Posts)
-8. [Reveal.js Presentations](#Revealjs-Presentations)
-9. [Hacker Slides](#Hacker-Slides)
-10. [Useful Docker Commands](#Useful-Docker-Commands)
+1. [Instructions](#instructions)
+2. [Cloning The Project Locally](#cloning-the-project-locally)
+3. [Continuous Integration Testing](#continuous-integration-testing)
+   1. [CI Tests Using Docker](#ci-tests-using-docker)
+   2. [CI Tests Using NPM](#ci-tests-using-npm)
+   3. [Types Of Tests](#types-of-tests)
+4. [Local Website](#local-website)
+5. [Jekyll Pages](#jekyll-pages)
+   1. [Layout](#layout)
+   2. [Title](#title)
+   3. [Ref](#ref)
+   4. [Lang](#lang)
+   5. [Status](#status)
+   6. [Permalink](#permalink)
+6. [Jekyll Blog Posts](#jekyll-blog-posts)
+   1. [Post Layout](#post-layout)
+   2. [Author](#author)
+   3. [Date](#date)
+   4. [Last Modified](#last-modified)
+7. [Jekyll Draft Blog Posts](#jekyll-draft-blog-posts)
+8. [Reveal.js Presentations](#revealjs-presentations)
+9. [Hacker Slides](#hacker-slides)
+10. [Useful Docker Commands](#useful-docker-commands)
 
 ## Cloning The Project Locally
 
@@ -370,9 +370,17 @@ Notice that we're using the same command as when we run the website locally but
 
 As part of our desire to work in the open, we are leveraging [Reveal.js](https://revealjs.com/#/), an open source framework project to generate web based presentations.
 
-To take a markdown file and generate a presentation on the website, you can use the following structure:
+To take a markdown file and generate a presentation on the website, you need to put your presentation in the `presentations` folder and the appropriate language subfolder:
 
+![Presentations folders](assets/images/presentations-layout.png)
 
+You can then create a link and use the following URL structure:
+
+```html
+https://gcdevops.github.io/presentation.html?markdown=/<lang>/<filename>.md
+```
+
+Where `lang` is the folder `en` or `fr` and `filename` is the presentation's file name.
 
 ## Hacker Slides
 
diff --git a/README.md b/README.md
@@ -1 +1,3 @@
-# gcdevops.github.io
+![Travis CI Build Status](https://travis-ci.com/gcdevops/gcdevops.github.io.svg?branch=master)
+
+# gcdevops.github.io
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -1,10 +1,16 @@
 ---
 layout: default
 ---
+
+<h2>{{ page.title }}</h2>
+
 <p>{{ page.date | date: "%Y-%m-%d" }} - {{ site.writtenBy[page.lang] }} {{ page.author }}</p>
 
-{% if page.data != page.last_modified %}
-    <p class="font-italic">{{ site.lastModified[page.lang] }}: {{ page.last_modified | date: "%Y-%m-%d"}}</p>
+{% assign pageDate = page.date | date: "%Y-%m-%d" %}
+{% assign modifiedDate = page.last_modified | date: "%Y-%m-%d" %}
+
+{% if pageDate != modifiedDate %}
+    <p class="font-italic">{{ site.lastModified[page.lang] }}: {{ modifiedDate }}</p>
 {% endif %}
 
 {{ content }}
diff --git a/_pages/en/home.md b/_pages/en/home.md
@@ -8,11 +8,15 @@ permalink: /home.html
 
 ## About the League
 
-The GC DevOps League is a grassroot movement that has spawn off of a collective desire to change our ways of working, both from a software development and IT operations practitioners' perspective.
+The GC DevOps League is a grass root movement that has spawn off of a collective desire to change our ways of working, both from a software development and IT operations practitioners' perspective.
 
 The league is open to anyone interested in working in the open, sharing their lessons learned and helping each other take over the challenges that we all have to deal with, even though we come from various organisations deemed "different".
  We're much more alike than some might want to let you believe.
 
+{% include listPages.md %}
+
+{% include listPosts.md %}
+
 ## Membership
 
 As it is, we do not have a "Membership" process.
@@ -21,7 +25,7 @@ However, we do have a Code of Conduct and we encourage you to read it carefully
 
 With regards to the "member" status of the GitHub organisation [(more details below)](#github-organisation-and-repositories), they have been created to maintain the documentation and plan events.
 If you are interested in having a more active role, please request to be added to the "members" of the organisation.
-If you do not have the time to review documentation, merge pull requests, organize events, it's **absolutely fine** and you can simply star the repos that interest you, create issues, participate to discussions or submit "Pull Requests" to suggest changes.
+If you do not have the time to review documentation, merge pull requests, organize events, it's **absolutely fine** and you can simply star the repositories that interest you, create issues, participate to discussions or submit "Pull Requests" to suggest changes.
 
 We do not expect everyone to take time off their regular work schedule to do so.
 But we collectively benefit from any contribution made, no matter how small it may seem to you as an individual.
@@ -62,9 +66,3 @@ If you're interested in actually looking at the workspace itself, join us on our
 You can create issues, participate in discussions and even contribute!
 
 We've also set up a few CI tests in order to keep our content clean but also to showcase how powerful these open collaboration tools can be to maintain a project, whether it is simple text files or source code.
-
-{% include listPages.md %}
-
-{% include listPosts.md %}
-
-
diff --git a/_pages/fr/accueil.md b/_pages/fr/accueil.md
@@ -13,6 +13,10 @@ La Ligue DevOps du GC est un mouvement populaire qui est né d'un désir collect
 La Ligue est ouverte à toute personne intéressée à travailler ouvertement, à partager ses leçons apprises et à s'entraider mutuellement pour relever les défis auxquels nous devons toutes et tous faire face, même si nous sommes issus de diverses organisations considérées "différentes".
 Nous nous ressemblons beaucoup plus que certains voudraient nous faire croire.
 
+{% include listPages.md %}
+
+{% include listPosts.md %}
+
 ## Adhésion
 
 Pour l'instant, nous n'avons pas de processus "d'adhésion".
@@ -62,7 +66,3 @@ Si vous êtes intéressé à regarder l'espace de travail lui-même, rejoignez-n
 Vous pouvez créer des enjeux, participer aux discussions et même contribuer !
 
 Nous avons également mis en place quelques tests d'intégrations continues (CI) afin de garder notre contenu propre, mais aussi de démontrer la puissance de ces outils de collaboration ouverte pour maintenir un projet, qu'il s'agisse de simples fichiers textes ou de code source.
-
-{% include listPages.md %}
-
-{% include listPosts.md %}
diff --git a/_posts/en/2019-07-24-welcome.md b/_posts/en/2019-07-24-welcome.md
@@ -0,0 +1,21 @@
+---
+layout: post
+title:  "Welcome to the GC DevOps League!"
+ref: welcome
+lang: en
+author: "The GC DevOps League"
+date: 2019-07-24
+last_modified: 2019-07-24
+---
+
+We are glad to welcome you to our community! As mentioned in our About section, we are a group of people from various departments and trades wishing to bring the DevOps culture in the Government of Canada.
+
+This is an informal initiative done on our own time and it's impressing to see the uptake this group has had over the course of the last few months since its inception. We've slowly been gathering people from all around in the GC and we wish to continue see this group grow in a diverse and inclusive manner.
+
+In order to support this goal, we would like to organize events of various sizes and on different topics to help communicate our passion to even more people and welcome them in our community. As such, any contribution you can make in your spare time, whether small or big, would greatly help make those happen! 
+
+For exemple, we organized a Failure Party last week. The concept was very simple: come share with us a failure you experimented and what you learned through it! It was fun and casual but we also learned a lot from everyone!
+
+DevOps is not just about IT, it really is about changing the way we are working together to bring value to our end users.
+
+Does DevOps intrigue you? Are you already living it? Come and join us! We want to learn from you all and help you spread the word across the whole government!
diff --git a/_posts/fr/2019-07-24-bienvenue.md b/_posts/fr/2019-07-24-bienvenue.md
@@ -0,0 +1,21 @@
+---
+layout: post
+title:  "Bienvenue dans la ligue GC DevOps!"
+ref: welcome
+lang: fr
+author: "La ligue GC DevOps"
+date: 2019-07-24
+last_modified: 2019-07-24
+---
+
+Nous sommes heureux de vous accueillir dans notre communauté ! Comme nous l'avons mentionné dans notre section À Propos, nous sommes un groupe de personnes de divers ministères et métiers qui souhaitent faire connaître la culture DevOps au sein du gouvernement du Canada.
+
+Il s'agit d'une initiative informelle réalisée sur notre temps libre et il est impressionnant de voir l'intérêt que ce groupe a soulevé au cours des derniers mois depuis sa création. Nous avons lentement rassemblé des gens de tous les coins du GC et nous souhaitons continuer à voir ce groupe grandir d'une manière diversifiée et inclusive.
+
+Afin de soutenir cet objectif, nous aimerions organiser des événements de différentes tailles et sur différents sujets pour aider à communiquer notre passion à encore plus de gens et les accueillir dans notre communauté. Ainsi, toute contribution que vous pouvez faire pendant votre temps libre, qu'elle soit petite ou grande, nous aiderait grandement à les réaliser !  
+
+Par exemple, la semaine dernière, nous avons organisé un Parti de Ratés. Le concept était très simple : venez partager avec nous un échec que vous avez expérimenté et ce que vous avez appris à travers lui ! C'était amusant et décontracté, mais nous avons aussi beaucoup appris de tout le monde !
+
+DevOps n'est pas seulement une question d'informatique, il s'agit vraiment de changer la façon dont nous travaillons ensemble pour apporter de la valeur à nos utilisatrices et utilisateurs finaux.
+
+DevOps vous intrigue ? Vous le vivez déjà ? Venez nous rejoindre ! Nous voulons apprendre de chaque membre et vous aider à faire passer le mot dans tout le gouvernement !
diff --git a/assets/images/presentations-layout.png b/assets/images/presentations-layout.png
