Merge pull request #4 from DevOpsDaysChicago/add-chicago-organizer

Add Allie Richards

.gitignore

@@ -3,6 +3,8 @@
 config.codekit
 # config.toml # This is a dangerous file, but we need it not in here.
 /min
+dist
+staging
 .DS_Store
 .AppleDouble
 .LSOverride

.mention-bot

@@ -6,12 +6,22 @@
   "alwaysNotifyForPaths": [
     {
       "name": "mattstratton",
-      "files": [".gitignore","config.toml","config-windows.toml", "gulpfile.js", "themes/**/*", "content/page/**/*", "static/_redirects"], 
+      "files": [".gitignore","config.toml","config-windows.toml", "gulpfile.js", "utilities/**/*", "themes/**/*", "content/page/**/*", "static/_redirects"], 
       "skipTeamPrs": false 
+    },
+        {
+      "name": "MikeRosTX",
+      "files": [".gitignore","config.toml","config-windows.toml", "utilities/**/*", "themes/**/*", "content/page/**/*"], 
+      "skipTeamPrs": true 
+    },
+        {
+      "name": "phrawzty",
+      "files": [".gitignore","config.toml","config-windows.toml", "utilities/**/*", "themes/**/*", "content/page/**/*"], 
+      "skipTeamPrs": true 
     },
     {
       "name": "bridgetkromhout",
-      "files": ["utilities/**/*", "themes/**/*", "content/page/**/*"],
+      "files": [".gitignore","config.toml","config-windows.toml", "utilities/**/*", "themes/**/*", "content/page/**/*"],
       "skipTeamPrs": false
      }
   ],

CONTRIBUTING.md

@@ -1,6 +1,8 @@
 # Contributing to devopsdays-web
 
