Merge pull request #2 from devopsdays/master

update devopsday-web master

.travis.yml

@@ -1,14 +1,13 @@
-sudo: required
-dist: trusty
+sudo: false
 language: go
 install: go get -v github.com/spf13/hugo
-before_install:
-- sudo apt-get update
-- sudo apt-get install nodejs
-- sudo apt-get install npm
-before_script:
-- npm install -g gulp
-- npm install
+# before_install:
+# - sudo apt-get update
+# - sudo apt-get install nodejs
+# - sudo apt-get install npm
+# before_script:
+# - npm install -g gulp
+# - npm install
 script:
   - hugo
-  - gulp min-html
+  # - gulp min-html

config.toml

@@ -9,6 +9,62 @@ dataDir = "data"
 archetypedir = "archetypes"
 PaginatePath = "blog"
 buildDrafts = false
+defaultContentLanguage = "en"
+
+[[languages.en.menu.main]]
+  name = "events"
+  url = "/events"
+  weight = -150
+[[languages.en.menu.main]]
+  name = "blog"
+  url = "/blog"
+  weight = -140
+[[languages.en.menu.main]]
+  name = "sponsor"
+  url = "/sponsor"
+  weight = -130
+[[languages.en.menu.main]]
+  name = "speaking"
+  url = "/speaking"
+  weight = -120
+[[languages.en.menu.main]]
+  name = "organizing"
+  url = "/organizing"
+  weight = -110
+[[languages.en.menu.main]]
+  name = "about"
+  url = "/about"
+  weight = -100
+
+[languages.es]
+weight = 10
+languageName = "español"
+title = "los dias de devops"
+
+[[languages.es.menu.main]]
+  name = "events"
+  url = "/events"
+  weight = -150
+[[languages.es.menu.main]]
+  name = "blog"
+  url = "/blog"
+  weight = -140
+[[languages.es.menu.main]]
+  name = "sponsor"
+  url = "/sponsor"
+  weight = -130
+[[languages.es.menu.main]]
+  name = "speaking"
+  url = "/speaking"
+  weight = -120
+[[languages.es.menu.main]]
+  name = "organizing"
+  url = "/organizing"
+  weight = -110
+[[languages.es.menu.main]]
+  name = "about"
+  url = "/about"
+  weight = -100
 
 [permalinks]
 	page = "/:filename/"
@@ -23,3 +79,5 @@ buildDrafts = false
 	# Set to "/" on *nix and Mac, "\\" on Windows
 	# Refer to https://github.com/spf13/hugo/issues/2394 for more information
 	PathSeperator = "/"
+  pathSeparator = "/"
+  weburl = "https://www.devopsdays.org"

content/blog/2016-chicago.md

@@ -1,9 +1,10 @@
 +++
 Categories = []
-Description = ""
+Description = "[DevOpsDays Chicago](https://devopsdays.org/events/2016-chicago) took place on August 30th & 31st at Summit West in beautiful downtown Chicago. A sold-out, diverse crowd gathered for keynotes, presentations, lightning talks, and open spaces to learn, discuss, and promote all things DevOps."
 Tags = []
 date = "2016-12-12T16:31:00-06:00"
 title = "Chicago 2016 in review"
+Author = "Matt Stratton"
 
 +++
 

content/blog/2016-minneapolis.md

@@ -2,9 +2,10 @@
 Title = "Minneapolis 2016 in review"
 Date = "2016-08-08T15:59:27-05:00"
 Tags = ["2016"]
+Author = "Bridget Kromhout"
 +++
 
-<img src="https://raw.githubusercontent.com/devopsdays/devopsdays-web/master/static/events/2016-minneapolis/logo.png" style="max-width: 90%;" />
+<img src="https://raw.githubusercontent.com/devopsdays/devopsdays-web/master/static/events/2016-minneapolis/logo.png" alt="" style="max-width: 90%;" />
 
 <br>
 
@@ -123,5 +124,3 @@ Donnie Berkholz, Heather Mickman, Tony Notto, Samantha Grumdahl, Andy Domeier, J
 
 
 </div>
-
-

content/events/2017-amsterdam/conduct.md

@@ -18,6 +18,14 @@ If a participant engages in harassing behavior, the conference organizers may ta
 
 If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff immediately.
 
+At Amsterdam we have staff dedicated to handle these incidents, please contact them via phone (WhatsApp, call, SMS):
+
+Kerim Satirli - +31 6 38 06 70 78
+Gerard DeVos - +31 6 47 43 00 94
+Mine Heck - +31 6 55 85 27 18
+
+You can also DM our Twitter handle {{< event_twitter devopsams >}}.
+
 Conference staff can be identified by distinct staff badges. Conference staff will be happy to help participants contact hotel/venue security or local law enforcement, provide escorts, or otherwise assist those experiencing harassment to feel safe for the duration of the conference. We value your attendance.
 
 We expect participants to adhere to the code of conduct at all conference venues and conference-related social events.

