Merge pull request #61 from OpenDataScotland/copilot/upgrade-bootstrap-3-to-bootstrap-5

Upgrade Bootstrap 3 to Bootstrap 5

Author: JackGilmore

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_WITHOUT: ""

Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "~> 3.2"
+ruby "3.2.9"
 
 gem "jekyll", "~> 4.3"
 gem "jekyll-sitemap"

_data/categories.yml

@@ -3,7 +3,7 @@
   featured: true
 - name: Budget / Finance
   logo: /assets/img/categories/budget-finance.svg
-  logo_credit: Renan Ferreira Santos from the Noun Project
+  logo_credit: Lulis Dian RP from the Noun Project
   featured: true
 - name: Business and Economy
   logo: /assets/img/categories/business_and_economy.svg

_data/schemas/default.yml

@@ -6,20 +6,15 @@ dataset_fields:
     datajson: title
   - field_name: organization
     label: Organization
-    form_template: form/organization.html
     datajson: publisher.name
   - field_name: notes
     label: Description
-    form_template: form/textarea.html
     datajson: description
   - field_name: license
     label: License
-    form_template: form/license.html
     datajson: license
   - field_name: category
     label: Category
-    form_template: form/category.html
-    display_template: display/category.html
     datajson: category
   - field_name: maintainer
     label: Maintainer
@@ -38,8 +33,6 @@ dataset_fields:
     datajson: records
   - field_name: original_dataset_link
     label: Original dataset link
-    display_template: display/link.html
-    html_id: original-dataset-link
     datajson: original_dataset_link    
 
 
@@ -53,7 +46,6 @@ resource_fields:
   - field_name: format
     label: Format
     datajson: distribution.format
-    form_template: form/dropdown.html
     values:
       - api
       - csv
@@ -74,8 +66,6 @@ organization_fields:
     label: Logo
   - field_name: type
     label: Type
-    form_template: form/org_type.html
-    display_template: display/org_type.html
     datajson: org_type
   - field_name: portal_url
     label: Portal URL
@@ -93,7 +83,6 @@ organization_fields:
     label: WhatDoTheyKnow organization ID 
   - field_name: portal_type
     label: Portal type
-    form_template: form/dropdown.html
     values:
       - CKAN
       - DKAN
@@ -114,7 +103,6 @@ category_fields:
     label: Logo Credit
   - field_name: featured
     label: Featured on Homepage
-    form_template: form/checkbox.html
 
 organization_type_fields:
   - field_name: title

_includes/addons/opengraph.html

@@ -1,4 +1,4 @@
-<meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}" />
+<meta property="og:title" content="{% if page.title %}{{ page.title }} - {% endif %}{% if page.organization %}{{ page.organization }} - {% endif %}{{ site.title }}" />
 <meta property="og:site_name" content="{{ site.title }}" />
 {% assign description = page.notes | default: site.description %}
 <meta property="og:description" content="{{ description | strip_html | truncate: 200 }}" />

_includes/addons/twittercard.html

@@ -1,7 +1,7 @@
 <meta name="twitter:card" content="summary" />
 <meta name="twitter:site" content="{{ site.twittercard.username }}" />
 <!-- Twitter truncates twitter:title to 70 characters. -->
-{% capture title %}{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}{% endcapture %}
+{% capture title %}{% if page.title %}{{ page.title }} - {% endif %}{% if page.organization %}{{ page.organization }} - {% endif %}{{ site.title }}{% endcapture %}
 <meta name="twitter:title" content="{{ title | truncate: 70 }}" />
 <!-- Twitter truncates twitter:description at the word to 200 characters. -->
 {% assign description = page.notes | default: site.description %}

_includes/breadcrumbs.html

@@ -1,24 +1,26 @@
-<ol class="breadcrumb{% if page.full_width %} container{% endif %}">
+<nav{% if page.full_width %} class="container"{% endif %} aria-label="breadcrumb">
+<ol class="breadcrumb bg-body-tertiary rounded px-3 py-2 mb-3">
   {% if page.title == site.title %}
-    <li class="active">
+    <li class="breadcrumb-item active" aria-current="page">
       <i class="fa-solid fa-home" aria-label="Home"></i>
     </li>
   {% else %}
-    <li>
+    <li class="breadcrumb-item">
       <a href="{{ site.baseurl }}/">
         <i class="fa-solid fa-home" aria-label="Home"></i>
       </a>
     </li>
     {% if include.parent %}
       {% assign parent = site.pages | where : "title", include.parent | first %}
       {% if parent %}
-        <li>
+        <li class="breadcrumb-item">
           <a href="{{ site.baseurl }}{{ parent.url }}">{{ parent.title }}</a>
         </li>
       {% else %}
-        <li>{{ include.parent }}</li>
+        <li class="breadcrumb-item">{{ include.parent }}</li>
       {% endif %}
     {% endif %}
-    <li class="active">{{ page.title }}</li>
+    <li class="breadcrumb-item active" aria-current="page">{{ page.title }}</li>
   {% endif %}
-</ol>
+</ol>
+</nav>