Skip to content

Commit 01b8ea1

Browse files
ozasadnyyozasadnyy
committed
Merge branch 'develop'
2 parents ec0d264 + 59106ff commit 01b8ea1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+468
-756
lines changed

‎.gitignore‎

Lines changed: 6 additions & 2 deletions
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‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ rightNavigationButtons:
4949
- {link: "http://bit.ly/dfua-c4p", text: "Become a speaker"}
5050

5151
# Hero Block
52-
heroTitle: "GDG DevFest <typeout> 2014"
52+
heroTitle: "GDG DevFest<typeout>2014"
5353
eventDate: "September - November, 2014"
5454
typeoutTextValues: '"", "Season", "Ukraine", "Germany", "USA"'
55+
typeoutFallback: "Season"
5556
heroButtons:
5657
- {url: "http://bit.ly/dfua-c4p", text: "Become a speaker"}
5758

@@ -104,43 +105,50 @@ twitterHashTag: "devfest"
104105
twitterFeed: "http://lviv.gdg.org.ua/tweetledee/favoritesjson.php?c=10&cache_interval=900"
105106

106107
# Partners Block
108+
organizersTitle: "Organizers"
107109
partnersTitle: "Partners"
108110
partnersC4sponsorsButton: "Become a sponsor"
109111

110-
# Organizers Block
111-
organizersTitle: "Organizers"
112-
113112
# Subscribe Block
114113
subscribeTitle: "Subscribe for updates"
115114
subscribeAction: "http://gdg.us5.list-manage1.com/subscribe/post?u=9fc8aa205b0521b5f05fc8e1e&amp;id=ae0fb459fc"
116115
subscribeInfo: "Registration will be open around end of August. Number of tickets are limited. Stay tuned!"
117116

118-
# Buy Tickets Block
119-
buyTicketsTitle: "Pricetable"
117+
# Tickets Block
118+
ticketsTitle: "Pricetable"
119+
ticketsInfo: "Tickets grant access to all conference sections, coffee brakes, lunch and party. Accommodation is NOT included in the ticket price."
120120
ticketsOffers:
121121
-
122-
name: "1 day"
123-
price: "$100"
122+
name: "Early Bird"
123+
price: "350"
124+
priceCurrency: "UAH"
125+
ticketsNumber: "150"
124126
buyButtonLink: "http://dfua.ticketforevent.com/"
125127
buyButtonText: "Buy Now"
126128
ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
127-
validFrom: "2014-08-20T10:00"
128-
validThrough: "2014-10-23T23:59"
129+
validFrom: "2014-08-25T10:00"
130+
validThrough: "2014-09-30T23:59"
129131
-
130-
name: "3 days"
131-
price: "$180"
132+
name: "Last Chance"
133+
price: "450"
134+
priceCurrency: "UAH"
135+
ticketsNumber: "100"
132136
ribbon: "-20%"
133137
featured: true
134138
buyButtonLink: "http://dfua.ticketforevent.com/"
135139
buyButtonText: "Buy Now"
136140
ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
137-
validFrom: "2014-08-20T10:00"
141+
validFrom: "2014-10-01T00:00"
138142
validThrough: "2014-10-23T23:59"
143+
disabled: true
139144
-
140-
name: "2 days"
141-
price: "$150"
145+
name: "Student"
146+
price: "200"
147+
priceCurrency: "UAH"
148+
ticketsNumber: "50"
142149
buyButtonLink: "http://dfua.ticketforevent.com/"
143150
buyButtonText: "Buy Now"
151+
additionalInfo: "Requires a valid student ID at the conference check in. Without student ID at the check in, ticket will be cancelled without refund"
144152
ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
145153
validFrom: "2014-08-20T10:00"
146154
validThrough: "2014-10-23T23:59"
@@ -150,7 +158,7 @@ socialLinks:
150158
- {link: "https://plus.google.com/b/102444623953913144164", icon: "google-plus"}
151159
- {link: "https://twitter.com/intent/user?screen_name=GDGLviv", icon: "twitter"}
152160
- {link: "https://facebook.com/GDGLviv", icon: "facebook"}
153-
- {link: "http://localhost:4000/zeppelin/feed.xml", icon: "rss"}
161+
- {permalink: "/feed.xml", icon: "rss"}
154162
footerBlocks:
155163
-
156164
title: "Links"
@@ -164,7 +172,7 @@ footerBlocks:
164172
-
165173
title: "FAQ"
166174
links:
167-
- {permalink: "http://localhost:4000/zeppelin/cod/", text: "Code of Conduct"}
175+
- {permalink: "/cod/", text: "Code of Conduct"}
168176

169177
# Blog
170178
blogTitle: "Latest news"

