Skip to content

Commit

Permalink
Cleanup project for primetime
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisdmacrae committed Jan 19, 2018
1 parent 659149f commit 884b52b
Show file tree
Hide file tree
Showing 78 changed files with 559 additions and 791 deletions.
46 changes: 0 additions & 46 deletions .forestry/front_matter/templates/about.yml

This file was deleted.

29 changes: 0 additions & 29 deletions .forestry/front_matter/templates/contact.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,17 @@ fields:
default: ''
hidden: false
default: ''
- type: boolean
name: show_news
label: Show News?
description: Enables a news section with a twitter feed & latest posts
- type: image_gallery
name: partners
label: Partner Logos
- type: boolean
name: show_staff
label: Show Staff?
description: Enables a staff section that lists each person in the People collection
- name: layout
label: Layout
type: text
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,9 @@ fields:
- name: role
label: Departments
type: list
hidden: false
default: []
description: ''
config:
use_select: true
source:
type: simple
options:
- staff
- board
- advisor
- partner
hidden: text
default: staff
description:
- name: email
label: Email
type: text
Expand Down
File renamed without changes.
16 changes: 8 additions & 8 deletions 404.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
title: This page doesn't exist
permalink: "/404.html"
title: Page not found
heading: Whoops, it looks like you got lost
sub_heading: We broke this page, or it doesn't exist
banner_image: "/images/banner.png"
layout: error
publish_date: 2017-11-01 03:00:00 +0000
description: Whoops! It looks like this page doesn't exist
---

banner_image: "/img/banner.png"
hero_button:
text: Go home
href: "/"
permalink: "/404.html"
layout: default
---
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ gem "jekyll", "~> 3.6.0"
group :jekyll_plugins do
gem "jekyll-feed", "~> 0.6"
gem "jekyll-menus"
gem "jekyll-tagging"
gem "jekyll-archives"
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down
7 changes: 7 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 3)
safe_yaml (~> 1.0)
jekyll-archives (2.1.1)
jekyll (>= 2.4)
jekyll-feed (0.9.2)
jekyll (~> 3.3)
jekyll-menus (0.6.0)
jekyll (~> 3.1)
jekyll-sass-converter (1.5.1)
sass (~> 3.4)
jekyll-tagging (1.1.0)
nuggets
jekyll-watch (1.5.1)
listen (~> 3.0)
kramdown (1.16.2)
Expand All @@ -32,6 +36,7 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
nuggets (1.5.0)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (3.0.1)
Expand All @@ -52,8 +57,10 @@ PLATFORMS

DEPENDENCIES
jekyll (~> 3.6.0)
jekyll-archives
jekyll-feed (~> 0.6)
jekyll-menus
jekyll-tagging
tzinfo-data

BUNDLED WITH
Expand Down
29 changes: 20 additions & 9 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,34 @@
title: Belkirk College of Engineering
short_title: Belkirk
description: The Forestry.io Prouct Tour Demo
description: Belkirk Demo Site for Forestry.io
baseurl: /belkirk-jekyll-demo/
permalink: "/:path/"
defaults:
- scope:
path: ""
values:
layout: page
- scope:
path: ""
type: posts
values:
layout: post
collections:
people:
title: People
output: true
permalink: "/about/people/:path/"
permalink: "/about/:path/"
posts:
title: Posts
output: true
projects:
title: Projects
output: true
permalink: "/projects/:path/"
publications:
title: Publications
output: false
permalink: "/publications/:path/"
tag_page_layout: tag_page
tag_page_dir: tag
jekyll-archives:
enabled: all
layout: "archive"
gems:
- jekyll-menus
- jekyll-feed
- jekyll/tagging
- jekyll-archives
4 changes: 0 additions & 4 deletions _data/departments.yml

This file was deleted.

20 changes: 20 additions & 0 deletions _data/publications.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
- title: 'Bioengineering: A Conceptual Approach'
date: 2017-09-30 14:43:51 +0000
PDF: ''
author: _people/kellie-brewer.md
layout: default
project: _projects/
link: https://www.amazon.ca/Bioengineering-Conceptual-Approach-Mirjana-Pavlovic-ebook/dp/B00RZJ8DL2/
- title: Mechanical Engineering Handbook
date: 2017-09-30 14:43:51 +0000
PDF: ''
author: _people/murphy-tiernan.md
layout: default
project: []
link: https://www.amazon.ca/Mechanical-Engineering-Handbook-R-Jain/dp/1683921305/
- title: 'Modern Engineering: First Edition'
date: 2017-09-30 14:43:51 +0000
PDF: "/uploads/2017/11/16/modern-engineering.pdf"
author: _people/murphy-tiernan.md
layout: default
project: _projects/modern-engineering.md
4 changes: 4 additions & 0 deletions _includes/address.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{% comment %}
Displays the address from _data/information.yml properly formatted
{% endcomment %}

