Skip to content

Commit 84c47e3

Browse files
committed
Optimized _layouts. Merged most js libraries into one
1 parent b17812e commit 84c47e3

34 files changed

+389
-674
lines changed

.gitignore

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
_site
2-
_sass/.sass-cache
1+
### Jekyll ###
2+
_site/
3+
4+
5+
### Sass ###
6+
.sass-cache

_config.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,10 @@ twitterHashTag: "devfest"
104104
twitterFeed: "http://lviv.gdg.org.ua/tweetledee/favoritesjson.php?c=10&cache_interval=900"
105105

106106
# Partners Block
107+
organizersTitle: "Organizers"
107108
partnersTitle: "Partners"
108109
partnersC4sponsorsButton: "Become a sponsor"
109110

110-
# Organizers Block
111-
organizersTitle: "Organizers"
112-
113111
# Subscribe Block
114112
subscribeTitle: "Subscribe for updates"
115113
subscribeAction: "http://gdg.us5.list-manage1.com/subscribe/post?u=9fc8aa205b0521b5f05fc8e1e&id=ae0fb459fc"
@@ -150,7 +148,7 @@ socialLinks:
150148
- {link: "https://plus.google.com/b/102444623953913144164", icon: "google-plus"}
151149
- {link: "https://twitter.com/intent/user?screen_name=GDGLviv", icon: "twitter"}
152150
- {link: "https://facebook.com/GDGLviv", icon: "facebook"}
153-
- {link: "http://localhost:4000/zeppelin/feed.xml", icon: "rss"}
151+
- {permalink: "/feed.xml", icon: "rss"}
154152
footerBlocks:
155153
-
156154
title: "Links"
@@ -164,7 +162,7 @@ footerBlocks:
164162
-
165163
title: "FAQ"
166164
links:
167-
- {permalink: "http://localhost:4000/zeppelin/cod/", text: "Code of Conduct"}
165+
- {permalink: "/cod/", text: "Code of Conduct"}
168166

169167
# Blog
170168
blogTitle: "Latest news"

_includes/footer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h5>{{ block.title }}</h5>
2424
<ul class="social-links">
2525
{% for social in site.socialLinks %}
2626
<li>
27-
<a href="{{ social.link }}" target="_blank">
27+
<a href="{% if linkElement.permalink != null %} {{ linkElement.permalink | prepend: site.baseurl }} {% else %} {{ linkElement.link }} {% endif %}" target="_blank">
2828
<svg class="icon icon-{{ social.icon }}" viewBox="0 0 30 32">
2929
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-{{ social.icon }}"></use>
3030
</svg>

