Skip to content

Commit f056f8d

Browse files
ozasadnyyozasadnyy
committed
Merge branch 'develop' into gh-pages
2 parents 3dc24bf + 220149a commit f056f8d

File tree

115 files changed

+428
-7327
lines changed

Some content is hidden

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

115 files changed

+428
-7327
lines changed

‎_config.yml

Lines changed: 22 additions & 12 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

@@ -113,32 +114,41 @@ subscribeTitle: "Subscribe for updates"
113114
subscribeAction: "http://gdg.us5.list-manage1.com/subscribe/post?u=9fc8aa205b0521b5f05fc8e1e&amp;id=ae0fb459fc"
114115
subscribeInfo: "Registration will be open around end of August. Number of tickets are limited. Stay tuned!"
115116

116-
# Buy Tickets Block
117-
buyTicketsTitle: "Pricetable"
117+
# Tickets Block
118+
ticketsTitle: "Pricetable"
119+
ticketsInfo: "Tickets grant access to all conference sections, coffee brakes, lunches and parties. Accommodation is NOT included in the ticket price."
118120
ticketsOffers:
119121
-
120-
name: "1 day"
121-
price: "$100"
122+
name: "Early Bird"
123+
price: "350"
124+
priceCurrency: "UAH"
125+
ticketsNumber: "150"
122126
buyButtonLink: "http://dfua.ticketforevent.com/"
123127
buyButtonText: "Buy Now"
124128
ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
125-
validFrom: "2014-08-20T10:00"
126-
validThrough: "2014-10-23T23:59"
129+
validFrom: "2014-08-25T10:00"
130+
validThrough: "2014-09-30T23:59"
127131
-
128-
name: "3 days"
129-
price: "$180"
132+
name: "Last Chance"
133+
price: "450"
134+
priceCurrency: "UAH"
135+
ticketsNumber: "100"
130136
ribbon: "-20%"
131137
featured: true
132138
buyButtonLink: "http://dfua.ticketforevent.com/"
133139
buyButtonText: "Buy Now"
134140
ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
135-
validFrom: "2014-08-20T10:00"
141+
validFrom: "2014-10-01T00:00"
136142
validThrough: "2014-10-23T23:59"
143+
disabled: true
137144
-
138-
name: "2 days"
139-
price: "$150"
145+
name: "Student"
146+
price: "200"
147+
priceCurrency: "UAH"
148+
ticketsNumber: "50"
140149
buyButtonLink: "http://dfua.ticketforevent.com/"
141150
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"
142152
ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
143153
validFrom: "2014-08-20T10:00"
144154
validThrough: "2014-10-23T23:59"

‎_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/hero.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
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 %}
54
<div class="jumbotron">
65
<div class="animated hiding" data-animation="fadeInDown" data-delay="500">
76
{% assign heroText = site.heroTitle | split:"<typeout>" %}
8-
<h1>{{ heroText[0] }}<span id="typeout-text"></span>{{ heroText[1] }}</h1>
7+
<h1>{{ heroText[0] }}<span id="typeout-text" class="hidden-xs"></span><span class="typeout-fallback">{{ site.typeoutFallback }}</span>{{ heroText[1] }}</h1>
98
<p>{{ site.eventDate }}</p>
109
{% for button in site.heroButtons %}
1110
<a href="{{ button.url }}" class="btn btn-primary waves-effect waves-button waves-light waves-float" target="_blank">{{ button.text }}</a>
1211
{% endfor %}
1312
</div>
1413
</div>
15-
<a href="#about" class="explore animated hidden fadeInDown">
14+
<a href="#about" class="explore">
1615
<svg class="icon icon-arrow-down" viewBox="0 0 32 32">
1716
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-arrow-down"></use>
1817
</svg>
1918
</a>
2019
</section>
21-
<!-- End Top Section -->
20+
<!-- 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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +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">
15+
{% assign postUrl = page.url | prepend: site.baseurl | prepend: site.url %}
1616
<li>
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;">
17+
<a href="#" onclick="window.open('https://plus.google.com/share?url={{ postUrl }}', '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={{ 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;">
24+
<a href="#" onclick="window.open('https://twitter.com/home?status={{ postUrl }}', '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={{ 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;">
31+
<a href="#" onclick="window.open('https://www.facebook.com/sharer/sharer.php?u={{ postUrl }}', '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>
@@ -44,12 +44,12 @@
4444
<div id="page-navigation" class="page-navigation">
4545
<div class="next col-xs-6">
4646
{% if page.next.url %}
47-
<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>
4848
{% endif %}
4949
</div>
50-
<div class="previous col-xs-6">
50+
<div class="previous col-xs-6 text-right">
5151
{% if page.previous.url %}
52-
<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>
5353
{% endif %}
5454
</div>
5555
</div>

‎_includes/schema-event.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"name" : "{{ ticketsOffer.name }}",
4646
"url" : "{{ ticketsOffer.buyButtonLink }}",
4747
"price" : "{{ ticketsOffer.price }}",
48+
"priceCurrency" : "{{ ticketsOffer.priceCurrency }}",
4849
"validFrom" : "{{ ticketsOffer.validFrom }}",
4950
"validThrough" : "{{ ticketsOffer.validThrough }}"
5051
}{% if forloop.index != forloop.length %},{% endif %}

