Merge branch 'master' of git://github.com/jedi4ever/devopsdays-webby

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 site/output/*
 .bundle/*
+*~

README.md

@@ -5,34 +5,43 @@ It uses webby as a framework:
 ## Get the source
 `$ git clone git@github.com:jedi4ever/devopsdays-webby.git`
 
+## Install native dependencies
+
+### On RedHat/CentOS/Fedora:
+`$ yum install oniguruma oniguruma-devel`
+
+### On Debian/Ubuntu:
+`$ apt-get install libonig-dev`
+
+### On Macosx
+`$ brew install oniguruma`
+
 ## If you use RVM
 
 - there is an .rvmrc that select ruby-1.8.7
 - and creates a new gemset devopsdays-webby
 
-Get the source
+### Get the source
 
 `$ git clone git@github.com:jedi4ever/devopsdays-webby.git`
 
-Enter the directory
+### Enter the directory
 
 `$ cd devopsdays-webby`
 
-Install bundler
+### Install bundler
 
 `$ gem install bundler`
 
-Do a bundler install; this will install the necessary gems (see Gemfile)
+### Do a bundler install; this will install the necessary gems (see Gemfile)
 
 `$ bundle install`
 
 ## If you don't have RVM installed
 
-`$ . devopsdays-webby.ENV`
-
-`$ gem install bundler`
-
-`$ bundle install`
+    $ . devopsdays-webby.ENV
+    $ gem install bundler
+    $ bundle install
 
 # Using it
 All interactions are done with the webby command, for this you need to be inside the 'site' directory
@@ -41,8 +50,7 @@ All interactions are done with the webby command, for this you need to be inside
 
     webby autobuild          # Continuously build the website
     webby build              # Build the website
-    webby rebuild              # Build the website
+    webby rebuild            # Build the website
 
 For more information on how to use webby
 [http://webby.rubyforge.org/](http://webby.rubyforge.org/)
-

site/content/_menu.txt

@@ -1,24 +1,28 @@
-<div style="height:140px;" id="quicklinks">
+<div style="height:170px;" id="quicklinks">
 <table><tr><td>
   <div style="margin-top:15px">
     <ul>
+      <li><a href="/events/2012-newyork/">New York</a></li>
+      <li><a href="/events/2012-italy/">Rome</a></li>
+      <li><a href="/events/2012-india/">Gurgaon</a></li>
+      <li><a href="/events/2012-austin/">Austin</a></li>
       <li><a href="/events/2011-manila/">Manila</a></li>
       <li><a href="/events/2011-goteborg/">Goteborg</a></li>
       <li><a href="/events/2011-bangalore/">Bangalore</a></li>
       <li><a href="/events/2011-melbourne/">Melbourne</a></li>
-      <li><a href="/events/2011-mountainview/">Mountain View</a></li>
-      <li><a href="/events/2011-boston/">Boston</a></li>
     </ul>
   </div>
   </td><td>
   <div style="margin-top:15px">
     <ul>
-      <li><a href="/events/2012-austin/">Austin</a></li>
+      <li><a href="/events/2011-mountainview/">Mountain View</a></li>
+      <li><a href="/events/2011-boston/">Boston</a></li>
       <li><a href="/events/2010-brazil/">Sao Paulo</a></li>
       <li><a href="/events/2010-europe/">Hamburg</a></li>
       <li><a href="/events/2010-us/">Mountain View</a></li>
       <li><a href="/events/2010-sydney/">Sydney</a></li>
       <li><a href="/events/2009-ghent/">Ghent</a></li>
+      <li></li>
     </ul>
   </div>
   </td></tr></table>

site/content/_upcoming.txt

@@ -1,9 +1,10 @@
-<div class="submenu" style="width:550px">
-<h3>
-<a href="/events/2012-tokyo/">Tokyo</a>&nbsp; -
-<a href="/events/2012-downunder/">Sydney</a>&nbsp; -
-<a href="/events/2012-mountainview/">Mountain View</a>&nbsp; - 
-<a href="/events/2012-india/">India</a>&nbsp; -
-<a href="/events/2012-italy/">Italy</a>&nbsp;
-</h3>
-</div>
+<div class="submenu" style="width:550px">
+<h3>
+<a href="/events/2013-london/">London</a>&nbsp;-
+<a href="/events/2013-paris/">Paris</a>&nbsp;-
+<a href="/events/2013-austin/">Austin</a>&nbsp;-
+<a href="/events/2013-berlin/">Berlin</a>&nbsp;-
+<a href="/events/2013-amsterdam/">Amsterdam</a>&nbsp;-
+<a href="/events/2013-downunder/">Downunder</a>&nbsp;
+</h3>
+</div>

site/content/blog/2012/08/30/final-speakers-rome-2012/index.txt

@@ -0,0 +1,33 @@
+--- 
+title:      DevOpsDays 2012 - Rome  Final Speakerslist
+created_at: 2012-08-30 20:16:57.336789 +01:00
+tags: 
+- 2012
+blog_post: true
+filter: 
+- erb
+- markdown
+---
+
+In case you hadn't noticed yet .. Devopsdays Rome is on again .. 
+
+And here's the list of speakers 
+
+   <ul>
+   <li><a href="/events/2012-italy/proposals/ChangeCulture/">You can't change culture, but you can influence behavior and behavior becomes culture.</a> - Damon Edwards 
+   <li><a href="/events/2012-italy/proposals/FailureIsTheNewSuccess/">Failure is the new Success</a> - Peter Halacsy
+   <li><a href="/events/2012-italy/proposals/TheStateOfOpenSourceMonitoring/">The State of Open Source Monitoring: The good, the bad, the fucking terrible, and a glimpse into our future.</a> - Jason Dixon 
+   <li><a href="/events/2012-italy/proposals/MonitoringFAO/">Monitoring data.fao.org</a> - Bryan Berry 
+   <li><a href="/events/2012-italy/proposals/MetricsDrivenDevelopment/">Metrics Driven Develpment</a> - Mantas Klasavicius 
+   <li><a href="/events/2012-italy/proposals/OneSmallStepForBusinessITAlignment/">DevOps - One small step for business-IT alignment, one giant leap for infrastructure culture</a> - Mark Burgess 
+
+   <li><a href="/events/2012-italy/proposals/StopWorryingandLovethePaas/">How I Learned to Stop Worrying and Love the PaaS</a> - Colin Humphreys 
+   <li><a href="/events/2012-italy/proposals/BeyondContinuousDelivery/">Beyond Continuous Delivery</a> - Chris Hilton
+</ul>
+
+There are still some hours left to get your ticket at the Early Bird rate
+
+<a href="http://devopsdays.org/events/2012-italy/registration/">http://devopsdays.org/events/2012-italy/registration/</a>
+
+so don't wait too long !
+

site/content/blog/2012/index.txt

@@ -0,0 +1,22 @@
+---
+title:      2012
+created_at: 2011-01-08 23:16:57.333059 +01:00
+filter:     erb
+dirty:      true
+---
+<h2><%= h(@page.title) %></h2>
+
+<%
+  articles = @pages.find(:all, :in_directory => @page.dir, :recursive => true,
+      :sort_by => "created_at", :reverse => true, :blog_post => true)
+  articles.delete(@page)
+  paginate(articles, 10) do |page|
+-%>
+<div class="article">
+  <h1><%= link_to_page(page) %><span class="date">(<%= page.created_at.strftime('%Y-%m-%d') %>)</span></h1>
+
+  <div class="body">
+    <%= render(page) %>
+  </div>
+</div>
+<% end -%>

site/content/blog/2013/03/08/dod-paris-2013/index.txt

@@ -0,0 +1,27 @@
+---
+title: DevOpsDays Paris 2013
+created_at: 2013-03-08 14:02:27.000000 +01:00
+tags:
+- 2013
+- paris
+blog_post: true
+filter:
+- erb
+- markdown
+---
+
+The first DevOpsDays Paris is scheduled for 18-19 April 2013, and while this
+blog post is a little late to the game, it's not yet too late for you to
+participate either as an attendee or a speaker.
+
+For those interested in attending, we're offering a 25% discount on tickets
+<<<<<<< HEAD
+through the end of this week (10 March 2013) - just use the "WELOVEDEVOPS" code
+=======
+through the end of this week (17 March 2013) - just use the "WELOVEDEVOPS" code
+>>>>>>> upstream/master
+and you're <a href="http://devopsdays.org/events/2013-paris/registration/">all set</a>.
+
+If you're more interested in speaking, the <a href="http://devopsdays.org/events/2013-paris/propose/">Call for Proposals</a> is still open
+until 20 March 2013, so don't hesitate - submit your proposal today!  Of
+course, all of the proposals are available for <a href="http://devopsdays.org/events/2013-paris/proposals/">your persual</a> at any time.

site/content/blog/2013/03/08/dod-paris-2013/index.txt.orig

@@ -0,0 +1,27 @@
+---
+title: DevOpsDays Paris 2013
+created_at: 2013-03-08 14:02:27.000000 +01:00
+tags:
+- 2013
+- paris
+blog_post: true
+filter:
+- erb
+- markdown
+---
+
+The first DevOpsDays Paris is scheduled for 18-19 April 2013, and while this
+blog post is a little late to the game, it's not yet too late for you to
+participate either as an attendee or a speaker.
+
+For those interested in attending, we're offering a 25% discount on tickets
+<<<<<<< HEAD
+through the end of this week (10 March 2013) - just use the "WELOVEDEVOPS" code
+=======
+through the end of this week (17 March 2013) - just use the "WELOVEDEVOPS" code
+>>>>>>> upstream/master
+and you're <a href="http://devopsdays.org/events/2013-paris/registration/">all set</a>.
+
+If you're more interested in speaking, the <a href="http://devopsdays.org/events/2013-paris/propose/">Call for Proposals</a> is still open
+until 20 March 2013, so don't hesitate - submit your proposal today!  Of
+course, all of the proposals are available for <a href="http://devopsdays.org/events/2013-paris/proposals/">your persual</a> at any time.

site/content/blog/2013/index.txt

@@ -0,0 +1,22 @@
+---
+title:      2013
+created_at: 2013-03-08 12:51:17.333059 +01:00
+filter:     erb
+dirty:      true
+---
+<h2><%= h(@page.title) %></h2>
+
+<%
+  articles = @pages.find(:all, :in_directory => @page.dir, :recursive => true,
+      :sort_by => "created_at", :reverse => true, :blog_post => true)
+  articles.delete(@page)
+  paginate(articles, 10) do |page|
+-%>
+<div class="article">
+  <h1><%= link_to_page(page) %><span class="date">(<%= page.created_at.strftime('%Y-%m-%d') %>)</span></h1>
+
+  <div class="body">
+    <%= render(page) %>
+  </div>
+</div>
+<% end -%>

site/content/css/devops.min.css

@@ -98,7 +98,7 @@ form.inline p {margin-bottom:0;}
 /* grid.css */
 .container {width:950px;margin:0 auto;}
 .showgrid {background:url(blueprint/src/grid.png?jcb=1294229170);}
