Skip to content

Commit 488f83f

Browse files
committed
Fixed ribbon url in session-modals, added webmaster tools verification, view-on-map bug fix, sold out tickets label, fixed schema.org speaker's image url
1 parent 6c0eda3 commit 488f83f

11 files changed

+40
-5
lines changed

_config.yml

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ url: "http://gdg-x.github.io"
1313
permalink: "/blog/:title"
1414
googleAnalyticsTrackingId: "UA-43643469-5"
1515
googleAnalyticsSiteUrl: "gdg-x.github.io"
16+
siteVerification: "b9imDOrFawXaBXCC4r3uJDdswSYcalD-wWpMYhFq-no"
1617

1718
# Organizer Info
1819
organizerName: "GDG Lviv"
@@ -163,6 +164,8 @@ ticketsOffers:
163164
ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
164165
validFrom: "2014-08-20T10:00"
165166
validThrough: "2014-10-23T23:59"
167+
soldOut: true
168+
soldOutText: "Sold Out"
166169

167170
# Footer
168171
socialLinks:

_includes/find-way.html

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ <h3 class="animated hiding" data-animation="fadeInUp" data-delay="0">{{ site.fin
4343
<a id="find-flight" href="https://google.com/flights" class="pull-right hidden" target="_blank">{{ site.findWayFindFlight }}</a>
4444
</li>
4545
</ul>
46+
<div class="clearfix"></div>
4647
<a href="http://maps.google.com/maps?ll={{ site.eventPlaceCoordinates | replace:' ',''}}&z=17&t=m&hl=en-US&gl=US&mapclient=embed&q={{ site.eventStreetAddress | replace:' ','%20' | replace:',','%2C'}}%2C%20{{ site.eventAddressLocality | replace:' ','%20' | replace:',','%2C'}}" class="view-on-map" target="_blank">{{ site.viewOnMap }}</a>
4748
</div>
4849
</div>

_includes/head.html

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<meta name="author" content="Oleh Zasadnyy, GDG Lviv">
77
<meta name="description" content="{{ site.description }}">
88
<meta name="keywords" content="{{ site.metaKeywords }}">
9+
<meta name="google-site-verification" content="{{ site.siteVerification }}" />
910
<link rel="canonical" href="{{ site.url }}">
1011
<!-- Social: Twitter -->
1112
<meta name="twitter:card" content="summary">

_includes/schema-event.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
{
8686
"@type" : "Person",
8787
"name" : "{{ speaker.name }} {{ speaker.surname }}",
88-
"image" : "{{ speaker.thumbnailUrl | prepend: site.thumbnailsFolder | prepend: site.baseurl | prepend: site.url }}",
88+
"image" : "{{ site.url | append: site.baseurl | append: '/img/people/' | append: speaker.thumbnailUrl }}",
8989
"jobTitle" : "{{ speaker.title }}",
9090
"worksFor" : {
9191
"@type" : "Organization",

_includes/sessions-modals.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h4>{{ session.title }}</h4>
3131
{% if speaker.ribbon != null %}
3232
<div class="modal-ribbon-wrapper">
3333
{% for ribbon in speaker.ribbon %}
34-
<a class="modal-ribbon" href="ribbon["url"]" target="_blank">{{ ribbon["title"] }}</a>
34+
<a class="modal-ribbon" href="{{ ribbon["url"] }}" target="_blank">{{ ribbon["title"] }}</a>
3535
{% endfor %}
3636
</div>
3737
{% endif %}

_includes/tickets-2.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ <h3>{{ site.ticketsTitle }}</h3>
2222
<p class="price">{{ ticketsOffer.price }} {{ ticketsOffer.priceCurrency }}</p>
2323
</div>
2424
<div class="col-sm-3 col-xs-12">
25-
{% if ticketsOffer.disabled != true %}
25+
{% if ticketsOffer.soldOut == true %}
26+
<p class="ticket-sold-out">{{ ticketsOffer.soldOutText }}</p>
27+
{% elsif ticketsOffer.disabled != true %}
2628
<span class="bordered dark-border button">
2729
<a href="{{ ticketsOffer.buyButtonLink }}" class="waves-effect waves-button" target="_blank">{{ ticketsOffer.buyButtonText }}</a>
2830
</span>

_includes/tickets.html

+7
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ <h3>{{ site.ticketsTitle }}</h3>
1818
<li>{{ listItem }}</li>
1919
{% endfor %}
2020
</ul>
21+
{% if ticketsOffer.soldOut == true %}
22+
<span class="button disabled">{{ ticketsOffer.soldOutText }}</span>
23+
{% elsif ticketsOffer.disabled != true %}
2124
<a class="button" href="{{ ticketsOffer.buyButtonLink }}" target="_blank">{{ ticketsOffer.buyButtonText }}</a>
25+
{% else %}
26+
{% assign ticketValidFrom = ticketsOffer.validFrom | split: "T" %}
27+
<span class="button disabled fallback">Ticket sales will begin on {{ ticketValidFrom[0] | date: "%-d %B %Y"}} {{ ticketValidFrom[1] }}</span>
28+
{% endif %}
2229
</div>
2330
</div>
2431
{% endfor %}

_sass/partials/_tickets-2.scss

+4
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ $border-color: rgba(51, 51, 51, .6);
4646
padding-top: 2px;
4747
line-height: 1.2;;
4848
}
49+
.ticket-sold-out {
50+
font-size: 18px;
51+
padding-top: 10px;
52+
}
4953
.tickets-info {
5054
font-size: 16px;
5155
}

_sass/partials/_tickets.scss

+15-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ $button-background-color-hover: #4d4d4d;
6060
@media (max-width: 767px) {
6161
margin: 0;
6262
}
63+
&.disabled {
64+
&:hover {
65+
background: $primary-color;
66+
}
67+
}
6368
}
6469
}
6570
.title {
@@ -83,14 +88,23 @@ $button-background-color-hover: #4d4d4d;
8388
font-size: 32px;
8489
display: block;
8590
margin-top: 30px;
86-
padding: 7px 0 10px;
91+
padding: 7px 25px 10px;
8792
color: #fff;
8893
background: $button-background-color;
8994
font-weight: $light;
9095
text-decoration: none;
9196
&:hover {
9297
background: $button-background-color-hover;
9398
}
99+
&.disabled {
100+
&:hover {
101+
background: $button-background-color;
102+
}
103+
}
104+
&.fallback {
105+
font-size: 18px;
106+
line-height: 1.4;
107+
}
94108
}
95109
.pricing-ribbon {
96110
position: absolute;

_sass/partials/_twitter-feed.scss

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
.twitter-feed {
2+
h3 {
3+
margin-bottom: 10px;
4+
}
25
.icon {
36
width: 64px;
47
height: 64px;

css/main.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)