SFD 191 Update TCS Navigation (#50)

* Add second level of navigation to nav bar for desktop view * Add generic side navigation layout to replace category layout * consolidate side navigation information into 1 yml file * Add mobile support for sub nav level * Restructure pages to match new layout, update page titles, change category layout to sideNavigation * Updated links and fixed some typos * Change underscore links to dashes * Add missing pages * Update missed underscore to dash link * Change sub navigation to be pop down menus * Change side nav to remove top level * Set up redirect for old routes * Add resources file to tailwind config as was not being picked up * Rename resources_section to resources * Move estate, paas and saas to correct places * Add some boiler plate to case studies * Set publish state to match current TCS * Create missing references page * Make drop down min width width of parent link * Unpublish empty content pages * Increase hit area of expand/collapse button. Make all links same height * Remove case studies sub nav menu * Add primary nav to side nav bar * Unpublish case studies pages * Tech categories page update order of list and entry names to match sub navigation * Add y padding and make line spacing tide so wrapped text looks linked together
ScottLogic · Aug 23, 2024 · 7f4cfb4 · 7f4cfb4
1 parent 162c8a1
commit 7f4cfb4
Show file tree

Hide file tree

Showing 53 changed files with 489 additions and 315 deletions.
diff --git a/Gemfile b/Gemfile
@@ -35,3 +35,5 @@ gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
 gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
 
 gem 'jekyll-node-module'
+
+gem 'jekyll-redirect-from'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -43,6 +43,8 @@ GEM
     jekyll-node-module (0.1.3)
       jekyll (>= 2.0, < 5.0)
     jekyll-postcss-v2 (1.0.2)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
     jekyll-sass-converter (3.0.0)
       sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
@@ -131,6 +133,7 @@ DEPENDENCIES
   jekyll-feed (~> 0.12)
   jekyll-node-module
   jekyll-postcss-v2
+  jekyll-redirect-from
   tzinfo (>= 1, < 3)
   tzinfo-data
   wdm (~> 0.1.1)

diff --git a/_config.yml b/_config.yml
@@ -36,6 +36,7 @@ collections:
 
 plugins:
   - jekyll-node-module
+  - jekyll-redirect-from
 
 node_modules:
   modules_dir: node_modules

diff --git a/_data/categories.yml b/_data/categories.yml
diff --git a/_data/information.yml b/_data/information.yml
diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -1,14 +1,26 @@
 - name: Technology Carbon Standard
   link: /
-- name: Impact Categories
-  link: /categories
-# - name: Views # TO BE PUBLSIHED WITH RESPECTIVE PAGES
-#   link: /views
+  sublinks:
+    - name: Impact Categories
+      link: /impact-categories
+    - name: Technology Categories
+      link: /technology-categories
+    # - name: Roles
+    #   link: /roles
+# - name: Case Studies
+#   link: /case-studies
 - name: Resources
   link: /resources
-- name: Glossary
-  link: /glossary
-- name: About
-  link: /about
+  sublinks:   
+  # - name: Tools
+  #   link: /resources/tools
+  # - name: Links
+  #   link: /resources/links
+  - name: Glossary
+    link: /resources/glossary
+  # - name: References
+  #   link: /resources/references
 - name: Carbon Estimator
   link: /estimator
+- name: About
+  link: /about
diff --git a/_data/overlays/architecture_nfrs.yml b/_data/overlays/architecture_nfrs.yml
@@ -63,7 +63,7 @@ CatCManaged:
 
 CatDEndUserDevices:
   selected: true
-  description: Single page view shold be &lt;x kWh energy. No energy use when user on another page/tab
+  description: Single page view should be &lt;x kWh energy. No energy use when user on another page/tab
   link: '#EndUserDevices'
 
 CatDNetworkDataTransfer:

diff --git a/_data/sideNavigation.yml b/_data/sideNavigation.yml
@@ -0,0 +1,51 @@
+- baseUrl: /technology-categories
+  name: Technology Categories
+  link: /technology-categories
+  categories: 
+    # - name: Estate
+    #   link: /technology-categories/estate
+    - name: Cloud Services
+      link: /technology-categories/cloud
+      # categories:
+      # - name: PaaS
+      #   link: /technology-categories/cloud/pass
+    # - name: SaaS
+    #   link: /technology-categories/saas
+    - name: Hardware Life Cycle Emissions
+      link: /technology-categories/lifecycle
+      categories:
+      - name: Embodied Emissions
+        link: /technology-categories/lifecycle/embodied
+      - name: Usage Emissions
+        link: /technology-categories/lifecycle/usage
+      - name: Worked Examples
+        categories:
+        - name: Employee Hardware
+          link: /technology-categories/lifecycle/example/employee
+        - name: Server Hardware
+          link: /technology-categories/lifecycle/example/server
+    - name: Data
+      link: /technology-categories/data
+    - name: Networks
+      link: /technology-categories/networks
+- baseUrl: /impact-categories
+  name: Impact Categories
+  link: /impact-categories
+  categories: 
+    - name: Upstream Emissions
+      link: /impact-categories/upstream
+    - name: Operational Emissions
+      link: /impact-categories/operational
+    - name: Downstream Emissions
+      link: /impact-categories/downstream
+- baseUrl: /roles
+  name: Roles
+  link: /roles
+  categories: 
+    - name: Architecture
+      link: /roles/architecture
+      categories:
+        - name: Strategy
+          link: /roles/architecture/strategy
+        - name: NFRs
+          link: /roles/architecture/nfrs
diff --git a/_glossary/embodied_carbon.md b/_glossary/embodied_carbon.md
@@ -4,6 +4,6 @@ title: Embodied Carbon
 
 The emissions associated with the manufacture, transportation, installation, maintenance, and end-of-life of a device or product.
 
-Embodied carbon emissions often contribute a larger portion of the total emissions in the technology industry compared to other sectors. These emissions are more challenging to quantify as they are indirect and typically require businesses to interact with suppliers and retrieve emissions data for the purchased products, such as [Product Carbon Footprint (PCF)](/glossary#product-carbon-footprint-pcf) data. Although the availability of such data is becoming more widespread, there is currently no standardised way to access this information for all products.
+Embodied carbon emissions often contribute a larger portion of the total emissions in the technology industry compared to other sectors. These emissions are more challenging to quantify as they are indirect and typically require businesses to interact with suppliers and retrieve emissions data for the purchased products, such as [Product Carbon Footprint (PCF)](/resources/glossary#product-carbon-footprint-pcf) data. Although the availability of such data is becoming more widespread, there is currently no standardised way to access this information for all products.
 
-[Read more about embodied carbon emissions.](../information/lifecycle/embodied)
+[Read more about embodied carbon emissions.](/technology-categories/lifecycle/embodied)
diff --git a/_glossary/ghg-protocols.md b/_glossary/ghg-protocols.md
@@ -8,7 +8,7 @@ link: https://ghgprotocol.org/
 Greenhouse Gas protocols set the standard to measure and manage emissions.
 
 ### Scope 1
-Includes all direct emissions that are generated from sources that are directly owned or controlled by an organisation. For a software company there is a very small list of sources but it is not empty. It can include any emissions from fossil fueled hire cars used to visit customers and emissions from refrigerant leaks found in A/C & fuel burnt in heating systems within offices.
+Includes all direct emissions that are generated from sources that are directly owned or controlled by an organisation. For a software company there is a very small list of sources but it is not empty. It can include any emissions from fossil fuelled hire cars used to visit customers and emissions from refrigerant leaks found in A/C & fuel burnt in heating systems within offices.
 
 ### Scope 2
 Includes all indirect emissions from the generation of the electricity purchased and used by an organisation at local or international sites. This is a much larger list for a software company. The most prominent is the electricity produced to run computers, office lights and office A/C and heating systems.

diff --git a/_glossary/green_energy.md b/_glossary/green_energy.md
@@ -2,7 +2,7 @@
 title: Green Energy
 ---
 
-A source of energy that does not harm the environment during it's operation. However, the production, transport and end of life process will typically emit carbon emissions and cause other harmful effects. Examples inlcude solar, wind, and nuclear energy.
+A source of energy that does not harm the environment during it's operation. However, the production, transport and end of life process will typically emit carbon emissions and cause other harmful effects. Examples include solar, wind, and nuclear energy.
 
 See also: 
 - [Fossil Fuel](#fossil-fuel)

diff --git a/_glossary/life_cycle_assessment.md b/_glossary/life_cycle_assessment.md
@@ -2,8 +2,8 @@
 title: Life Cycle Assessment (LCA)
 ---
 
-A method used to evaluate the environmental impacts of a product or system by looking at its entire [product life cycle](/glossary#product-life-cycle), considering a variety of environmental impacts such as climate change, water consumption, land use, and health factors. 
+A method used to evaluate the environmental impacts of a product or system by looking at its entire [product life cycle](/resources/glossary#product-life-cycle), considering a variety of environmental impacts such as climate change, water consumption, land use, and health factors. 
 
-An LCA considers a broad range of environmental impacts of a product. This is different to [Product Carbon Footprint (PCF)](/glossary#product-carbon-footprint-pcf) which assesses only the climate impact (environmental impacts due to GHG emissions).
+An LCA considers a broad range of environmental impacts of a product. This is different to [Product Carbon Footprint (PCF)](/resources/glossary#product-carbon-footprint-pcf) which assesses only the climate impact (environmental impacts due to GHG emissions).
 
-[Read more about life cycle emissions data.](../information/lifecycle#life-cycle-emissions-data)
+[Read more about life cycle emissions data.](/technology-categories/lifecycle#life-cycle-emissions-data)
diff --git a/_glossary/power_profiling.md b/_glossary/power_profiling.md
@@ -7,4 +7,4 @@ Power profiling is the process of measuring and recording the power use of a dev
 For more information about power profiling, with an emphasis on Intel processors used in desktop and laptop machines; [read more](https://firefox-source-docs.mozilla.org/performance/power_profiling_overview.html)
 
 See also: 
-- [RAPL](#rapl)
+- [RAPL](#running-average-power-limit-rapl)
diff --git a/_glossary/product-carbon-footprint.md b/_glossary/product-carbon-footprint.md
@@ -2,8 +2,8 @@
 title: Product Carbon Footprint (PCF)
 ---
 
-A method used to assess the climate impact of a product through the measurement of the greenhouse gases (GHGs) emitted throughout its [product life cycle](/glossary#product-life-cycle). GHGs are translated into carbon equivalents (CO2e) for comparison purposes.
+A method used to assess the climate impact of a product through the measurement of the greenhouse gases (GHGs) emitted throughout its [product life cycle](/resources/glossary#product-life-cycle). GHGs are translated into carbon equivalents (CO2e) for comparison purposes.
 
-The evaluation of a product's carbon footprint typically involves conducting a [Life Cycle Assessment (LCA)](/glossary#life-cycle-assessment-lca) to assess the environmental impacts associated with all stages of the product's life. The difference is that a full LCA looks at wider environmental impacts (such as land use, water consumption) whereas PCF focuses on the environmental impacts due to GHG emissions.
+The evaluation of a product's carbon footprint typically involves conducting a [Life Cycle Assessment (LCA)](/resources/glossary#life-cycle-assessment-lca) to assess the environmental impacts associated with all stages of the product's life. The difference is that a full LCA looks at wider environmental impacts (such as land use, water consumption) whereas PCF focuses on the environmental impacts due to GHG emissions.
 
-[Read more about life cycle emissions data.](../information/lifecycle#life-cycle-emissions-data)
+[Read more about life cycle emissions data.](/technology-categories/lifecycle#life-cycle-emissions-data)
diff --git a/_glossary/product_life_cycle.md b/_glossary/product_life_cycle.md
@@ -12,6 +12,6 @@ Refers to all of the aspects that contribute to the environmental impact of a de
 
 Aspects like usage will need to take into account the expected life span of the device, its typical use patterns, and the [carbon intensity](#carbon-intensity) of the energy used to power the device.
 
-The environmental impacts of a product or device throughout its product life cycle can be assessed by considering its [Life Cycle Assessment (LCA)](/glossary#life-cycle-assessment-lca) or [Product Carbon Footprint (PCF)](/glossary#product-carbon-footprint-pcf).
+The environmental impacts of a product or device throughout its product life cycle can be assessed by considering its [Life Cycle Assessment (LCA)](/resources/glossary#life-cycle-assessment-lca) or [Product Carbon Footprint (PCF)](/resources/glossary#product-carbon-footprint-pcf).
 
-[Read more about life cycle emissions data.](../information/lifecycle#life-cycle-emissions-data)
+[Read more about life cycle emissions data.](/technology-categories/lifecycle#life-cycle-emissions-data)
diff --git a/_glossary/usage_carbon.md b/_glossary/usage_carbon.md
@@ -2,8 +2,8 @@
 title: Usage Carbon
 ---
 
-Carbon emissions from the usage stage of the [product life cycle](/glossary#product-life-cycle). This refers to the [greenhouse gas (GHG)](#greenhouse-gases-ghgs) emissions associated with the operation and use of a device or product throughout its entire life cycle, including the energy required to keep servers and devices running, and to transfer data from servers to the devices. 
+Carbon emissions from the usage stage of the [product life cycle](/resources/glossary#product-life-cycle). This refers to the [greenhouse gas (GHG)](#greenhouse-gases-ghgs) emissions associated with the operation and use of a device or product throughout its entire life cycle, including the energy required to keep servers and devices running, and to transfer data from servers to the devices. 
 
-Factors influencing usage carbon include the device’s energy efficiency, usage patterns, life span, and the [carbon intensity](/glossary#carbon-intensity) of the energy grid powering it.
+Factors influencing usage carbon include the device’s energy efficiency, usage patterns, life span, and the [carbon intensity](/resources/glossary#carbon-intensity) of the energy grid powering it.
 
-[Read more about usage carbon emissions.](../information/lifecycle/usage)
+[Read more about usage carbon emissions.](/technology-categories/lifecycle/usage)
diff --git a/_includes/carbonStandard.html b/_includes/carbonStandard.html
@@ -45,7 +45,7 @@ <h2 class="text-2xl lg:text-3xl font-medium">{{ title }}</h2>
     <div class="flex">
       <div class="grow flex flex-col justify-center h-[4rem] px-2 py-2 cat-u">
         <div class="relative">
-          <h3 class="pl-2 mb-0 text-xl font-medium text-white"><a class="text-inherit hover:text-inherit hover:opacity-80" href="/categories/upstream">Upstream Emissions</a></h3>
+          <h3 class="pl-2 mb-0 text-xl font-medium text-white"><a class="text-inherit hover:text-inherit hover:opacity-80" href="/impact-categories/upstream">Upstream Emissions</a></h3>
           <div class="absolute right-0 top-8">
             {% include categoryLabel.html label="CatU" %}
           </div>
@@ -99,7 +99,7 @@ <h4 class="mt-4 mb-2 text-lg font-medium">Hardware Manufacture, Transport and In
   <div class="flex flex-col lg:w-2/4">
     <div class="flex">
       <div class="grow flex flex-col justify-center h-[4rem] lg:-ml-[2rem] px-2 py-2 cat-o">
-        <h3 class="lg:pl-[3rem] mb-0 text-xl font-medium"><a class="text-inherit hover:text-inherit hover:opacity-80" href="/categories/operational">Operational Emissions</a></h3>
+        <h3 class="lg:pl-[3rem] mb-0 text-xl font-medium"><a class="text-inherit hover:text-inherit hover:opacity-80" href="/impact-categories/operational">Operational Emissions</a></h3>
       </div>
       <!-- ARROW RIGHT: hidden on smaller screens -->
       <div class="hidden lg:block w-0 h-0 z-10 cat-o-arrow-right"></div>
@@ -209,7 +209,7 @@ <h4 class="mb-2 text-lg font-medium">Indirect</h4>
     <div class="flex">
       <div class="grow flex flex-col justify-center h-[4rem] lg:-ml-[2rem] px-2 py-2 cat-d">
         <div class="relative">
-          <h3 class="lg:pl-[3rem] mb-0 text-xl font-medium"><a class="text-inherit hover:text-inherit hover:opacity-80" href="/categories/downstream">Downstream Emissions</a></h3>
+          <h3 class="lg:pl-[3rem] mb-0 text-xl font-medium"><a class="text-inherit hover:text-inherit hover:opacity-80" href="/impact-categories/downstream">Downstream Emissions</a></h3>
           <div class="absolute right-0 top-8">
             {% include categoryLabel.html label="CatD" %}
           </div>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,3 +35,5 @@ gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
		gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]

		gem 'jekyll-node-module'

		gem 'jekyll-redirect-from'