-.column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 {float:left;margin-right:10px;}
+.column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24, div.span-25 {float:left;margin-right:10px;}
 .last, div.last {margin-right:0;}
 .span-1 {width:30px;}
 .span-2 {width:70px;}
@@ -124,6 +124,7 @@ form.inline p {margin-bottom:0;}
 .span-22 {width:870px;}
 .span-23 {width:910px;}
 .span-24, div.span-24 {width:950px;margin-right:0;}
+.span-25, div.span-25 {width:1000px;margin-right:0;}
 input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-24, textarea.span-24 {border-left-width:1px!important;border-right-width:1px!important;padding-left:5px!important;padding-right:5px!important;}
 input.span-1, textarea.span-1 {width:18px!important;}
 input.span-2, textarea.span-2 {width:58px!important;}
@@ -376,16 +377,16 @@ div#quicklinks {
 }
 
 div#quicklinks a {
-	color: white;	
+	color: white;
 	font-weight: bold;
 }
 
 div#quicklinks li {
-	list-style-type:none	
+	list-style-type:none
 }
 
 div#headermenu {
-	font-color: #1581AB;	
+	font-color: #1581AB;
 }
 
 div#headermenu * a {
@@ -400,9 +401,7 @@ div#headermenu * a {
 	padding: 10px;
 }
 
