Merge branch 'develop' into gh-pages

baiano · Aug 25, 2014 · f056f8d · f056f8d
2 parents 3dc24bf + 220149a
commit f056f8d
Show file tree

Hide file tree

Showing 115 changed files with 428 additions and 7,327 deletions.
diff --git a/_config.yml b/_config.yml
@@ -49,9 +49,10 @@ rightNavigationButtons:
  - {link: "http://bit.ly/dfua-c4p", text: "Become a speaker"}
 
 # Hero Block
-heroTitle: "GDG DevFest <typeout> 2014"
+heroTitle: "GDG DevFest<typeout>2014"
 eventDate: "September - November, 2014"
 typeoutTextValues: '"", "Season", "Ukraine", "Germany", "USA"'
+typeoutFallback: "Season"
 heroButtons:
  - {url: "http://bit.ly/dfua-c4p", text: "Become a speaker"}
 
@@ -113,32 +114,41 @@ subscribeTitle: "Subscribe for updates"
 subscribeAction: "http://gdg.us5.list-manage1.com/subscribe/post?u=9fc8aa205b0521b5f05fc8e1e&amp;id=ae0fb459fc"
 subscribeInfo: "Registration will be open around end of August. Number of tickets are limited. Stay tuned!"
 
-# Buy Tickets Block
-buyTicketsTitle: "Pricetable"
+# Tickets Block
+ticketsTitle: "Pricetable"
+ticketsInfo: "Tickets grant access to all conference sections, coffee brakes, lunches and parties. Accommodation is NOT included in the ticket price."
 ticketsOffers:
  -
-  name: "1 day"
-  price: "$100"
+  name: "Early Bird"
+  price: "350"
+  priceCurrency: "UAH"
+  ticketsNumber: "150"
   buyButtonLink: "http://dfua.ticketforevent.com/"
   buyButtonText: "Buy Now"
   ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
-  validFrom: "2014-08-20T10:00"
-  validThrough: "2014-10-23T23:59"
+  validFrom: "2014-08-25T10:00"
+  validThrough: "2014-09-30T23:59"
  -
-  name: "3 days"
-  price: "$180"
+  name: "Last Chance"
+  price: "450"
+  priceCurrency: "UAH"
+  ticketsNumber: "100"
   ribbon: "-20%"
   featured: true
   buyButtonLink: "http://dfua.ticketforevent.com/"
   buyButtonText: "Buy Now"
   ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
-  validFrom: "2014-08-20T10:00"
+  validFrom: "2014-10-01T00:00"
   validThrough: "2014-10-23T23:59"
+  disabled: true
  -
-  name: "2 days"
-  price: "$150"
+  name: "Student"
+  price: "200"
+  priceCurrency: "UAH"
+  ticketsNumber: "50"
   buyButtonLink: "http://dfua.ticketforevent.com/"
   buyButtonText: "Buy Now"
+  additionalInfo: "Requires a valid student ID at the conference check in. Without student ID at the check in, ticket will be cancelled without refund"
   ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
   validFrom: "2014-08-20T10:00"
   validThrough: "2014-10-23T23:59"

diff --git a/_data/organizers.yml b/_data/organizers.yml
@@ -5,6 +5,6 @@
 - 
   group: "Co-organizers"
   elements: 