‎_includes/tickets-2.html

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<!-- Begin Tickets 2 Section -->
2+
<section id="tickets-2" class="tickets-2">
3+
<div class="content-wrapper">
4+
<div class="col-lg-8 col-md-10 col-lg-offset-2 col-md-offset-1">
5+
<h3>{{ site.ticketsTitle }}</h3>
6+
<div class="tickets-table row animated hiding" data-animation="fadeInDown" data-delay="0">
7+
{% assign animationDelay = 0 %}
8+
{% for ticketsOffer in site.ticketsOffers %}
9+
<div class="tickets-row animated hiding" data-animation="fadeInDown" data-delay="{{ animationDelay }}">
10+
<div class="row">
11+
<div class="col-md-6 col-xs-12">
12+
<p class="title">{{ ticketsOffer.name }}</p>
13+
{% if ticketsOffer.additionalInfo != null %}
14+
<span class="ticket-additional-info">{{ ticketsOffer.additionalInfo }}</span>
15+
{% endif %}
16+
</div>
17+
<div class="col-md-3 col-xs-12">
18+
<p class="price">{{ ticketsOffer.price }} {{ ticketsOffer.priceCurrency }}</p>
19+
{% if ticketsOffer.disabled != true %}
20+
{% assign ticketValidTo = ticketsOffer.validThrough | split: "T" %}
21+
<span class="ticket-sales">Before {{ ticketValidTo[0] | date: "%-d %B %Y"}} {{ ticketValidTo[1] }} or {{ ticketsOffer.ticketsNumber }} tickets</span>
22+
{% endif %}
23+
</div>
24+
<div class="col-md-3 col-xs-12">
25+
{% if ticketsOffer.disabled != true %}
26+
<span class="bordered dark-border button">
27+
<a href="{{ ticketsOffer.buyButtonLink }}" class="waves-effect waves-button" target="_blank">{{ ticketsOffer.buyButtonText }}</a>
28+
</span>
29+
{% else %}
30+
{% assign ticketValidFrom = ticketsOffer.validFrom | split: "T" %}
31+
<p class="ticket-fallback">Ticket sales will begin on {{ ticketValidFrom[0] | date: "%-d %B %Y"}} {{ ticketValidFrom[1] }}</p>
32+
{% endif %}
33+
</div>
34+
</div>
35+
</div>
36+
{% assign animationDelay = animationDelay | plus:250 %}
37+
{% endfor %}
38+
</div>
39+
<span class="tickets-info">{{ site.ticketsInfo }}</span>
40+
</div>
41+
</div>
42+
</section>
43+
<!-- End Tickets 2 Section -->

‎_includes/buy-tickets.html renamed to ‎_includes/tickets.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
<!-- Begin Buy Tickets Section -->
2-
<section id="buy-tickets" class="buy-tickets">
1+
<!-- Begin Tickets Section -->
2+
<section id="tickets" class="tickets">
33
<div class="content-wrapper">
44
<div class="col-lg-8 col-md-10 col-lg-offset-2 col-md-offset-1">
5-
<h3>{{ site.buyTicketsTitle }}</h3>
5+
<h3>{{ site.ticketsTitle }}</h3>
66
{% for ticketsOffer in site.ticketsOffers %}
77
{% assign colWidth = 12 | divided_by: forloop.length %}
88
{% assign check = forloop.index | modulo:2 %}
99
<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 %}">
1010
{% if ticketsOffer.ribbon != null %}<div class="pricing-ribbon">{{ ticketsOffer.ribbon }}</div>{% endif %}
1111
<div class="pricing-header">
12-
<h3 class="title">{{ ticketsOffer.name }}</h3>
13-
<h4 class="amount">{{ ticketsOffer.price }}</h4>
12+
<p class="title">{{ ticketsOffer.name }}</p>
13+
<p class="price">{{ ticketsOffer.price }} <span class="currency">{{ ticketsOffer.priceCurrency }}</span></p>
1414
</div>
1515
<div class="pricing-content">
1616
<ul>
@@ -25,4 +25,4 @@ <h4 class="amount">{{ ticketsOffer.price }}</h4>
2525
</div>
2626
</div>
2727
</section>
28-
<!-- End Buy Tickets Section -->
28+
<!-- End Tickets Section -->

‎_includes/twitter-feed.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<section id="twitter-feed" class="twitter-feed image-section parallax" style="background-image: url({{ site.baseurl }}/img/twitter-feed.jpg);">
33
<div class="overlay solid-overlay"></div>
44
<div class="content-wrapper">
5-
<div class="col-lg-6 col-md-8 col-lg-offset-3 col-md-offset-2">
5+
<div class="col-md-8 col-md-offset-2">
66
<svg class="icon" viewBox="0 0 30 32">
77
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-twitter"></use>
88
</svg>

0 commit comments

Comments
 (0)