-The technical details on how to set up [Hugo](https://gohugo.io/) (to see your local edits), and prepare a Pull Request for inclusion on the [Devopsdays](http://www.devopsdays.org/) website.
+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 for inclusion on the [devopsdays](http://www.devopsdays.org/) website.
+
+If you'd like to assist in contributing to the code of the website, please see [devopsdays/devopsdays-theme](https://github.com/devopsdays/devopsdays-theme).
 
 ## Setup
 
@@ -24,7 +26,7 @@ If you are running Windows, change the command to
 hugo server -w --baseUrl="http://localhost:1313" --config config-windows.toml
 ```
 
-Now open `baseURL` in a browser and navigate to the content that you're editing - voilà!
+Now open `http://localhost:1313` in a browser and navigate to the content that you're editing - voilà!
 
 ## Pull requests
 
@@ -48,27 +50,34 @@ Now open `baseURL` in a browser and navigate to the content that you're editing
 
 ### Guidelines
 
-1. Code changes that affect the overall site will be reviewed only if they are in a separate pull request from any event-specific content. In short, don't add "giant template change" in the same PR as "here are some more sponsors" - if it affects *anything other than your event*, it should be in its own PR.
-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 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. Code changes that affect the overall site will be merged only in the [devopsdays-theme](https://github.com/devopsdays/devopsdays-theme) repo. Theme changes should be made there, and when released, will be used in this repo.
+1. We use [github issues](https://github.com/devopsdays/devopsdays-theme/issues) to track work, so feel free to create new issues if you like (or read/comment 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-theme/issues) so that it can be discussed by the team, prior to submitting a pull request.
 
+### Only make changes to event content files
+"Content" means anything inside the `/content/...`, `/data/...`, or `/static/...` directories.
 
-## Advanced
-If you are going to be making changes to the overall functionality of the site, please keep the following in mind:
+Changes to event-specific content should be submitted in a separate PR from changes to more general content for the whole site.
 
-### Changes to content should be separate from overall functionality
-"Content" means anything inside the `/content/...`, `/data/...`, or `/static/...` directories.
 
-Changes to content should be submitted as a separate PR from changes to site functionality. It would be additionally delightful if you label PR's for site functionality (such as `bug` or `enhancement`), but that's not required.
+## Maintainer Guidelines
+
+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. Our bot will notify maintainers for any changes to non-content files and assign the PR's to the maintainers, so that should help.
+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`.
 
-### CSS changes are done with LESS
-Please do NOT make changes to any of the files in the `/themes/devopsdays-responsive/static/css` directory. These are files that are compiled via [LESS](http://lesscss.org/), and while your changes in there might work, they will be blown away by the LESS compiler at some point.
+### PR Tests
 
-If you want to make changes to CSS, you will need a LESS compiler on your system. [@mattstratton](https://github.com/mattstratton) uses [CodeKit](https://incident57.com/codekit/), but that is OS X only, and is not free. Here's a list of other possible LESS compilers (note - Matt has not tested any of these):
-- [SimpleLess](http://wearekiss.com/simpless) - all platforms, free.
-- [Less.js](http://lesscss.org/) - node application, free.
+The following tests run when a PR is submitted:
 
-The only place to make changes to the LESS files is in `/themes/devopsdays-responsive/static/site_variables.less` and `/themes/devopsdays-responsive/static/site.less`. Make sure your LESS compiler is compiling the output into `/themes/devopsdays-responsive/static/css/`. *DO NOT* make any changes to any other LESS file (do not directly modify the bootstrap LESS files, for example).
+1. [Travis](https://travis-ci.org/devopsdays/devopsdays-web/) - this is a basic test that confirms that the site can be built with Hugo on linux, and it runs an `html-min` gulp task which will identify if there is any invalid HTML in the site. This protects the final build, so if the Travis tests fail, please take a look as to why they failed.
+1. [Appveyor](https://ci.appveyor.com/project/DevOpsDays/devopsdays-web) - this again is a small test that builds Hugo on Windows, to ensure that no Windows-incompatible files have been included. If Appveyor tests fail, merge at your own discretion, based upon the failure reason.
+1. [Gitmagic](https://gitmagic.io/) - This is a bot that makes sure our pull requests are fashioned cleanly. See [contributing.json](https://github.com/devopsdays/devopsdays-web/blob/master/contributing.json) for a list of rules that we enforce.
+1. [Netlify](https://app.netlify.com/sites/devopsdays-web) - This is a very useful test. It builds the site, and hosts an ephemeral preview version of it (viewable by clicking on the "details" link next to the test once it has turned green). It's pretty important to view this "deploy preview" if the PR has changed anything significant (adding a sponsor, etc, probably not...but changing content in a large way? Yes.)
 
 ## Credits
 

README.md

@@ -1,12 +1,13 @@
-[![Stories in Ready](https://badge.waffle.io/devopsdays/devopsdays-web.svg?label=ready&title=Ready)](http://waffle.io/devopsdays/devopsdays-web) [![Stories in Progress](https://badge.waffle.io/devopsdays/devopsdays-web.svg?label=ready&title=In%20Progress)](http://waffle.io/mattstratton/devopsdays-web) [![Build Status](https://travis-ci.org/devopsdays/devopsdays-web.svg?branch=master)](https://travis-ci.org/devopsdays/devopsdays-web)
-
-You can see progress on tasks at http://waffle.io/devopsdays/devopsdays-web
-
-[![Throughput Graph](https://graphs.waffle.io/devopsdays/devopsdays-web/throughput.svg)](https://waffle.io/devopsdays/devopsdays-web/metrics)
+[![Build Status](https://travis-ci.org/devopsdays/devopsdays-web.svg?branch=master)](https://travis-ci.org/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)
 
 # devopsdays-web
 This is the repo for managing [devopsdays.org](http://www.devopsdays.org).
 
+## Reporting issues
+
+If you discover an issue with the theme, please open an issue in the [devopsdays-theme repo](https://github.com/devopsdays/devopsdays-theme/issues/new).
+
 ## Contributing
 
 The technical details and guidelines for contributing to this repository are outlined in [CONTRIBUTING.md](CONTRIBUTING.md). If you intend to contribute (and we sure hope you do!), please take a moment to review that document.
@@ -23,3 +24,13 @@ Generally speaking, you should avoid storing any files other than logos or small
 * Small, web images are fine (logos, etc). If you have high-resolution versions of your logo to share with others, please do not host them on the devopsdays-web repo.
 * It is acceptable to add in a single PDF for your sponsor prospectus if you desire (in `static/events/YYYY-city`), but please keep this file under 3 MB. It is better to host it on Google Drive or something similar, and then link to it from your site.
 * OPTIONAL - you can host your PDF's for prospectus, etc, in the repo at [devopsdays/devopsdays-assets](https://github.com/devopsdays/devopsdays-assets) and then link to them from there. Files in that repo are presented under their relative URL at https://assets.devopsdays.org. For example, the file located at `static/events/2016/chicago/devopsdays-chicago-2016-prospectus.pdf` in the `devopsdays/devopsdays-assets` repo will be presented at `https://assets.devopsdays.org/events/2016/chicago/devopsdays-chicago-2016-prospectus.pdf`
+
+## Feature Requests
+If there is a feature in the theme that you would like to see, please visit our [ideas portal](https://www.devopsdays.org/ideas) and suggest it. On that same page, you can upvote existing feedback that you would like to see.
+
+If you'd like to see what we have planned, check out our [roadmap](https://www.devopsdays.org/roadmap).
+
+Please only use [GitHub issues](https://www.github.com/devopsdays/devopsdays-theme) for reporting defects/bugs.
+
+## Contributing
+See [CONTRIBUTING.md](https://github.com/devopsdays/devopsdays-theme/blob/master/CONTRIBUTING.md) for details on our workflow, dev setup, and how to release new versions of the theme.

appveyor.yml

@@ -6,21 +6,21 @@ install:
 
     hugo version
 
-# Change the Path seperator to a Windows version (backslash)    
-- ps: >-
-    $buildRoot = $ENV:APPVEYOR_BUILD_FOLDER
-
-    $content = (Get-Content ($buildRoot + '\config.toml')) -join "`n"
-
-    $content = $content -replace 'PathSeperator = "/"','PathSeperator = "\\"'
-
-    Write-Output "config.toml content changed to:`n----`n$($content)"
-
-    $content | Set-Content ($buildRoot + '\config.toml')
+# Change the Path seperator to a Windows version (backslash)
+# - ps: >-
+#     $buildRoot = $ENV:APPVEYOR_BUILD_FOLDER
+#
+#     $content = (Get-Content ($buildRoot + '\config.toml')) -join "`n"
+#
+#     $content = $content -replace 'PathSeperator = "/"','PathSeperator = "\\"'
+#
+#     Write-Output "config.toml content changed to:`n----`n$($content)"
+#
+#     $content | Set-Content ($buildRoot + '\config.toml')
 
 build_script:
 #  Build the devopsdays-web site once
 - cmd: >-
-    hugo --verbose
+    hugo --verbose --config config-windows.toml
 
 test: off

bin/netlify-production.sh

@@ -0,0 +1,2 @@
+hugo_0.18 --theme=devopsdays-theme --buildDrafts=false --baseURL="/"
+gulp

bin/netlify.sh

@@ -0,0 +1 @@
+hugo_0.18 --theme=devopsdays-theme --buildDrafts=false --baseURL="/"

config-windows.toml

@@ -1,4 +1,4 @@
-theme = "devopsdays-responsive"
+theme = "devopsdays-theme"
 baseurl = "https://www.devopsdays.org/"
 # baseurl = "http://localhost:1313/"
 languageCode = "en-us"
@@ -47,7 +47,7 @@ buildDrafts = false
 
   # Set to "/" on *nix and Mac, "\\" on Windows
   # Refer to https://github.com/spf13/hugo/issues/2394 for more information
-  # Do not change this setting in the file directly. Instead run hugo with the --config flag if using Windows. 
+  # Do not change this setting in the file directly. Instead run hugo with the --config flag if using Windows.
   # See CONTRIBUTING.md on devopsdays/devopsdays-web for more details
   PathSeperator = "\\" # this will be deprecated with devopsdays-theme
   pathSeparator = "\\"

config.toml

@@ -1,4 +1,4 @@
-theme = "devopsdays-responsive"
+theme = "devopsdays-theme"
 baseurl = "https://www.devopsdays.org/"
 # baseurl = "http://localhost:1313/"
 languageCode = "en-us"
@@ -38,6 +38,8 @@ buildDrafts = false
 [permalinks]
   page = "/:filename/"
   blog = "/blog/:year/:month/:day/:title/"
+  speaking = "/:filename/"
+
 
 [params]
   Facebook = "//www.facebook.com/group.php?gid=106761636771"

content/events/2017-amsterdam/welcome.md

@@ -90,4 +90,4 @@ heading = "devopsdays Amsterdam - Welcome"
   </div>
 </div>
 
-{{< event_twitter devopsams >}}
+{{< event_twitter >}}

content/events/2017-atlanta/program.md

@@ -50,7 +50,12 @@ type = "event"
         <time>09:15-09:45</time>
       </div>
       <div class = "col-md-6 box">
-        &nbsp;
+      <strong>Opening Keynote</strong>
+        <br/>
+        <a style="text-decoration:none;"><strong>NoOps</strong></a>
+        <br/>
+        <em>by</em> <a href="https://twitter.com/kelseyhightower">Kelsey Hightower</a>
+          <br />
       </div>
     </div> <!-- end timeslot div -->
     <!-- this div is repeated for each timeslot -->
@@ -68,7 +73,10 @@ type = "event"
         <time>09:55-10:25</time>
       </div>
       <div class = "col-md-6 box">
-        &nbsp;
+      <a style="text-decoration:none;"><strong>Tales of test-driven infrastructure as told by a windows-toucher</strong></a>
+        <br/>
+        <em>by</em> <a href="https://twitter.com/chris_evett">Chris Evett</a>
+          <br />
       </div>
     </div> <!-- end timeslot div -->
     <!-- this div is repeated for each timeslot -->
@@ -86,7 +94,10 @@ type = "event"
         <time>10:40-11:10</time>
       </div>
       <div class = "col-md-6 box">
-        &nbsp;
+      <a style="text-decoration:none;"><strong>Best practices for leveraging UX in an agile enterprise development process</strong></a>
+        <br/>
+        <em>by</em> <a href="https://twitter.com/angelmbanks">Angel Banks</a>
+          <br />
       </div>
     </div> <!-- end timeslot div -->
     <!-- this div is repeated for each timeslot -->
@@ -104,7 +115,11 @@ type = "event"
         <time>11:20-11:50</time>
       </div>
       <div class = "col-md-6 box">
-        &nbsp;
+      <strong>Closing Keynote</strong>
+      <a style="text-decoration:none;"><strong>Cloud Native Java</strong></a>
+        <br/>
+        <em>by</em> <a href="https://twitter.com/starbuxman">Josh Long</a>
+          <br />
       </div>
     </div> <!-- end timeslot div -->
     <!-- this div is repeated for each timeslot -->
@@ -123,6 +138,17 @@ type = "event"
       </div>
       <div class = "col-md-6 box">
         <strong>Ignites</strong>
+        <br/><br/>
+        Unconventional Wisdom: What Non-Techies Can Teach Us About Technology <br/> <a href="https://twitter.com/joshlohrman">Josh Lohrman</a>
+        <br/>  <br/>
+        You Will NEVER Be "Done" <br/> <a href="https://twitter.com/mykelalvis">Mykel Alvis</a>
+        <br/>  <br/>
+        Becoming a Plumber: Building Deployment Pipelines <br/> <a href="https://twitter.com/barkerd427">Daniel Barker</a>
+        <br/>  <br/>
+        Introduction to Azure Functions <br/> <a href="https://twitter.com/tobiaswright">Tobbias Wright</a>
+        <br/>  <br/>
+        Your goat antifragiled my snowflake!: Demystifying DevOps Jargon <br/> <a href="https://twitter.com/clintoncwolfe">Clinton Wolfe</a>
+        <br/>
       </div>
     </div> <!-- end timeslot div -->
     <!-- this div is repeated for each timeslot -->
@@ -220,7 +246,10 @@ type = "event"
         <time>09:15-09:45</time>
       </div>
       <div class = "col-md-6 box">
-        &nbsp;
+      <a style="text-decoration:none;"><strong>The Five Dirty Words of CI</strong></a>
+        <br/>
+        <em>by</em> <a href="https://twitter.com/jpaulreed">J Paul Reed</a>
+          <br />
       </div>
     </div> <!-- end timeslot div -->
     <!-- this div is repeated for each timeslot -->
@@ -238,7 +267,10 @@ type = "event"
         <time>09:55-10:25</time>
       </div>
       <div class = "col-md-6 box">
-        &nbsp;
+      <a style="text-decoration:none;"><strong>Fear of the Bus: devOps and Docs</strong></a>
+        <br/>
+        <em>by</em> <a href="https://twitter.com/wiredferret">Heidi Waterhouse</a>
+          <br />
       </div>
     </div> <!-- end timeslot div -->
     <!-- this div is repeated for each timeslot -->
@@ -256,7 +288,10 @@ type = "event"
         <time>10:40-11:10</time>
       </div>
       <div class = "col-md-6 box">
-        &nbsp;
+      <a style="text-decoration:none;"><strong>AppSec in a DevOps World</strong></a>
+        <br/>
+        <em>by</em> <a href="https://twitter.com/PeteChestna">Pete Chesna</a>
+          <br />
       </div>
     </div> <!-- end timeslot div -->
     <!-- this div is repeated for each timeslot -->
@@ -274,7 +309,10 @@ type = "event"
         <time>11:20-11:50</time>
       </div>
       <div class = "col-md-6 box">
-        &nbsp;
+  <a style="text-decoration:none;"><strong>DevOps is NOT a Strategy</strong></a>
+    <br/>
+    <em>by</em> <a href="https://twitter.com/CatSwetel">Cat Swetel</a>
+      <br />
       </div>
     </div> <!-- end timeslot div -->
     <!-- this div is repeated for each timeslot -->
@@ -292,7 +330,18 @@ type = "event"
         <time>13:00-13:30</time>
       </div>
       <div class = "col-md-6 box">
-        <strong>Ignites</strong>
+      <strong>Ignites</strong>
+      <br/><br/>
+      Gamifying that Work/Life Balance <br/> <a href="https://twitter.com/FergatROn">Marc Ferguson</a>
+      <br/>  <br/>
+      Is it too late to learn how to program? How I become a developer later in life <br/> <a href="https://twitter.com/Fineblkwoman">Alicia V Carr</a>
+      <br/>  <br/>
+      Lessons Learned from Eventbrite's VPC Migration<br/> <a href="https://twitter.com/sciurus">Brian Pitts</a>
+      <br/>  <br/>
+      In Depth Monitoring<br/> <a>Eldon Stegall</a>
+      <br/>  <br/>
+      Marriage of UX and DevOps<br/> <a href="https://twitter.com/vcagwin">Virginia Cagwin</a>
+      <br/>
       </div>
     </div> <!-- end timeslot div -->
     <!-- this div is repeated for each timeslot -->

content/events/2017-atlanta/welcome.md

@@ -88,7 +88,6 @@ aliases = ["/events/2017-atlanta"]
   </div>
 </div>
 
-<!-- add your city twitter name here without the @ sign -->
 <!--
-{{< event_twitter devopsdaysyourcity >}}
+{{< event_twitter >}}
 -->

content/events/2017-austin/welcome.md

@@ -10,7 +10,7 @@ aliases = ["/events/2017-austin"]
 
 <h2>{{< event_start >}} - {{< event_end >}}</h2>
 
-{{< event_twitter dodaustin >}}
+{{< event_twitter >}}
 
 Watch [www.devopsdaysaustin.com](http://www.devopsdaysaustin.com) for more up to date information as it becomes available.