Skip to content

Commit 5fc29d0

Browse files
martinbeanmartinbean
committed
Redesign
1 parent 7f690bc commit 5fc29d0

Some content is hidden

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

46 files changed

+10852
-622
lines changed

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.vagrant
22
.DS_Store
33
_site
4+
node_modules

Diff for: ‎LICENSE renamed to ‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013 PHP North East
3+
Copyright (c) 2018 PHP North East
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

Diff for: ‎README.md

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
#phpne.github.io
2-
3-
The phpne.org.uk website
1+
# PHP North East
2+
The PHP North East user group website.
43

54
## Contributing
5+
If you would like to contribute to this project, fork this repository and create
6+
a pull request.
67

7-
1. Fork phpne.github.io
8-
2. Create a feature branch from `develop` (`git checkout -b my-new-feature develop`)
9-
3. Commit your changes (`git commit -am 'Add some feature'`)
10-
4. Push to your feature branch (`git push origin my-new-feature`)
11-
5. Create new Pull Request
8+
## License
9+
This project is licensed under the [MIT Licence](LICENSE.md).

Diff for: ‎_config.yml

+10
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,17 @@ gems:
1010
- jekyll-paginate
1111

1212
exclude:
13+
- node_modules
1314
- CNAME
1415
- LICENSE
1516
- README.md
1617
- Vagrantfile
18+
- gulpfile.js
19+
- package-lock.json
20+
- package.json
21+
22+
future: true
23+
24+
collections:
25+
sponsors:
26+
output: false

Diff for: ‎_includes/analytics.html

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1+
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-46863902-1"></script>
12
<script>
2-
var _gaq = _gaq || [];
3-
_gaq.push(['_setAccount', '{{ site.google_analytics_id }}']);
4-
_gaq.push(['_trackPageview']);
5-
6-
(function() {
7-
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
8-
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
9-
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
10-
})();
3+
window.dataLayer = window.dataLayer || [];
4+
function gtag(){dataLayer.push(arguments);}
5+
gtag('js', new Date());
6+
gtag('config', 'UA-46863902-1');
117
</script>

Diff for: ‎_includes/comments.html

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<div id="disqus_thread"></div>
2+
<script type="text/javascript">
3+
var disqus_shortname = 'php-north-east';
4+
var disqus_identifier = '{{ page.id | escape }}';
5+
var disqus_title = '{{ page.title | escape }}';
6+
(function() {
7+
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
8+
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
9+
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
10+
})();
11+
</script>

Diff for: ‎_includes/event-register.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% if page.date > site.time and page.eventbrite_id %}
2-
<aside class="event-register">
3-
<iframe src="https://www.eventbrite.com/tickets-external?eid={{ page.eventbrite_id }}&amp;ref=etckt&amp;v=2" frameborder="0" height="280" width="100%" allowtransparency="true" style="display: block;"></iframe>
4-
</aside>
2+
<aside class="event-register">
3+
<iframe src="https://www.eventbrite.com/tickets-external?eid={{ page.eventbrite_id }}&amp;ref=etckt&amp;v=2" frameborder="0" height="280" width="100%" allowtransparency="true" style="display: block;"></iframe>
4+
</aside>
55
{% endif %}

Diff for: ‎_includes/event-sponsor.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<aside class="event-sponsor">
2-
<p>Thanks to the generous sponsorship of Laura Sharpe of <a href="http://sharperecruitment.co.uk/" rel="external">Sharpe Recruitment</a>, there will once again be a stack of pizzas for you to enjoy before the talk.</p>
3-
<p>The event is free and open to all, but please sign up online so that we have know how much pizza we need to order. Feedback, suggestions and ideas for future topics are welcome on our <a href="http://groups.google.com/group/php-north-east" rel="external">Google Group</a>.</p>
4-
<p>Please promote this event via Twitter or your own website to help us spread the word.</p>
5-
</aside>
1+
<aside class="event-sponsor">
2+
<p>Thanks to the generous sponsorship of Laura Sharpe of <a href="http://sharperecruitment.co.uk/" rel="external" target="_blank">Sharpe Recruitment</a>, there will once again be a stack of pizzas for you to enjoy before the talk.</p>
3+
<p>The event is free and open to all, but please sign up online so that we have know how much pizza we need to order. Feedback, suggestions and ideas for future topics are welcome on our <a href="http://groups.google.com/group/php-north-east" rel="external">Google Group</a>.</p>
4+
<p>Please promote this event via Twitter or your own website to help us spread the word.</p>
5+
</aside>

