Site clean-up

- prep for re-use
- fix people to contributors links

.github/ISSUE_TEMPLATE/new-chapter.md

@@ -71,7 +71,7 @@ Reference:
 
 ### Publish
 
-- [ ] Add contributor(s) to contributor list ([doc](https://docs.google.com/document/d/1rruJsEF8-E3qTVCv0Giw2mK43HcNS4d7233rgGk9wjw/edit#heading=h.c0rl7i1lbum8)/[website](https://proudlyservingbook.com/people/) (M - @lukefretwell)
+- [ ] Add contributor(s) to contributor list ([doc](https://docs.google.com/document/d/1rruJsEF8-E3qTVCv0Giw2mK43HcNS4d7233rgGk9wjw/edit#heading=h.c0rl7i1lbum8)/[website](https://proudlyservingbook.com/contributors/) (M - @lukefretwell)
 - [ ] Add [acknowledgements](https://docs.google.com/document/d/1rruJsEF8-E3qTVCv0Giw2mK43HcNS4d7233rgGk9wjw/edit#heading=h.kg53erhbnr5t) (M - @lukefretwell)
 - [ ] [Doc](https://docs.google.com/document/d/1rruJsEF8-E3qTVCv0Giw2mK43HcNS4d7233rgGk9wjw/edit?usp=sharing) (M - @lukefretwell)
 - [ ] Update chapter page on website (M - @lukefretwell)

Gemfile

@@ -1,19 +1,7 @@
 source "https://rubygems.org"
-# Hello! This is where you manage which Jekyll version is used to run.
-# When you want to use a different version, change it below, save the
-# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
-#
-#     bundle exec jekyll serve
-#
-# This will help ensure the proper Jekyll version is running.
-# Happy Jekylling!
-gem "jekyll", "~> 4.2.2"
-# This is the default theme for new Jekyll sites. You may change this to anything you like.
-# gem "minima", "~> 2.5"
-# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
-# uncomment the line below. To upgrade, run `bundle update github-pages`.
-# gem "github-pages", group: :jekyll_plugins
-# If you have any plugins, put them here!
+gem "jekyll", "~> 4.3.0"
+
+# Plugins
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.12"
   gem "jekyll-sitemap"
@@ -37,6 +25,8 @@ end
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
 
+gem "kramdown", "~> 2.4.0"
+
 # Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem
 # do not have a Java counterpart.
 gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]

Gemfile.lock

@@ -14,31 +14,35 @@ GEM
     eventmachine (1.2.7)
     ffi (1.17.0-x86_64-darwin)
     forwardable-extended (2.6.0)
+    google-protobuf (4.28.3-x86_64-darwin)
+      bigdecimal
+      rake (>= 13)
     http_parser.rb (0.8.0)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.2)
+    jekyll (4.3.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 2.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
     jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (2.2.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
@@ -55,22 +59,23 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.6.1)
     mercenary (0.4.0)
-    ostruct (0.6.0)
+    ostruct (0.6.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (6.0.1)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.3.8)
-    rouge (3.30.0)
+    rexml (3.3.9)
+    rouge (4.5.1)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.8.0)
-    webrick (1.8.2)
+    sass-embedded (1.81.0-x86_64-darwin)
+      google-protobuf (~> 4.28)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.6.0)
+    webrick (1.9.0)
 
 PLATFORMS
   x86_64-darwin
@@ -80,12 +85,13 @@ DEPENDENCIES
   bigdecimal
   csv
   http_parser.rb (~> 0.6.0)
-  jekyll (~> 4.2.2)
+  jekyll (~> 4.3.0)
   jekyll-feed (~> 0.12)
   jekyll-paginate
   jekyll-redirect-from
   jekyll-seo-tag
   jekyll-sitemap
+  kramdown (~> 2.4.0)
   logger
   ostruct
   tzinfo (~> 1.2)
@@ -94,4 +100,4 @@ DEPENDENCIES
   webrick (~> 1.7)
 
 BUNDLED WITH
-   2.5.21
+   2.5.23

_config.yml

@@ -1,8 +1,22 @@
 # General
 title: Proudly Serving
 description: Public service in the digital age
-#baseurl: ""
 url: https://proudlyservingbook.com
+#baseurl: ""
+
+# Sections
+quotes-name: What they're saying
+quotes-url: /what-theyre-saying
+contributors-name: Contributors
+contributors-url: /contributors
+contents-name: Contents
+contents-url: /book
+about-name: Purpose
+about-url: /about
+book-name: book
+book-url: /book
+author-name: Author
+author-url: /author
 
 # Organization
 org-name: Proudly Serving
@@ -24,9 +38,9 @@ date: "%B %-d, %Y"
 timezone: America/Los_Angeles
 
 markdown: kramdown
-highlighter: rouge
 kramdown:
-  syntax_highlighter: rouge
+  input: GFM
+  auto_ids: true
 
 # Build settings
 plugins:

_includes/author.html

@@ -1,17 +1,4 @@
 {% if page.author %}
-    {% for author in page.author %}
-        {% assign
-author_data = site.people | where:"title", author | first %}
-        {% if
-author_data.content.size > 1 %}
-            <p>
-                By
-                <a href="{{ site.baseurl }}{{ author_data.url }}">
-                    {{ author_data.title }}</a>
-                {% if page.date %}
-                    &middot; {% include date.html %}
-                {% endif %}
-            </p>
-        {% endif %}
-    {% endfor %}
-{% endif %}
+  By
+  {{ page.author }}
+{% endif %}

_includes/card-quotes.html

@@ -24,7 +24,7 @@
             <div class="card-img-top card-img-top">
               <img
                 src="{{ site.baseurl }}/assets/img/contributors/{{ quotes.img }}"
-                class="rounded-circle sm float-start mx-3 mb-3"
+                class="rounded-circle sm float-start mx-3 mb-3 shadow"
                 alt="{{ item.name }}">
             </div>
             <p class="fs-5">"{{ quotes.quote }}"</p>

_includes/footer.html

@@ -26,7 +26,11 @@
         <div class="row mt-2">
           <div class="col-12"></div>
           <p class="mb-0 pb-0">
-            {{ "now" | date: "%Y" }} {{ site.title }}
+            A project by
+            <a
+              hre
+              href="{{ site.org-url }}"
+              class="text-white">{{ site.org-name }}</a>
           </p>
         </div>
       {% endif %}

_includes/image.html

@@ -1,18 +1,8 @@
-{% if page.parent == "events" or page.parent == "orgs" or page.parent == "pitches" or page.parent == "innovations" %}
-    {% if page.img %}
-        <div class="img">
-            <img src="{{ site.baseurl }}/assets/img/{{ page.img-path }}/{{ page.img }}" alt="{{ page.img-alt }}" type="{{ page.folder }}" class="lg line">
-            {% if page.img-caption %}
-                <p class="img-caption">{{ page.img-caption }}</p>
-            {% endif %}
-        </div>
-    {% endif %}
-{% endif %}
-
-{% if page.parent == == "people" %}
-    {% if page.img-feat %}
-        <div class="img">
-            <img src="{{ site.baseurl }}/assets/img/{{ page.img-path }}/{{ page.img-feat }}" alt="{{ page.img-alt }}" type="{{ page.folder }}">
-        </div>
-    {% endif %}
-{% endif %}
+{% if page.parent == == "{{ site.contributors.name }}" %}
+  {% if page.img-feat %}
+    <img
+      src="{{ site.baseurl }}/assets/img/{{ page.img-path }}/{{ page.img-feat }}"
+      alt="{{ page.img-alt }}"
+      type="{{ page.folder }}">
+  {% endif %}
+{% endif %}

_includes/jumbotron.html

@@ -63,13 +63,20 @@ <h1 class="mb-0 display-3">{{ page.title }}</h1>
     <div class="container">
       <div class="row">
         <div class="col-12 col-sm-12 col-md-8 col-lg-8 col-xl-8">
-          <h1>{{ page.title }}</h1>
+          <h1 class="mb-3">{{ page.title }}</h1>
         </div>
         <div class="col-12 col-sm-12 col-md-4 col-lg-4 col-xl-4"></div>
         <div class="row">
           <div class="col-sm-9">
             {% assign item = page %}
-            <p class="lead text-white">{% include date.html %}</p>
+            <p class="lead text-white">
+              {% if page.author %}
+                {% include author.html %}
+              {% endif %}
+              {% if page.date %}
+                &middot;{% include date.html %}
+              {% endif %}
+            </p>
           </div>
           <div class="col-sm-3"></div>
         </div>

_layouts/xcontents.html → _layouts/contents.html

@@ -14,6 +14,7 @@ <h2 class="mb-4">Contents</h2>
     </div>
   </div>
 </div>
+
 <div class="col-12">
   {% for section in site.data.contents.docs %}
     <h3>{{ section.name | capitalize }}</h3>