Merge pull request #265 from devopsdays/bridget-migration

More migration (mostly corrections).
devopsdays · May 7, 2016 · a96b982 · a96b982
2 parents ec3b5f4 + d22e4fc
commit a96b982
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 68 deletions.
diff --git a/content/events/2016-amsterdam/contact.md b/content/events/2016-amsterdam/contact.md
@@ -10,10 +10,10 @@ type = "event"
 
 If you'd like to contact us by email: {{< email_organizers >}}
 
-** Our local team**
+**Our local team**
 
 {{< list_organizers >}}
 
-** The core devopsdays organizer group**
+**The core devopsdays organizer group**
 
 {{< list_core >}}
diff --git a/content/events/2016-chicago/contact.md b/content/events/2016-chicago/contact.md
@@ -7,10 +7,10 @@ type = "event"
 
 If you'd like to contact us by email: {{< email_organizers >}}
 
-** Our local team**
+**Our local team**
 
 {{< list_organizers >}}
 
-** The core devopsdays organizer group**
+**The core devopsdays organizer group**
 
 {{< list_core >}}
diff --git a/content/events/2016-dallas/conduct.md b/content/events/2016-dallas/conduct.md
@@ -7,7 +7,7 @@ type = "event"
 
 +++
 
-##ANTI-HARASSMENT POLICY
+## 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.
 
@@ -23,7 +23,7 @@ Conference staff can be identified by distinct staff badges. Conference staff wi
 
 We expect participants to adhere to the code of conduct at all conference venues and conference-related social events.
 
-##CODE OF CONDUCT
+## 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.
 

diff --git a/content/events/2016-dallas/contact.md b/content/events/2016-dallas/contact.md
@@ -10,10 +10,10 @@ type = "event"
 
 If you'd like to contact us by email: {{< email_organizers >}}
 
-** Our local team**
+**Our local team**
 
 {{< list_organizers >}}
 
-** The core devopsdays organizer group**
+**The core devopsdays organizer group**
 
 {{< list_core >}}
diff --git a/content/events/2016-dallas/registration.md b/content/events/2016-dallas/registration.md
@@ -7,8 +7,4 @@ type = "event"
 
 +++
 
-<div style="width:100%; text-align:left;">
-
-Embed registration iframe/link/etc.
-</div></div>
-</div>
+Coming soon!
diff --git a/content/events/2016-detroit/conduct.md b/content/events/2016-detroit/conduct.md
@@ -7,7 +7,7 @@ type = "event"
 
 +++
 
-##ANTI-HARASSMENT POLICY
+## 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.
 
@@ -23,7 +23,7 @@ Conference staff can be identified by distinct staff badges. Conference staff wi
 
 We expect participants to adhere to the code of conduct at all conference venues and conference-related social events.
 
-##CODE OF CONDUCT
+## 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.
 

diff --git a/content/events/2016-detroit/contact.md b/content/events/2016-detroit/contact.md
@@ -10,10 +10,10 @@ type = "event"
 
 If you'd like to contact us by email: {{< email_organizers >}}
 
-** Our local team**
+**Our local team**
 
 {{< list_organizers >}}
 
-** The core devopsdays organizer group**
+**The core devopsdays organizer group**
 
 {{< list_core >}}
diff --git a/content/events/2016-minneapolis/location.md b/content/events/2016-minneapolis/location.md
@@ -6,7 +6,7 @@ title = "location"
 type = "event"
 
 +++
-The conference will take place Wednesday July 20 and Thursday July 21, 2016 at the <a href="http://www3.hilton.com/en/hotels/minnesota/hilton-minneapolis-MSPMHHH/index.html">downtown Minneapolis Hilton</a>. We will have a discounted rate for those who'd like to stay at the Hilton.
+The conference will take place Wednesday July 20 and Thursday July 21, 2016 at the <a href="http://www3.hilton.com/en/hotels/minnesota/hilton-minneapolis-MSPMHHH/index.html">downtown Minneapolis Hilton</a>. The Hilton has very few hotel rooms available, but there are many other hotels nearby.
 <p>
 Last year, we worked with the hotel to make space available for nursing mothers, and if that would be useful for you, please let us know. We'd also be happy to accommodate any other accessibility needs. You can reach out <a href="http://www.devopsmsp.org/slack/">on devops MSP Slack</a> or via <a href="mailto:organizers-minneapolis-2016@devopsdays.org">email</a>.
 <p>