_includes/post.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@
1414
<div class="share pull-right">
1515
<ul class="social-links">
1616
<li>
17-
<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;">
17+
<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;">
1818
<svg class="icon icon-google-plus" viewBox="0 0 30 32">
1919
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-google-plus"></use>
2020
</svg>
2121
</a>
2222
</li>
2323
<li>
24-
<a href="https://twitter.com/home?status={{ postUrl }}" onclick="window.open('https://twitter.com/home?status={{ postUrl }}', 'newwindow', 'width=600, height=250'); return false;">
24+
<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;">
2525
<svg class="icon icon-twitter" viewBox="0 0 30 32">
2626
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-twitter"></use>
2727
</svg>
2828
</a>
2929
</li>
3030
<li>
31-
<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;">
31+
<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;">
3232
<svg class="icon icon-facebook" viewBox="0 0 30 32">
3333
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-facebook"></use>
3434
</svg>
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,4 @@
1-
<!DOCTYPE html>
2-
<html lang="en" itemscope itemtype="http://schema.org/Blog">
3-
4-
{% include head.html %}
5-
6-
<body>
7-
<div id="preloader" class="preloader">
8-
<div class="loader-gplus"></div>
9-
</div>
10-
11-
<div id="st-container" class="st-container">
12-
<div class="st-pusher">
13-
<div class="st-content">
14-
15-
{{ content }} {% include footer.html %}
16-
17-
</div>
18-
</div>
19-
</div>
20-
21-
{% include analytics.html %}
22-
<script src="//code.jquery.com/jquery-2.1.1.min.js"></script>
23-
<!-- jQuery local fallback -->
24-
<script>
25-
window.jQuery || document.write('<script src="{{ "/js/jquery-2.1.1.min.js " | prepend: site.baseurl }}><\/script>')
26-
</script>
27-
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
28-
<!-- Bootstrap JS local fallback -->
29-
<script>
30-
if (typeof ($.fn.modal) === 'undefined') {
31-
document.write('<script src="{{ "/js/bootstrap.min.js " | prepend: site.baseurl }}><\/script>')
32-
}
33-
</script>
34-
<script src="{{ "/js/jquery.appear.min.js" | prepend: site.baseurl }}"></script>
35-
<script src="{{ "/js/waves.min.js" | prepend: site.baseurl }}"></script>
36-
<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=places,geometry"></script>
37-
<script>
38-
var googleMaps = 'logistics';
39-
var eventPlace = new google.maps.LatLng({{site.eventPlaceCoordinates}});
40-
var centerMap = new google.maps.LatLng({{site.logisticsMapCenterCoordinates}});
41-
var mobileCenterMap = new google.maps.LatLng({{site.logisticsMapMobileCenterCoordinates}});
42-
var icon = '{{ site.baseurl }}/img/svg/map-marker.svg';
43-
Waves.displayEffect();
44-
</script>
45-
<script src="{{ "/js/scripts.min.js" | prepend: site.baseurl }}"></script>
46-
<script type="application/ld+json">
1+
<script type="application/ld+json">
472
[{
483
"@context" : "http://schema.org",
494
"@type" : "Event",
@@ -73,15 +28,16 @@
7328
"longitude" : "{{ coordinates[1] }}"
7429
}
7530
},
76-
"organizer" : {
77-
"@type" : "Organization",
78-
"name" : "{{ site.organizerName }}",
79-
"alternateName" : "{{ site.organizerAlternateName }}",
80-
"description" : "{{ site.organizerDescription }}",
81-
"logo" : "{{ site.organizerLogo | prepend: site.baseurl | prepend: site.url }}",
82-
"email" : "{{ site.organizerEmail }}",
83-
"sameAs" : "{{ site.organizerLink }}"
84-
},
31+
// Not supported yet
32+
// "organizer" : {
33+
// "@type" : "Organization",
34+
// "name" : "{{ site.organizerName }}",
35+
// "alternateName" : "{{ site.organizerAlternateName }}",
36+
// "description" : "{{ site.organizerDescription }}",
37+
// "logo" : "{{ site.organizerLogo | prepend: site.baseurl | prepend: site.url }}",
38+
// "email" : "{{ site.organizerEmail }}",
39+
// "sameAs" : "{{ site.organizerLink }}"
40+
// },
8541
"offers" : [
8642
{% for ticketsOffer in site.ticketsOffers %}
8743
{
@@ -112,7 +68,4 @@
11268
"eventStatus" : "EventScheduled",
11369
"typicalAgeRange" : "16+"
11470
}]
115-
</script>
116-
</body>
117-
118-
</html>
71+
</script>

_layouts/default.html

+61-85
Original file line numberDiff line numberDiff line change
@@ -30,103 +30,79 @@
3030

3131
{% include analytics.html %}
3232