‎_data/organizers.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
-
66
group: "Co-organizers"
77
elements:
8-
- {name: "GDG Lviv", description: "GDG Kyiv - Open and volunteer geek community", link: "http://kyiv.gdg.org.ua", imageUrl: "gdg-kyiv.png"}
9-
- {name: "GDG Cherkassy", description: "GDG Cherkassy - Open and volunteer geek community", link: "http://cherkassy.gdg.org.ua", imageUrl: "gdg-cherkassy.png"}
10-
- {name: "GDG Dnipropetrovsk", description: "GDG Dnipropetrovsk - Open and volunteer geek community", link: "http://dnipro.gdg.org.ua", imageUrl: "gdg-dnipropetrovsk.png"}
8+
- {name: "GDG Lviv", description: "GDG Kyiv - Open and volunteer geek community", link: "http://kyiv.gdg.org.ua", imageUrl: "gdg-kyiv.svg"}
9+
- {name: "GDG Cherkassy", description: "GDG Cherkassy - Open and volunteer geek community", link: "http://cherkassy.gdg.org.ua", imageUrl: "gdg-cherkasy.svg"}
10+
- {name: "GDG Dnipropetrovsk", description: "GDG Dnipropetrovsk - Open and volunteer geek community", link: "http://dnipro.gdg.org.ua", imageUrl: "gdg-dnipropetrovsk.svg"}

‎_includes/blog.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@
55
<h3>{{ site.blogTitle }}</h3>
66
<div class="col-lg-8 col-md-10 col-xs-12">
77
{% for post in site.posts %}
8-
{% assign postUrl = site.url | append: site.baseurl | append: post.url %}
98
<article class="row post">
109
<a href="{{ site.baseurl | append: post.url }}" title="{{ post.title }}"><h4>{{ post.title }}</h4></a>
1110
<div class="post-header">
12-
<div class="published pull-left">
11+
<div class="published col-md-6 col-xs-6 pull-left">
1312
<span class="caption">Posted:</span>
1413
<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>
1514
</div>
16-
<div class="share pull-right">
15+
<div class="share col-md-6 col-xs-6 pull-right">
1716
<ul class="social-links">
17+
{% assign postUrl = site.url | append: site.baseurl | append: post.url %}
1818
<li>
19-
<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;">
19+
<a href="#" onclick="window.open('https://plus.google.com/share?url={{ postUrl }}', 'newwindow', 'width=600, height=500'); return false;">
2020
<svg class="icon icon-google-plus" viewBox="0 0 30 32">
2121
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-google-plus"></use>
2222
</svg>
2323
</a>
2424
</li>
2525
<li>
26-
<a href="https://twitter.com/home?status={{ postUrl }}" onclick="window.open('https://twitter.com/home?status={{ postUrl }}', 'newwindow', 'width=600, height=250'); return false;">
26+
<a href="#" onclick="window.open('https://twitter.com/home?status={{ postUrl }}', 'newwindow', 'width=600, height=250'); return false;">
2727
<svg class="icon icon-twitter" viewBox="0 0 30 32">
2828
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-twitter"></use>
2929
</svg>
3030
</a>
3131
</li>
3232
<li>
33-
<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;">
33+
<a href="#" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u={{ postUrl }}', 'newwindow', 'width=600, height=500'); return false;">
3434
<svg class="icon icon-facebook" viewBox="0 0 30 32">
3535
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-facebook"></use>
3636
</svg>

‎_includes/direction-details.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<h3>{{ site.directionDetailsTitle }}</h3>
66
</section>
77
<div class="row">
8-
<div class="col-lg-10 col-lg-offset-1 text-left same-height-wrapper">
8+
<div class="col-lg-10 col-lg-offset-1 text-left">
99
{% assign animationDelay = 0 %}
1010
{% for card in site.directionDetailsCards %}
1111
{% assign colWidth = 12 | divided_by: forloop.length %}

‎_includes/footer.html‎

Lines changed: 2 additions & 2 deletions
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>
@@ -38,7 +38,7 @@ <h5>{{ block.title }}</h5>
3838
<!-- Please don't delete this line-->
3939
<div class="col-md-6">
4040
<p class="copyright">
41-
&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>
41+
&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>
4242
</p>
4343
</div>
4444
</div>

‎_includes/head.html‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
<meta name="description" content="{{ site.description }}">
88
<meta name="keywords" content="{{ site.metaKeywords }}">
99
<link rel="canonical" href="{{ site.url }}">
10-
<!-- Social: Google+ / Schema.org -->
11-
<meta itemprop="name" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
12-
<meta itemprop="description" content="{{ site.description }}">
13-
<meta itemprop="image" content="{{ site.socialImageSrcGooglePlus | prepend: site.baseurl | prepend: site.url }}">
1410
<!-- Social: Twitter -->
1511
<meta name="twitter:card" content="summary">
1612
<meta name="twitter:site" content="{{ site.twitterAccount }}">
@@ -25,7 +21,6 @@
2521
<meta property="og:image" content="{{ site.socialImageSrcFacebook | prepend: site.baseurl | prepend: site.url }}" />
2622
<meta property="og:description" content="{{ site.description }}" />
2723