Diff for: ‎_includes/facebook-js-sdk.html

-8
This file was deleted.

Diff for: ‎_includes/footer.html

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<footer class="site-footer" role="contentinfo">
2+
<div class="site-footer-bg"></div>
3+
<div class="site-footer-inner">
4+
<div class="container">
5+
<div class="py-5 small text-center">
6+
<ul class="list-inline fa-2x mb-2 social-list">
7+
<li class="list-inline-item mr-0">
8+
<a href="https://twitter.com/phpne" rel="external noreferrer" target="_blank" title="PHP North East on Twitter">
9+
<span class="fa-layers fa-fw">
10+
<i class="fas fa-circle"></i>
11+
<i class="fa-inverse fab fa-twitter" data-fa-transform="shrink-7"></i>
12+
</span>
13+
<span class="sr-only">PHP North East on Twitter</span>
14+
</a>
15+
</li>
16+
<li class="list-inline-item mr-0">
17+
<a href="https://www.facebook.com/PHP-North-East-530355733811108/" rel="external noreferrer" target="_blank" title="PHP North East on Facebook">
18+
<span class="fa-layers fa-fw">
19+
<i class="fas fa-circle"></i>
20+
<i class="fa-inverse fab fa-facebook-f" data-fa-transform="shrink-7"></i>
21+
</span>
22+
<span class="sr-only">PHP North East on Facebook</span>
23+
</a>
24+
</li>
25+
<li class="list-inline-item mr-0">
26+
<a href="https://www.youtube.com/channel/UCKTVnaV4Pn_xzieKjKxmq3g" rel="external noreferrer" target="_blank" title="PHP North East on YouTube">
27+
<span class="fa-layers fa-fw">
28+
<i class="fas fa-circle"></i>
29+
<i class="fa-inverse fab fa-youtube" data-fa-transform="shrink-7"></i>
30+
</span>
31+
<span class="sr-only">PHP North East on YouTube</span>
32+
</a>
33+
</li>
34+
</ul>
35+
<p class="mb-0">&copy; 2018 PHP North East. All rights reserved.</p>
36+
</div>
37+
</div>
38+
</div>
39+
</footer>

Diff for: ‎_includes/header.html

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<header class="site-header py-3" role="banner">
2+
<div class="container d-md-flex justify-content-md-between text-center text-md-left align-items-md-center">
3+
<a class="site-header-logo mb-2 mb-md-0 mx-auto mx-md-0" href="/">
4+
<span class="site-header-logo-text">PHP North East</span>
5+
</a>
6+
<nav class="nav site-header-navigation">
7+
<li class="nav-item">
8+
<a class="nav-link{% if page.active == 'home' %} active{% endif %}" href="{% link index.html %}">
9+
<span class="nav-link-text">Home</span>
10+
</a>
11+
</li>
12+
<li class="nav-item">
13+
<a class="nav-link{% if page.active == 'about' %} active{% endif %}" href="{% link about.html %}">
14+
<span class="nav-link-text">About</span>
15+
</a>
16+
</li>
17+
<li class="nav-item">
18+
<a class="nav-link{% if page.active == 'events' %} active{% endif %}" href="{% link events/index.html %}">
19+
<span class="nav-link-text">Events</span>
20+
</a>
21+
</li>
22+
</nav>
23+
</div>
24+
</header>

