Merge branch 'develop' into gh-pages

baiano · Aug 21, 2014 · 3dc24bf · 3dc24bf
2 parents 8e7bdee + 84c47e3
commit 3dc24bf
Show file tree

Hide file tree

Showing 35 changed files with 403 additions and 963 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
+### Jekyll ###
 _site/
-_sass/.sass-cache
+
+
+### Sass ###
+.sass-cache
diff --git a/_config.yml b/_config.yml
@@ -104,12 +104,10 @@ 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"
@@ -150,7 +148,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 +162,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/_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/post.html b/_includes/post.html
@@ -14,21 +14,21 @@
                         <div class="share pull-right">
                             <ul class="social-links">
                                 <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="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;">
                                         <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="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;">
                                         <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="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;">
                                         <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/_layouts/logistics.html → _includes/schema-event.html b/_layouts/logistics.html → _includes/schema-event.html
@@ -1,49 +1,4 @@
-<!DOCTYPE html>
-<html lang="en" itemscope itemtype="http://schema.org/Blog">
-
-{% include head.html %}
-
-<body>
-    <div id="preloader" class="preloader">
-        <div class="loader-gplus"></div>
-    </div>
-
-    <div id="st-container" class="st-container">
-        <div class="st-pusher">
-            <div class="st-content">
-
-                {{ content }} {% include footer.html %}
-
-            </div>
-        </div>
-    </div>
-
-    {% include analytics.html %}
-    <script src="//code.jquery.com/jquery-2.1.1.min.js"></script>
-    <!-- jQuery local fallback -->
-    <script>
-        window.jQuery || document.write('<script src="{{ "/js/jquery-2.1.1.min.js " | prepend: site.baseurl }}><\/script>')
-    </script>
-    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-    <!-- Bootstrap JS local fallback -->
-    <script>
-        if (typeof ($.fn.modal) === 'undefined') {
-            document.write('<script src="{{ "/js/bootstrap.min.js " | prepend: site.baseurl }}><\/script>')
-        }
-    </script>
-    <script src="{{ "/js/jquery.appear.min.js" | prepend: site.baseurl }}"></script>
-    <script src="{{ "/js/waves.min.js" | prepend: site.baseurl }}"></script>
-    <script src="https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=places,geometry"></script>
-    <script>
-        var googleMaps = 'logistics';
-        var eventPlace = new google.maps.LatLng({{site.eventPlaceCoordinates}});
-        var centerMap = new google.maps.LatLng({{site.logisticsMapCenterCoordinates}});
-        var mobileCenterMap = new google.maps.LatLng({{site.logisticsMapMobileCenterCoordinates}});
-        var icon = '{{ site.baseurl }}/img/svg/map-marker.svg';
-        Waves.displayEffect();
-    </script>
-    <script src="{{ "/js/scripts.min.js" | prepend: site.baseurl }}"></script>
-    <script type="application/ld+json">
+<script type="application/ld+json">
     [{
         "@context" : "http://schema.org",
         "@type" : "Event",
@@ -73,15 +28,16 @@
                 "longitude" : "{{ coordinates[1] }}"
             }
         },
-        "organizer" : {
-            "@type" : "Organization",
-            "name" : "{{ site.organizerName }}",
-            "alternateName" : "{{ site.organizerAlternateName }}",
-            "description" : "{{ site.organizerDescription }}",
-            "logo" : "{{ site.organizerLogo | prepend: site.baseurl | prepend: site.url }}",
-            "email" : "{{ site.organizerEmail }}",
-            "sameAs" : "{{ site.organizerLink }}"
-        },
+        // Not supported yet
+        // "organizer" : {
+        //     "@type" : "Organization",
+        //     "name" : "{{ site.organizerName }}",
+        //     "alternateName" : "{{ site.organizerAlternateName }}",
+        //     "description" : "{{ site.organizerDescription }}",
+        //     "logo" : "{{ site.organizerLogo | prepend: site.baseurl | prepend: site.url }}",
+        //     "email" : "{{ site.organizerEmail }}",
+        //     "sameAs" : "{{ site.organizerLink }}"
+        // },
         "offers" : [
         {% for ticketsOffer in site.ticketsOffers %}
         {
@@ -112,7 +68,4 @@
         "eventStatus" : "EventScheduled",
         "typicalAgeRange" : "16+"
     }]