diff --git a/content/events/2016-ohio/propose.md b/content/events/2016-ohio/propose.md
@@ -7,6 +7,12 @@ type = "event"
 draft = false
 +++
 
+  {{< cfp_dates >}}
+
+Proposal submission is not available at this time. Stay tuned for more information.
+
+
+
 <hr>
 There are three ways to propose a session:
 <ol>
@@ -15,7 +21,6 @@ There are three ways to propose a session:
   <li><strong><em>Open Space session</em></strong> : even without a prepared presentation we welcome the discussion and interaction by having people propose a session on the fly during Open Space. Check the <a href="/pages/open-space-format">Open Space explanation</a> for more information.
 </ol>
 
-### Even if you don't propose, please consider {{< event_link page="proposals" text="commenting on proposals submitted by others" >}}
 
 Our main criteria to make it to the top selection are:
 

diff --git a/content/events/2016-ohio/sponsor.md b/content/events/2016-ohio/sponsor.md
@@ -9,44 +9,14 @@ draft = false
 
 +++
 
-We greatly value sponsors for this open event.  If you are interested in sponsoring, please drop us an email at [{{< email_organizers >}}].
+We greatly value sponsors for this open event.
+
+
+Sponsorship Prospectus TBD.
+
+
+If you are interested in sponsoring this event in any way, please email us: {{< email_organizers >}}.
 
 <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/>
-
-<!--
-
-<div style="width:590px">
-<table border=1 cellspacing=1>
-  <tr>
-    <th><i>packages</i></th>
-    <th><center><b><u>Bronze<br />1000 usd</u></center></b></th>
-    <th><center><b><u>Silver<br />3000 usd</u></center></b></th>
-    <th><center><b><u>Gold<br />5000 usd</u></center></b></th>
-    <th></th>
-  </tr>
-<tr><td>2 included tickets</td><td bgcolor="gold">&nbsp;</td><td bgcolor="gold">&nbsp;</td><td bgcolor="gold">&nbsp;</td></tr>
-<tr><td>logo on event website</td><td bgcolor="gold">&nbsp;</td><td bgcolor="gold">&nbsp;</td><td bgcolor="gold">&nbsp;</td></tr>
-<tr><td>logo on shared slide, rotating during breaks</td><td bgcolor="gold">&nbsp;</td><td bgcolor="gold">&nbsp;</td><td bgcolor="gold">&nbsp;</td></tr>
-<tr><td>logo on all email communication</td><td>&nbsp;</td><td bgcolor="gold">&nbsp;</td><td bgcolor="gold">&nbsp;</td></tr>
-<tr><td>logo on its own slide, rotating during breaks</td><td>&nbsp;</td><td bgcolor="gold">&nbsp;</td><td bgcolor="gold">&nbsp;</td></tr>
-<tr><td>1 minute pitch to full audience (including streaming audience)</td><td>&nbsp;</td><td>&nbsp;</td><td bgcolor="gold">&nbsp;</td></tr></tr>
-<tr><td>2 additional tickets (4 in total)</td><td>&nbsp;</td><td bgcolor="gold">&nbsp;</td><td>&nbsp;</td></tr>
-<tr><td>4 additional tickets (6 in total)</td><td>&nbsp;</td><td>&nbsp;</td><td bgcolor="gold">&nbsp;</td></tr>
-<tr><td>shared table for swag</td><td>&nbsp;</td><td bgcolor="gold">&nbsp;</td><td>&nbsp;</td></tr>
-<tr><td>booth/table space</td><td>&nbsp;</td><td>&nbsp;</td><td bgcolor="gold">&nbsp;</td></tr>
-</table>
-<hr/>
-There are also opportunities for exclusive special sponsorships. We'll have sponsors for various events with special privileges for the sponsors of these events. If you are interested in special sponsorships or have a creative idea about how you can support the event, <a href="mailto:<%= render(:partial => "/#{@eventhome}/_email_organizers") %>?subject=Sponsor devopsdays <%= @eventid %>">send us an email</a>.
-<br/>
-<br/>
-</div>
--->
-<hr/>
+DevOpsDays is a self-organizing conference for practitioners that depends on sponsorships. We do not have vendor booths, sell product presentations, or distributee 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.
diff --git a/content/events/2016-ohio/welcome.md b/content/events/2016-ohio/welcome.md
@@ -51,7 +51,7 @@ Thanks to a great success in <a href="http://www.devopsdays.org/events/2015-ohio
   <tr>
   <td></td>
     <td>