33-
<script src="//code.jquery.com/jquery-2.1.1.min.js"></script>
34-
<!-- jQuery local fallback -->
33+
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
3534
<script>
3635
window.jQuery || document.write('<script src="{{ "/js/jquery-2.1.1.min.js" | prepend: site.baseurl }}><\/script>')
3736
</script>
3837
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
39-
<!-- Bootstrap JS local fallback -->
4038
<script>
4139
if (typeof($.fn.modal) === 'undefined') {
4240
document.write('<script src="{{ "/js/bootstrap.min.js" | prepend: site.baseurl }}><\/script>')
4341
}
4442
</script>
45-
<script src="{{ "/js/jquery.appear.min.js" | prepend: site.baseurl }}"></script>
46-
<script src="{{ "/js/waves.min.js" | prepend: site.baseurl }}"></script>
47-
<script>Waves.displayEffect();</script>
43+
<script src="{{ "/js/default.js" | prepend: site.baseurl }}"></script>
44+
{% if page.permalink == '/' %}
45+
<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false"></script>
46+
{% elsif page.permalink == '/logistics/' %}
47+
<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=places,geometry"></script>
48+
{% endif %}
49+
<script>
50+
Waves.displayEffect();
51+
{% if page.permalink == '/' %}
52+
var googleMaps = 'index',
53+
eventPlace = new google.maps.LatLng({{ site.eventPlaceCoordinates }}),
54+
centerMap = new google.maps.LatLng({{ site.mapCenterCoordinates }}),
55+
mobileCenterMap = new google.maps.LatLng({{ site.mapMobileCenterCoordinates }}),
56+
icon = '{{ site.baseurl }}/img/svg/map-marker.svg';
57+
var twitterFeedUrl = '{{ site.twitterFeed }}';
58+
$(document).ready(function () {
59+
$(function () {
60+
$("#typeout-text").typed({
61+
strings: [{{site.typeoutTextValues}}],
62+
typeSpeed: 150,
63+
backDelay: 900,
64+
loop: true
65+
});
66+
});
67+
var rockstarSpeakers = [
68+
{% for speaker in site.data.speakers %}
69+
{% if speaker.rockstar %}
70+
{name: "{{ speaker.name }} {{ speaker.surname }}", company: "{{ speaker.company }}", image: "{{ site.baseurl | append: site.thumbnailsFolder | append: speaker.thumbnailUrl }}"}{% if forloop.index != forloop.length %},{% endif %}
71+
{% endif %}
72+
{% endfor %}
73+
];
74+
rockstarSpeakers.sort(function() {return 0.5 - Math.random()});
75+
if(rockstarSpeakers.length > 0) {
76+
var animationDelay = 1500,
77+
count = {{ site.rockstarSpeakersCount }},
78+
colWidth = 12/count;
79+
for(i=0; i<count; i++) {
80+
$('#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>');
81+
animationDelay -= 500;
82+
}
83+
}
84+
});
85+
{% elsif page.permalink == '/logistics/' %}
86+
var googleMaps = 'logistics',
87+
eventPlace = new google.maps.LatLng({{ site.eventPlaceCoordinates }}),
88+
centerMap = new google.maps.LatLng({{ site.logisticsMapCenterCoordinates }}),
89+
mobileCenterMap = new google.maps.LatLng({{ site.logisticsMapMobileCenterCoordinates }}),
90+
icon = '{{ site.baseurl }}/img/svg/map-marker.svg';
91+
{% endif %}
92+
</script>
4893
<script src="{{ "/js/scripts.min.js" | prepend: site.baseurl }}"></script>
4994
{% if page.permalink == '/schedule/' %}
50-
<script src="{{ "/js/jquery.sticky-kit.min.js" | prepend: site.baseurl }}"></script>
51-
<script type="text/javascript">
52-
$(document).ready(function () {
53-
var navHeight = $('#top-header').height();
54-
var headerHeight = $('.track-header').first().height();
55-
$('.stick-header').stick_in_parent({sticky_class: 'sticky', offset_top: navHeight});
56-
$('.stick-label').stick_in_parent({offset_top: navHeight + headerHeight});
57-
});
58-
</script>
95+
<script type="text/javascript">
96+
$(document).ready(function () {
97+
var navHeight = $('#top-header').height();
98+
var headerHeight = $('.track-header').first().height();
99+
$('.stick-header').stick_in_parent({sticky_class: 'sticky', offset_top: navHeight});
100+
$('.stick-label').stick_in_parent({offset_top: navHeight + headerHeight});
101+
});
102+
</script>
59103
{% endif %}
60-
<script type="application/ld+json">
61-
[{
62-
"@context" : "http://schema.org",
63-
"@type" : "Event",
64-
"name" : "{{ site.title }}",
65-
"description": "{{ site.description }}",
66-
"image" : "{{ site.socialImageSrcGooglePlus | prepend: site.baseurl | prepend: site.url }}",
67-
"url" : "{{ site.url }}",
68-
"startDate" : "{{ site.eventStartTime }}",
69-
"doorTime" : "{{ site.eventDoorTime }}",
70-
"endDate" : "{{ site.eventEndTime }}",
71-
"location" : {
72-
"@type" : "Place",
73-
"name" : "{{ site.eventLocationName }}",
74-
"sameAs" : "{{ site.eventLocationLink }}",
75-
"address" : {
76-
"@type" : "PostalAddress",
77-
"streetAddress" : "{{ site.eventStreetAddress }}",
78-
"addressLocality" : "{{ site.eventAddressLocality }}",
79-
"addressRegion" : "{{ site.eventAddressLocalityRegion }}",
80-
"postalCode" : "{{ site.eventPostalCode }}",
81-
"addressCountry" : "{{ site.eventAddressCountry }}"
82-
},
83-
"geo" : {
84-
"@type" : "GeoCoordinates",
85-
{% assign coordinates = site.eventPlaceCoordinates | split:"," %}
86-
"latitude" : "{{ coordinates[0] }}",
87-
"longitude" : "{{ coordinates[1] }}"
88-
}
89-
},
90-
"organizer" : {
91-
"@type" : "Organization",
92-
"name" : "{{ site.organizerName }}",
93-
"alternateName" : "{{ site.organizerAlternateName }}",
94-
"description" : "{{ site.organizerDescription }}",
95-
"logo" : "{{ site.organizerLogo | prepend: site.baseurl | prepend: site.url }}",
96-
"email" : "{{ site.organizerEmail }}",
97-
"sameAs" : "{{ site.organizerLink }}"
98-
},
99-
"offers" : [
100-
{% for ticketsOffer in site.ticketsOffers %}
101-
{
102-
"@type" : "Offer",
103-
"name" : "{{ ticketsOffer.name }}",
104-
"url" : "{{ ticketsOffer.buyButtonLink }}",
105-
"price" : "{{ ticketsOffer.price }}",
106-
"validFrom" : "{{ ticketsOffer.validFrom }}",
107-
"validThrough" : "{{ ticketsOffer.validThrough }}"
108-
}{% if forloop.index != forloop.length %},{% endif %}
109-
{% endfor %}
110-
],
111-
"performer" : [
112-
{% for speaker in site.data.speakers %}
113-
{
114-
"@type" : "Person",
115-
"name" : "{{ speaker.name }} {{ speaker.surname }}",
116-
"image" : "{{ speaker.thumbnailUrl | prepend: site.thumbnailsFolder | prepend: site.baseurl | prepend: site.url }}",
117-
"jobTitle" : "{{ speaker.title }}",
118-
"worksFor" : {
119-
"@type" : "Organization",
120-
"name" : "{{ speaker.company }}"
121-
},
122-
"sameAs" : "{{ speaker.social[0].link }}"
123-
}{% if forloop.index != forloop.length %},{% endif %}
124-
{% endfor %}
125-
],
126-
"eventStatus" : "EventScheduled",
127-
"typicalAgeRange" : "16+"
128-
}]
129-
</script>
104+
105+
{% include schema-event.html %}
130106
</body>
131107

132108
</html>

0 commit comments

Comments
 (0)