-    </script>
-</body>
-
-</html>
+    </script>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" itemscope itemtype="http://schema.org/Blog">
+<html lang="en">
 
 {% include head.html %}
 
@@ -30,103 +30,79 @@
 
     {% include analytics.html %}
 
-    <script src="//code.jquery.com/jquery-2.1.1.min.js"></script>
-    <!-- jQuery local fallback -->
+    <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script>
         window.jQuery || document.write('<script src="{{ "/js/jquery-2.1.1.min.js" | prepend: site.baseurl }}><\/script>')
     </script>
     <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-    <!-- Bootstrap JS local fallback -->
     <script>
     if (typeof($.fn.modal) === 'undefined') {
         document.write('<script src="{{ "/js/bootstrap.min.js" | prepend: site.baseurl }}><\/script>')
     }
     </script>
-    <script src="{{ "/js/jquery.appear.min.js" | prepend: site.baseurl }}"></script>
-    <script src="{{ "/js/waves.min.js" | prepend: site.baseurl }}"></script>
-    <script>Waves.displayEffect();</script>
+    <script src="{{ "/js/default.js" | prepend: site.baseurl }}"></script>
+    {% if page.permalink == '/' %}
+        <script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false"></script>
+    {% elsif page.permalink == '/logistics/' %}
+        <script src="https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=places,geometry"></script>
+    {% endif %} 
+    <script>
+        Waves.displayEffect();
+        {% if page.permalink == '/' %}
+            var googleMaps = 'index',
+                eventPlace = new google.maps.LatLng({{ site.eventPlaceCoordinates }}),
+                centerMap = new google.maps.LatLng({{ site.mapCenterCoordinates }}),
+                mobileCenterMap = new google.maps.LatLng({{ site.mapMobileCenterCoordinates }}),
+                icon = '{{ site.baseurl }}/img/svg/map-marker.svg';
+            var twitterFeedUrl = '{{ site.twitterFeed }}';
+            $(document).ready(function () {
+                $(function () {
+                    $("#typeout-text").typed({
+                        strings: [{{site.typeoutTextValues}}],
+                        typeSpeed: 150,
+                        backDelay: 900,
+                        loop: true
+                    });
+                });
+                var rockstarSpeakers = [
+                    {% for speaker in site.data.speakers %}
+                        {% if speaker.rockstar %}
+                        {name: "{{ speaker.name }} {{ speaker.surname }}", company: "{{ speaker.company }}", image: "{{ site.baseurl | append: site.thumbnailsFolder | append: speaker.thumbnailUrl }}"}{% if forloop.index != forloop.length %},{% endif %}
+                        {% endif %}
+                    {% endfor %}
+                ];
+                rockstarSpeakers.sort(function() {return 0.5 - Math.random()});
+                if(rockstarSpeakers.length > 0) {
+                    var animationDelay = 1500,
+                        count = {{ site.rockstarSpeakersCount }},
+                        colWidth = 12/count;
+                    for(i=0; i<count; i++) {
+                        $('#rockstar-speaker-title').after('<div class="col-md-'+ colWidth +' col-xs-6 rockstar-speakers-item animated hiding" data-animation="fadeInUp" data-delay="' + animationDelay +'"><div class="rockstar-speaker"><div class="flow-img img-circle rockstar-speaker-img" style="background-image: url(' + rockstarSpeakers[i].image + ')"></div><div class="name">' + rockstarSpeakers[i].name + '</div><div class="sub">' + rockstarSpeakers[i].company + '</div></div></div>');
+                        animationDelay -= 500;
+                    }
+                }
+            });
+        {% elsif page.permalink == '/logistics/' %}
+            var googleMaps = 'logistics',
+                eventPlace = new google.maps.LatLng({{ site.eventPlaceCoordinates }}),
+                centerMap = new google.maps.LatLng({{ site.logisticsMapCenterCoordinates }}),
+                mobileCenterMap = new google.maps.LatLng({{ site.logisticsMapMobileCenterCoordinates }}),
+                icon = '{{ site.baseurl }}/img/svg/map-marker.svg';
+        {% endif %} 
+    </script>
     <script src="{{ "/js/scripts.min.js" | prepend: site.baseurl }}"></script>
     {% if page.permalink == '/schedule/' %}
