Skip to content

Commit 4602bc6

Browse files
cajogoscajogos
committed
Breadcrumbs element done
1 parent 36823ee commit 4602bc6

File tree

10 files changed

+85
-44
lines changed

10 files changed

+85
-44
lines changed

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@
66

77
* TODO: Email forwarding for hi@coderdojorise.com and dev@coderdojorise.com
88
* TODO: Set-up way to sign-up for email newsletters from Mailchimp.
9-
* TODO: Fix the breadcrumbs element for each page.
9+
* TODO: Volunteer pages
10+
* TODO: Resources pages
11+
* TODO: Supporters pages
12+
* TODO: Community pages
13+
* TODO: Add Google Analytics tag

‎_data/events.json‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,74 @@
11
[
22
{
33
"name": "CoderDojo RISE",
4-
"date": "28-03-2020 14:00",
5-
"location": "RISE London, 41 Luke street, Shoreditch, London EC2A 4DP",
4+
"date": "28 Mar 2020",
5+
"time": "14:00",
6+
"location": "RISE London, 41 Luke street, London EC2A 4DP",
67
"type": "Regular",
7-
"tickets_link": "https://www.eventbrite.co.uk/e/coderdojo-rise-28-march-2020-tickets-87608614725"
8+
"ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-28-march-2020-tickets-87608614725"
89
},
910
{
1011
"name": "CoderDojo RISE",
11-
"date": "25-04-2020 14:00",
12-
"location": "RISE London, 41 Luke street, Shoreditch, London EC2A 4DP",
12+
"date": "25 Apr 2020",
13+
"time": "14:00",
14+
"location": "RISE London, 41 Luke street, London EC2A 4DP",
1315
"type": "Regular",
14-
"tickets_link": "https://www.eventbrite.co.uk/e/coderdojo-rise-25-april-2020-tickets-87608630773"
16+
"ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-25-april-2020-tickets-87608630773"
1517
},
1618
{
1719
"name": "CoderDojo RISE",
18-
"date": "30-05-2020 14:00",
19-
"location": "RISE London, 41 Luke street, Shoreditch, London EC2A 4DP",
20+
"date": "30 May 2020",
21+
"time": "14:00",
22+
"location": "RISE London, 41 Luke street, London EC2A 4DP",
2023
"type": "Regular",
21-
"tickets_link": "https://www.eventbrite.co.uk/e/coderdojo-rise-30-may-2020-tickets-87608648827"
24+
"ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-30-may-2020-tickets-87608648827"
2225
},
2326
{
2427
"name": "CoderDojo RISE",
25-
"date": "27-06-2020 14:00",
26-
"location": "RISE London, 41 Luke street, Shoreditch, London EC2A 4DP",
28+
"date": "27 Jun 2020",
29+
"time": "14:00",
30+
"location": "RISE London, 41 Luke street, London EC2A 4DP",
2731
"type": "Regular",
28-
"tickets_link": "https://www.eventbrite.co.uk/e/coderdojo-rise-27-june-2020-tickets-87608668887"
32+
"ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-27-june-2020-tickets-87608668887"
2933
},
3034
{
3135
"name": "CoderDojo RISE",
32-
"date": "25-07-2020 14:00",
33-
"location": "RISE London, 41 Luke street, Shoreditch, London EC2A 4DP",
36+
"date": "25 Jul 2020",
37+
"time": "14:00",
38+
"location": "RISE London, 41 Luke street, London EC2A 4DP",
3439
"type": "Regular",
35-
"tickets_link": "https://www.eventbrite.co.uk/e/coderdojo-rise-25-july-2020-tickets-87608682929"
40+
"ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-25-july-2020-tickets-87608682929"
3641
},
3742
{
3843
"name": "CoderDojo RISE",
39-
"date": "29-08-2020 14:00",
40-
"location": "RISE London, 41 Luke street, Shoreditch, London EC2A 4DP",
44+
"date": "29 Aug 2020",
45+
"time": "14:00",
46+
"location": "RISE London, 41 Luke street, London EC2A 4DP",
4147
"type": "Regular",
42-
"tickets_link": "https://www.eventbrite.co.uk/e/coderdojo-rise-29-august-2020-tickets-87608809307"
48+
"ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-29-august-2020-tickets-87608809307"
4349
},
4450
{
4551
"name": "CoderDojo RISE",
46-
"date": "26-09-2020 14:00",
47-
"location": "RISE London, 41 Luke street, Shoreditch, London EC2A 4DP",
52+
"date": "26 Sep 2020",
53+
"time": "14:00",
54+
"location": "RISE London, 41 Luke street, London EC2A 4DP",
4855
"type": "Regular",
49-
"tickets_link": "https://www.eventbrite.co.uk/e/coderdojo-rise-26-september-2020-tickets-87608819337"
56+
"ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-26-september-2020-tickets-87608819337"
5057
},
5158
{
5259
"name": "CoderDojo RISE",
53-
"date": "31-10-2020 14:00",
54-
"location": "RISE London, 41 Luke street, Shoreditch, London EC2A 4DP",
60+
"date": "31 Oct 2020",
61+
"time": "14:00",
62+
"location": "RISE London, 41 Luke street, London EC2A 4DP",
5563
"type": "Regular",
56-
"tickets_link": "https://www.eventbrite.co.uk/e/coderdojo-rise-31-october-2020-tickets-87608979817"
64+
"ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-31-october-2020-tickets-87608979817"
5765
},
5866
{
5967
"name": "CoderDojo RISE",
60-
"date": "28-11-2020 14:00",
61-
"location": "RISE London, 41 Luke street, Shoreditch, London EC2A 4DP",
68+
"date": "28 Nov 2020",
69+
"time": "14:00",
70+
"location": "RISE London, 41 Luke street, London EC2A 4DP",
6271
"type": "Regular",
63-
"tickets_link": "https://www.eventbrite.co.uk/e/coderdojo-rise-28-november-2020-tickets-87608995865"
72+
"ticketsLink": "https://www.eventbrite.co.uk/e/coderdojo-rise-28-november-2020-tickets-87608995865"
6473
}
6574
]