28-
2924
<title>{% if page.title %}{{ page.title }} &bull; {{ site.title }}{% else %}{{ site.title }}{% endif %}</title>
3025
<link rel="shortcut icon" href="{{ "/img/favicons/favicon.ico" | prepend: site.baseurl }}">
3126
<link rel="apple-touch-icon" sizes="152x152" href="{{ "/img/favicons/apple-touch-icon-152x152.png" | prepend: site.baseurl }}">

‎_includes/hero.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
<!-- Begin Top Section -->
1+
<!-- Begin Hero Section -->
22
<section id="top-section-hero" class="top-section-hero top-section image-section" style="background-image: url('{{ site.baseurl }}/img/hero.jpg');">
3-
43
{% include navigation.html %}
4+
<div class="content-wrapper">
55
<div class="jumbotron">
66
<div class="animated hiding" data-animation="fadeInDown" data-delay="500">
77
{% assign heroText = site.heroTitle | split:"<typeout>" %}
8-
<h1>{{ heroText[0] }}<span id="typeout-text"></span>{{ heroText[1] }}</h1>
8+
<h1>{{ heroText[0] }}<span id="typeout-text" class="hidden-xs"></span><span class="typeout-fallback">{{ site.typeoutFallback }}</span>{{ heroText[1] }}</h1>
99
<p>{{ site.eventDate }}</p>
1010
{% for button in site.heroButtons %}
1111
<a href="{{ button.url }}" class="btn btn-primary waves-effect waves-button waves-light waves-float" target="_blank">{{ button.text }}</a>
1212
{% endfor %}
1313
</div>
1414
</div>
15-
<a href="#about" class="explore animated hidden fadeInDown">
15+
<a href="#about" class="explore">
1616
<svg class="icon icon-arrow-down" viewBox="0 0 32 32">
1717
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-arrow-down"></use>
1818
</svg>
1919
</a>
20+
</div>
2021
</section>
21-
<!-- End Top Section -->
22+
<!-- End Hero Section -->

‎_includes/navigation.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ul>
1111
{% for navigationLink in site.navigationLinks %}
1212
<li>
13-
<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>
13+
<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>
1414
</li>
1515
{% endfor %}
1616
</ul>

‎_includes/post.html‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,32 @@
33
<div class="content-wrapper text-left">
44
<div class="col-md-10 col-sm-10 col-lg-offset-2 col-md-offset-2 col-sm-offset-1">
55
<div class="col-lg-8 col-md-10 col-xs-12">
6-
76
<article class="row post">
87
{% if include.isStaticPost == false %}
98
<div class="post-header">
10-
<div class="published pull-left">
9+
<div class="published col-md-6 col-xs-6 pull-left">
1110
<span class="caption">Posted:</span>
1211
<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>
1312
</div>
14-
<div class="share pull-right">
13+
<div class="share col-md-6 col-xs-6 pull-right">
1514
<ul class="social-links">
16-
{% assign postUrl = site.url | append:page.url %}
15+
{% assign postUrl = page.url | prepend: site.baseurl | prepend: site.url %}
1716
<li>
18-
<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="#" onclick="window.open('https://plus.google.com/share?url={{ postUrl }}', 'newwindow', 'width=600, height=500'); return false;">
1918
<svg class="icon icon-google-plus" viewBox="0 0 30 32">
2019
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-google-plus"></use>
2120
</svg>
2221
</a>
2322
</li>
2423
<li>
25-
<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="#" onclick="window.open('https://twitter.com/home?status={{ postUrl }}', 'newwindow', 'width=600, height=250'); return false;">
2625
<svg class="icon icon-twitter" viewBox="0 0 30 32">
2726
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-twitter"></use>
2827
</svg>
2928
</a>
3029
</li>
3130
<li>
32-
<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="#" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u={{ postUrl }}', 'newwindow', 'width=600, height=500'); return false;">
3332
<svg class="icon icon-facebook" viewBox="0 0 30 32">
3433
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-facebook"></use>
3534
</svg>
@@ -45,12 +44,12 @@
4544
<div id="page-navigation" class="page-navigation">
4645
<div class="next col-xs-6">
4746
{% if page.next.url %}
48-
<a href="{{page.next.url}}" title="{{page.next.title | strip_html }}">&laquo; {{page.next.title | strip_html | truncate: 15 }}</a>
47+
<a href="{{ page.next.url | prepend: site.baseurl }}" title="{{ page.next.title | strip_html }}">&laquo; {{page.next.title | strip_html | truncate: 15 }}</a>
4948
{% endif %}
5049
</div>
51-
<div class="previous col-xs-6">
50+
<div class="previous col-xs-6 text-right">
5251
{% if page.previous.url %}
53-
<a href="{{page.previous.url}}" title="{{page.previous.title | strip_html }}">{{page.previous.title | strip_html | truncate: 15 }} &raquo;</a>
52+
<a href="{{ page.previous.url | prepend: site.baseurl }}" title="{{ page.previous.title | strip_html }}">{{page.previous.title | strip_html | truncate: 15 }} &raquo;</a>
5453
{% endif %}
5554
</div>
5655
</div>

0 commit comments

Comments
 (0)