content/events/2017-beijing/welcome.md

@@ -14,7 +14,7 @@ aliases = ["/events/2017-beijing"]
 <h2>{{< event_start >}} - {{< event_end >}}</h2>
 
 
-**DevOpsDays is coming to {{< event_location >}}!**
+**DevOpsDays is coming to {{< event_location >}} in Beijing,China!**
 <!-- **devopsdays is coming to {{< event_location >}}!** -->
 
 <!-- <div style="text-align:center;">
@@ -30,14 +30,14 @@ aliases = ["/events/2017-beijing"]
   </div>
 </div>
 
-<!-- <div class = "row">
+<div class = "row">
   <div class = "col-md-2">
     <strong>Location</strong>
   </div>
   <div class = "col-md-8">
     {{< event_location >}}
   </div>
-</div> -->
+</div>
 
 <!-- <div class = "row">
   <div class = "col-md-2">

content/events/2017-chicago/location.md

@@ -5,6 +5,11 @@ type = "event"
 
 +++
 
-Information about the venue including address, map/direction, parking/transit, and any hotel group discount codes.
+Event will be taking place at the Holiday Inn Mart Plaza.
 
-<!-- {{< event_map >}} -->
+## A River North Hotel Near Chicago's Busy Downtown
+*350 West Mart Center Drive, Chicago, IL 60654 (Hotel Lobby: Floor 15 - Guest Rooms: Floors 16-23)*
+
+This contemporary hotel puts you in the middle of downtown Chicago's bustling River North area. Featuring upscale lodging atop the famous Chicago Sun-Times building, it's next door to the Merchandise Mart and within walking distance of the Loop, the main business district, and the Magnificent Mile. Near Chicago's chic shops and restaurants, you're close to attractions like Navy Pier, Millennium Park, Chicago Theatre, 360 Chicago and the Willis Tower Skydeck.
+
+<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2970.214376515372!2d-87.6400501482383!3d41.888246472654856!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x880e2cb7ca30a3ff%3A0x3936cc667d8556f!2sHoliday+Inn+Chicago+Mart+Plaza+River+North!5e0!3m2!1sen!2sus!4v1487329717904" width="600" height="450" frameborder="0" style="border:0" allowfullscreen></iframe>

content/events/2017-chicago/sponsor.md

@@ -11,11 +11,11 @@ We greatly value sponsors for this open event.  If you are interested in sponsor
 <hr>
 
 DevOpsDays is a self-organizing conference for practitioners that depends on sponsorships. We do not have vendor booths, sell product presentations, or distribute attendee contact lists. Sponsors have the opportunity to have short elevator pitches during the program and will get recognition on the website and social media before, during and after the event. Sponsors are encouraged to represent themselves by actively participating and engaging with the attendees as peers. Any attendee also has the opportunity to demo products/projects as part of an open space session.
-<br>
+
 Gold sponsors get a full table and Silver sponsors a shared table where they can interact with those interested to come visit during breaks. All attendees are welcome to propose any subject they want during the open spaces, but this is a community-focused conference, so heavy marketing will probably work against you when trying to make a good impression on the attendees.
-<br>
+
 The best thing to do is send engineers to interact with the experts at DevOpsDays on their own terms.
-<br>
+
 <hr/>
 
 <!--

content/events/2017-chicago/welcome.md

@@ -15,23 +15,23 @@ Welcome!  The group that brought you DevOpsDays Chicago 2014-2016 is back togeth
   {{< event_logo >}}
 </div>
 
-<!-- <div class = "row">
+<div class = "row">
   <div class = "col-md-2">
     <strong>Dates</strong>
   </div>
   <div class = "col-md-8">
     {{< event_start >}} - {{< event_end >}}
   </div>
-</div> -->
+</div>
 
-<!-- <div class = "row">
+<div class = "row">
   <div class = "col-md-2">
     <strong>Location</strong>
   </div>
   <div class = "col-md-8">
     {{< event_location >}}
   </div>
-</div> -->
+</div>
 
 <!-- <div class = "row">
   <div class = "col-md-2">
@@ -88,5 +88,5 @@ Welcome!  The group that brought you DevOpsDays Chicago 2014-2016 is back togeth
 </div>
 
 <!-- add your city twitter name here without the @ sign -->
-<!--
-{{< event_twitter devopsdaysyourcity >}} -->
+
+{{< event_twitter devopsdayschi >}}

content/events/2017-denver/welcome.md

