Merge pull request #7 from devopsdays/main

[CAI-21] Getting latest

.circleci/config.yml

@@ -73,15 +73,15 @@ workflows:
           filters:
             branches:
               ignore:
-                - master
+                - main
                 - gh-pages
       - test:
           requires:
             - build
           filters:
             branches:
               ignore:
-                - master
+                - main
                 - gh-pages
       # - production:
       #     filters:

CONTRIBUTING.md

@@ -2,15 +2,15 @@
 
 This document contains the technical details on how to set up [Hugo](https://gohugo.io/) (to see your edits locally before pushing them to GitHub), and how to prepare a pull request to make changes to content on the [devopsdays](https://www.devopsdays.org/) website.
 
-If you'd like to assist in contributing to the code itself (as opposed to the content) of the website, please see the [devopsdays-theme CONTRIBUTING guidelines](https://github.com/devopsdays/devopsdays-web/blob/master/themes/devopsdays-theme/CONTRIBUTING.md).
+If you'd like to assist in contributing to the code itself (as opposed to the content) of the website, please see the [devopsdays-theme CONTRIBUTING guidelines](https://github.com/devopsdays/devopsdays-web/blob/main/themes/devopsdays-theme/CONTRIBUTING.md).
 
 ## Setup
 
 If you'd like to edit a specific devopsdays event site (and/or contribute code), here's how to get started:
 
 ### Quick Overview
 
-1. Install [Hugo](http://gohugo.io). Use the Hugo version that we use in [.circleci/config.yml](https://github.com/devopsdays/devopsdays-web/blob/master/.circleci/config.yml) file. [(Quick Install)](https://gohugo.io/getting-started/installing#binary-cross-platform)
+1. Install [Hugo](http://gohugo.io). Use the Hugo version that we use in [.circleci/config.yml](https://github.com/devopsdays/devopsdays-web/blob/main/.circleci/config.yml) file. [(Quick Install)](https://gohugo.io/getting-started/installing#binary-cross-platform)
 Examples of hugo installation with a version:  
  - maxOS: `brew install hugo@0.67.1`
  - linux: `brew install hugo@0.67.1`
@@ -65,11 +65,11 @@ You only need to create your fork once, as long as you don't delete it.
 1. Before starting any new change, it is essential that you `rebase` your local repository from the upstream. You may think that working from your fork is enough, but sometimes upstream changes will affect your work in ways you may not anticipate, so you'll want to stay current. Issue these commands:
 
 
- - `git checkout master`
- - `git pull upstream master --rebase`
+ - `git checkout main`
+ - `git pull upstream main --rebase`
 
 
-This confirms you are on the master branch locally, and then applies the changes from the upstream to your copy.
+This confirms you are on the main branch locally, and then applies the changes from the upstream to your copy.
 
 
 2. Create a new local [branch](https://help.github.com/articles/about-branches/) for your changes. This helps to keep things tidy!
@@ -89,19 +89,19 @@ This confirms you are on the master branch locally, and then applies the changes
 4. Submit a [Pull Request](https://help.github.com/articles/using-pull-requests/) for the branch you just pushed. Please title the pull request according to the event affected, i.e., `[CHI-2017] Add Bluth Company as a sponsor`
 5. Optionally, open your [pull request](https://github.com/devopsdays/devopsdays-web/pulls) in a browser and look at the preview that `Netlify` (a build tool) built.
 6. You can mention on devopsdays Slack's #website if you'd like a PR merged quickly. (Availability of maintainers varies.)
-7. When a commit is merged to `master` on GitHub, Netlify will automatically build the site and publish it to [https://www.devopsdays.org](https://www.devopsdays.org).
+7. When a commit is merged to `main` on GitHub, Netlify will automatically build the site and publish it to [https://www.devopsdays.org](https://www.devopsdays.org).
 
 ### Guidelines
 
-1. Code changes for [devopsdays-theme](https://github.com/devopsdays/devopsdays-web/blob/master/themes/devopsdays-theme/) should be made in a different PR from event content updates. 
+1. Code changes for [devopsdays-theme](https://github.com/devopsdays/devopsdays-web/blob/main/themes/devopsdays-theme/) should be made in a different PR from event content updates. 
 1. We use [github issues](https://github.com/devopsdays/devopsdays-web/issues) to track work, so feel free to create new issues if you like (or read/comment/work on existing ones).
 1. If you are proposing a change that affects the overall site, and is not tied to an existing issue, please open a [new issue](https://github.com/devopsdays/devopsdays-web/issues) so that it can be discussed by the team, prior to submitting a pull request.
 1. If you're using CRLF line terminators (like on Windows), the site won't build correctly if the first `+++` line of frontmatter in speaker and program files ends in a space like `+++ `. The [workaround](https://github.com/devopsdays/devopsdays-theme/issues/652) is to remove the trailing space.
 
 ### How Changes are Merged
 - A maintainer will merge the PR if it is mergable, as soon as the checks pass.
 - If you do not want your PR merged immediately, in most cases you should not open the PR.
-- Our [workflow guide](https://github.com/devopsdays/devopsdays-web/blob/master/utilities/docs/workflow/README.md) provides solutions to most `WIP` use cases without opening a PR.
+- Our [workflow guide](https://github.com/devopsdays/devopsdays-web/blob/main/utilities/docs/workflow/README.md) provides solutions to most `WIP` use cases without opening a PR.
 - Questions about specific cases not covered in the guide can be asked in the #website channel on devopsdays Slack.
 
 ### Acceptable changes
@@ -124,7 +124,7 @@ Generally speaking, you should avoid storing any files other than logos or small
 If you have permissions to merge PRs on this repo, here are a few guidelines to consider:
 
 1. Is the requestor authorized to make changes for that event? They need to appear on the contact list for the year and city they're editing.
-1. Do not allow any PRs that change files outside of the above-mentioned "content" directories. Especially watch out for `.gitignore`, `config.toml`, `config-windows.toml`, and anything in the `themes` directory. GitHub will require a review from certain maintainers/admins if specific non-content files/directories are included. See [CODEOWNERS](https://github.com/devopsdays/devopsdays-web/blob/master/.github/CODEOWNERS) for specifics.
+1. Do not allow any PRs that change files outside of the above-mentioned "content" directories. Especially watch out for `.gitignore`, `config.toml`, `config-windows.toml`, and anything in the `themes` directory. GitHub will require a review from certain maintainers/admins if specific non-content files/directories are included. See [CODEOWNERS](https://github.com/devopsdays/devopsdays-web/blob/main/.github/CODEOWNERS) for specifics.
 1. Check to see if the tests pass, but use your judgement on merging something that fails (see "PR Tests" below for guidance)
 1. If you are unsure about merging a PR, please use the "request a review" button on the PR to request one from other maintainers.
 1. If you're reviewing all the details of a PR before merging or are communicating with the *Submitter*, add yourself to *Assignees* so that others know someone is waiting on a response or reviewing all the details of the PR thoroughly. Be sure to also add a comment into the PR that you are reviewing it, and if you need a change from the *Submitter* prior to merge, be sure to label the PR as `do-not-merge`.

README.md

@@ -1,5 +1,5 @@
-[![Build Status](https://circleci.com/gh/devopsdays/devopsdays-web.svg?branch=master)](https://circleci.com/gh/devopsdays/devopsdays-web) [![Build status](https://ci.appveyor.com/api/projects/status/3lobrrssphdb20xd?svg=true)](https://ci.appveyor.com/project/DevOpsDays/devopsdays-web)
-[![license](https://img.shields.io/github/license/devopsdays/devopsdays-theme.svg)](https://github.com/devopsdays/devopsdays-web/blob/master/LICENSE) [![Greenkeeper badge](https://badges.greenkeeper.io/devopsdays/devopsdays-web.svg)](https://greenkeeper.io/)
+[![Build Status](https://circleci.com/gh/devopsdays/devopsdays-web.svg?branch=main)](https://circleci.com/gh/devopsdays/devopsdays-web) [![Build status](https://ci.appveyor.com/api/projects/status/3lobrrssphdb20xd?svg=true)](https://ci.appveyor.com/project/DevOpsDays/devopsdays-web)
+[![license](https://img.shields.io/github/license/devopsdays/devopsdays-theme.svg)](https://github.com/devopsdays/devopsdays-web/blob/main/LICENSE) [![Greenkeeper badge](https://badges.greenkeeper.io/devopsdays/devopsdays-web.svg)](https://greenkeeper.io/)
 
 
 # devopsdays-web
@@ -20,9 +20,9 @@ In the instance where you might need to cancel an event that is already listed o
 
 ## Site-wide Hugo theme
 
-You may find that you want to improve the site in some way that's not specific to your event. We use a custom Hugo theme, and reference documentation is available in [devopsdays-theme's REFERENCE.md](https://github.com/devopsdays/devopsdays-web/blob/master/themes/devopsdays-theme/REFERENCE.md).
+You may find that you want to improve the site in some way that's not specific to your event. We use a custom Hugo theme, and reference documentation is available in [devopsdays-theme's REFERENCE.md](https://github.com/devopsdays/devopsdays-web/blob/main/themes/devopsdays-theme/REFERENCE.md).
 
-The technical details for contributing to the site-wide theme's development are covered in [devopsdays-theme's CONTRIBUTING.md](https://github.com/devopsdays/devopsdays-web/blob/master/themes/devopsdays-theme/CONTRIBUTING.md).
+The technical details for contributing to the site-wide theme's development are covered in [devopsdays-theme's CONTRIBUTING.md](https://github.com/devopsdays/devopsdays-web/blob/main/themes/devopsdays-theme/CONTRIBUTING.md).
 
 ## Reporting problems & feature requests
 

config.toml

@@ -10,6 +10,7 @@ archetypedir = "archetypes"
 PaginatePath = "blog"
 buildDrafts = false
 disableKinds = ["taxonomy", "taxonomyTerm"]
+enableEmoji = true
 
 [markup]
   [markup.goldmark]

content/events/2020-aarhus/welcome.md

@@ -13,8 +13,8 @@ aliases = [
   ]
 Description = "devopsdays aarhus 2020"
 +++
-<h1>Due to the COVID-19 situation, we have decided to postpone the event to February 3-4, 2021.
-We will automatically postpone your ticket to these dates, unless you prefer a full refund of course.
+<h1>Due to the COVID-19 situation, we have decided to postpone the event to the Fall of 2021. See the new devopsdays.org event for Aarhus 2021.
+We will automatically postpone your ticket, unless you prefer a full refund of course.
 If you have any questions, you can contact us: aarhus@devopsdays.org.
 Until then be safe, and keep the DevOps practices going!</h1>
 <div style="text-align:center;">

content/events/2021-aarhus/welcome.md

@@ -8,7 +8,7 @@ Description = "devopsdays Aarhus 2021"
    {{< event_logo >}}
 </div>
 
-Due to the COVID-19 situation, we rescheduled the event from June 2020 to February 3-4, 2021. We will automatically postpone your ticket to these dates, unless you prefer a full refund of course.
+Due to the COVID-19 situation, we rescheduled the event from June 2020 to the fall of 2021. We will automatically postpone your ticket to these dates, unless you prefer a full refund of course.
 
 <div class = "row">
   <div class = "col-md-2">

content/events/2021-birmingham/welcome.md

@@ -1,7 +1,14 @@
 +++
 Title = "DevOpsDays Birmingham 2021"
 Type = "welcome"
-aliases = ["/events/2021-birmingham/"]
+aliases = [
+	"/events/2021-birmingham/",
+	"/events/2021-birmingham/location",
+	"/events/2021-birmingham/propose",
+	"/events/2021-birmingham/registration",
+	"/events/2021-birmingham/sponsor"
+]
+
 Description = "DevOpsDays Birmingham 2021"
 
 +++
@@ -12,32 +19,13 @@ Description = "DevOpsDays Birmingham 2021"
   </div>
 
   <div class="col-md-7">
-    <h1><p>Tickets available!</p></h1>
-    <p>The first DevOpsDays was held in Ghent, Belgium in 2009. Since then, DevOpsDays events have multiplied and expanded globally with over 80 events in for 2019.</p>
-    <p>DevOpsDays is a worldwide series of community run technical conferences covering topics of software development, IT infrastructure operations, and the intersection between them. It is run by volunteers from community, for the benefit of the community.
+    <h1>
+	<p>We have had to cancel our first in-person event in March 2021 due to COVID</p>
+    </h1>
+	<p> Refunds have been issued to ticket holders and we will be aiming for a 2022 relaunch provided the situation allows it!</p>
+	<p>DevOpsDays is a worldwide series of community run technical conferences covering topics of software development, IT infrastructure operations, and the intersection between them. It is run by volunteers from community, for the benefit of the community.
       We are not a commercial conference and we believe that our focus on serving the community creates a truly unique experience for both delegates and sponsors.
     </p>
-    <p>We expect 350 people this year and will be holding the event on March 04-05, 2021 at Millennium Point Birmingham.</p>
-    <br/>
-    <br/>
-    <div class="d-flex flex-row">
-      <div class="col-md-12">
-        <div class="p-2">
-          <a class="btn btn-secondary btn-block" href="/events/2021-birmingham/sponsor"> <i class="fa fa-money fa-lg"></i>&nbsp;&nbsp;&nbsp;Sponsor the Conference</a>
-        </div>
-        <!-- 
-        <div class="p-2">
-          <a class="btn btn-secondary btn-block" href="/events/2021-birmingham/program" rel="noopener"> <i class="fa fa-file-o fa-lg"></i>&nbsp;&nbsp;&nbsp;Program</a>
-        </div>
-        -->
-        <div class="p-2">
-          <a class="btn btn-secondary btn-block" href="https://ti.to/tech-events-birmingham/dodb-2021" rel="noopener"> <i class="fa fa-ticket fa-lg"></i>&nbsp;&nbsp;&nbsp;Buy a ticket</a>
-        </div>
-        <div class="p-2">
-          <a class="btn btn-secondary btn-block" href="/events/2021-birmingham/contact"> <i class="fa fa-envelope-o fa-lg"></i>&nbsp;&nbsp;&nbsp;Contact the Organizers</a>
-        </div>
-      </div>
-    </div>
   </div>
 </div>
 

content/events/2021-boston/sponsor.md

@@ -10,7 +10,7 @@ Description = "Sponsor DevOpsDays Boston 2021"
 <div class="col-md-9">
 <div>
 <h3>Join the community</h3>
-<p><strong>DevOpsDays Boston Virtual</strong> is a one-day online technology community conference that will be held this year on September 27 using a virtual conference platform.</p>
+<p><strong>DevOpsDays Boston Virtual</strong> is an online technology community conference that will be held this year on September 27 using a virtual conference platform.</p>
 <p>The conference is designed to promote awareness around bridging gaps and breaking down silos between development, operations, and security teams and their related business organizations.</p>
 <p>DevOpsDays is a grassroots event for professionals in technology to network and share ideas and challenges relating to DevOps, IT management, and technology in general. It is organized by peers who care about and believe in improving the culture of technology work, process automation, metrics, and sharing in an environment of inclusion.</p>
 <h3>Why Sponsor DevOpsDays Boston?</h3>

content/events/2021-boston/welcome.md

@@ -19,7 +19,7 @@ h1.welcome-page { text-transform: initial; }
   <div class="col-md-6">
     <div class="row">
       <div class="col-md-2"><strong>Dates</strong></div>
-      <div class="col-md-8">{{< event_start >}}</div>
+      <div class="col-md-8">{{< event_start >}}-{{< event_end >}}</div>
     </div>
     <div class="row">
       <div class="col-md-2"><strong>Location</strong></div>