-    - {name: "GDG Lviv", description: "GDG Kyiv - Open and volunteer geek community", link: "http://kyiv.gdg.org.ua", imageUrl: "gdg-kyiv.png"}
-    - {name: "GDG Cherkassy", description: "GDG Cherkassy - Open and volunteer geek community", link: "http://cherkassy.gdg.org.ua", imageUrl: "gdg-cherkassy.png"}
-    - {name: "GDG Dnipropetrovsk", description: "GDG Dnipropetrovsk - Open and volunteer geek community", link: "http://dnipro.gdg.org.ua", imageUrl: "gdg-dnipropetrovsk.png"}
+    - {name: "GDG Lviv", description: "GDG Kyiv - Open and volunteer geek community", link: "http://kyiv.gdg.org.ua", imageUrl: "gdg-kyiv.svg"}
+    - {name: "GDG Cherkassy", description: "GDG Cherkassy - Open and volunteer geek community", link: "http://cherkassy.gdg.org.ua", imageUrl: "gdg-cherkasy.svg"}
+    - {name: "GDG Dnipropetrovsk", description: "GDG Dnipropetrovsk - Open and volunteer geek community", link: "http://dnipro.gdg.org.ua", imageUrl: "gdg-dnipropetrovsk.svg"}
diff --git a/_includes/blog.html b/_includes/blog.html
@@ -5,32 +5,32 @@
             <h3>{{ site.blogTitle }}</h3>
             <div class="col-lg-8 col-md-10 col-xs-12">
                 {% for post in site.posts %}
-                    {% assign postUrl = site.url | append: site.baseurl | append: post.url %} 
                     <article class="row post">
                         <a href="{{ site.baseurl | append: post.url }}" title="{{ post.title }}"><h4>{{ post.title }}</h4></a>
                         <div class="post-header">
-                            <div class="published pull-left">
+                            <div class="published col-md-6 col-xs-6 pull-left">
                                 <span class="caption">Posted:</span>
                                 <span class="publish-date" itemprop="datePublished">{{ post.date | date: "%b %-d, %Y" }}{% if post.author %} • {{ post.author }}{% endif %}{% if post.meta %} • {{ post.meta }}{% endif %}</span>
                             </div>
-                            <div class="share pull-right">
+                            <div class="share col-md-6 col-xs-6 pull-right">
                                 <ul class="social-links">
+                                    {% assign postUrl = site.url | append: site.baseurl | append: post.url %} 
                                     <li>
-                                        <a href="https://plus.google.com/share?url={{ postUrl }}" onclick="window.open('https://plus.google.com/share?url={{ postUrl }}', 'newwindow', 'width=600, height=500'); return false;">
+                                        <a href="#" onclick="window.open('https://plus.google.com/share?url={{ postUrl }}', 'newwindow', 'width=600, height=500'); return false;">
                                             <svg class="icon icon-google-plus" viewBox="0 0 30 32">
                                                 <use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-google-plus"></use>
                                             </svg>
                                         </a>
                                     </li>
                                     <li>
-                                        <a href="https://twitter.com/home?status={{ postUrl }}" onclick="window.open('https://twitter.com/home?status={{ postUrl }}', 'newwindow', 'width=600, height=250'); return false;">
+                                        <a href="#" onclick="window.open('https://twitter.com/home?status={{ postUrl }}', 'newwindow', 'width=600, height=250'); return false;">
                                             <svg class="icon icon-twitter" viewBox="0 0 30 32">
                                                 <use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-twitter"></use>
                                             </svg>
                                         </a>
                                     </li>
                                     <li>
-                                        <a href="https://www.facebook.com/sharer/sharer.php?u={{ postUrl }}" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u={{ postUrl }}', 'newwindow', 'width=600, height=500'); return false;">
+                                        <a href="#" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u={{ postUrl }}', 'newwindow', 'width=600, height=500'); return false;">
                                             <svg class="icon icon-facebook" viewBox="0 0 30 32">
                                                 <use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-facebook"></use>
                                             </svg>

diff --git a/_includes/direction-details.html b/_includes/direction-details.html
@@ -5,7 +5,7 @@
             <h3>{{ site.directionDetailsTitle }}</h3>
         </section>
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-1 text-left same-height-wrapper">
+            <div class="col-lg-10 col-lg-offset-1 text-left">
                 {% assign animationDelay = 0 %}
                 {% for card in site.directionDetailsCards %}
                 {% assign colWidth = 12 | divided_by: forloop.length %}

