Move city_new layout back to city!

Subsequently, move all city pages to the new layout name!

Fixes #137

_layouts/city.html

@@ -1,7 +1,7 @@
 {% include _head.html %}
 {% include _main_nav.html %}
 
-<header class="site_header site_header_img site_header_{{page.class}}">
+<header class="site_header site_header_img site_header_{% if page.class %}{{ page.class }}{% else %}{{page.title | downcase}}{% endif %}">
   <div class="container">
 
     <div class="city_title">
@@ -28,10 +28,7 @@ <h2 class="tagline">
 
 <section class="bg_full bg_full_white about">
   <div class="container container_narrow">
-    <h2>About</h2>
-    <p>
-      {{page.about}}
-    </p>
+    {{content}}
   </div>
 </section>
 
@@ -86,7 +83,37 @@ <h3 class="post_title"><a href="http://{{site.blog_domain}}${link}">${title}</a>
 
 <section class="bg_full bg_full_white">
   <div class="container container_wide">
-    {{content}}
+    <h2 class="team_title">Team {{page.title}}</h2>
+    <ul class="float_list float_list_4 team_list">
+      {% for member in site.members[page.title] %}
+      <li class="member">
+        <img src="{{site.baseurl}}images/team/{{member.img}}"
+        alt="{{member.name}}">
+        <h3>{{member.name}}</h3>
+        <p>{{member.email}}</p>
+      </li>
+      {% endfor %}
+      {% if page.mailing_list %}
+      <li class="join">
+        <div>
+          <form action="https://groups.google.com/a/opentechschool.org/group/{{ page.mailing_list }}/boxsubscribe">
+            <input type="text" class="subscribe_email" name="email" placeholder="your@email">
+            <input type="submit" name="sub" value="Subscribe">
+          </form>
+        </div>
+        <h3>You?</h3>
+        <p>{{ page.mailing_list }}@opentechschool.org</p>
+      </li>
+      {% endif %}
+    </ul>
+    {% if page.twitter %}
+    <div class="team_twitter">
+      <a class="twitter-timeline"
+        href="https://twitter.com/{{page.twitter}}"
+        data-widget-id="{{page.widget_id}}">Tweets by @{{page.twitter}}</a>
+      <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+    </div>
+    {% endif %}
   </div>
 </section>
 

berlin/index.md

@@ -1,5 +1,5 @@
 ---
-layout: city_new
+layout: city
 title: Berlin
 tagline: "Where everything started... and you can take a ride in a rotating TV tower"
 rss_feed: berlin

dortmund/index.md

@@ -1,50 +1,15 @@
 ---
-layout: city_new
+layout: city
 title: Dortmund
 tagline: "Between train rides, football and currywurst."
 rss_feed: dortmund
 meetupcom_group: opentechschool-dortmund
-about: ""
 ---
 
 ## About
 
-As passionate computer science students we’ve started an OpenTechSchool chapter in the heart of the Ruhrpott, a metropolitan area with a fast developing start-up and IT scene.
-We’d love to encourage all kinds of people to use open technology and get connected to the tech community.
-
-<!--
-<h2 style="margin: 0 0 50px 50px;">Team Dortmund</h2>
-
-
-<ul class="float_list float_list_4 team_list">
-
-  <li class="member">
-    <img src="{{site.baseurl}}images/team/carsten.jpg" alt="Carsten" title="Carsten">
-    <h3>Carsten</h3>
-    <p>[email protected]</p>
-  </li>
-
-  <li class="member">
-    <img src="{{site.baseurl}}images/team/hendrik.jpg" alt="Hendrik" title="Hendrik">
-    <h3>Hendrik</h3>
-    <p>[email protected]</p>
-  </li>
-
-  <li class="member">
-    <img src="{{site.baseurl}}images/team/leif.jpg" alt="leif" title="leif">
-    <h3>Leif</h3>
-    <p>[email protected]</p>
-  </li>
-
-  <li class="member">
-    <img src="{{site.baseurl}}images/team/ola.jpg" alt="Ola" title="Ola">
-    <h3>Ola</h3>
-    <p>[email protected]</p>
-  </li>
-
-</ul>
--->
-<!-- <div style="display: block; margin: 15px auto; width:522px">
-  <a class="twitter-timeline" href="https://twitter.com/OTS_HH" data-widget-id="276335676528672768">Tweets by @OTS_HH</a>
-  <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-</div> -->
+As passionate computer science students we've started an OpenTechSchool
+chapter in the heart of the Ruhrpott, a metropolitan area with a fast
+developing start-up and IT scene.
+We'd love to encourage all kinds of people to use open technology
+and get connected to the tech community.

hamburg/index.md

@@ -1,5 +1,5 @@
 ---
-layout: city_new
+layout: city
 title: Hamburg
 tagline: "Shipping is our tradition... and so are Franzbrötchen."
 rss_feed: hamburg

melbourne/index.md

@@ -1,5 +1,5 @@
 ---
-layout: city_new
+layout: city
 title: Melbourne
 tagline: "Great learning is achieved with great coffee!"
 rss_feed: melbourne

nairobi/index.md

@@ -1,5 +1,5 @@
 ---
-layout: city_new
+layout: city
 title: Nairobi
 tagline: "When nature and tech had a baby, Nairobi was born"
 rss_feed: nairobi

ramallah/index.md

@@ -1,5 +1,5 @@
 ---
-layout: city_new
+layout: city
 title: Ramallah
 tagline: "freedom is our dream .... learning is our passion"
 rss_feed: ramallah

stockholm/index.md

@@ -1,5 +1,5 @@
 ---
-layout: city_new
+layout: city
 title: Stockholm
 tagline: "Where kanelbullar and köttbullar come from"
 rss_feed: stockholm

zurich/index.md

@@ -1,5 +1,5 @@
 ---
-layout: city_new
+layout: city
 title: Zürich
 class: zurich
 tagline: "The real Mountain View"