Diff for: ‎_includes/jumbotron.html

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<header class="jumbotron jumbotron-fluid jumbotron-home mb-3 mb-md-4 py-0">
2+
<div class="jumbotron-bg"></div>
3+
<div class="container">
4+
<div class="jumbotron-home-inner text-center text-md-left">
5+
<div class="row">
6+
<div class="col-12 col-md-8">
7+
<h1 class="jumbotron-home-logo mt-0 mb-4 mx-auto mx-md-0">PHP North East</h1>
8+
<p class="lead mb-5">
9+
PHP North East is a free, monthly meetup based in Newcastle upon Tyne, <abbr class="initialism" title="United Kingdom">UK</abbr>.<br />
10+
We meet on the third Tuesday of each month to talk PHP and related topics.
11+
</p>
12+
<ul class="list-inline">
13+
<li class="list-inline-item">
14+
<a class="btn btn-lg btn-outline-light" href="{% link events/index.html %}">
15+
<span class="btn-text">View past events</span>
16+
</a>
17+
</li>
18+
</ul>
19+
</div>
20+
</div>
21+
</div>
22+
</div>
23+
</header>

Diff for: ‎_includes/main.html

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<main class="site-main" role="main">
2+
{{ content }}
3+
</main>

Diff for: ‎_includes/next-event.html

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<div class="container">
2+
<div class="card card-next-event mx-auto mb-0">
3+
<div class="card-body text-center">
4+
<p class="text-muted">Our next event&hellip;</p>
5+
<h1 class="h3 mb-2">April event</h1>
6+
<p>Event details will be announced soon.</p>
7+
<ul class="list-inline mb-0">
8+
<li class="list-inline-item">
9+
<span class="sr-only">Date</span>
10+
<span class="fas fa-fw fa-calendar-alt text-muted"></span>
11+
<time datetime="2018-04-17T18:00:00+00:00">Tuesday, 17 April</time>
12+
</li>
13+
<li class="list-inline-item">
14+
<span class="sr-only">Time</span>
15+
<span class="fas fa-fw fa-clock text-muted"></span>
16+
<time datetime="18:00:00">6 PM</time>
17+
</li>
18+
<li class="list-inline-item">
19+
<span class="sr-only">Location</span>
20+
<span class="fas fa-fw fa-map-marker-alt text-muted"></span>
21+
<time datetime="18:00:00">Campus North</time>
22+
</li>
23+
</ul>
24+
</div>
25+
</div>
26+
</div>

Diff for: ‎_includes/open-graph.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<meta property="og:site_name" content="PHP North East" />
2-
<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
3-
<meta property="og:title" content="{{ page.title }}" />
4-
<meta property="og:type" content="{% if page.open_graph_type %}{{ page.open_graph_type }}{% else %}website{% endif %}" />
5-
<meta property="og:image" content="{% if page.image %}{{ page.image }}{% else %}{{ site.url }}/img/logo.png{% endif %}" />
6-
<meta property="og:description" content="{{ page.excerpt|strip_html }}" />
1+
<meta property="og:site_name" content="PHP North East" />
2+
<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
3+
<meta property="og:title" content="{{ page.open_graph_title | default: page.title }}" />
4+
<meta property="og:type" content="{{ page.open_graph_type | default: 'website' }}" />
5+
<meta property="og:image" content="{{ page.open_graph_image | default: '/img/open-graph-image.png' | prepend: site.url }}" />
6+
<meta property="og:description" content="{{ page.open_graph_description | default: page.excerpt | strip_html }}" />