diff --git a/_includes/hero.html b/_includes/hero.html
@@ -1,21 +1,20 @@
-<!-- Begin Top Section -->
+<!-- Begin Hero Section -->
 <section id="top-section-hero" class="top-section-hero top-section image-section" style="background-image: url('{{ site.baseurl }}/img/hero.jpg');">
-
     {% include navigation.html %}
     <div class="jumbotron">
         <div class="animated hiding" data-animation="fadeInDown" data-delay="500">
             {% assign heroText = site.heroTitle | split:"<typeout>" %}
-            <h1>{{ heroText[0] }}<span id="typeout-text"></span>{{ heroText[1] }}</h1>
+            <h1>{{ heroText[0] }}<span id="typeout-text" class="hidden-xs"></span><span class="typeout-fallback">{{ site.typeoutFallback }}</span>{{ heroText[1] }}</h1>
             <p>{{ site.eventDate }}</p>
             {% for button in site.heroButtons %}
             <a href="{{ button.url }}" class="btn btn-primary waves-effect waves-button waves-light waves-float" target="_blank">{{ button.text }}</a>
             {% endfor %}
         </div>
     </div>
-    <a href="#about" class="explore animated hidden fadeInDown">
+    <a href="#about" class="explore">
         <svg class="icon icon-arrow-down" viewBox="0 0 32 32">
             <use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-arrow-down"></use>
         </svg>
     </a>
 </section>
-<!-- End Top Section -->
+<!-- End Hero Section -->
diff --git a/_includes/navigation.html b/_includes/navigation.html
@@ -10,7 +10,7 @@
         <ul>
             {% for navigationLink in site.navigationLinks %}
             <li>
-                <a class="{% if page.permalink == navigationLink.permalink %}current{% endif %}"  href="{% if navigationLink.permalink != null %} {{ navigationLink.permalink | prepend: site.baseurl }} {% else %} {{ navigationLink.link }} {% endif %}">{{ navigationLink.text}}</a>
+                <a class="{% if navigationLink.permalink != null and page.permalink == navigationLink.permalink %}current{% endif %}"  href="{% if navigationLink.permalink != null %} {{ navigationLink.permalink | prepend: site.baseurl }} {% else %} {{ navigationLink.link }} {% endif %}">{{ navigationLink.text}}</a>
             </li>
             {% endfor %}
         </ul>

diff --git a/_includes/post.html b/_includes/post.html
@@ -3,32 +3,32 @@
     <div class="content-wrapper text-left">
         <div class="col-md-10 col-sm-10 col-lg-offset-2 col-md-offset-2 col-sm-offset-1">
             <div class="col-lg-8 col-md-10 col-xs-12">
-
                 <article class="row post">
                     {% if include.isStaticPost == false %}
                     <div class="post-header">
-                        <div class="published pull-left">
+                        <div class="published col-md-6 col-xs-6 pull-left">
                             <span class="caption">Posted:</span>
                             <span class="publish-date" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</span>
                         </div>
-                        <div class="share pull-right">
+                        <div class="share col-md-6 col-xs-6 pull-right">
                             <ul class="social-links">
+                            {% assign postUrl = page.url | prepend: site.baseurl | prepend: site.url %} 
                                 <li>
-                                    <a href="https://plus.google.com/share?url={{ page.url | prepend: site.baseurl | prepend: site.url }}" onclick="window.open('https://plus.google.com/share?url={{ page.url | prepend: site.baseurl | prepend: site.url }}', 'newwindow', 'width=600, height=500'); return false;">
+                                    <a href="#" onclick="window.open('https://plus.google.com/share?url={{ postUrl }}', 'newwindow', 'width=600, height=500'); return false;">
                                         <svg class="icon icon-google-plus" viewBox="0 0 30 32">
                                             <use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-google-plus"></use>
                                         </svg>
                                     </a>
                                 </li>
                                 <li>