‎_includes/breadcrumbs.html‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎_includes/partials/breadcrumbs.html‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{% assign breadcrumbs = page.breadcrumbs | split: ";" %}
2+
3+
{%- comment -%}
4+
5+
The breadcrumbs element is generated using the Front Matter with a simple syntax.
6+
If the breadcrumbs front matter variable is not provided then no breadcrumbs will be generated.
7+
8+
Syntax rules:
9+
- Separate each breadcrumb using a semi-colon (;)
10+
- Separate each breadcrumb's attributes using a colon (:)
11+
12+
Attributes:
13+
- 0: Crumb Title
14+
- 1: Crumb URL (relative path)
15+
- 2: Crumb CSS classes (leave empty for no classes)
16+
17+
Example: "Title A:/url-a:;Title B:/url-b:active"
18+
19+
{%- endcomment -%}
20+
21+
{% if page.breadcrumbs %}
22+
<div class="container breadcrumbs-element">
23+
<ol class="breadcrumb">
24+
{% for breadcrumb in breadcrumbs %}
25+
{% assign crumb = breadcrumb | split: ":" %}
26+
<li class="{{ crumb[2] }}">
27+
<a href="{{ crumb[1] | relative_url }}">{{ crumb[0] }}</a>
28+
</li>
29+
{% endfor %}
30+
</ol>
31+
</div>
32+
{% endif %}

_includes/eu-cookie-message.html renamed to _includes/partials/eu-cookie-message.html

File renamed without changes.

‎_includes/partials/events-table.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ <h3>Upcoming Events</h3>
66
<table class="table table-striped table-condensed">
77
<thead>
88
<tr>
9-
<th class="col-date">When</th>
9+
<th class="col-date">Date</th>
10+
<th class="col-date hidden-xs">Time</th>
1011
<th>Dojo<span class="hidden-xs"> Name</span></th>
1112
<th>Location</th>
1213
<th class="hidden-xs">Type</th>
@@ -16,11 +17,12 @@ <h3>Upcoming Events</h3>
1617
<tbody>
1718
{% for event in site.data.events %}
1819
<tr>
19-
<td class="col-date">{{ event.date }}</td>
20+
<td class="col-date">{{ event.date }}</td>
21+
<td class="col-date hidden-xs">{{ event.time }}</td>
2022
<td>{{ event.name }}</td>
2123
<td>{{ event.location }}</td>
2224
<td class="hidden-xs">{{ event.type }}</td>
23-
<td><a href="{{ event.tickets_link }}" class="btn" target="_blank"><span class="hidden-xs">Book </span>Tickets</a></td>
25+
<td><a href="{{ event.ticketsLink }}" class="btn" target="_blank"><span class="hidden-xs">Book </span>Tickets</a></td>
2426
</tr>
2527
{% endfor %}
2628
</tbody>

‎_layouts/master.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<meta charset="utf-8">
77
<meta name="viewport" content="width=device-width, initial-scale=1.0">
88
<link rel="icon" type="image/png" href="{{ 'assets/favicon.png' | relative_url }}" />
9-
<!-- Stylesheets -->
9+
1010
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
1111
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css" />
1212
<link rel="stylesheet" href="{{ 'assets/css/master.css' | relative_url }}" />
1313
</head>
1414
<body>
1515
{% include header.html %}
16-
{% include breadcrumbs.html %}
16+
{% include partials/breadcrumbs.html %}
1717
{{ content }}
1818
{% include footer.html %}
19-
{% include eu-cookie-message.html %}
20-
<!-- Scripts -->
19+
{% include partials/eu-cookie-message.html %}
20+
2121
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
2222
<script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
2323
<script type="text/javascript" src="{{ 'assets/js/utils.js' | relative_url }}"></script>

‎pages/about-us.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
permalink: /about-us
33
layout: master
44
title: Find out about CoderDojo in London
5+
breadcrumbs: "Home:/:;About Us:/about-us:about-us active"
56
---
67

78
<div class="heading-banner-container heading-orange">

‎pages/attend-a-dojo.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
permalink: /attend-a-dojo
33
layout: master
44
title: Attend a CoderDojo in London
5+
breadcrumbs: "Home:/:;Attend a Dojo:/attend-a-dojo:attend active"
56
---
67

78
<div class="heading-banner-container heading-green">

‎pages/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
permalink: /
33
layout: master
44
title: CoderDojo - Be Cool and get involved
5+
breadcrumbs: "Home:/:"
56
---
67

78
<div class="jumbotron-home-container">

0 commit comments

Comments
 (0)