From 8b092ecfeb3dfbdd6ef06fb525a49a8598b05beb Mon Sep 17 00:00:00 2001 From: Matthew Iversen Date: Wed, 6 Nov 2013 02:19:22 +1100 Subject: [PATCH] Move city_new layout back to city! Subsequently, move all city pages to the new layout name! Fixes #137 --- _layouts/city.html | 39 +++++++++++-- _layouts/city_new.html | 124 ----------------------------------------- berlin/index.md | 2 +- dortmund/index.md | 47 ++-------------- hamburg/index.md | 2 +- melbourne/index.md | 2 +- nairobi/index.md | 2 +- ramallah/index.md | 2 +- stockholm/index.md | 2 +- zurich/index.md | 2 +- 10 files changed, 46 insertions(+), 178 deletions(-) delete mode 100644 _layouts/city_new.html diff --git a/_layouts/city.html b/_layouts/city.html index b443296..702d097 100644 --- a/_layouts/city.html +++ b/_layouts/city.html @@ -1,7 +1,7 @@ {% include _head.html %} {% include _main_nav.html %} -
+
@@ -28,10 +28,7 @@

-

About

-

- {{page.about}} -

+ {{content}}
@@ -86,7 +83,37 @@

${title}
- {{content}} +

Team {{page.title}}

+
    + {% for member in site.members[page.title] %} +
  • + {{member.name}} +

    {{member.name}}

    +

    {{member.email}}

    +
    • + {% endfor %} + {% if page.mailing_list %} +
  • +
    +
    + + +
    +
    +

    You?

    +

    {{ page.mailing_list }}@opentechschool.org

    +
    • + {% endif %} +
+ {% if page.twitter %} +
+ + +
+ {% endif %}
diff --git a/_layouts/city_new.html b/_layouts/city_new.html deleted file mode 100644 index 702d097..0000000 --- a/_layouts/city_new.html +++ /dev/null @@ -1,124 +0,0 @@ -{% include _head.html %} -{% include _main_nav.html %} - -
-
- -
-

- {{page.title}} -

- {% if page.tagline %} -

- {{page.tagline}} -

- {% endif %} -
- -
- - Join now -   - -
- - -
-
- -
-
- {{content}} -
-
- -
- -
-
-
-

- Upcoming events - »cal -

- {% if page.custom_events %} - {{page.custom_events}} - {% endif %} -
- -
-
- -
-
-

- Latest news - »rss -

- -
- -
-
- -
- -
- -
-
-

Team {{page.title}}

-
    - {% for member in site.members[page.title] %} -
  • - {{member.name}} -

    {{member.name}}

    -

    {{member.email}}

    -
    • - {% endfor %} - {% if page.mailing_list %} -
  • -
    -
    - - -
    -
    -

    You?

    -

    {{ page.mailing_list }}@opentechschool.org

    -
    • - {% endif %} -
- {% if page.twitter %} -
- - -
- {% endif %} -
-
- -{% include _footer.html %} -{% include _scripts.html %} -{% include _load_blog_feed.html %} -{% include _load_events_feed.html %} -{% include _end.html %} diff --git a/berlin/index.md b/berlin/index.md index 6880330..9d6e540 100644 --- a/berlin/index.md +++ b/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 diff --git a/dortmund/index.md b/dortmund/index.md index f19df04..959d276 100644 --- a/dortmund/index.md +++ b/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. - - - +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. diff --git a/hamburg/index.md b/hamburg/index.md index 09032db..c73dcbc 100644 --- a/hamburg/index.md +++ b/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 diff --git a/melbourne/index.md b/melbourne/index.md index dbba8f4..ab8b2cb 100644 --- a/melbourne/index.md +++ b/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 diff --git a/nairobi/index.md b/nairobi/index.md index b7c3172..6873e8a 100644 --- a/nairobi/index.md +++ b/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 diff --git a/ramallah/index.md b/ramallah/index.md index c63cccb..8da2390 100644 --- a/ramallah/index.md +++ b/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 diff --git a/stockholm/index.md b/stockholm/index.md index c166807..76a1ad1 100644 --- a/stockholm/index.md +++ b/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 diff --git a/zurich/index.md b/zurich/index.md index 5d4ec53..fc64391 100644 --- a/zurich/index.md +++ b/zurich/index.md @@ -1,5 +1,5 @@ --- -layout: city_new +layout: city title: Zürich class: zurich tagline: "The real Mountain View"