-.submenu h3 a { 
-	color: #333333;	
+.submenu h3 a {
+	color: #333333;
 	text-decoration: none;
 }
-
-

site/content/events/2011-melbourne/contact/index.html

@@ -6,7 +6,7 @@
 title: Melbourne 2011 - contact
 dirty: true
 ---
-<%= render(:partial => '/events/2011-melbourn/_menu') %>
+<%= render(:partial => '/events/2011-melbourne/_menu') %>
 
 If you want to contact us by email at <a href="mailto:organizers-sydney-2011@devopsdays.org">organizers-sydney-2011@devopsdays.org</a>
 

site/content/events/2012-downunder/index.html

@@ -5,10 +5,10 @@
 - markdown
 title: Devopsdays Down Under 2012
 ---
-In the tradition of the previous [Devopsdays Downunder conferences](http://devopsdownunder.org), we're pleased to announce that we will organize the next devopsdays Downunder scheduled in May (tentative)
+In the tradition of the previous [Devopsdays Downunder conferences](http://devopsdownunder.org), we're pleased to announce that we will organize the next devopsdays Downunder scheduled in August.
 
-We are currently scouting the area around Sydney to find the best venue. 
+This year's conference is going bush, being hosted in Katoomba in the New South Wales Blue Mountains, 110km west of Sydney.
 
-Are you company willing to host it?  Or interested in helping organizing, speaking, sponsoring or just giving your moral support ?
+The Call For Participation closes on Monday the 18th of June.
 
 [Drop us an email](mailto:info@devopsdays.org) to make this yet another awesome event!

site/content/events/2012-india/_menu.txt

@@ -2,7 +2,7 @@
 <h3>
 <a href="/events/2012-india/">welcome</a>&nbsp;
 <a href="/events/2012-india/program">program</a>&nbsp;
-<a href="/events/2012-india/proposals">propose</a>&nbsp;
+<a href="/events/2012-india/sponsorship">sponsorship</a>&nbsp;
 <a href="/events/2012-india/location">location</a>&nbsp;
 <a href="/events/2012-india/registration">register</a>&nbsp;
 <a href="/events/2012-india/contact">contact</a>&nbsp;

site/content/events/2012-india/contact/index.html

@@ -16,3 +16,4 @@
 - Rashmi Mishra
 - Ranjib Dey
 - Patrick Debois
+- Saager Mhatre 

site/content/events/2012-india/index.html

@@ -9,32 +9,31 @@
 ## Event Theme: Continuous Delivery and Infrastructure Orchestration
 <table>
 	<tr>
-		<td><img src='human-vs-robot-11.jpg'><br><small>Source: <a href="http://www.chilloutpoint.com/images/2009/09/human-and-robots-visions-of-the-future/human-vs-robot-11.jpg">http://www.chilloutpoint.com/images/2009/09/human-and-robots-visions-of-the-future/human-vs-robot-11.jpg</a></small></td>
-		<td>Don't miss this unique chance and join us for Devopsdays in Delhi.
-			<p><b>Dates - 21st &amp; 22nd July, 2012</b></p>
-			<p><b><strong>Call for Proposals is now open.<a href="/events/2012-india/proposals/index.html">Submit your proposal today! </a> </strong></b></p>
-			<p>Venue is yet to be decided; will be announced soon... </p>
+		<td><img src='images/logo.png'></td>
+		<td>
+<p><h3>Registrations now Open! Please <a href=https://docs.google.com/a/thoughtworks.com/spreadsheet/viewform?fromEmail=true&formkey=dF8yZjNWZ2hucjRvZ3BaZG4wZG1PUVE6MQ>Register </a>to attend now!!!</h3></p>
+<b>
+<p>Registrations will remain open till the 20th of July 2012.</p>
+<p>Don't miss this unique chance and join us for Devopsdays in Delhi.</b>
+<p>Event dates - 21st &amp; 22nd July, 2012</p>
+</b>
 		</td>
 	</tr>
 </table>	
 
+
+
 <hr>
+<h3>Technology and Platinum Sponsors : ThoughtWorks Technologies (India) Pvt. Ltd.</h3>
+<img src='images/thoughtworks.png'>
+<br>
 
-<h3>Organized by:</h3>
 <div class="span-15 append-bottom last">
-	<div class="span-4">
-	<img src="/images/itt_logo.png" >
-	<br>
-	Innovation and Technology Trust
-	</div>
-	<div class="span-5">
-	</div>
-	<div class="span-5 last" style="padding-left:20px">
-	</div>
-
+<h3>Organized by: Innovation and Technology Trust</h3>
+<img src="/images/itt_logo.png" >
 </div>
 
-<h3>Call for Sponsorship will be opened on the 15th April 2012</h3>
+
 
 <!--
 <div class="span-15 append-bottom last">