Merge branch 'develop'

Corikachu · Aug 25, 2014 · 01b8ea1 · 01b8ea1
2 parents ec0d264 + 59106ff
commit 01b8ea1
Show file tree

Hide file tree

Showing 49 changed files with 468 additions and 756 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
-_site
-_sass/.sass-cache
+### Jekyll ###
+_site/
+
+
+### Sass ###
+.sass-cache
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"}
 
@@ -104,43 +105,50 @@ twitterHashTag: "devfest"
 twitterFeed: "http://lviv.gdg.org.ua/tweetledee/favoritesjson.php?c=10&cache_interval=900"
 
 # Partners Block
+organizersTitle: "Organizers"
 partnersTitle: "Partners"
 partnersC4sponsorsButton: "Become a sponsor"
 
-# Organizers Block
-organizersTitle: "Organizers"
-
 # Subscribe Block
 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, lunch and party. 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"
@@ -150,7 +158,7 @@ socialLinks:
  - {link: "https://plus.google.com/b/102444623953913144164", icon: "google-plus"}
  - {link: "https://twitter.com/intent/user?screen_name=GDGLviv", icon: "twitter"}
  - {link: "https://facebook.com/GDGLviv", icon: "facebook"}
- - {link: "http://localhost:4000/zeppelin/feed.xml", icon: "rss"}
+ - {permalink: "/feed.xml", icon: "rss"}
 footerBlocks:
  -
   title: "Links"
@@ -164,7 +172,7 @@ footerBlocks:
  -
   title: "FAQ"
   links:
-   - {permalink: "http://localhost:4000/zeppelin/cod/", text: "Code of Conduct"}
+   - {permalink: "/cod/", text: "Code of Conduct"}
 
 # Blog
 blogTitle: "Latest news"

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/footer.html b/_includes/footer.html
@@ -24,7 +24,7 @@ <h5>{{ block.title }}</h5>
 			<ul class="social-links">
 				{% for social in site.socialLinks %}
 				<li>
-					<a href="{{ social.link }}" target="_blank">
+					<a href="{% if linkElement.permalink != null %} {{ linkElement.permalink | prepend: site.baseurl }} {% else %} {{ linkElement.link }} {% endif %}" target="_blank">
 						<svg class="icon icon-{{ social.icon }}" viewBox="0 0 30 32">
 							<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-{{ social.icon }}"></use>
 						</svg>
@@ -38,7 +38,7 @@ <h5>{{ block.title }}</h5>
 		<!-- Please don't delete this line-->
 		<div class="col-md-6">
 			<p class="copyright">
-				&copy; 2014 Designed and created by <a href="https://plus.google.com/+OlehZasadnyy/about">Oleh Zasadnyy</a> &middot; <a href="http://lviv.gdg.org.ua" target="_blank">GDG Lviv</a>
+				&copy; 2014 Based on <a href="https://github.com/gdg-x/zeppelin" target="_blank">Project Zeppelin</a>. Designed and created by <a href="https://plus.google.com/+OlehZasadnyy/about" target="_blank">Oleh Zasadnyy</a> &middot; <a href="http://lviv.gdg.org.ua" target="_blank">GDG Lviv</a>
 			</p>
 		</div>
 	</div>

diff --git a/_includes/head.html b/_includes/head.html
@@ -7,10 +7,6 @@
     <meta name="description" content="{{ site.description }}">
     <meta name="keywords" content="{{ site.metaKeywords }}">
     <link rel="canonical" href="{{ site.url }}">
-    <!-- Social: Google+ / Schema.org  -->
-    <meta itemprop="name" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
-    <meta itemprop="description" content="{{ site.description }}">
-    <meta itemprop="image" content="{{ site.socialImageSrcGooglePlus | prepend: site.baseurl | prepend: site.url }}">
     <!-- Social: Twitter -->
     <meta name="twitter:card" content="summary">
     <meta name="twitter:site" content="{{ site.twitterAccount }}">
@@ -25,7 +21,6 @@
     <meta property="og:image" content="{{ site.socialImageSrcFacebook | prepend: site.baseurl | prepend: site.url }}" />
     <meta property="og:description" content="{{ site.description }}" /> 
 
-
     <title>{% if page.title %}{{ page.title }} &bull; {{ site.title }}{% else %}{{ site.title }}{% endif %}</title>
     <link rel="shortcut icon" href="{{ "/img/favicons/favicon.ico" | prepend: site.baseurl }}">
     <link rel="apple-touch-icon" sizes="152x152" href="{{ "/img/favicons/apple-touch-icon-152x152.png" | prepend: site.baseurl }}">

diff --git a/_includes/hero.html b/_includes/hero.html
@@ -1,21 +1,22 @@
-<!-- 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="content-wrapper">
     <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>
+    </div>
 </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,33 +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 = site.url | append:page.url %} 
+                            {% assign postUrl = page.url | prepend: site.baseurl | prepend: site.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>
@@ -45,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>