-                                    <a href="https://twitter.com/home?status={{ page.url | prepend: site.baseurl | prepend: site.url }}" onclick="window.open('https://twitter.com/home?status={{ page.url | prepend: site.baseurl | prepend: site.url }}', 'newwindow', 'width=600, height=250'); return false;">
+                                    <a href="#" onclick="window.open('https://twitter.com/home?status={{ postUrl }}', 'newwindow', 'width=600, height=250'); return false;">
                                         <svg class="icon icon-twitter" viewBox="0 0 30 32">
                                             <use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-twitter"></use>
                                         </svg>
                                     </a>
                                 </li>
                                 <li>
-                                    <a href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | prepend: site.baseurl | prepend: site.url }}" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u={{ page.url | prepend: site.baseurl | prepend: site.url }}', 'newwindow', 'width=600, height=500'); return false;">
+                                    <a href="#" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u={{ postUrl }}', 'newwindow', 'width=600, height=500'); return false;">
                                         <svg class="icon icon-facebook" viewBox="0 0 30 32">
                                             <use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-facebook"></use>
                                         </svg>
@@ -44,12 +44,12 @@
                     <div id="page-navigation" class="page-navigation">
                         <div class="next col-xs-6">
                             {% if page.next.url %}
-                                <a href="{{page.next.url}}" title="{{page.next.title |  strip_html }}">&laquo; {{page.next.title |  strip_html | truncate: 15 }}</a>
+                                <a href="{{ page.next.url | prepend: site.baseurl }}" title="{{ page.next.title | strip_html }}">&laquo; {{page.next.title | strip_html | truncate: 15 }}</a>
                             {% endif %}
                         </div>
-                        <div class="previous col-xs-6">
+                        <div class="previous col-xs-6 text-right">
                             {% if page.previous.url %}
-                                <a href="{{page.previous.url}}" title="{{page.previous.title |  strip_html }}">{{page.previous.title |  strip_html | truncate: 15 }} &raquo;</a>
+                                <a href="{{ page.previous.url | prepend: site.baseurl }}" title="{{ page.previous.title | strip_html }}">{{page.previous.title | strip_html | truncate: 15 }} &raquo;</a>
                             {% endif %}
                         </div>
                     </div>

diff --git a/_includes/schema-event.html b/_includes/schema-event.html
@@ -45,6 +45,7 @@
             "name" : "{{ ticketsOffer.name }}",
             "url" : "{{ ticketsOffer.buyButtonLink }}",
             "price" : "{{ ticketsOffer.price }}",
+            "priceCurrency" : "{{ ticketsOffer.priceCurrency }}",
             "validFrom" : "{{ ticketsOffer.validFrom }}",
             "validThrough" : "{{ ticketsOffer.validThrough }}"
         }{% if forloop.index != forloop.length %},{% endif %}