@@ -19,18 +19,18 @@ DevOpsDays is back for its 3rd anual event in the Rocky Mountains {{< event_star
 
 <div class = "row">
   <div class = "col-md-2">
-    <strong>CFP</strong>
+    <strong>Program</strong>
   </div>
   <div class = "col-md-8">
-    {{< event_link page="propose" text="CFP for talks is now open. Submit yours now!" >}}
+    Check back Wednesday, March 1st!
   </div>
 </div>
 <div class = "row">
   <div class = "col-md-2">
     <strong>Tickets</strong>
   </div>
   <div class = "col-md-8">
-    [Tickets are now availible. Early Bird ends on Feb 11th so get yours today!](https://www.eventbrite.com/e/devopsdays-denver-2017-tickets-31187069364)
+    [Tickets are now availible](https://www.eventbrite.com/e/devopsdays-denver-2017-tickets-31187069364)
   </div>
 </div>
 <div class = "row">

content/events/2017-edinburgh/conduct.md

@@ -0,0 +1,36 @@
++++
+date = "2017-02-06T21:06:13+00:00"
+title = "conduct"
+type = "event"
+
++++
+
+## ANTI-HARASSMENT POLICY
+
+DevOpsDays is dedicated to providing a harassment-free conference experience for everyone, regardless of gender, sexual orientation, disability, physical appearance, body size, race, or religion. We do not tolerate harassment of conference participants in any form. Sexual language and imagery is not appropriate for any conference venue, including talks. Conference participants violating these rules may be sanctioned or expelled from the conference without a refund at the discretion of the conference organizers.
+
+Harassment includes offensive verbal comments related to gender, sexual orientation, disability, physical appearance, body size, race, religion, sexual images in public spaces, deliberate intimidation, stalking, following, harassing photography or recording, sustained disruption of talks or other events, inappropriate physical contact, and unwelcome sexual attention. Participants asked to stop any harassing behavior are expected to comply immediately.
+
+Exhibitors in the expo hall, sponsor or vendor booths, or similar activities are also subject to the anti-harassment policy. In particular, exhibitors should not use sexualized images, activities, or other material. Booth staff (including volunteers) should not use sexualized clothing/uniforms/costumes, or otherwise create a sexualized environment.
+
+If a participant engages in harassing behavior, the conference organizers may take any action they deem appropriate, including warning the offender or expulsion from the conference with no refund.
+
+If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff immediately.
+
+Conference staff can be identified by distinct staff badges. Conference staff will be happy to help participants contact hotel/venue security or local law enforcement, provide escorts, or otherwise assist those experiencing harassment to feel safe for the duration of the conference. We value your attendance.
+
+We expect participants to adhere to the code of conduct at all conference venues and conference-related social events.
+
+## CODE OF CONDUCT
+
+I. I am an attendee at devopsdays, learning from and sharing with other devopsdays attendees in an effort to better myself and my industry. I co-create the experience with fellow attendees. I am prepared to give my energy, presence and sensitivity to creating the best possible experience for myself and others.
+
+II. I am coming to devopsdays to interact with people. I understand that imagery and language which is suggestive or derogatory will offend and make people uncomfortable. I also understand that people may have boundaries and sensibilities different from my own. I will accept without question when informed that something is offensive or unacceptable in the context of the devopsdays event.
+
+III. I will never intentionally harass or offend another attendee regardless of gender, sexual orientation, disability, appearance, size, race or religion and will not abide another attendee being harassed or offended. If I am aware that anyone is uncomfortable or unsafe, I will notify those giving offense and the devopsdays event organizers.
+
+IV. If I am offended or harassed, I will inform people around me who make me feel safe and the event organizers. If I feel safe, at my discretion, I will inform those giving offense of the specific actions with the hope that the other party is well-intentioned and ignorant, but I am under no obligation to do so.
+
+V. I understand that people are different and I attempt to be forgiving of others actions at the level of their sincere intent, but my priority is protecting my safety and the safety of others. I will act without hesitation or reservation until there are no question of the safety of all parties.
+
+VI. I trust the devopsdays organizers and attendees will co-create the best possible experience for everyone involved, as I will. I believe devopsdays is about empowering people and I will not forget I am empowered to create a safe and nurturing environment. If I or any other attendee violates this aspect of the event, I expect the conference organizers to protect the attendees by direct action, including expelling those in violation and contacting the proper authorities.

content/events/2017-edinburgh/contact.md

@@ -0,0 +1,17 @@
++++
+date = "2017-02-06T21:06:13+00:00"
+title = "contact"
+type = "event"
+
+
++++
+
+If you'd like to contact us by email: {{< email_organizers >}}
+
+**Our local team**
+
+{{< list_organizers >}}
+
+**The core devopsdays organizer group**
+
+{{< list_core >}}

content/events/2017-edinburgh/location.md

@@ -0,0 +1,10 @@
++++
+date = "2017-02-06T21:06:13+00:00"
+title = "location"
+type = "event"
+
++++
+
+Information about the venue including address, map/direction, parking/transit, and any hotel group discount codes.
+
+<!-- {{< event_map >}} -->