-    {{< event_twitter devopsdayschi >}} <!-- add your twitter name here without the @ sign -->
+    {{< event_twitter DevOpsDaysOhio >}} <!-- add your twitter name here without the @ sign -->
     </td>
   </tr>
 </table>
diff --git a/content/events/2016-raleigh/contact.md b/content/events/2016-raleigh/contact.md
@@ -7,10 +7,10 @@ type = "event"
 
 If you'd like to contact us by email: {{< email_organizers >}}
 
-** Our local team**
+**Our local team**
 
 {{< list_organizers >}}
 
-** The core devopsdays organizer group**
+**The core devopsdays organizer group**
 
 {{< list_core >}}
diff --git a/content/events/2016-raleigh/welcome.md b/content/events/2016-raleigh/welcome.md
@@ -10,9 +10,9 @@ aliases = ["/events/2016-raleigh"]
 
 Welcome to Raleigh DevOpsDays! More information will be coming shortly. Stay tuned to our <a href="https://twitter.com/devopsdaysTRI">twitter account</a> as we solidify plans for the event.
 
-<div style="text-align:center;">
+<!-- <div style="text-align:center;">
   {{< event_logo >}}
-</div>
+</div> -->
 
 <table>
   <tr>
@@ -25,7 +25,7 @@ Welcome to Raleigh DevOpsDays! More information will be coming shortly. Stay tun
   </tr>
   <tr>
     <td><b>Propose</b></td>
-    <td>{{< event_link page="propose" text="Propose a talk!" >}}.</td>
+    <td>{{< event_link page="propose" text="Propose a talk!" >}}</td>
   </tr>
   <tr>
     <td><b>Register</b></td>

diff --git a/content/events/2016-singapore/welcome.md b/content/events/2016-singapore/welcome.md
@@ -24,7 +24,7 @@ aliases = ["/events/2016-Singapore"]
   </tr>
   <tr>
     <td><b>Location</b></td>
-    <td>{{< event_location >}} (same as <a href="../2015-singapore">last year</a>)</td>
+    <td>{{< event_location >}} (same as <a href="/events/2015-singapore">last year</a>)</td>
   </tr>
   <tr>
     <td><b>Propose</b></td>

diff --git a/content/events/2016-washington-dc/conduct.md b/content/events/2016-washington-dc/conduct.md
@@ -5,7 +5,7 @@ type = "event"
 
 +++
 
-##ANTI-HARASSMENT POLICY
+## 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.
 
@@ -21,7 +21,7 @@ Conference staff can be identified by distinct staff badges. Conference staff wi
 
 We expect participants to adhere to the code of conduct at all conference venues and conference-related social events.
 
-##CODE OF CONDUCT
+## 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.
 

diff --git a/data/events/2016-amsterdam.yml b/data/events/2016-amsterdam.yml
@@ -13,7 +13,7 @@ cfp_date_announce: 2016-01-01 # inform proposers of status
 
 # Location
 coordinates: "52.376862, 4.922078" # The coordinates of your city. Get Latitude and Longitude of a Point: http://itouchmap.com/latlong.html
-location: "Amsterdam" # Defaults to city, but you can make it the venue name.
+location: "Pakhuis de Zwijger - Amsterdam" # Defaults to city, but you can make it the venue name.
 
 # Team members
 team: ["Harm Boertien", "Thomas Krag", "Kerim Satirli", "Arjan Wolfs", "Wilco Noordermeer", "Arjan Eriks", "Gérard de Vos", "Yvo van Doorn", "Marjana Shammi", "Mine Heck", "Daniel Paulus", "Mark Heistek"]

diff --git a/data/events/2016-raleigh.yml b/data/events/2016-raleigh.yml
@@ -33,4 +33,4 @@ sponsor_levels: # In this section, list the level of sponsorships and the label
   - id: silver
     label: Silver
   - id: community
-    label: Community Partner
+    label: Community