{% if site.data.information %}
{% assign info = site.data.information %}
<p>
Expand Down
24 changes: 24 additions & 0 deletions _includes/breadcrumbs.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{% comment %}
Creates a breadcrumb from the page's URL
{% endcomment %}

<nav class="breadcrumbs">
<div class="container">
{% assign parts = page.url | split: "/" %}
<ul>
<li><a href="{{ site.baseurl | default "/" }}">Home</a>&nbsp;<i class="fa fa-chevron-right"></i></li>
{% for part in parts offset: 1 %}
{% if forloop.last %}
<li class="active">{{ page.title }}</li>
{% else %}
{% assign text = part | replace:'-', ' ' | capitalize %}
{% assign limit = forloop.index | plus: 1 %}
{% capture href %}{% for part in parts limit: limit %}{{ part | append: '/' }}{% endfor %}{% endcapture %}
<li>
<a href="{{ href | relative_url }}">{{ text }}</a>&nbsp;<i class="fa fa-chevron-right"></i>
</li>
{% endif %}
{% endfor %}
</ul>
</div>
</nav>
55 changes: 28 additions & 27 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
<footer class="site-footer">
<div class="container pure-g">
<div class="footer-col pure-u-1 pure-u-md-1-4">
<img src="{{ "/images/logo-white.png" | relative_url }}" alt="" class="footer-logo">
</div>
<div class="footer-col pure-u-1 pure-u-md-1-4">
<h3>About {{ site.short_title }}</h3>
<ul>
{% for item in site.menus.footer %}
<li><a href="{{ item.url | relative_url }}">{{ item.title }}</a></li>
{% endfor %}
</ul>
</div>
<div class="footer-col pure-u-1 pure-u-md-1-4">
<h3>Projects</h3>
<ul>
{% for project in site.projects limit:5 %}
<li><a href="{{ project.url | relative_url }}">{{ project.title }}</a></li>
{% endfor %}
{% if site.projects | size > 5 %}
<li><a href="{{ "/projects/" | relative_url }}">See all projects</a></li>
{% endif %}
</ul>
</div>
<div class="footer-col pure-u-1 pure-u-md-1-4">
<h3>Contact</h3>
{% include address.html %}
</div>
<div class="footer-col pure-u-1 pure-u-md-1-4">
<img src="{{ "/img/logo-white.png" | relative_url }}" alt="" class="footer-logo">
</div>
<div class="footer-col pure-u-1 pure-u-md-1-4">
<h3>About {{ site.short_title }}</h3>
<ul>
{% for item in site.menus.footer %}
<li><a href="{{ item.url | relative_url }}">{{ item.title }}</a></li>
{% endfor %}
</ul>
</div>
<div class="footer-col pure-u-1 pure-u-md-1-4">
<h3>Projects</h3>
<ul>
{% for project in site.projects limit:5 %}
<li><a href="{{ project.url | relative_url }}">{{ project.title }}</a></li>
{% endfor %}
{% if site.projects | size > 5 %}
<li><a href="{{ "/projects/" | relative_url }}">See all projects</a></li>
{% endif %}
</ul>
</div>
<div class="footer-col pure-u-1 pure-u-md-1-4">
<h3>Contact</h3>
{% include address.html %}
</div>
</div>
<div class="copyright">
<p>&copy;{{ 'now' | date: "%Y" }} {{ site.title }} - All Rights Reserved<br>
<p>&copy;{{ 'now' | date: "%Y" }} {{ site.title }} - All Rights Reserved</p>
<p>
<a href="{{ "/admin" | relative_url }}">Site Admin</a>
</p>
</div>
Expand Down
28 changes: 20 additions & 8 deletions _includes/head.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
<header class="site-header">
<div class="container">
<h1 class="logo"><a href="{{ "/" | absolute_url }}">{{ site.name }}</a></h1>
<nav class="main-nav">
{% include nav-main.html %}
</nav>
</div>
</header>
<!doctype html>
<html class="no-js" lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>{{ page.title }} - {{ site.title }}</title>
<meta name="description" content="{% if .page.description %}{{ .page.description }}{% else %}{{ .site.description }}{% endif %}">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/png" href="{{ "/img/favicon.png" | relative_url }}"/>
<link rel="stylesheet" href="https://yui-s.yahooapis.com/pure/0.6.0/pure-min.css">
<!--[if lte IE 8]>
<link rel="stylesheet" href="http://yui.yahooapis.com/pure/0.6.0/grids-responsive-old-ie-min.css">
<![endif]-->
<!--[if gt IE 8]><!-->
<link rel="stylesheet" href="https://yui-s.yahooapis.com/pure/0.6.0/grids-responsive-min.css">
<!--<![endif]-->
<link rel="stylesheet" href="{{ "/css/main.css" | relative_url }}">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css">
</head>
<body>
Loading

0 comments on commit 884b52b

Please sign in to comment.