diff --git a/_includes/tickets-2.html b/_includes/tickets-2.html
@@ -0,0 +1,43 @@
+<!-- Begin Tickets 2 Section -->
+<section id="tickets-2" class="tickets-2">
+	<div class="content-wrapper">
+		<div class="col-lg-8 col-md-10 col-lg-offset-2 col-md-offset-1">
+			<h3>{{ site.ticketsTitle }}</h3>
+			<div class="tickets-table row animated hiding" data-animation="fadeInDown" data-delay="0">
+			{% assign animationDelay = 0 %}
+            {% for ticketsOffer in site.ticketsOffers %}
+	            <div class="tickets-row animated hiding" data-animation="fadeInDown" data-delay="{{ animationDelay }}">
+	            	<div class="row">
+						<div class="col-md-6 col-xs-12">
+							<p class="title">{{ ticketsOffer.name }}</p>
+							{% if ticketsOffer.additionalInfo != null %}
+								<span class="ticket-additional-info">{{ ticketsOffer.additionalInfo }}</span>
+							{% endif %}
+						</div>
+						<div class="col-md-3 col-xs-12">
+							<p class="price">{{ ticketsOffer.price }} {{ ticketsOffer.priceCurrency }}</p>
+							{% if ticketsOffer.disabled != true %}
+								{% assign ticketValidTo = ticketsOffer.validThrough | split: "T" %}
+								<span class="ticket-sales">Before {{ ticketValidTo[0] | date: "%-d %B %Y"}} {{ ticketValidTo[1] }} or {{ ticketsOffer.ticketsNumber }} tickets</span>
+							{% endif %}
+						</div>
+						<div class="col-md-3 col-xs-12">
+							{% if ticketsOffer.disabled != true %}
+							<span class="bordered dark-border button">
+								<a href="{{ ticketsOffer.buyButtonLink }}" class="waves-effect waves-button" target="_blank">{{ ticketsOffer.buyButtonText }}</a>
+							</span>
+							{% else %}
+		           			{% assign ticketValidFrom = ticketsOffer.validFrom | split: "T" %}
+							<p class="ticket-fallback">Ticket sales will begin on {{ ticketValidFrom[0] | date: "%-d %B %Y"}} {{ ticketValidFrom[1] }}</p>
+							{% endif %}
+						</div>
+					</div>
+				</div>
+			{% assign animationDelay = animationDelay | plus:250 %}
+            {% endfor %}
+            </div>
+            <span class="tickets-info">{{ site.ticketsInfo }}</span>
+		</div>
+	</div>
+</section>
+<!-- End Tickets 2 Section -->
diff --git a/_includes/buy-tickets.html → _includes/tickets.html b/_includes/buy-tickets.html → _includes/tickets.html
@@ -1,16 +1,16 @@
-<!-- Begin Buy Tickets Section -->
-<section id="buy-tickets" class="buy-tickets">
+<!-- Begin Tickets Section -->
+<section id="tickets" class="tickets">
 	<div class="content-wrapper">
 		<div class="col-lg-8 col-md-10 col-lg-offset-2 col-md-offset-1">
-			<h3>{{ site.buyTicketsTitle }}</h3>
+			<h3>{{ site.ticketsTitle }}</h3>
             {% for ticketsOffer in site.ticketsOffers %}
 	            {% assign colWidth = 12 | divided_by: forloop.length %}
 	            {% assign check = forloop.index | modulo:2 %}
 	            <div class="col-md-{{ colWidth }} col-sm-{{ colWidth }} pricing-col {% if ticketsOffer.featured != null %}pricing-col-featured{% endif %} animated hiding" data-animation="{% if forloop.index == 1 %}fadeInLeft{% elsif forloop.index == forloop.length %}fadeInRight{% else %}fadeInDown{% endif %}" data-delay="{% if check == 0 %}0{% else %}500{% endif %}">
 	            	{% if ticketsOffer.ribbon != null %}<div class="pricing-ribbon">{{ ticketsOffer.ribbon }}</div>{% endif %}
 					<div class="pricing-header">
-						<h3 class="title">{{ ticketsOffer.name }}</h3>
-						<h4 class="amount">{{ ticketsOffer.price }}</h4>
+						<p class="title">{{ ticketsOffer.name }}</p>
+						<p class="price">{{ ticketsOffer.price }} <span class="currency">{{ ticketsOffer.priceCurrency }}</span></p>
 					</div>
 					<div class="pricing-content">
 						<ul>
@@ -25,4 +25,4 @@ <h4 class="amount">{{ ticketsOffer.price }}</h4>
 		</div>
 	</div>
 </section>
-<!-- End Buy Tickets Section -->
+<!-- End Tickets Section -->
diff --git a/_includes/twitter-feed.html b/_includes/twitter-feed.html
@@ -2,7 +2,7 @@
 <section id="twitter-feed" class="twitter-feed image-section parallax" style="background-image: url({{ site.baseurl }}/img/twitter-feed.jpg);">
     <div class="overlay solid-overlay"></div>
     <div class="content-wrapper">
-        <div class="col-lg-6 col-md-8 col-lg-offset-3 col-md-offset-2">
+        <div class="col-md-8 col-md-offset-2">
             <svg class="icon" viewBox="0 0 30 32">
                 <use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-twitter"></use>
             </svg>