-    <script src="{{ "/js/jquery.sticky-kit.min.js" | prepend: site.baseurl }}"></script>
-    <script type="text/javascript">
-        $(document).ready(function () {
-            var navHeight = $('#top-header').height();
-            var headerHeight = $('.track-header').first().height();
-            $('.stick-header').stick_in_parent({sticky_class: 'sticky', offset_top: navHeight});
-            $('.stick-label').stick_in_parent({offset_top: navHeight + headerHeight});
-        });
-    </script>
+        <script type="text/javascript">
+            $(document).ready(function () {
+                var navHeight = $('#top-header').height();
+                var headerHeight = $('.track-header').first().height();
+                $('.stick-header').stick_in_parent({sticky_class: 'sticky', offset_top: navHeight});
+                $('.stick-label').stick_in_parent({offset_top: navHeight + headerHeight});
+            });
+        </script>
     {% endif %}
-    <script type="application/ld+json">
-    [{
-        "@context" : "http://schema.org",
-        "@type" : "Event",
-        "name" : "{{ site.title }}",
-        "description": "{{ site.description }}",
-        "image" : "{{ site.socialImageSrcGooglePlus | prepend: site.baseurl | prepend: site.url }}",
-        "url" : "{{ site.url }}",
-        "startDate" : "{{ site.eventStartTime }}",
-        "doorTime" : "{{ site.eventDoorTime }}",
-        "endDate" : "{{ site.eventEndTime }}",
-        "location" : {
-            "@type" : "Place",
-            "name" : "{{ site.eventLocationName }}",
-            "sameAs" : "{{ site.eventLocationLink }}",
-            "address" : {
-                "@type" : "PostalAddress",
-                "streetAddress" : "{{ site.eventStreetAddress }}",
-                "addressLocality" : "{{ site.eventAddressLocality }}",
-                "addressRegion" : "{{ site.eventAddressLocalityRegion }}",
-                "postalCode" : "{{ site.eventPostalCode }}",
-                "addressCountry" : "{{ site.eventAddressCountry }}"
-            },
-            "geo" : {
-                "@type" : "GeoCoordinates",
-                {% assign coordinates = site.eventPlaceCoordinates | split:"," %}
-                "latitude" : "{{ coordinates[0] }}",
-                "longitude" : "{{ coordinates[1] }}"
-            }
-        },
-        "organizer" : {
-            "@type" : "Organization",
-            "name" : "{{ site.organizerName }}",
-            "alternateName" : "{{ site.organizerAlternateName }}",
-            "description" : "{{ site.organizerDescription }}",
-            "logo" : "{{ site.organizerLogo | prepend: site.baseurl | prepend: site.url }}",
-            "email" : "{{ site.organizerEmail }}",
-            "sameAs" : "{{ site.organizerLink }}"
-        },
-        "offers" : [
-        {% for ticketsOffer in site.ticketsOffers %}
-        {
-            "@type" : "Offer",
-            "name" : "{{ ticketsOffer.name }}",
-            "url" : "{{ ticketsOffer.buyButtonLink }}",
-            "price" : "{{ ticketsOffer.price }}",
-            "validFrom" : "{{ ticketsOffer.validFrom }}",
-            "validThrough" : "{{ ticketsOffer.validThrough }}"
-        }{% if forloop.index != forloop.length %},{% endif %}
-        {% endfor %} 
-        ],
-        "performer" : [ 
-        {% for speaker in site.data.speakers %}
-        {
-            "@type" : "Person",
-            "name" : "{{ speaker.name }} {{ speaker.surname }}",
-            "image" : "{{ speaker.thumbnailUrl | prepend: site.thumbnailsFolder | prepend: site.baseurl | prepend: site.url }}",
-            "jobTitle" : "{{ speaker.title }}",
-            "worksFor" : {
-                "@type" : "Organization",
-                "name" : "{{ speaker.company }}"
-            },
-            "sameAs" : "{{ speaker.social[0].link }}"
-        }{% if forloop.index != forloop.length %},{% endif %}
-        {% endfor %}  
-        ],
-        "eventStatus" : "EventScheduled",
-        "typicalAgeRange" : "16+"
-    }]
-    </script>
+
+    {% include schema-event.html %}
 </body>
 
 </html>