Diff for: ‎_includes/sponsors.html

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<aside class="py-5" id="sponsors">
2+
<div class="container text-center">
3+
<header>
4+
<h1 class="h3">Sponsors</h1>
5+
</header>
6+
<p>PHP North East would like to thank the following for their ongoing support.</p>
7+
<ul class="list-unstyled row justify-content-center align-items-center sponsor-list">
8+
{% for sponsor in site.sponsors %}
9+
<li class="d-block sponsor-item sponsor-item-{{ sponsor.title|slugify }}">
10+
<a href="{{ sponsor.website }}" rel="external" target="_blank" title="{{ sponsor.title }}">{{ sponsor.title }}</a>
11+
</li>
12+
{% endfor %}
13+
</ul>
14+
</div>
15+
</aside>

Diff for: ‎_includes/twitter-card.html

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
{% if page.twitter_card %}
2-
<meta name="twitter:card" content="summary" />
3-
<meta name="twitter:site" content="@phpne" />
4-
<meta name="twitter:title" content="{{ page.title }}" />
5-
<meta name="twitter:description" content="{{ page.excerpt|strip_html }}" />
6-
<meta name="twitter:image:src" content="{{ site.url }}/img/logo.png" />
7-
<meta name="twitter:domain" content="phpne.org.uk" />
8-
{% endif %}
1+
<meta name="twitter:card" content="{{ page.twitter_card_type | default: 'summary_large_image' }}" />
2+
<meta name="twitter:site" content="@phpne" />
3+
<meta name="twitter:title" content="{{ page.twitter_card_title | default: page.title }}" />
4+
<meta name="twitter:description" content="{{ page.twitter_card_description | default: page.excerpt | strip_html }}" />
5+
<meta name="twitter:image:src" content="{{ page.twitter_card_image | default: '/img/twitter-card-large-image.jpg' | prepend: site.url }}" />
6+
<meta name="twitter:domain" content="phpne.org.uk" />

Diff for: ‎_layouts/default.html

