From 884b52ba65c89cf8472f7971485b1c12c9d4b8c3 Mon Sep 17 00:00:00 2001 From: Chris Macrae Date: Fri, 19 Jan 2018 14:43:58 -0400 Subject: [PATCH] Cleanup project for primetime --- .forestry/front_matter/templates/about.yml | 46 -------- .forestry/front_matter/templates/contact.yml | 29 ----- .../templates/{home.yml => landing-page.yml} | 8 ++ .../templates/{people.yml => person.yml} | 15 +-- .../templates/{posts.yml => post.yml} | 0 .../templates/{projects.yml => project.yml} | 0 .../{publications.yml => publication.yml} | 0 404.md | 16 +-- Gemfile | 2 + Gemfile.lock | 7 ++ _config.yml | 29 +++-- _data/departments.yml | 4 - _data/publications.yml | 20 ++++ _includes/address.html | 4 + _includes/breadcrumbs.html | 24 ++++ _includes/footer.html | 55 ++++----- _includes/head.html | 28 +++-- _includes/header.html | 21 ---- _includes/hero.html | 67 +++++++---- _includes/nav-main.html | 36 ------ _includes/nav.html | 50 ++++++++ _includes/news.html | 32 ++++++ _includes/partners.html | 20 ++++ _includes/services.html | 19 ++++ _includes/staff.html | 43 +++++++ _includes/sub-header-wide.html | 19 ---- _layouts/about.html | 54 --------- _layouts/archive.html | 5 +- _layouts/contact.html | 12 -- _layouts/default-wide.html | 21 ---- _layouts/default.html | 44 +++---- _layouts/error.html | 14 --- _layouts/home.html | 57 ---------- _layouts/landing-page.html | 29 +++++ _layouts/page.html | 14 +++ _layouts/person.html | 7 -- _layouts/post.html | 9 +- _layouts/{blog.html => posts.html} | 6 + _layouts/projects.html | 46 +++++--- _layouts/publication.html | 37 ------ _layouts/publications.html | 107 ++++++++++-------- _layouts/staff.html | 34 ------ _layouts/tag.html | 20 ++++ _layouts/tag_index.html | 18 --- _layouts/text.html | 8 -- _people/charlize-babatunde.md | 1 - _people/grady-nerio.md | 1 - _people/kellie-brewer.md | 1 - _people/martin-marino.md | 1 - _people/mary-ann-macswain.md | 1 - _people/murphy-tiernan.md | 1 - _posts/2017-09-25-exploring.md | 61 ---------- _posts/2017-09-25-introduction.md | 7 +- _projects/epilepsy-monitoring.md | 3 +- _projects/modern-engineering.md | 3 +- _publications/bioengineering.md | 10 -- _publications/mechanical-engineering.md | 10 -- _publications/modern-engineering-2.md | 10 -- _publications/modern-engineering.md | 10 -- about.md | 11 +- about/board.html | 21 ---- about/staff.html | 20 ---- contact.md | 8 -- css/main.css | 6 +- css/main.css.map | 2 +- css/main.min.css | 4 +- {images => img}/banner.png | Bin {images => img}/banner_2.png | Bin {images => img}/campus.jpg | Bin .../favicon-96x96.png => img/favicon.png | Bin {images => img}/logo-retina.png | Bin {images => img}/logo-white.png | Bin {images => img}/logo.png | Bin {images => img}/placeholder.png | Bin {images => img}/shield.png | Bin index.md | 6 +- people.md | 10 -- posts.md | 6 +- 78 files changed, 559 insertions(+), 791 deletions(-) delete mode 100755 .forestry/front_matter/templates/about.yml delete mode 100755 .forestry/front_matter/templates/contact.yml rename .forestry/front_matter/templates/{home.yml => landing-page.yml} (81%) rename .forestry/front_matter/templates/{people.yml => person.yml} (74%) rename .forestry/front_matter/templates/{posts.yml => post.yml} (100%) rename .forestry/front_matter/templates/{projects.yml => project.yml} (100%) rename .forestry/front_matter/templates/{publications.yml => publication.yml} (100%) delete mode 100644 _data/departments.yml create mode 100644 _data/publications.yml create mode 100644 _includes/breadcrumbs.html delete mode 100755 _includes/header.html delete mode 100755 _includes/nav-main.html create mode 100755 _includes/nav.html create mode 100644 _includes/news.html create mode 100644 _includes/partners.html create mode 100644 _includes/services.html create mode 100644 _includes/staff.html delete mode 100644 _includes/sub-header-wide.html delete mode 100644 _layouts/about.html delete mode 100644 _layouts/contact.html delete mode 100755 _layouts/default-wide.html delete mode 100644 _layouts/error.html delete mode 100644 _layouts/home.html create mode 100644 _layouts/landing-page.html create mode 100644 _layouts/page.html delete mode 100644 _layouts/person.html rename _layouts/{blog.html => posts.html} (63%) delete mode 100644 _layouts/publication.html delete mode 100644 _layouts/staff.html create mode 100644 _layouts/tag.html delete mode 100644 _layouts/tag_index.html delete mode 100644 _layouts/text.html delete mode 100644 _posts/2017-09-25-exploring.md delete mode 100644 _publications/bioengineering.md delete mode 100644 _publications/mechanical-engineering.md delete mode 100644 _publications/modern-engineering-2.md delete mode 100644 _publications/modern-engineering.md delete mode 100644 about/board.html delete mode 100644 about/staff.html delete mode 100644 contact.md rename {images => img}/banner.png (100%) rename {images => img}/banner_2.png (100%) rename {images => img}/campus.jpg (100%) rename images/favicon/favicon-96x96.png => img/favicon.png (100%) rename {images => img}/logo-retina.png (100%) rename {images => img}/logo-white.png (100%) rename {images => img}/logo.png (100%) rename {images => img}/placeholder.png (100%) rename {images => img}/shield.png (100%) delete mode 100644 people.md diff --git a/.forestry/front_matter/templates/about.yml b/.forestry/front_matter/templates/about.yml deleted file mode 100755 index 5309817..0000000 --- a/.forestry/front_matter/templates/about.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -hide_body: false -fields: -- type: text - name: title - label: Title - config: - required: true -- type: textarea - name: description - label: Description - config: - wysiwyg: true - required: true -- type: datetime - name: date - label: Publish Date -- type: text - label: Hero Heading - name: heading - config: - required: true -- type: text - name: sub_heading - label: Hero Sub Heading -- type: field_group - name: hero_button - label: Hero Button - fields: - - type: text - name: text - label: Text - - type: text - name: href - label: Link -- type: file - name: banner_image - label: Hero Image - description: 'Dimensions: 1200px by 580px' - config: - maxSize: '2' -- type: text - name: layout - label: Layout - hidden: true - default: about diff --git a/.forestry/front_matter/templates/contact.yml b/.forestry/front_matter/templates/contact.yml deleted file mode 100755 index 9aa8f74..0000000 --- a/.forestry/front_matter/templates/contact.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -hide_body: true -fields: -- type: text - name: title - label: Title - config: - required: true -- type: text - name: description - label: Description - config: - required: true -- type: datetime - name: publish_date - label: Publish Date -- type: textarea - name: map - label: Map - config: - wysiwyg: false - required: true - description: '' - hidden: true -- type: text - name: layout - label: Layout - default: contact - hidden: true diff --git a/.forestry/front_matter/templates/home.yml b/.forestry/front_matter/templates/landing-page.yml similarity index 81% rename from .forestry/front_matter/templates/home.yml rename to .forestry/front_matter/templates/landing-page.yml index cda6d4d..33e1ccb 100755 --- a/.forestry/front_matter/templates/home.yml +++ b/.forestry/front_matter/templates/landing-page.yml @@ -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 diff --git a/.forestry/front_matter/templates/people.yml b/.forestry/front_matter/templates/person.yml similarity index 74% rename from .forestry/front_matter/templates/people.yml rename to .forestry/front_matter/templates/person.yml index 3b2d425..2fd13da 100755 --- a/.forestry/front_matter/templates/people.yml +++ b/.forestry/front_matter/templates/person.yml @@ -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 diff --git a/.forestry/front_matter/templates/posts.yml b/.forestry/front_matter/templates/post.yml similarity index 100% rename from .forestry/front_matter/templates/posts.yml rename to .forestry/front_matter/templates/post.yml diff --git a/.forestry/front_matter/templates/projects.yml b/.forestry/front_matter/templates/project.yml similarity index 100% rename from .forestry/front_matter/templates/projects.yml rename to .forestry/front_matter/templates/project.yml diff --git a/.forestry/front_matter/templates/publications.yml b/.forestry/front_matter/templates/publication.yml similarity index 100% rename from .forestry/front_matter/templates/publications.yml rename to .forestry/front_matter/templates/publication.yml diff --git a/404.md b/404.md index c43328c..138205e 100644 --- a/404.md +++ b/404.md @@ -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 +--- \ No newline at end of file diff --git a/Gemfile b/Gemfile index 6298e8a..b3fd5aa 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index fa1ca51..afb5818 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -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) @@ -52,8 +57,10 @@ PLATFORMS DEPENDENCIES jekyll (~> 3.6.0) + jekyll-archives jekyll-feed (~> 0.6) jekyll-menus + jekyll-tagging tzinfo-data BUNDLED WITH diff --git a/_config.yml b/_config.yml index 628e0b1..e797634 100644 --- a/_config.yml +++ b/_config.yml @@ -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 \ No newline at end of file diff --git a/_data/departments.yml b/_data/departments.yml deleted file mode 100644 index 6b59831..0000000 --- a/_data/departments.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -staff: Belkirk Staff -board: Management Board -advisor: Advisory Board diff --git a/_data/publications.yml b/_data/publications.yml new file mode 100644 index 0000000..d07db73 --- /dev/null +++ b/_data/publications.yml @@ -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 \ No newline at end of file diff --git a/_includes/address.html b/_includes/address.html index f97bad0..c8d4d1b 100644 --- a/_includes/address.html +++ b/_includes/address.html @@ -1,3 +1,7 @@ +{% comment %} + Displays the address from _data/information.yml properly formatted +{% endcomment %} + {% if site.data.information %} {% assign info = site.data.information %}

diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html new file mode 100644 index 0000000..ea650c5 --- /dev/null +++ b/_includes/breadcrumbs.html @@ -0,0 +1,24 @@ +{% comment %} + Creates a breadcrumb from the page's URL +{% endcomment %} + +

diff --git a/_includes/footer.html b/_includes/footer.html index e8f970f..2255993 100755 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,34 +1,35 @@