+16-73
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,24 @@
11
<!DOCTYPE html>
2-
<html lang="en-GB" prefix="og: http://ogp.me/ns#">
2+
<html lang="en">
33
<head>
4-
<meta charset="utf-8" />
5-
<title>{{ page.title }} &middot; PHPNE: The PHP User Group for the North East of England</title>
4+
{% include analytics.html %}
5+
<meta charset="UTF-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
{% if meta_description %}
8-
<meta name="description" content="{{ meta_description }}" />
9-
{% endif %}
7+
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
8+
<meta name="description" content="{{ page.excerpt | strip_html }}" />
109
{% include open-graph.html %}
1110
{% include twitter-card.html %}
12-
<link href="/img/apple-touch-icon.png" rel="apple-touch-icon" />
13-
<link href="/favicon.ico" rel="shortcut icon" />
14-
<link href="/css/style.css" rel="stylesheet" />
15-
<!--[if lt IE 9]>
16-
<script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
17-
<script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
18-
<![endif]-->
11+
<title>{{ page.title | default: 'PHP North East' }}</title>
12+
<link href="/css/app.css" rel="stylesheet" />
13+
<link href="https://fonts.googleapis.com/css?family=Lato:400,700" rel="stylesheet" />
14+
<script defer src="https://use.fontawesome.com/releases/v5.0.9/js/solid.js" integrity="sha384-P4tSluxIpPk9wNy8WSD8wJDvA8YZIkC6AQ+BfAFLXcUZIPQGu4Ifv4Kqq+i2XzrM" crossorigin="anonymous"></script>
15+
<script defer src="https://use.fontawesome.com/releases/v5.0.9/js/brands.js" integrity="sha384-qJKAzpOXfvmSjzbmsEtlYziSrpVjh5ROPNqb8UZ60myWy7rjTObnarseSKotmJIx" crossorigin="anonymous"></script>
16+
<script defer src="https://use.fontawesome.com/releases/v5.0.9/js/fontawesome.js" integrity="sha384-2IUdwouOFWauLdwTuAyHeMMRFfeyy4vqYNjodih+28v2ReC+8j+sLF9cK339k5hY" crossorigin="anonymous"></script>
1917
</head>
20-
<body>
21-
{% include analytics.html %}
22-
{% include facebook-js-sdk.html %}
23-
<div class="container wrapper">
24-
<header class="site-header" role="banner">
25-
<a class="brand" href="/" rel="home">PHP North East</a>
26-
</header>
27-
<nav class="primary-navigation" role="navigation">
28-
<ul>
29-
<li><a href="/">Home</a></li>
30-
<li><a href="/about-php-north-east/">About</a></li>
31-
<li><a href="https://twitter.com/phpne" rel="external">Twitter</a></li>
32-
<li><a href="https://www.facebook.com/PHP-North-East-530355733811108/" rel="external">Facebook</a></li>
33-
<li><a href="https://www.eventbrite.co.uk/o/php-north-east-840509669" rel="external">Eventbrite</a></li>
34-
</ul>
35-
</nav>
36-
<div id="main">
37-
<section id="primary" role="main">
38-
{{ content }}
39-
</section>
40-
<aside id="secondary" role="complementary">
41-
<article class="sponsors">
42-
<h2>Sponsors</h2>
43-
<ul class="sponsor-list">
44-
<li>
45-
<a class="sponsor sponsor-sharpe-recruitment" href="http://www.sharperecruitment.co.uk/" rel="external">Sharpe Recruitment</a>
46-
</li>
47-
<li>
48-
<a class="sponsor sponsor-opia-sp" href="https://www.opia-sp.com/en/home" rel="external">Opia</a>
49-
</li>
50-
<li>
51-
<a class="sponsor sponsor-campus-north" href="http://ignite.io/#campus" rel="external">Campus North</a>
52-
</li>
53-
</ul>
54-
</article>
55-
<div>
56-
<a href="https://twitter.com/phpne" class="twitter-follow-button" data-size="large" data-lang="en" data-dnt="true" data-show-count="false">Follow @phpne</a>
57-
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
58-
</div>
59-
<div class="fb-like" data-href="https://www.facebook.com/PHP-North-East-530355733811108/" data-layout="button_count" data-action="like" data-size="large" data-show-faces="false" data-share="false"></div>
60-
</aside>
61-
</div>
62-
<footer class="site-footer" role="contentinfo">
63-
<div id="location-map"></div>
64-
<div class="row">
65-
<div class="event-location">
66-
<h3>Event location</h3>
67-
<p>We meet on the third Tuesday of the month at Campus North, Carliol Square, Newcastle upon Tyne, NE1 6UF.</p>
68-
</div>
69-
<div class="after-the-event">
70-
<h3>After the event</h3>
71-
<p>After the event, many make their way to the bar at The Ware Rooms (just around the corner), for further discussions and networking.</p>
72-
</div>
73-
</div>
74-
<p class="copyright">&copy; {{ site.time|date:'%Y' }} PHP North East. All rights reserved.</p>
75-
</footer>
76-
</div>
77-
<script src="//code.jquery.com/jquery.js"></script>
78-
<script src="//maps.googleapis.com/maps/api/js?key={{ site.google_api_key }}&amp;sensor=false"></script>
79-
<script src="/js/main.js"></script>
18+
<body class="d-flex flex-column">
19+
{% include header.html %}
20+
{% include main.html %}
21+
{% include sponsors.html %}
22+
{% include footer.html %}
8023
</body>
8124
</html>

Diff for: ‎_layouts/page.html

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
---
22
layout: default
33
---
4-
<header class="page-header">
5-
<h1 class="page-title">{{ page.title }}<h1>
6-
</header>
7-
{{ content }}
4+
<div class="page">
5+
<div class="container">
6+
<header class="page-header">
7+
<h1 class="page-title">{{ page.title }}</h1>
8+
</header>
9+
<div class="page-content">
10+
{{ content }}
11+
</div>
12+
</div>
13+
</div>

0 commit comments

Comments
 (0)