From bd70607908ec6d31e17fe7667da177c9286a59c8 Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Fri, 13 Jun 2025 11:46:26 -0400
Subject: [PATCH 01/18] OPEN-4034: form pages for dataset type

---
 ckanext/canada/schemas/dataset.yaml | 116 ++++++++++++++++------------
 1 file changed, 66 insertions(+), 50 deletions(-)

diff --git a/ckanext/canada/schemas/dataset.yaml b/ckanext/canada/schemas/dataset.yaml
index 33b915c06..a3cbb7949 100644
--- a/ckanext/canada/schemas/dataset.yaml
+++ b/ckanext/canada/schemas/dataset.yaml
@@ -1,7 +1,7 @@
-
-scheming_version: 1
 dataset_type: dataset
 
+draft_fields_required: false
+
 before_validators: limit_resources_per_dataset
 
 about: 'open.canada.ca: raw open data metadata definition'
@@ -59,7 +59,9 @@ sidebar_show_fields:
 dataset_fields:
 
 # our id + name fields are uuids and always equal
-- preset: canada_dataset_id
+- start_form_page:
+    title: Descriptive Metadata
+  preset: canada_dataset_id
 - preset: canada_dataset_name
 
 - preset: canada_collection
@@ -69,6 +71,67 @@ dataset_fields:
     - api
     - app
 
+- preset: canada_title
+- preset: canada_owner_org
+- preset: canada_notes
+- preset: canada_keywords
+- preset: canada_digital_object_identifier
+
+- start_form_page:
+    title: Publishing Information
+  preset: canada_org_title_at_publication
+- preset: canada_org_section_name
+- preset: canada_creator
+- preset: canada_contributor
+- preset: canada_maintainer_email
+- preset: canada_maintainer_contact_form
+- preset: canada_credit
+
+- start_form_page:
+    title: Taxonomic Metadata
+  preset: canada_subject
+- preset: canada_audience
+
+- field_name: place_of_publication
+  label:
+    en: Place of Publication
+    fr: Endroit de publication
+  help_text:
+    en: "The region where the dataset was originally published. You may select or deselect multiple options (Ctrl+Click) "
+    fr: "La région où le jeu de données a été publié initialement. Vous pouvez sélectionner ou désélectionner de multiples options (Ctrl+Clic)"
+  preset: canada_geographic_region # use same multi-select controlled list
+  select_size: 10
+
+- preset: canada_spatial
+- preset: canada_geographic_region
+
+- start_form_page:
+    title: Series Metadata
+  preset: canada_data_series_name
+- preset: canada_data_series_issue_identification
+- preset: canada_program_page_url
+- preset: canada_dataset_relationship
+
+- start_form_page:
+    title: Coverage
+  preset: canada_time_period_coverage_start
+- preset: canada_time_period_coverage_end
+- preset: canada_frequency
+- preset: canada_date_published
+- preset: canada_date_modified
+- preset: canada_federated_date_modified
+- preset: canada_jurisdiction
+- preset: canada_license_id
+- preset: canada_restrictions
+
+- start_form_page:
+    title: Approval
+  preset: canada_imso_approval
+- preset: canada_ready_to_publish
+- preset: canada_portal_release_date
+
+
+
 # FGP fields (hidden from form)
 - field_name: metadata_contact
   label:
@@ -100,14 +163,6 @@ dataset_fields:
     fr: Identifiant court
   form_snippet: null
   validators: scheming_required string_safe
-
-- preset: canada_title
-- preset: canada_owner_org
-- preset: canada_org_title_at_publication
-- preset: canada_org_section_name
-- preset: canada_creator
-
-# FGP fields (hidden from form)
 - field_name: position_name
   label:
     en: Position Name
@@ -212,37 +267,6 @@ dataset_fields:
       fr: Services communication
     value: utilities_communication
 
-- preset: canada_contributor
-- preset: canada_maintainer_email
-- preset: canada_maintainer_contact_form
-- preset: canada_credit
-- preset: canada_notes
-- preset: canada_keywords
-- preset: canada_subject
-- preset: canada_audience
-
-- field_name: place_of_publication
-  label:
-    en: Place of Publication
-    fr: Endroit de publication
-  help_text:
-    en: "The region where the dataset was originally published. You may select or deselect multiple options (Ctrl+Click) "
-    fr: "La région où le jeu de données a été publié initialement. Vous pouvez sélectionner ou désélectionner de multiples options (Ctrl+Clic)"
-  preset: canada_geographic_region # use same multi-select controlled list
-  select_size: 10
-
-- preset: canada_spatial
-- preset: canada_geographic_region
-- preset: canada_time_period_coverage_start
-- preset: canada_time_period_coverage_end
-- preset: canada_frequency
-- preset: canada_date_published
-- preset: canada_date_modified
-- preset: canada_program_page_url
-- preset: canada_federated_date_modified
-- preset: canada_data_series_name
-- preset: canada_data_series_issue_identification
-- preset: canada_digital_object_identifier
 
 # FGP fields (hidden from form)
 - field_name: reference_system_information
@@ -340,13 +364,6 @@ dataset_fields:
 - preset: canada_spatial_representation_type
 
 
-- preset: canada_jurisdiction
-- preset: canada_license_id
-- preset: canada_restrictions
-- preset: canada_imso_approval
-- preset: canada_ready_to_publish
-- preset: canada_portal_release_date
-
 # fields hidden from the form to support loading fgp and geogratis data
 
 - field_name: presentation_form
@@ -453,7 +470,6 @@ dataset_fields:
       en: FGP viewer is supported
     value: fgp_viewer
 
-- preset: canada_dataset_relationship
 
 
 #

From d5d74ffe41e652822d148d33989fedc7c4f6290d Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Fri, 13 Jun 2025 11:49:47 -0400
Subject: [PATCH 02/18] changes

---
 changes/1582.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/1582.feature

diff --git a/changes/1582.feature b/changes/1582.feature
new file mode 100644
index 000000000..119cda11d
--- /dev/null
+++ b/changes/1582.feature
@@ -0,0 +1 @@
+split dataset type into separate pages using scheming form pages and dataset completeness feature

From 48252f928d65b48cb0e0ad4a1526cb7b4dcfddce Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Fri, 18 Jul 2025 13:28:38 -0400
Subject: [PATCH 03/18] allow scheming pages functionality to pass through

---
 ckanext/canada/plugin/dataset_plugin.py            | 14 ++++++++++++++
 .../scheming/package/snippets/package_form.html    | 10 +---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ckanext/canada/plugin/dataset_plugin.py b/ckanext/canada/plugin/dataset_plugin.py
index 9289d3b9e..e8dc538a5 100644
--- a/ckanext/canada/plugin/dataset_plugin.py
+++ b/ckanext/canada/plugin/dataset_plugin.py
@@ -13,6 +13,10 @@
 
 from ckanext.datastore.interfaces import IDataDictionaryForm
 from ckanext.scheming.plugins import SchemingDatasetsPlugin
+from ckanext.scheming.views import (
+    SchemingEditPageView,
+    SchemingCreatePageView,
+)
 from ckanext.canada.helpers import RELEASE_DATE_FACET_STEP
 from ckanext.canada.view import (
     CanadaDatasetEditView,
@@ -116,6 +120,16 @@ def prepare_dataset_blueprint(self, package_type: str,
             methods=['GET'],
             strict_slashes=False
         )
+        blueprint.add_url_rule(
+            '/new/<id>/<page>',
+            'scheming_new_page',
+            SchemingCreatePageView.as_view('new_page'),
+        )
+        blueprint.add_url_rule(
+            '/edit/<id>/<page>',
+            'scheming_edit_page',
+            SchemingEditPageView.as_view('edit_page'),
+        )
         # redirect PD endpoints accessed from /dataset/<pd pkg id>
         blueprint.before_request(cast(BeforeRequestCallable,
                                       self._redirect_pd_dataset_endpoints))
diff --git a/ckanext/canada/templates/scheming/package/snippets/package_form.html b/ckanext/canada/templates/scheming/package/snippets/package_form.html
index 5aa248e51..64734840e 100644
--- a/ckanext/canada/templates/scheming/package/snippets/package_form.html
+++ b/ckanext/canada/templates/scheming/package/snippets/package_form.html
@@ -2,7 +2,7 @@
 
 {% block stages %}
   {% if form_style != 'edit' and dataset_type != 'prop' %}
-    {{ h.snippet('package/snippets/stages.html', stages=stage, dataset_type=dataset_type) }}
+    {{ super() }}
   {% endif %}
 {% endblock %}
 
@@ -68,11 +68,3 @@
 {% endblock %}
 
 {% block publish_button %}{% endblock %}
-
-{% block save_button_text %}
-  {% if form_style != 'edit' %}
-    {{- _('Next: Add Resource') -}}
-  {% else %}
-    {{- _('Update Record') -}}
-  {% endif %}
-{% endblock %}
\ No newline at end of file

From 642e00b86dddac1d5cb0a6ef500a481de50485e2 Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Fri, 18 Jul 2025 13:43:21 -0400
Subject: [PATCH 04/18] one more is_resource_supported_by_xloader check

---
 ckanext/canada/templates/package/snippets/resources.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/canada/templates/package/snippets/resources.html b/ckanext/canada/templates/package/snippets/resources.html
index 0da2368a1..422c83ff5 100644
--- a/ckanext/canada/templates/package/snippets/resources.html
+++ b/ckanext/canada/templates/package/snippets/resources.html
@@ -30,7 +30,7 @@
                     <ul class="dropdown-menu" aria-labelledby="dropdownRes{{ loop.index }}">
                       <li>{% link_for _('Edit resource'), named_route=pkg.type ~ '_resource.edit', id=pkg.name, resource_id=resource.id, class_='dropdown-item', icon='pencil' %}</li>
                       {% block resources_list_edit_dropdown_inner scoped %}{% endblock %}
-                      {% if h.is_resource_supported_by_xloader(resource) %}
+                      {% if 'is_resource_supported_by_xloader' in h and h.is_resource_supported_by_xloader(resource) %}
                         <li>{% link_for _('DataStore'), named_route='xloader.resource_data', id=pkg.name, resource_id=resource.id, class_='dropdown-item', icon='cloud-upload' %}</li>
                         <li>{% link_for _('Data Dictionary'), named_route='datastore.dictionary', id=pkg.name, resource_id=resource.id, class_='dropdown-item', icon='code' %}</li>
                       {% endif %}

From 7b9b2719a665aa4bf2587da9cffca09223356ed0 Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Mon, 18 Aug 2025 20:04:44 -0400
Subject: [PATCH 05/18] allow scheming create redirect to page 2

---
 ckanext/canada/view.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/canada/view.py b/ckanext/canada/view.py
index 1f6017878..2490af40e 100644
--- a/ckanext/canada/view.py
+++ b/ckanext/canada/view.py
@@ -39,8 +39,8 @@
 from ckan.views.dataset import (
     EditView as DatasetEditView,
     search as dataset_search,
-    CreateView as DatasetCreateView,
 )
+from ckanext.scheming.views import SchemingCreateView
 from ckanext.activity.views import package_activity
 from ckan.views.resource import (
     EditView as ResourceEditView,
@@ -203,7 +203,7 @@ def post(self, package_type: str, id: str):
         return response
 
 
-class CanadaDatasetCreateView(DatasetCreateView):
+class CanadaDatasetCreateView(SchemingCreateView):
     def post(self, package_type: str):
         response = super(CanadaDatasetCreateView, self).post(package_type)
         if hasattr(response, 'status_code'):

From eb2719e258a6f8c13437907e624e274d281cd4a4 Mon Sep 17 00:00:00 2001
From: RabiaSajjad <rabiasajjad.dev@gmail.com>
Date: Fri, 5 Dec 2025 14:40:14 -0500
Subject: [PATCH 06/18] improve display for the navigation for form stages

---
 .../assets/internal/canada_internal.css       | 26 +++++++++++++++++++
 .../templates/package/new_resource.html       | 10 +++++++
 2 files changed, 36 insertions(+)

diff --git a/ckanext/canada/assets/internal/canada_internal.css b/ckanext/canada/assets/internal/canada_internal.css
index fdc9f03ce..10020c9d4 100644
--- a/ckanext/canada/assets/internal/canada_internal.css
+++ b/ckanext/canada/assets/internal/canada_internal.css
@@ -484,6 +484,32 @@ label:lang(fr):after {
 .control-required {
   color: #e00;
 }
+.fs-3{
+  margin: 10px;
+}
+.stages{
+  background-color: #EDEDED;
+}
+.stages li {
+  --tri-h: calc((27px + 25px + 25px) / 2); /* line-height + top padding + bottom padding */
+  padding: 25px 20px;
+}
+.stages li::after {
+  content: "";
+  height: 0;
+  width: 0;
+  border-style: solid;
+  border-color: transparent;
+  border-width: var(--tri-h) 0 var(--tri-h) 30px;
+  margin-top: calc(var(--tri-h) * -1);
+}
+.stages li .highlight {
+  display: flex;
+  align-items: center;
+  padding: 0 52px;
+  line-height: 1.4;
+  white-space: normal;
+}
 .stages li.active:after {
   border-top-color: #EDEDED;
   border-bottom-color: #EDEDED;
diff --git a/ckanext/canada/templates/package/new_resource.html b/ckanext/canada/templates/package/new_resource.html
index 3b7c0b3ff..cbb0a61ee 100644
--- a/ckanext/canada/templates/package/new_resource.html
+++ b/ckanext/canada/templates/package/new_resource.html
@@ -8,6 +8,16 @@
   </div>
 {% endblock %}
 
+{% block pre_primary %}
+  <div class="panel panel-default mrgn-tp-lg">
+    {% snippet 'package/snippets/resource_help.html' %}
+  </div>
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet 'package/snippets/resources.html', pkg=pkg %}
+{% endblock %}
+
 {% block form %}
   {% set max_resource_count = h.max_resources_per_dataset() %}
   {% if g.is_registry and max_resource_count and pkg_dict.resources|length >= max_resource_count %}

From 0dfca8aedde81580c583f7bcb53af706083ce0a5 Mon Sep 17 00:00:00 2001
From: RabiaSajjad <rabiasajjad.dev@gmail.com>
Date: Fri, 5 Dec 2025 17:19:45 -0500
Subject: [PATCH 07/18] move resources snippet out of secondary block

---
 ckanext/canada/templates/package/new_resource.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/canada/templates/package/new_resource.html b/ckanext/canada/templates/package/new_resource.html
index cbb0a61ee..35d648620 100644
--- a/ckanext/canada/templates/package/new_resource.html
+++ b/ckanext/canada/templates/package/new_resource.html
@@ -12,10 +12,10 @@
   <div class="panel panel-default mrgn-tp-lg">
     {% snippet 'package/snippets/resource_help.html' %}
   </div>
+  {% snippet 'package/snippets/resources.html', pkg=pkg %}
 {% endblock %}
 
 {% block secondary_content %}
-  {% snippet 'package/snippets/resources.html', pkg=pkg %}
 {% endblock %}
 
 {% block form %}

From 702a131b9e934f55e87c50061cd8ae4976926923 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Mon, 2 Feb 2026 21:35:34 +0000
Subject: [PATCH 08/18] feat(dev): form pages;

- Cont form pages.
---
 .../assets/internal/canada_internal.css       | 173 ++++++++++++------
 .../package/snippets/package_form.html        |  11 +-
 .../package/snippets/resource_form.html       |   9 +
 3 files changed, 127 insertions(+), 66 deletions(-)

diff --git a/ckanext/canada/assets/internal/canada_internal.css b/ckanext/canada/assets/internal/canada_internal.css
index 3f8dfe07c..0f60490a4 100644
--- a/ckanext/canada/assets/internal/canada_internal.css
+++ b/ckanext/canada/assets/internal/canada_internal.css
@@ -24,6 +24,10 @@ ol.breadcrumb {
   text-decoration: none;
 }
 
+.border-0 {
+  border: 0 !important;
+}
+
 #wb-info a {
   text-decoration: none;
 }
@@ -504,65 +508,7 @@ label:lang(fr):after {
 .control-required {
   color: #e00;
 }
-.fs-3{
-  margin: 10px;
-}
-.stages{
-  background-color: #EDEDED;
-}
-.stages li {
-  --tri-h: calc((27px + 25px + 25px) / 2); /* line-height + top padding + bottom padding */
-  padding: 25px 20px;
-}
-.stages li::after {
-  content: "";
-  height: 0;
-  width: 0;
-  border-style: solid;
-  border-color: transparent;
-  border-width: var(--tri-h) 0 var(--tri-h) 30px;
-  margin-top: calc(var(--tri-h) * -1);
-}
-.stages li .highlight {
-  display: flex;
-  align-items: center;
-  padding: 0 52px;
-  line-height: 1.4;
-  white-space: normal;
-}
-.stages li.active:after {
-  border-top-color: #EDEDED;
-  border-bottom-color: #EDEDED;
-  border-right-color: #284162;
-  z-index: -1;
-}
-.border-0 {
-    border: 0 !important;
-}
-
-.stages li.complete .highlight {
-  color: #aeaeae;
-  background: #EDEDED;
-}
-
-.stages li.complete:before {
-  color: #aeaeae;
-  background: white;
-}
 
-.stages li.active:after {
-  border-top-color: #284162;
-  border-bottom-color: #284162;
-  border-right-color: #284162;
-}
-.stages li.active:after {
-  border-top-color: #EDEDED;
-  border-bottom-color: #EDEDED;
-}
-.stages li.complete:after {
-  border-top-color: #EDEDED;
-  border-bottom-color: #EDEDED;
-}
 li.nav-item.justify-content-between.position-relative:hover {
   background-color: #eee;
 }
@@ -726,6 +672,115 @@ body ul.xloader-log li.item.failure > i::after{
 ##           END           ##
 #############################*/
 
+/*####################
+##  Package Stages  ##
+######################*/
+#canada-package-form-stages{
+  background-color: #EDEDED;
+}
+
+#canada-package-form-stages[data-style="new"]{
+  margin-left: calc(((100vw - 100%) / 2) * -1);
+  margin-right: calc(((100vw - 100%) / 2) * -1);
+}
+
+#canada-package-form-stages > ol.stages{
+  padding-left: 48px;
+  padding-right: 48px;
+  background-color: #EDEDED;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: row;
+  flex-wrap: wrap;
+  width: 100%;
+  overflow: hidden !important;
+}
+
+@media all and (max-width: 768px){
+  #canada-package-form-stages > ol.stages{
+    padding-left: 0;
+    padding-right: 0;
+    justify-content: flex-start;
+  }
+}
+
+#canada-package-form-stages[data-style="edit"] > ol.stages{
+  padding-left: 0;
+  padding-right: 0;
+  justify-content: flex-start;
+}
+
+#canada-package-form-stages > ol.stages li{
+  padding: 0;
+  width: auto !important;
+  flex-shrink: 1 !important;
+  position: relative;
+  overflow: hidden !important;
+}
+
+#canada-package-form-stages > ol.stages li::before{
+  position: absolute;
+  width: 20px;
+  height: 20px;
+  line-height: 20px;
+  top: 50%;
+  left: 8px;
+  transform: translate(0, -50%);
+  font-weight: 400 !important;
+}
+
+#canada-package-form-stages > ol.stages li.first::after{
+  border: 29px solid !important;
+  border-left-color: transparent !important;
+  border-top-color: #EDEDED !important;
+  border-bottom-color: #EDEDED !important;
+  border-right-color: #EDEDED !important;
+}
+
+#canada-package-form-stages > ol.stages li:last-of-type::after{
+  border: none !important;
+}
+
+#canada-package-form-stages > ol.stages li::after{
+  content: "";
+  position: absolute;
+  top: 50%;
+  left: initial;
+  right: -28px;
+  height: 100%;
+  width: 30px;
+  transform: translate(0, -50%);
+  z-index: 2;
+  pointer-events: none;
+  margin: 0 !important;
+  border-width: 29px !important;
+  border-top-color: #EDEDED !important;
+  border-bottom-color: #EDEDED !important;
+  border-right-color: #EDEDED !important;
+}
+
+#canada-package-form-stages > ol.stages li .highlight{
+  display: block;
+  padding: 18px 28px 18px 36px !important;
+  line-height: 1.4;
+  white-space: normal;
+  position: relative;
+  font-weight: 500 !important;
+}
+
+#canada-package-form-stages > ol.stages li .highlight a[data-bs-toggle]{
+  position: absolute;
+  top: 50%;
+  right: 10px;
+  transform: translate(0, -50%);
+  pointer-events: hover;
+}
+/*####################
+##       END        ##
+##  Package Stages  ##
+##       END        ##
+######################*/
 
 /*####################################
 ##  Recombinant Base CSS Overrides  ##
@@ -894,4 +949,4 @@ input#field-resource-url{
 ##    TODO: DEPRECATED:               ##
 ## REMOVE AFTER FULL PD DATATABLES QA ##
 ##               END                  ##
-########################################*/
\ No newline at end of file
+########################################*/
diff --git a/ckanext/canada/templates/scheming/package/snippets/package_form.html b/ckanext/canada/templates/scheming/package/snippets/package_form.html
index 73d7f080c..0a28d73a0 100644
--- a/ckanext/canada/templates/scheming/package/snippets/package_form.html
+++ b/ckanext/canada/templates/scheming/package/snippets/package_form.html
@@ -1,8 +1,10 @@
 {% ckan_extends %}
 
 {% block stages %}
-  {% if form_style != 'edit' and dataset_type != 'prop' %}
-    {{ super() }}
+  {% if dataset_type != 'prop' %}
+    <div id="canada-package-form-stages" data-style="{{- form_style -}}">
+      {{ super() }}
+    </div>
   {% endif %}
 {% endblock %}
 
@@ -96,11 +98,6 @@ <h3 class="modal-title" id="modalLabel">{{ _('Confirm Contact Email') }}</h3>
 {% block publish_button %}{% endblock %}
 
 {% block save_button_text %}
-  <!-- {% if form_style != 'edit' %}
-    {{- _('Next: Add Resource') -}}
-  {% else %}
-    {{- _('Update Record') -}}
-  {% endif %} -->
   {{ super() }}
 {% endblock %}
 
diff --git a/ckanext/canada/templates/scheming/package/snippets/resource_form.html b/ckanext/canada/templates/scheming/package/snippets/resource_form.html
index 533ebfe47..1b0ef529e 100644
--- a/ckanext/canada/templates/scheming/package/snippets/resource_form.html
+++ b/ckanext/canada/templates/scheming/package/snippets/resource_form.html
@@ -2,6 +2,15 @@
 
 {% import 'macros/form.html' as form %}
 
+{% block stages %}
+  {% if dataset_type != 'prop' %}
+    <div id="canada-package-form-stages" data-style="new">
+      {{ super() }}
+    </div>
+  {% endif %}
+{% endblock %}
+
+
 {% block errors %}
   {%- if resource_validation_errors -%}
     {%- set schema = h.scheming_get_dataset_schema(dataset_type) -%}

From 9496f993d20c6dad6d91c5fb911e89f1774b2af6 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Tue, 3 Feb 2026 21:30:18 +0000
Subject: [PATCH 09/18] feat(dev): scheming pages;

- Cont scheming pages.
---
 ckanext/canada/plugin/dataset_plugin.py       | 10 ++--
 ckanext/canada/templates/package/new.html     | 20 ++++++-
 .../package/snippets/package_form.html        |  9 ++-
 .../package/snippets/resource_form.html       |  1 -
 ckanext/canada/view.py                        | 55 ++++++++++++++++++-
 5 files changed, 81 insertions(+), 14 deletions(-)

diff --git a/ckanext/canada/plugin/dataset_plugin.py b/ckanext/canada/plugin/dataset_plugin.py
index e8dc538a5..ec3bba23e 100644
--- a/ckanext/canada/plugin/dataset_plugin.py
+++ b/ckanext/canada/plugin/dataset_plugin.py
@@ -13,14 +13,12 @@
 
 from ckanext.datastore.interfaces import IDataDictionaryForm
 from ckanext.scheming.plugins import SchemingDatasetsPlugin
-from ckanext.scheming.views import (
-    SchemingEditPageView,
-    SchemingCreatePageView,
-)
 from ckanext.canada.helpers import RELEASE_DATE_FACET_STEP
 from ckanext.canada.view import (
     CanadaDatasetEditView,
+    CanadaDatasetEditPageView,
     CanadaDatasetCreateView,
+    CanadaDatasetCreatePageView,
     CanadaResourceEditView,
     CanadaResourceCreateView,
     canada_search,
@@ -123,12 +121,12 @@ def prepare_dataset_blueprint(self, package_type: str,
         blueprint.add_url_rule(
             '/new/<id>/<page>',
             'scheming_new_page',
-            SchemingCreatePageView.as_view('new_page'),
+            CanadaDatasetCreatePageView.as_view('new_page'),
         )
         blueprint.add_url_rule(
             '/edit/<id>/<page>',
             'scheming_edit_page',
-            SchemingEditPageView.as_view('edit_page'),
+            CanadaDatasetEditPageView.as_view('edit_page'),
         )
         # redirect PD endpoints accessed from /dataset/<pd pkg id>
         blueprint.before_request(cast(BeforeRequestCallable,
diff --git a/ckanext/canada/templates/package/new.html b/ckanext/canada/templates/package/new.html
index 91cd683c6..d7715c5d7 100644
--- a/ckanext/canada/templates/package/new.html
+++ b/ckanext/canada/templates/package/new.html
@@ -1,12 +1,26 @@
 {% ckan_extends %}
 
 {% block subtitle %}
+  {%- set editingDraft = form_vars.data.state == 'draft' -%}
+  {%- set title = h.get_translated(form_vars.data, 'title') or form_vars.data.id -%}
   {% if dataset_type == 'info' %}
-    {{- _('Create an Open Information Asset') -}}
+    {% if editingDraft %}
+      {{- _('Edit Draft Open Information Asset:') -}}&nbsp;{{- title -}}
+    {% else %}
+      {{- _('Create an Open Information Asset') -}}
+    {% endif %}
   {% elif dataset_type == 'dataset' %}
-    {{- _('Create an Open Data Record') -}}
+    {% if editingDraft %}
+      {{- _('Edit Draft Open Data Record:') -}}&nbsp;{{- title -}}
+    {% else %}
+      {{- _('Create an Open Data Record') -}}
+    {% endif %}
   {% else %}
-    {{- h.humanize_entity_type('package', dataset_type, 'create title') or _('Create Dataset') -}}
+    {% if editingDraft %}
+      {{- h.humanize_entity_type('package', dataset_type, 'edit label') or _('Edit Dataset') -}}{{- _(':') -}}&nbsp;{{- title -}}
+    {% else %}
+      {{- h.humanize_entity_type('package', dataset_type, 'create title') or _('Create Dataset') -}}
+    {% endif %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckanext/canada/templates/scheming/package/snippets/package_form.html b/ckanext/canada/templates/scheming/package/snippets/package_form.html
index 0a28d73a0..a63181316 100644
--- a/ckanext/canada/templates/scheming/package/snippets/package_form.html
+++ b/ckanext/canada/templates/scheming/package/snippets/package_form.html
@@ -102,7 +102,12 @@ <h3 class="modal-title" id="modalLabel">{{ _('Confirm Contact Email') }}</h3>
 {% endblock %}
 
 {% block save_button %}
-  <div data-module="package_confirm_contact_email">
+  {%- set active_page = data.get('_form_page', 1) | int -%}
+  {% if active_page == 2 %}
+    <div data-module="package_confirm_contact_email">
+      {{ super() }}
+    </div>
+  {% else %}
     {{ super() }}
-  </div>
+  {% endif %}
 {% endblock %}
diff --git a/ckanext/canada/templates/scheming/package/snippets/resource_form.html b/ckanext/canada/templates/scheming/package/snippets/resource_form.html
index 1b0ef529e..c5bb1cd47 100644
--- a/ckanext/canada/templates/scheming/package/snippets/resource_form.html
+++ b/ckanext/canada/templates/scheming/package/snippets/resource_form.html
@@ -10,7 +10,6 @@
   {% endif %}
 {% endblock %}
 
-
 {% block errors %}
   {%- if resource_validation_errors -%}
     {%- set schema = h.scheming_get_dataset_schema(dataset_type) -%}
diff --git a/ckanext/canada/view.py b/ckanext/canada/view.py
index 626e416a1..2c4a77e38 100644
--- a/ckanext/canada/view.py
+++ b/ckanext/canada/view.py
@@ -40,7 +40,11 @@
     EditView as DatasetEditView,
     search as dataset_search,
 )
-from ckanext.scheming.views import SchemingCreateView
+from ckanext.scheming.views import (
+    SchemingCreateView,
+    SchemingEditPageView,
+    SchemingCreatePageView,
+)
 from ckanext.activity.views import package_activity
 from ckan.views.resource import (
     EditView as ResourceEditView,
@@ -192,6 +196,34 @@ def post(self, package_type: str, id: str):
         return response
 
 
+class CanadaDatasetEditPageView(SchemingEditPageView):
+    def post(self, package_type: str, id: str, page: int):
+        response = super(CanadaDatasetEditPageView, self).post(
+            package_type, id, page)
+        if hasattr(response, 'status_code'):
+            # type_ignore_reason: checking attribute
+            if (
+              response.status_code == 200 or  # type: ignore
+              response.status_code == 302):  # type: ignore
+                context = self._prepare()
+                pkg_dict = get_action('package_show')(
+                    cast(Context, dict(context, for_view=True)), {
+                        'id': id
+                    }
+                )
+                if pkg_dict['type'] == 'prop':
+                    h.flash_success(_('The status has been added/updated for this '
+                                      'suggested dataset. This update will be '
+                                      'reflected on open.canada.ca shortly.'))
+                else:
+                    pages = h.scheming_get_dataset_form_pages(package_type)
+                    h.flash_success(
+                        _('Saved "%s" for dataset %s.')
+                        % (h.scheming_language_text(pages[int(page) - 1]['title']),
+                           pkg_dict['id']))
+        return response
+
+
 class CanadaDatasetCreateView(SchemingCreateView):
     def post(self, package_type: str):
         response = super(CanadaDatasetCreateView, self).post(package_type)
@@ -200,7 +232,26 @@ def post(self, package_type: str):
             if (
               response.status_code == 200 or  # type: ignore
               response.status_code == 302):  # type: ignore
-                h.flash_success(_('Dataset added.'))
+                pages = h.scheming_get_dataset_form_pages(package_type)
+                h.flash_success(
+                    _('Saved "%s" for new dataset.')
+                    % h.scheming_language_text(pages[0]['title']))
+        return response
+
+
+class CanadaDatasetCreatePageView(SchemingCreatePageView):
+    def post(self, package_type: str, id: str, page: int):
+        response = super(CanadaDatasetCreatePageView, self).post(
+            package_type, id, page)
+        if hasattr(response, 'status_code'):
+            # type_ignore_reason: checking attribute
+            if (
+              response.status_code == 200 or  # type: ignore
+              response.status_code == 302):  # type: ignore
+                pages = h.scheming_get_dataset_form_pages(package_type)
+                h.flash_success(
+                    _('Saved "%s" for dataset %s.')
+                    % (h.scheming_language_text(pages[int(page) - 1]['title']), id))
         return response
 
 

From 3daf59f210c520c0a65ff3891aceaabf7d57f4c8 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Tue, 3 Feb 2026 21:56:46 +0000
Subject: [PATCH 10/18] feat(dev): scheming pages;

- Cont scheming pages.
---
 ckanext/canada/assets/internal/canada_internal.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/canada/assets/internal/canada_internal.css b/ckanext/canada/assets/internal/canada_internal.css
index 0f60490a4..40890a740 100644
--- a/ckanext/canada/assets/internal/canada_internal.css
+++ b/ckanext/canada/assets/internal/canada_internal.css
@@ -748,7 +748,7 @@ body ul.xloader-log li.item.failure > i::after{
   top: 50%;
   left: initial;
   right: -28px;
-  height: 100%;
+  height: 101%;
   width: 30px;
   transform: translate(0, -50%);
   z-index: 2;

From aa0d1709531154810111431f7c23d7f0388799bb Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Wed, 4 Feb 2026 21:29:11 +0000
Subject: [PATCH 11/18] Merge branch 'master' into OPEN-4034-form-pages

---
 .../assets/internal/canada_internal.css       | 45 +++++++++++++++++++
 ckanext/canada/templates/package/edit.html    | 10 ++++-
 .../canada/templates/package/read_base.html   |  9 +++-
 ckanext/canada/view.py                        | 38 ++++++++++++++++
 4 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/ckanext/canada/assets/internal/canada_internal.css b/ckanext/canada/assets/internal/canada_internal.css
index 40890a740..2d79d2ef3 100644
--- a/ckanext/canada/assets/internal/canada_internal.css
+++ b/ckanext/canada/assets/internal/canada_internal.css
@@ -675,8 +675,20 @@ body ul.xloader-log li.item.failure > i::after{
 /*####################
 ##  Package Stages  ##
 ######################*/
+form#dataset-edit{
+  position: relative;
+  width: 100%;
+}
+
+.canada-package-edit-toolbar{
+  margin: 0 !important;
+  padding: 0 !important;
+  margin-bottom: 80px !important;
+}
+
 #canada-package-form-stages{
   background-color: #EDEDED;
+  margin-bottom: 10px;
 }
 
 #canada-package-form-stages[data-style="new"]{
@@ -684,6 +696,38 @@ body ul.xloader-log li.item.failure > i::after{
   margin-right: calc(((100vw - 100%) / 2) * -1);
 }
 
+#canada-package-form-stages[data-style="edit"]{
+  margin-left: calc((-100% / 3) - 10px);
+  margin-right: 0;
+  width: calc((100% / 0.75) + 10px);
+  margin-top: -100px;
+}
+
+@media all and (max-width: 992px){
+  #canada-package-form-stages[data-style="edit"]{
+    margin-left: 0;
+    margin-right: calc((-100% / 3) - 10px);
+  }
+}
+
+@media all and (max-width: 768px){
+  #canada-package-form-stages[data-style="edit"]{
+    margin-left: 0;
+    margin-right: 0;
+    width: 100%;
+  }
+}
+
+.canada-package-edit-sidepanel{
+  margin-top: -30px;
+}
+
+@media all and (max-width: 1200px){
+  .canada-package-edit-sidepanel{
+    margin-top: 30px;
+  }
+}
+
 #canada-package-form-stages > ol.stages{
   padding-left: 48px;
   padding-right: 48px;
@@ -695,6 +739,7 @@ body ul.xloader-log li.item.failure > i::after{
   flex-wrap: wrap;
   width: 100%;
   overflow: hidden !important;
+  margin-bottom: 0 !important;
 }
 
 @media all and (max-width: 768px){
diff --git a/ckanext/canada/templates/package/edit.html b/ckanext/canada/templates/package/edit.html
index 28ff174d5..3f50248a2 100644
--- a/ckanext/canada/templates/package/edit.html
+++ b/ckanext/canada/templates/package/edit.html
@@ -16,9 +16,17 @@
   </div>
 {% endblock %}
 
+{% block page_header %}
+  <div class="canada-package-edit-toolbar">
+    {{ super() }}
+  </div>
+{% endblock %}
+
 {% block secondary_content %}
   {% if pkg_dict and pkg_dict.resources %}
-    {% snippet "package/snippets/resources.html", pkg=pkg %}
+    <div class="canada-package-edit-sidepanel">
+      {% snippet "package/snippets/resources.html", pkg=pkg %}
+    </div>
   {% endif %}
 {% endblock %}
 
diff --git a/ckanext/canada/templates/package/read_base.html b/ckanext/canada/templates/package/read_base.html
index 25aba744b..84b3131cd 100644
--- a/ckanext/canada/templates/package/read_base.html
+++ b/ckanext/canada/templates/package/read_base.html
@@ -31,8 +31,13 @@
 {% endblock %}
 
 {% block content_action %}
-  {% if pkg.type not in h.recombinant_get_types() %}
-    {{ super() }}
+  {% if pkg.type not in h.recombinant_get_types() and h.check_access('package_update', {'id':pkg.id }) %}
+    {%- set pages = h.scheming_get_dataset_form_pages(pkg.type) -%}
+    {% if pages %}
+      {% link_for _('Manage'), named_route=pkg.type ~ '.scheming_edit_page', package_type=pkg.type, id=pkg.name, page=1, class_='btn btn-default', icon='wrench' %}
+    {% else %}
+      {{- super() -}}
+    {% endif %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckanext/canada/view.py b/ckanext/canada/view.py
index 2c4a77e38..33653d49b 100644
--- a/ckanext/canada/view.py
+++ b/ckanext/canada/view.py
@@ -173,6 +173,9 @@ def canada_prevent_pd_views(uri: str, package_type: str) -> Union[Response, str]
 
 class CanadaDatasetEditView(DatasetEditView):
     def post(self, package_type: str, id: str):
+        """
+        Custom flash messages per dataset type.
+        """
         response = super(CanadaDatasetEditView, self).post(package_type, id)
         if hasattr(response, 'status_code'):
             # type_ignore_reason: checking attribute
@@ -195,9 +198,32 @@ def post(self, package_type: str, id: str):
                         % pkg_dict['id'])
         return response
 
+    def get(self, package_type: str, id: str, data: Optional[dict[str, Any]] = None,
+            errors: Optional[dict[str, Any]] = None,
+            error_summary: Optional[dict[str, Any]] = None) -> Union[Response, str]:
+        """
+        If the ACTUAL dataset type has pages, redirect to the edit 1st page.
+
+        This solves issues with Missing objects in Schemings stages.
+        """
+        pkg = model.Package.get(id)
+        package_type = pkg.type if pkg else package_type
+        pages = h.scheming_get_dataset_form_pages(package_type)
+        if pages:
+            return h.redirect_to('%s.scheming_edit_page' % package_type,
+                                 package_type=package_type,
+                                 id=id,
+                                 page=1)
+        return super(CanadaDatasetEditView, self).get(package_type, id,
+                                                      data, errors,
+                                                      error_summary)
+
 
 class CanadaDatasetEditPageView(SchemingEditPageView):
     def post(self, package_type: str, id: str, page: int):
+        """
+        Custom flash messages per dataset type.
+        """
         response = super(CanadaDatasetEditPageView, self).post(
             package_type, id, page)
         if hasattr(response, 'status_code'):
@@ -226,6 +252,9 @@ def post(self, package_type: str, id: str, page: int):
 
 class CanadaDatasetCreateView(SchemingCreateView):
     def post(self, package_type: str):
+        """
+        Custom flash messages for scheming pages.
+        """
         response = super(CanadaDatasetCreateView, self).post(package_type)
         if hasattr(response, 'status_code'):
             # type_ignore_reason: checking attribute
@@ -241,6 +270,9 @@ def post(self, package_type: str):
 
 class CanadaDatasetCreatePageView(SchemingCreatePageView):
     def post(self, package_type: str, id: str, page: int):
+        """
+        Custom flash messages for scheming pages.
+        """
         response = super(CanadaDatasetCreatePageView, self).post(
             package_type, id, page)
         if hasattr(response, 'status_code'):
@@ -257,6 +289,9 @@ def post(self, package_type: str, id: str, page: int):
 
 class CanadaResourceEditView(ResourceEditView):
     def post(self, package_type: str, id: str, resource_id: str):
+        """
+        Custom flash messages.
+        """
         response = super(CanadaResourceEditView, self).post(
             package_type, id, resource_id)
         if hasattr(response, 'status_code'):
@@ -270,6 +305,9 @@ def post(self, package_type: str, id: str, resource_id: str):
 
 class CanadaResourceCreateView(ResourceCreateView):
     def post(self, package_type: str, id: str):
+        """
+        Custom flash messages.
+        """
         response = super(CanadaResourceCreateView, self).post(package_type, id)
         if hasattr(response, 'status_code'):
             # type_ignore_reason: checking attribute

From 746d5a2dced1a915580abdf73e39cbca0821d29e Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Thu, 5 Feb 2026 19:13:53 +0000
Subject: [PATCH 12/18] feat(templates) manage dropdown;

- Make the manage button for datasets dropdown with page links for scheming pages.
---
 .../assets/internal/canada_internal.css       | 39 +++++++++++++++++++
 .../canada/templates/package/read_base.html   | 19 ++++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/ckanext/canada/assets/internal/canada_internal.css b/ckanext/canada/assets/internal/canada_internal.css
index 2d79d2ef3..28de1a91d 100644
--- a/ckanext/canada/assets/internal/canada_internal.css
+++ b/ckanext/canada/assets/internal/canada_internal.css
@@ -675,6 +675,45 @@ body ul.xloader-log li.item.failure > i::after{
 /*####################
 ##  Package Stages  ##
 ######################*/
+#dropdown-manage-dataset{
+  font-weight: bold !important;
+  font-size: 16px !important;
+  line-height: 1.4375 !important;
+  border-radius: 0 !important;
+  border: none !important;
+  background-color: #f6f6f6 !important;
+  transition-duration: 0.325s !important;
+}
+
+#dropdown-manage-dataset:hover,
+#dropdown-manage-dataset:active,
+#dropdown-manage-dataset:focus{
+  background-color: #335075 !important;
+  color: white !important;
+}
+
+ul.dropdown-menu#dropdown-manage-dataset-menu a{
+  display: block !important;
+  padding: 3px 20px !important;
+  clear: both !important;
+  font-weight: 400 !important;
+  line-height: 1.4375 !important;
+  color: #333 !important;
+  white-space: nowrap !important;
+  text-decoration: none !important;
+  margin: 0 !important;
+  transition-duration: 0.325s !important;
+  background-color: white !important;
+}
+
+ul.dropdown-menu#dropdown-manage-dataset-menu a:hover,
+ul.dropdown-menu#dropdown-manage-dataset-menu a:active,
+ul.dropdown-menu#dropdown-manage-dataset-menu a:focus{
+  color: #333 !important;
+  text-decoration: none !important;
+  background-color: #f5f5f5 !important;
+}
+
 form#dataset-edit{
   position: relative;
   width: 100%;
diff --git a/ckanext/canada/templates/package/read_base.html b/ckanext/canada/templates/package/read_base.html
index 84b3131cd..49ce0d2a5 100644
--- a/ckanext/canada/templates/package/read_base.html
+++ b/ckanext/canada/templates/package/read_base.html
@@ -34,7 +34,24 @@
   {% if pkg.type not in h.recombinant_get_types() and h.check_access('package_update', {'id':pkg.id }) %}
     {%- set pages = h.scheming_get_dataset_form_pages(pkg.type) -%}
     {% if pages %}
-      {% link_for _('Manage'), named_route=pkg.type ~ '.scheming_edit_page', package_type=pkg.type, id=pkg.name, page=1, class_='btn btn-default', icon='wrench' %}
+      <button class="btn btn btn-default dropdown-toggle"
+              data-bs-toggle="dropdown" role="button"
+              data-bs-toggle="dropdown" id="dropdown-manage-dataset"
+              aria-label="{{ _('Manage') }}">
+        <i aria-hidden="true" class="fa fa-wrench"></i>&nbsp;{{ _('Manage') }}&nbsp;
+      </button>
+      <ul class="dropdown-menu" id="dropdown-manage-dataset-menu">
+        <li>
+          {% for page in pages %}
+            <a href="{{- h.url_for(pkg.type ~ '.scheming_edit_page', package_type=pkg.type, id=pkg.name, page=loop.index) -}}" rel='noopener noreferrer'>
+              <span><i aria-hidden="true" class="fa fa-wrench"></i>&nbsp;{{- h.scheming_language_text(page['title']) -}}</span>
+            </a>
+          {% endfor %}
+          <a href="{{- h.url_for(pkg.type ~ '.resources', id=pkg.name) -}}" rel='noopener noreferrer'>
+            <span><i aria-hidden="true" class="fa fa-bars"></i>&nbsp;{{- _('Reorder resources') -}}</span>
+          </a>
+        </li>
+      </ul>
     {% else %}
       {{- super() -}}
     {% endif %}

From 4ce1e110389919aa2c0e7e9d5c1175803e7cf73d Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Thu, 5 Feb 2026 19:55:57 +0000
Subject: [PATCH 13/18] fix(syntax): typing;

- Pyright fixes.
---
 ckanext/canada/view.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ckanext/canada/view.py b/ckanext/canada/view.py
index 33653d49b..dfb538767 100644
--- a/ckanext/canada/view.py
+++ b/ckanext/canada/view.py
@@ -172,7 +172,7 @@ def canada_prevent_pd_views(uri: str, package_type: str) -> Union[Response, str]
 
 
 class CanadaDatasetEditView(DatasetEditView):
-    def post(self, package_type: str, id: str):
+    def post(self, package_type: str, id: str) -> Union[Response, str]:
         """
         Custom flash messages per dataset type.
         """
@@ -220,7 +220,7 @@ def get(self, package_type: str, id: str, data: Optional[dict[str, Any]] = None,
 
 
 class CanadaDatasetEditPageView(SchemingEditPageView):
-    def post(self, package_type: str, id: str, page: int):
+    def post(self, package_type: str, id: str, page: int) -> Union[Response, str]:
         """
         Custom flash messages per dataset type.
         """
@@ -251,16 +251,15 @@ def post(self, package_type: str, id: str, page: int):
 
 
 class CanadaDatasetCreateView(SchemingCreateView):
-    def post(self, package_type: str):
+    def post(self, package_type: str) -> Union[Response, str]:
         """
         Custom flash messages for scheming pages.
         """
         response = super(CanadaDatasetCreateView, self).post(package_type)
         if hasattr(response, 'status_code'):
-            # type_ignore_reason: checking attribute
             if (
-              response.status_code == 200 or  # type: ignore
-              response.status_code == 302):  # type: ignore
+              response.status_code == 200 or
+              response.status_code == 302):
                 pages = h.scheming_get_dataset_form_pages(package_type)
                 h.flash_success(
                     _('Saved "%s" for new dataset.')
@@ -269,7 +268,7 @@ def post(self, package_type: str):
 
 
 class CanadaDatasetCreatePageView(SchemingCreatePageView):
-    def post(self, package_type: str, id: str, page: int):
+    def post(self, package_type: str, id: str, page: int) -> Union[Response, str]:
         """
         Custom flash messages for scheming pages.
         """
@@ -288,7 +287,8 @@ def post(self, package_type: str, id: str, page: int):
 
 
 class CanadaResourceEditView(ResourceEditView):
-    def post(self, package_type: str, id: str, resource_id: str):
+    def post(self, package_type: str, id: str,
+             resource_id: str) -> Union[Response, str]:
         """
         Custom flash messages.
         """
@@ -304,7 +304,7 @@ def post(self, package_type: str, id: str, resource_id: str):
 
 
 class CanadaResourceCreateView(ResourceCreateView):
-    def post(self, package_type: str, id: str):
+    def post(self, package_type: str, id: str) -> Union[Response, str]:
         """
         Custom flash messages.
         """
@@ -320,7 +320,7 @@ def post(self, package_type: str, id: str):
 
 class CanadaUserRegisterView(UserRegisterView):
     @nocache_store
-    def post(self):
+    def post(self) -> Union[Response, str]:
         data = clean_dict(unflatten(tuplize_dict(parse_params(request.form))))
         email = data.get('email', '')
         fullname = data.get('fullname', '')

From 54b6bd6c810ae7b8b00691d95d05915021d199d3 Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Sat, 21 Feb 2026 18:19:18 -0500
Subject: [PATCH 14/18] rough sidebar stages

---
 .../templates/package/base_form_page.html     | 11 ++--
 .../templates/package/new_resource.html       | 15 +++---
 .../templates/package/resource_edit_base.html | 11 ++++
 .../templates/package/snippets/stages.html    | 42 ---------------
 .../package/snippets/stages_sidebar.html      | 52 +++++++++++++++++++
 .../package/snippets/package_form.html        |  5 --
 .../package/snippets/resource_form.html       |  5 --
 7 files changed, 79 insertions(+), 62 deletions(-)
 delete mode 100644 ckanext/canada/templates/package/snippets/stages.html
 create mode 100644 ckanext/canada/templates/package/snippets/stages_sidebar.html

diff --git a/ckanext/canada/templates/package/base_form_page.html b/ckanext/canada/templates/package/base_form_page.html
index 5d12e34a5..086c73a30 100644
--- a/ckanext/canada/templates/package/base_form_page.html
+++ b/ckanext/canada/templates/package/base_form_page.html
@@ -7,9 +7,14 @@
 {% endblock %}
 
 {% block secondary_content %}
-  {% if not h.is_registry_domain() %}
-    {{ super() }}
-  {% endif %}
+  {% snippet "package/snippets/stages_sidebar.html",
+    data=form_vars.data,
+    dataset_type=form_vars.dataset_type,
+    form_style=form_vars.form_style,
+    s1 = form_vars.stage[0] or 'active',
+    s2 = form_vars.stage[1] or 'uncomplete'
+  %}
+  {{ super() }}
 {% endblock %}
 
 {% block page_header %}
diff --git a/ckanext/canada/templates/package/new_resource.html b/ckanext/canada/templates/package/new_resource.html
index f363788be..bd11ac632 100644
--- a/ckanext/canada/templates/package/new_resource.html
+++ b/ckanext/canada/templates/package/new_resource.html
@@ -8,14 +8,15 @@
   </div>
 {% endblock %}
 
-{% block pre_primary %}
-  <div class="panel panel-default mrgn-tp-lg">
-    {% snippet 'package/snippets/resource_help.html' %}
-  </div>
-  {% snippet 'package/snippets/resources.html', pkg=pkg %}
-{% endblock %}
-
 {% block secondary_content %}
+  {%- set pages = h.scheming_get_dataset_form_pages(dataset_type) -%}
+  {% snippet "package/snippets/stages_sidebar.html",
+    data={"_form_page": pages | length + 1},
+    dataset_type=dataset_type,
+    s1 = 'complete',
+    s2 = 'active'
+  %}
+  {{ super() }}
 {% endblock %}
 
 {% block form %}
diff --git a/ckanext/canada/templates/package/resource_edit_base.html b/ckanext/canada/templates/package/resource_edit_base.html
index 1749e6444..483b5849a 100644
--- a/ckanext/canada/templates/package/resource_edit_base.html
+++ b/ckanext/canada/templates/package/resource_edit_base.html
@@ -8,6 +8,17 @@
   {% endif %}
 {% endblock %}
 
+{% block secondary_content %}
+  {%- set pages = h.scheming_get_dataset_form_pages(dataset_type) -%}
+  {% snippet "package/snippets/stages_sidebar.html",
+    data={"_form_page": pages | length + 1},
+    dataset_type=dataset_type,
+    s1 = 'complete',
+    s2 = 'active'
+  %}
+  {{ super() }}
+{% endblock %}
+
 {% block content_action %}
   {%- link_for _('All resources'), named_route=pkg.type ~ '.resources', id=pkg.name, class_='btn btn-default', icon='arrow-left' -%}
   {% if res %}
diff --git a/ckanext/canada/templates/package/snippets/stages.html b/ckanext/canada/templates/package/snippets/stages.html
deleted file mode 100644
index 041f33f91..000000000
--- a/ckanext/canada/templates/package/snippets/stages.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{#
-Inserts a stepped progress indicator for the new package form. Each stage can
-have one of three states, "uncomplete", "complete" and "active".
-
-stages - A list of states for each of the three stages. Missing stages default
-         to "uncomplete".
-
-Example:
-
-    {% snippet 'package/snippets/stages.html', stages=['active'] %}
-    {% snippet 'package/snippets/stages.html', stages=['complete', 'active'] %}
-    {% snippet 'package/snippets/stages.html', stages=['active', 'complete'] %}
-
-#}
-{% set s1 = stages[0] or 'active' %}
-{% set s2 = stages[1] or 'uncomplete' %}
-
-<ol class="stages stage-2">
-  <li role="presentation" class="first {{ s1 }}">
-    {% if dataset_type == 'info' %}
-      {% set m1 = _('Add Asset Metadata') %}
-    {% else %}
-      {% set m1 = _('Add Record Metadata') %}
-    {% endif %}
-    {% if s1 != 'complete' %}
-      <a><span class="highlight">{{ m1 }}</span></a>
-    {% else %}
-      <a><button class="btn-link highlight" name="save" value="go-dataset" type="submit">{{ m1 }}</button></a>
-    {% endif %}
-  </li>
-  <li class="last {{ s2 }}">
-    {% if s2 != 'complete' %}
-      <a><span class="highlight">{{ _('Add Resource') }}</span></a>
-    {% else %}
-      {% if s1 == 'active' %}
-        <a><button class="btn-link highlight" name="save" value="go-resources" type="submit">{{ _('Add Resource Metadata') }}</button></a>
-      {% else %}
-        {% link_for _('Add data'), dataset_type + '.new', class_="highlight" %}
-      {% endif %}
-    {% endif %}
-  </li>
-</ol>
diff --git a/ckanext/canada/templates/package/snippets/stages_sidebar.html b/ckanext/canada/templates/package/snippets/stages_sidebar.html
new file mode 100644
index 000000000..bcf24ddc9
--- /dev/null
+++ b/ckanext/canada/templates/package/snippets/stages_sidebar.html
@@ -0,0 +1,52 @@
+{# stages side bar #}
+
+{%- set pages = h.scheming_get_dataset_form_pages(dataset_type) -%}
+{%- if pages -%}
+  {%- set active_page = data.get('_form_page', 1) | int -%}
+  {%- set draft_missing_required = h.scheming_missing_required_fields(
+    pages, data) -%}
+  <section class="module module-narrow resources">
+    <h2 class="module-heading"><i class="fa fa-bars"></i> {{ _("Metadata") }}</h2>
+    <ul class="list-unstyled nav nav-simple">
+      {%- for p in pages -%}
+        <li class="nav-item {% if loop.index == active_page %}active{% else %}position-relative{% endif %}">
+          {% if loop.index <= active_page %}
+            <a href="{{'#' if loop.index == active_page else
+              h.url_for(dataset_type +
+                  ('.scheming_edit_page' if form_style == 'edit' else '.scheming_new_page'),
+                package_type=dataset_type,
+                id=data.name or data.id,
+                page=loop.index)
+            }}">{{ h.scheming_language_text(p.title) }}</a>
+          {% else %}
+            {{ h.scheming_language_text(p.title) }}
+          {% endif %}
+
+          {%- set mreq = draft_missing_required[loop.index0] -%}
+          {% if mreq %}
+            <a href="#" data-bs-toggle="tooltip" title="{{
+                ungettext("Missing required field", "Missing required fields", mreq | length)
+              }}: {% for m in mreq %}{{
+                  h.scheming_language_text(h.scheming_field_by_name(p.fields, m).label)
+                }}{% if not loop.last %}, {% endif %}{% endfor %}">
+              <i class="fa fa-exclamation-circle text-danger fs-3" aria-hidden="true"></i>
+            </a>
+          {% endif %}
+        </li>
+      {%- endfor -%}
+      {% if form_style != 'edit' %}
+        <li class="nav-item {{ s2 }}">
+          {% if s2 != 'complete' %}
+            <a><span class="highlight">{{ _('Add Resource') }}</span></a>
+          {% else %}
+            {% if s1 == 'active' %}
+              <a><button class="btn-link" name="save" value="go-resources" type="submit">{{ _('Add Resource Metadata') }}</button></a>
+            {% else %}
+              {% link_for _('Add data'), dataset_type + '.new', class_="highlight" %}
+            {% endif %}
+          {% endif %}
+        </li>
+      {% endif %}
+    </ul>
+  </section>
+{%- endif -%}
diff --git a/ckanext/canada/templates/scheming/package/snippets/package_form.html b/ckanext/canada/templates/scheming/package/snippets/package_form.html
index a63181316..695f4e427 100644
--- a/ckanext/canada/templates/scheming/package/snippets/package_form.html
+++ b/ckanext/canada/templates/scheming/package/snippets/package_form.html
@@ -1,11 +1,6 @@
 {% ckan_extends %}
 
 {% block stages %}
-  {% if dataset_type != 'prop' %}
-    <div id="canada-package-form-stages" data-style="{{- form_style -}}">
-      {{ super() }}
-    </div>
-  {% endif %}
 {% endblock %}
 
 {% block basic_fields %}
diff --git a/ckanext/canada/templates/scheming/package/snippets/resource_form.html b/ckanext/canada/templates/scheming/package/snippets/resource_form.html
index c5bb1cd47..1102f1a06 100644
--- a/ckanext/canada/templates/scheming/package/snippets/resource_form.html
+++ b/ckanext/canada/templates/scheming/package/snippets/resource_form.html
@@ -3,11 +3,6 @@
 {% import 'macros/form.html' as form %}
 
 {% block stages %}
-  {% if dataset_type != 'prop' %}
-    <div id="canada-package-form-stages" data-style="new">
-      {{ super() }}
-    </div>
-  {% endif %}
 {% endblock %}
 
 {% block errors %}

From 478f15744431166b6a9bda5b6d1f1217659cf6ce Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Thu, 5 Mar 2026 15:42:50 +0000
Subject: [PATCH 15/18] feat(templates): sidebar stages cont;

- Additional layout changes for the sidebar stages/pages.
---
 .../assets/internal/canada_internal.css       | 146 +++++-------------
 .../canada/assets/public/canada_public.css    |  16 +-
 .../templates/package/base_form_page.html     |  10 ++
 ckanext/canada/templates/package/edit.html    |   7 +
 .../templates/package/new_resource.html       |   2 +-
 .../package/snippets/stages_sidebar.html      |  51 +++---
 6 files changed, 102 insertions(+), 130 deletions(-)

diff --git a/ckanext/canada/assets/internal/canada_internal.css b/ckanext/canada/assets/internal/canada_internal.css
index 28de1a91d..669530722 100644
--- a/ckanext/canada/assets/internal/canada_internal.css
+++ b/ckanext/canada/assets/internal/canada_internal.css
@@ -722,143 +722,71 @@ form#dataset-edit{
 .canada-package-edit-toolbar{
   margin: 0 !important;
   padding: 0 !important;
-  margin-bottom: 80px !important;
 }
 
 #canada-package-form-stages{
   background-color: #EDEDED;
-  margin-bottom: 10px;
-}
-
-#canada-package-form-stages[data-style="new"]{
-  margin-left: calc(((100vw - 100%) / 2) * -1);
-  margin-right: calc(((100vw - 100%) / 2) * -1);
-}
-
-#canada-package-form-stages[data-style="edit"]{
-  margin-left: calc((-100% / 3) - 10px);
-  margin-right: 0;
-  width: calc((100% / 0.75) + 10px);
-  margin-top: -100px;
-}
-
-@media all and (max-width: 992px){
-  #canada-package-form-stages[data-style="edit"]{
-    margin-left: 0;
-    margin-right: calc((-100% / 3) - 10px);
-  }
-}
-
-@media all and (max-width: 768px){
-  #canada-package-form-stages[data-style="edit"]{
-    margin-left: 0;
-    margin-right: 0;
-    width: 100%;
-  }
+  margin-bottom: 30px;
+  margin-top: 0;
 }
 
-.canada-package-edit-sidepanel{
+#canada-package-form-stages[data-form-style="new"]{
   margin-top: -30px;
 }
 
-@media all and (max-width: 1200px){
-  .canada-package-edit-sidepanel{
-    margin-top: 30px;
-  }
+#canada-package-form-stages .module-heading{
+  padding-left: 15px !important;
 }
 
-#canada-package-form-stages > ol.stages{
-  padding-left: 48px;
-  padding-right: 48px;
-  background-color: #EDEDED;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+#canada-package-form-stages ul.nav li.nav-item{
+  display: flex !important;
   flex-direction: row;
-  flex-wrap: wrap;
-  width: 100%;
-  overflow: hidden !important;
-  margin-bottom: 0 !important;
-}
-
-@media all and (max-width: 768px){
-  #canada-package-form-stages > ol.stages{
-    padding-left: 0;
-    padding-right: 0;
-    justify-content: flex-start;
-  }
-}
-
-#canada-package-form-stages[data-style="edit"] > ol.stages{
-  padding-left: 0;
-  padding-right: 0;
-  justify-content: flex-start;
-}
-
-#canada-package-form-stages > ol.stages li{
-  padding: 0;
-  width: auto !important;
-  flex-shrink: 1 !important;
+  flex-wrap: nowrap;
   position: relative;
-  overflow: hidden !important;
+  padding: 0 !important;
 }
 
-#canada-package-form-stages > ol.stages li::before{
-  position: absolute;
-  width: 20px;
-  height: 20px;
-  line-height: 20px;
-  top: 50%;
-  left: 8px;
-  transform: translate(0, -50%);
-  font-weight: 400 !important;
+#canada-package-form-stages .canada-package-form-stages--label{
+  padding: 17px 35px 17px 25px;
+  display: block;
+  width: 100%;
+  text-decoration: none !important;
+  color: #333 !important;
 }
 
-#canada-package-form-stages > ol.stages li.first::after{
-  border: 29px solid !important;
-  border-left-color: transparent !important;
-  border-top-color: #EDEDED !important;
-  border-bottom-color: #EDEDED !important;
-  border-right-color: #EDEDED !important;
+#canada-package-form-stages a.canada-package-form-stages--label:hover,
+#canada-package-form-stages a.canada-package-form-stages--label:active,
+#canada-package-form-stages a.canada-package-form-stages--label:focus{
+  background: #d9d9d9;
+  color: #333 !important;
+  transition-duration: 0.325s;
 }
 
-#canada-package-form-stages > ol.stages li:last-of-type::after{
-  border: none !important;
+#canada-package-form-stages ul.nav li.nav-item.active .canada-package-form-stages--label{
+ background: #38414d;
+ color: #fefefe !important;
+ font-weight: 600;
 }
 
-#canada-package-form-stages > ol.stages li::after{
-  content: "";
+#canada-package-form-stages ul.nav li.nav-item abbr{
+  height: auto;
+  display: block;
   position: absolute;
+  right: 12px;
   top: 50%;
-  left: initial;
-  right: -28px;
-  height: 101%;
-  width: 30px;
   transform: translate(0, -50%);
-  z-index: 2;
-  pointer-events: none;
-  margin: 0 !important;
-  border-width: 29px !important;
-  border-top-color: #EDEDED !important;
-  border-bottom-color: #EDEDED !important;
-  border-right-color: #EDEDED !important;
+  pointer-events: hover;
+  cursor: help;
 }
 
-#canada-package-form-stages > ol.stages li .highlight{
-  display: block;
-  padding: 18px 28px 18px 36px !important;
-  line-height: 1.4;
-  white-space: normal;
-  position: relative;
-  font-weight: 500 !important;
+#canada-package-form-stages ul.nav li.nav-item.active abbr i{
+  background: white;
+  border: 1px solid white;
+  border-radius: 50%;
 }
 
-#canada-package-form-stages > ol.stages li .highlight a[data-bs-toggle]{
-  position: absolute;
-  top: 50%;
-  right: 10px;
-  transform: translate(0, -50%);
-  pointer-events: hover;
+#canada-package-form-stages ul.nav button{
+  padding: 0 !important;
 }
 /*####################
 ##       END        ##
diff --git a/ckanext/canada/assets/public/canada_public.css b/ckanext/canada/assets/public/canada_public.css
index fe75abe30..b7dee5de2 100644
--- a/ckanext/canada/assets/public/canada_public.css
+++ b/ckanext/canada/assets/public/canada_public.css
@@ -146,6 +146,20 @@ body .canada-w10-spacer{
   line-height: 0 !important;
 }
 
+body .canada-v10-spacer{
+  display: block !important;
+  margin: 0 !important;
+  padding: 0 !important;
+  min-height: 10px !important;
+  max-height: 10px !important;
+  height: 10px !important;
+  min-width: 0 !important;
+  max-width: 0 !important;
+  width: 0 !important;
+  line-height: 0 !important;
+}
+
+
 img.openness-rating-stars {
   margin-bottom: 0px !important;
 }
@@ -2074,4 +2088,4 @@ body select[data-field-select2="True"]{
   font-weight: 600 !important;
   font-size: 32px !important;
   color: #38414d !important;
-}
\ No newline at end of file
+}
diff --git a/ckanext/canada/templates/package/base_form_page.html b/ckanext/canada/templates/package/base_form_page.html
index 086c73a30..0f54ee517 100644
--- a/ckanext/canada/templates/package/base_form_page.html
+++ b/ckanext/canada/templates/package/base_form_page.html
@@ -15,6 +15,16 @@
     s2 = form_vars.stage[1] or 'uncomplete'
   %}
   {{ super() }}
+  {% if form_vars.data and form_vars.data.resources %}
+    <div class="canada-package-edit-sidepanel">
+      {% snippet "package/snippets/resources.html", pkg=form_vars.data %}
+    </div>
+  {% endif %}
+{% endblock %}
+
+{% block pre_primary %}
+  {{ super() }}
+  <div class="canada-v10-spacer"></div>
 {% endblock %}
 
 {% block page_header %}
diff --git a/ckanext/canada/templates/package/edit.html b/ckanext/canada/templates/package/edit.html
index 3f50248a2..e02369f02 100644
--- a/ckanext/canada/templates/package/edit.html
+++ b/ckanext/canada/templates/package/edit.html
@@ -23,6 +23,13 @@
 {% endblock %}
 
 {% block secondary_content %}
+  {% snippet "package/snippets/stages_sidebar.html",
+    data=form_vars.data,
+    dataset_type=form_vars.dataset_type,
+    form_style=form_vars.form_style,
+    s1 = form_vars.stage[0] or 'active',
+    s2 = form_vars.stage[1] or 'uncomplete'
+  %}
   {% if pkg_dict and pkg_dict.resources %}
     <div class="canada-package-edit-sidepanel">
       {% snippet "package/snippets/resources.html", pkg=pkg %}
diff --git a/ckanext/canada/templates/package/new_resource.html b/ckanext/canada/templates/package/new_resource.html
index bd11ac632..955441bc4 100644
--- a/ckanext/canada/templates/package/new_resource.html
+++ b/ckanext/canada/templates/package/new_resource.html
@@ -11,7 +11,7 @@
 {% block secondary_content %}
   {%- set pages = h.scheming_get_dataset_form_pages(dataset_type) -%}
   {% snippet "package/snippets/stages_sidebar.html",
-    data={"_form_page": pages | length + 1},
+    data={"_form_page": pages | length + 1, "id": pkg_dict.id, "state": pkg_dict.state},
     dataset_type=dataset_type,
     s1 = 'complete',
     s2 = 'active'
diff --git a/ckanext/canada/templates/package/snippets/stages_sidebar.html b/ckanext/canada/templates/package/snippets/stages_sidebar.html
index bcf24ddc9..3d51d45b3 100644
--- a/ckanext/canada/templates/package/snippets/stages_sidebar.html
+++ b/ckanext/canada/templates/package/snippets/stages_sidebar.html
@@ -2,48 +2,61 @@
 
 {%- set pages = h.scheming_get_dataset_form_pages(dataset_type) -%}
 {%- if pages -%}
+  {%- set is_draft = data.get('state') == 'draft' -%}
   {%- set active_page = data.get('_form_page', 1) | int -%}
   {%- set draft_missing_required = h.scheming_missing_required_fields(
     pages, data) -%}
-  <section class="module module-narrow resources">
+  <section id="canada-package-form-stages" data-form-style="{{- form_style -}}" class="module">
     <h2 class="module-heading"><i class="fa fa-bars"></i> {{ _("Metadata") }}</h2>
     <ul class="list-unstyled nav nav-simple">
       {%- for p in pages -%}
         <li class="nav-item {% if loop.index == active_page %}active{% else %}position-relative{% endif %}">
-          {% if loop.index <= active_page %}
-            <a href="{{'#' if loop.index == active_page else
-              h.url_for(dataset_type +
-                  ('.scheming_edit_page' if form_style == 'edit' else '.scheming_new_page'),
-                package_type=dataset_type,
-                id=data.name or data.id,
-                page=loop.index)
-            }}">{{ h.scheming_language_text(p.title) }}</a>
+          {% if form_style == 'edit' %}
+            {# you can click on any stage/page link when editing a record #}
+            <a class="canada-package-form-stages--label"
+               href="{{- h.url_for(dataset_type ~ '.scheming_edit_page',
+                                   package_type=dataset_type,
+                                   id=data.name or data.id,
+                                   page=loop.index) -}}">
+              {{- h.scheming_language_text(p.title) -}}
+            </a>
           {% else %}
-            {{ h.scheming_language_text(p.title) }}
+            {% if loop.index <= active_page or is_draft %}
+              {# you can click on any stage/page link when editing a DRAFT record, otherwise you have to step through the form #}
+              <a class="canada-package-form-stages--label"
+                 href="{{- h.url_for(dataset_type ~ '.scheming_new_page',
+                                     package_type=dataset_type,
+                                     id=data.name or data.id,
+                                     page=loop.index) -}}">
+                {{- h.scheming_language_text(p.title) -}}
+              </a>
+            {% else %}
+              <span class="canada-package-form-stages--label">{{- h.scheming_language_text(p.title) -}}</span>
+            {% endif %}
           {% endif %}
 
           {%- set mreq = draft_missing_required[loop.index0] -%}
           {% if mreq %}
-            <a href="#" data-bs-toggle="tooltip" title="{{
+            <abbr data-bs-toggle="tooltip" title="{{
                 ungettext("Missing required field", "Missing required fields", mreq | length)
               }}: {% for m in mreq %}{{
                   h.scheming_language_text(h.scheming_field_by_name(p.fields, m).label)
                 }}{% if not loop.last %}, {% endif %}{% endfor %}">
               <i class="fa fa-exclamation-circle text-danger fs-3" aria-hidden="true"></i>
-            </a>
+            </abbr>
           {% endif %}
         </li>
       {%- endfor -%}
       {% if form_style != 'edit' %}
         <li class="nav-item {{ s2 }}">
-          {% if s2 != 'complete' %}
-            <a><span class="highlight">{{ _('Add Resource') }}</span></a>
+          {% if is_draft %}
+            <a class="canada-package-form-stages--label"
+               href="{{- h.url_for(dataset_type ~ '_resource.new',
+                                   id=data.name or data.id) -}}">
+              {{ _('Add Resource') }}
+            </a>
           {% else %}
-            {% if s1 == 'active' %}
-              <a><button class="btn-link" name="save" value="go-resources" type="submit">{{ _('Add Resource Metadata') }}</button></a>
-            {% else %}
-              {% link_for _('Add data'), dataset_type + '.new', class_="highlight" %}
-            {% endif %}
+            <span class="canada-package-form-stages--label">{{ _('Add Resource') }}</span>
           {% endif %}
         </li>
       {% endif %}

From e0919571a15a3cd797af51cbdefa7356e850ee92 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Wed, 11 Mar 2026 14:24:05 +0000
Subject: [PATCH 16/18] fix(templates): pd forms;

- Fix stages sidebar template call for pd types.
- Fix a11y issues in the webform pages.
---
 .../templates/package/base_form_page.html     | 26 ++++++++++---------
 ckanext/canada/templates/package/edit.html    | 16 +++++++-----
 .../recombinant/create_pd_record.html         |  6 ++++-
 .../recombinant/update_pd_record.html         |  6 ++++-
 ckanext/canada/view.py                        |  8 ++++++
 5 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/ckanext/canada/templates/package/base_form_page.html b/ckanext/canada/templates/package/base_form_page.html
index 0f54ee517..73d87f6c7 100644
--- a/ckanext/canada/templates/package/base_form_page.html
+++ b/ckanext/canada/templates/package/base_form_page.html
@@ -7,18 +7,20 @@
 {% endblock %}
 
 {% block secondary_content %}
-  {% snippet "package/snippets/stages_sidebar.html",
-    data=form_vars.data,
-    dataset_type=form_vars.dataset_type,
-    form_style=form_vars.form_style,
-    s1 = form_vars.stage[0] or 'active',
-    s2 = form_vars.stage[1] or 'uncomplete'
-  %}
-  {{ super() }}
-  {% if form_vars.data and form_vars.data.resources %}
-    <div class="canada-package-edit-sidepanel">
-      {% snippet "package/snippets/resources.html", pkg=form_vars.data %}
-    </div>
+  {% if form_vars and form_vars.dataset_type not in h.recombinant_get_types() %}
+    {% snippet "package/snippets/stages_sidebar.html",
+      data=form_vars.data,
+      dataset_type=form_vars.dataset_type,
+      form_style=form_vars.form_style,
+      s1 = form_vars.stage[0] or 'active',
+      s2 = form_vars.stage[1] or 'uncomplete'
+    %}
+    {{ super() }}
+    {% if form_vars.data and form_vars.data.resources %}
+      <div class="canada-package-edit-sidepanel">
+        {% snippet "package/snippets/resources.html", pkg=form_vars.data %}
+      </div>
+    {% endif %}
   {% endif %}
 {% endblock %}
 
diff --git a/ckanext/canada/templates/package/edit.html b/ckanext/canada/templates/package/edit.html
index e02369f02..ae453ecc3 100644
--- a/ckanext/canada/templates/package/edit.html
+++ b/ckanext/canada/templates/package/edit.html
@@ -23,13 +23,15 @@
 {% endblock %}
 
 {% block secondary_content %}
-  {% snippet "package/snippets/stages_sidebar.html",
-    data=form_vars.data,
-    dataset_type=form_vars.dataset_type,
-    form_style=form_vars.form_style,
-    s1 = form_vars.stage[0] or 'active',
-    s2 = form_vars.stage[1] or 'uncomplete'
-  %}
+  {% if form_vars and form_vars.dataset_type not in h.recombinant_get_types() %}
+    {% snippet "package/snippets/stages_sidebar.html",
+      data=form_vars.data,
+      dataset_type=form_vars.dataset_type,
+      form_style=form_vars.form_style,
+      s1 = form_vars.stage[0] or 'active',
+      s2 = form_vars.stage[1] or 'uncomplete'
+    %}
+  {% endif %}
   {% if pkg_dict and pkg_dict.resources %}
     <div class="canada-package-edit-sidepanel">
       {% snippet "package/snippets/resources.html", pkg=pkg %}
diff --git a/ckanext/canada/templates/recombinant/create_pd_record.html b/ckanext/canada/templates/recombinant/create_pd_record.html
index 8c9865760..b71602a74 100644
--- a/ckanext/canada/templates/recombinant/create_pd_record.html
+++ b/ckanext/canada/templates/recombinant/create_pd_record.html
@@ -1,6 +1,10 @@
 {% extends "package/base_form_page.html" %}
 
-{% block page_title %}<h3>{{ _("Create Record") }}</h3>{% endblock %}
+{% block page_title %}
+  <h1 id="wb-cont">{{- h.recombinant_language_text(chromo_title) -}}</h1>
+  <h2 class="wb-invisible">{{- h.get_translated(org_dict, 'title') -}}</h2>
+  <h3>{{ _("Create Record") }}</h3>
+{% endblock %}
 {% block subtitle %}{{ _("Create Record") }}{% endblock %}
 
 {% block breadcrumb_content %}
diff --git a/ckanext/canada/templates/recombinant/update_pd_record.html b/ckanext/canada/templates/recombinant/update_pd_record.html
index 36042c2d5..73584704f 100644
--- a/ckanext/canada/templates/recombinant/update_pd_record.html
+++ b/ckanext/canada/templates/recombinant/update_pd_record.html
@@ -1,6 +1,10 @@
 {% extends "package/base_form_page.html" %}
 
-{% block page_title %}<h3>{{ _("Update Record") }}</h3>{% endblock %}
+{% block page_title %}
+  <h1 id="wb-cont">{{- h.recombinant_language_text(chromo_title) -}}</h1>
+  <h2 class="wb-invisible">{{- h.get_translated(org_dict, 'title') -}}</h2>
+  <h3>{{ _("Update Record") }}</h3>
+{% endblock %}
 {% block subtitle %}{{ _("Update Record") }}{% endblock %}
 
 {% block breadcrumb_content %}
diff --git a/ckanext/canada/view.py b/ckanext/canada/view.py
index dfb538767..5bcd03f8d 100644
--- a/ckanext/canada/view.py
+++ b/ckanext/canada/view.py
@@ -491,6 +491,8 @@ def create_pd_record(owner_org: str, resource_name: str):
             dataset_type=chromo['dataset_type'])
         [res] = [r for r in rcomb['resources'] if r['name'] == resource_name]
 
+        org = lc.action.organization_show(id=owner_org)
+
         check_access(
             'datastore_upsert',
             {'user': g.user, 'auth_user_obj': g.userobj},
@@ -571,6 +573,7 @@ def create_pd_record(owner_org: str, resource_name: str):
                               'chromo_title': chromo['title'],
                               'choice_fields': choice_fields,
                               'owner_org': rcomb['owner_org'],
+                              'org_dict': org,
                               # prevent rendering error on parent template
                               'pkg_dict': {},
                               'errors': err,
@@ -592,6 +595,7 @@ def create_pd_record(owner_org: str, resource_name: str):
                       'chromo_title': chromo['title'],
                       'choice_fields': choice_fields,
                       'owner_org': rcomb['owner_org'],
+                      'org_dict': org,
                       'pkg_dict': {},  # prevent rendering error on parent template
                       'errors': {},
                   })
@@ -611,6 +615,8 @@ def update_pd_record(owner_org: str, resource_name: str, pk: str):
             dataset_type=chromo['dataset_type'])
         [res] = [r for r in rcomb['resources'] if r['name'] == resource_name]
 
+        org = lc.action.organization_show(id=owner_org)
+
         check_access(
             'datastore_upsert',
             {'user': g.user, 'auth_user_obj': g.userobj},
@@ -679,6 +685,7 @@ def update_pd_record(owner_org: str, resource_name: str, pk: str):
                               'choice_fields': choice_fields,
                               'pk_fields': pk_fields,
                               'owner_org': rcomb['owner_org'],
+                              'org_dict': org,
                               # prevent rendering error on parent template
                               'pkg_dict': {},
                               'errors': err,
@@ -715,6 +722,7 @@ def update_pd_record(owner_org: str, resource_name: str, pk: str):
                       'choice_fields': choice_fields,
                       'pk_fields': pk_fields,
                       'owner_org': rcomb['owner_org'],
+                      'org_dict': org,
                       # prevent rendering error on parent template
                       'pkg_dict': {},
                       'errors': {},

From c905ec51e24b4263a3d832ad90819b1c3764cc18 Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Sun, 15 Mar 2026 11:41:35 -0400
Subject: [PATCH 17/18] info schema with pages

---
 ckanext/canada/schemas/info.yaml | 343 ++++++++++---------------------
 1 file changed, 113 insertions(+), 230 deletions(-)

diff --git a/ckanext/canada/schemas/info.yaml b/ckanext/canada/schemas/info.yaml
index ab6cac435..d7d6753ff 100644
--- a/ckanext/canada/schemas/info.yaml
+++ b/ckanext/canada/schemas/info.yaml
@@ -1,7 +1,7 @@
-
-scheming_version: 1
 dataset_type: info
 
+draft_fields_required: false
+
 before_validators: limit_resources_per_dataset
 
 about: 'open.canada.ca: open information metadata definition'
@@ -53,7 +53,9 @@ sidebar_show_fields:
 dataset_fields:
 
 # our id + name fields are uuids and always equal
-- preset: canada_dataset_id
+- start_form_page:
+    title: Descriptive Metadata
+  preset: canada_dataset_id
 - preset: canada_dataset_name
 
 - preset: canada_collection
@@ -67,62 +69,9 @@ dataset_fields:
     - aia
     - accessibiliy_plans
 
-# Field = Title English.
-# {The English name by which the asset is known}
-# Field = Title French.
-# {The French name by which the asset is known}
 - preset: canada_title
-
-# Field = Publisher - Current Organization Name.
-# List box Source: Publisher - Current Organization Name code table (refer to Data Migration).
-# Populate the list box with the Titles of all the organizations the currently logged-in user is linked to.
-# {The Title of the current Organization (GC Department or Agency) primarily responsible for publishing the asset}
 - preset: canada_owner_org
-
-# Field = Publisher - Organization Name at Publication (English).
-# {The organization Title at publication Time}
-# Field = Publisher - Organization Name at Publication (French).
-# {The organization Title at publication Time}
-- preset: canada_org_title_at_publication
-
-# Field = Publisher - Organization Section Name English.
-# {The English names of the work groups, units of work, business units, etc. of the organization that publishes the asset (separate multiple names by commas).}
-# Field = Publisher - Organization Section Name French.
-# {The French names of the work groups, units of work, business units, etc. of the organization that publishes the asset (separate multiple names by commas).}
-- preset: canada_org_section_name
-
-# Field = Creator.
-# { Individual entities (persons) primarily responsible for making the asset (separate multiple entities by commas).}
-- preset: canada_creator
-
-# Field = Contributor English.
-# {The English names of entities (persons, groups, GC Departments or Agencies) that contributed to the asset (separate multiple entities by commas).}
-# Field = Contributor French.
-# {The French names of entities (persons, groups, GC Departments or Agencies) that contributed to the asset (separate multiple entities by commas).}
-- preset: canada_contributor
-
-# Field = Contact Email.
-# {The contact person's email for the information asset}
-- preset: canada_maintainer_email
-
-# Field = Credit English.
-# {The English names of entities (persons, groups, GC Departments or Agencies) that are credited for the dataset.}
-# Field = Reconnaissance French.
-# {The French names of entities (persons, groups, GC Departments or Agencies) that are credited for the dataset.}
-- preset: canada_credit
-
-# Field = Description English
-# Markdown formatting Property = http://daringfireball.net/projects/markdown/syntax
-# {An account of the information asset, in English. A description may include abstract, table of contents or a free-text.}
-# Field = Description French.
-# Markdown formatting Property = http://daringfireball.net/projects/markdown/syntax
-# {An account of the information asset, in French. A description may include abstract, table of contents or a free-text.}
 - preset: canada_notes
-
-# Field = Note English.
-# { General information relating to an asset, in English }
-# Field = Note English.
-# { General information relating to an asset, in French }
 - field_name: additional_notes
   label:
     en: Note
@@ -150,25 +99,71 @@ dataset_fields:
       size: 100
       class: form-control
 
-# Field = Keywords English.
-# {Commonly used words or phrases which describe the asset, in English}
-# Field = Keywords French.
-# {Commonly used words or phrases which describe the asset, in French}
 - preset: canada_keywords
 
-# Field = Subject.
-# List box Source: Subject code table (refer to Data Migration).
-# {The topic of the content of the information asset. You may select or deselect multiple subjects (Ctrl+Click).}
-- preset: canada_subject
+- start_form_page:
+    title: Publishing Information
+  preset: canada_org_title_at_publication
+- preset: canada_org_section_name
+- preset: canada_creator
+- preset: canada_contributor
+- preset: canada_maintainer_email
+- preset: canada_credit
 
-# Field = Audience.
-# List box Source: Audience code table (refer to Data Migration).
-# {A description of the audience or group of people for whom the described asset is intended or useful. You may select or deselect multiple options (Ctrl+Click).}
+# Field = ISBN.
+# {The identification of the asset’s - International Standard Book Number, a unique identifier assigned to many types of publications except serials by a registration agency.}
+- field_name: isbn
+  label:
+    en: ISBN
+  help_text:
+    en: The identification of the asset’s - International Standard Book Number, a unique identifier assigned to many types of publications except serials by a registration agency
+
+# Field = ISSN.
+# {The identification of the asset’s International Standard Serial Number, a unique identifier assigned to serial publications by a registration agency.}
+- field_name: issn
+  label:
+    en: ISSN
+  help_text:
+    en: The identification of the asset’s International Standard Serial Number, a unique identifier assigned to serial publications by a registration agency
+    fr: Identification du Numéro international normalisé des publications en série du produit, un identificateur unique assigné aux publications en série par un organisme d’enregistrement
+
+# Field = Government of Canada Catalogue Number.
+# {The identification of the asset’s  GC Catalogue Number}
+- field_name: gc_catalogue_number
+  label:
+    en: Government of Canada Catalogue Number
+    fr: Numéro de catalogue du gouvernement du Canada
+  help_text:
+    en: The identification of the asset’s  GC Catalogue Number
+    fr: Identification du numéro du produit dans le catalogue du GC
+
+# Field = Departmental Identification Number.
+# {The identification number of the organization which published the asset}
+- field_name: departmental_identification_number
+  label:
+    en: Departmental Identification Number
+    fr: Numéro d’identification du ministère
+  help_text:
+    en: The identification number of the organization which published the asset
+    fr: Numéro d’identification de l’organisation qui a publié le produit
+
+# Field = PSPC System Identifier.
+# {The identification number given to the asset by Public Service and Procurement Canada}
+- field_name: pspc_identification_number
+  label:
+    en: PSPC System Identifier
+    fr: Identificateur de système de SPAC
+  help_text:
+    en: The identification number given to the asset by Public Service and Procurement Canada
+    fr: Le numéro d’identification attribué au produit par Services publics et Approvisionnement Canada
+
+- preset: canada_digital_object_identifier
+
+- start_form_page:
+    title: Taxonomic Metadata
+  preset: canada_subject
 - preset: canada_audience
 
-# Field = Place pf Publication.
-# List box Source: Geographic Region Name code table (refer to Data Migration).
-# {The region where the asset was originally published}
 - field_name: place_of_publication
   label:
     en: Place of Publication
@@ -178,68 +173,20 @@ dataset_fields:
     fr: La région où le produit a été publié initialement. Vous pouvez sélectionner ou désélectionner de multiples options (Ctrl+Clic)
   preset: canada_geographic_region # use same multi-select controlled list
 
-# Field = Spatial.
-# {The range of spatial applicability of an information asset. This element could include either a bounding box, or GeoJson string.}
 - preset: canada_spatial
-
-# Field = Geographic Region Name.
-# List box Source: Geographic Region name code table (refer to Data Migration).
-# Format: {Province – Region}, e.g. Ontario – Sudbury.
-# {The geographic region of an asset. You may or deselect multiple regions (Ctrl+Click).}
 - preset: canada_geographic_region
 
-# Field = Time Period Coverage Start Date.
-# Add a Calendar control to select a Date.
-# {The start date of the period covered by the asset (YYYY-MM-DD)}
-- preset: canada_time_period_coverage_start
+- start_form_page:
+    title: Series Metadata
+  preset: canada_data_series_name
+- preset: canada_data_series_issue_identification
+- preset: canada_program_page_url
+- preset: canada_dataset_relationship
 
-# Field = Time Period Coverage End Date.
-# Add a Calendar control to select a Date.
-# {The end date of the period covered by the asset (YYYY-MM-DD)}
+- start_form_page:
+    title: Coverage
+  preset: canada_time_period_coverage_start
 - preset: canada_time_period_coverage_end
-
-# Field = Issuance.
-# List box Source: Issuance code table (refer to Data Migration).
-# { A term that designates how the resource is issued }
-- field_name: issuance
-  label:
-    en: Issuance
-    fr: Publication
-  help_text:
-    en: A term that designates how the asset is issued
-    fr: Un terme qui décrit comment la ressource est publié
-  form_snippet: select.html
-  display_snippet: select.html
-  validators: scheming_required scheming_choices
-  choices:
-  - label:
-      en: Monographic
-      fr: Monographique
-    value: monographic
-  - label:
-      en: Single Unit
-      fr: Unité simple
-    value: single_unit
-  - label:
-      en: Multipart monograph
-      fr: Monographie en plusieurs volumes
-    value: multipart_monograph
-  - label:
-      en: Continuing
-      fr: Suite
-    value: continuing
-  - label:
-      en: Serial
-      fr: Série
-    value: serial
-  - label:
-      en: Integrating Resource
-      fr: Ressource intégratrice
-    value: integrating_resource
-
-# Field = Frequency of Issuance.
-# List box Source: Frequency of Issuance code table (refer to Data Migration).
-# { A statement of publication frequency in textual form }
 - field_name: issuance_frequency
   label:
     en: Frequency of Issuance
@@ -320,19 +267,8 @@ dataset_fields:
       fr: Entièrement irrégulier
     value: irregular
 
-# Field = Maintenance and Update Frequency.
-# List box Source: Maintenance and Update Frequency code table (refer to Data Migration).
-# {The frequency with which changes and additions are made to the initial asset}
 - preset: canada_frequency
-
-# Field = Date Published.
-# Add a Calendar control to select a Date.
-# {The date of issuance (e.g., publication) of the information asset (YYYY-MM-DD)}
 - preset: canada_date_published
-
-# Field = Date Modified.
-# Add a Calendar control to select a Date.
-# {The date on which the information asset was updated (YYYY-MM-DD)}
 - preset: canada_date_modified
 
 # Field = Date Created.
@@ -393,108 +329,55 @@ dataset_fields:
   form_attrs:
     class: form-control
 
-# Field = Homepage English.
-# {A program or homepage that can be navigated to gain additional or contextual information about the asset.}
-# Field = Homepage French.
-# {A program or homepage that can benavigated to gain additional or contextual information about the asset.}
-- preset: canada_program_page_url
-
-# Field = Series Title English.
-# {The English name of the series, or aggregate asset, of which the asset is a part}
-# Field = Series Title French.
-# {The French name of the series, or aggregate asset, of which the asset is a part}
-- preset: canada_data_series_name
-
-# Field = Series Issue ID English.
-# {English identification of the series’ issue information}
-# Field = Series Issue ID French.
-# {French identification of the series’ issue information}
-- preset: canada_data_series_issue_identification
-
-# Field = ISBN.
-# {The identification of the asset’s - International Standard Book Number, a unique identifier assigned to many types of publications except serials by a registration agency.}
-- field_name: isbn
-  label:
-    en: ISBN
-  help_text:
-    en: The identification of the asset’s - International Standard Book Number, a unique identifier assigned to many types of publications except serials by a registration agency
-
-# Field = ISSN.
-# {The identification of the asset’s International Standard Serial Number, a unique identifier assigned to serial publications by a registration agency.}
-- field_name: issn
-  label:
-    en: ISSN
-  help_text:
-    en: The identification of the asset’s International Standard Serial Number, a unique identifier assigned to serial publications by a registration agency
-    fr: Identification du Numéro international normalisé des publications en série du produit, un identificateur unique assigné aux publications en série par un organisme d’enregistrement
-
-# Field = Government of Canada Catalogue Number.
-# {The identification of the asset’s  GC Catalogue Number}
-- field_name: gc_catalogue_number
-  label:
-    en: Government of Canada Catalogue Number
-    fr: Numéro de catalogue du gouvernement du Canada
-  help_text:
-    en: The identification of the asset’s  GC Catalogue Number
-    fr: Identification du numéro du produit dans le catalogue du GC
-
-# Field = Departmental Identification Number.
-# {The identification number of the organization which published the asset}
-- field_name: departmental_identification_number
-  label:
-    en: Departmental Identification Number
-    fr: Numéro d’identification du ministère
-  help_text:
-    en: The identification number of the organization which published the asset
-    fr: Numéro d’identification de l’organisation qui a publié le produit
-
-# Field = PSPC System Identifier.
-# {The identification number given to the asset by Public Service and Procurement Canada}
-- field_name: pspc_identification_number
+# Field = Issuance.
+# List box Source: Issuance code table (refer to Data Migration).
+# { A term that designates how the resource is issued }
+- field_name: issuance
   label:
-    en: PSPC System Identifier
-    fr: Identificateur de système de SPAC
+    en: Issuance
+    fr: Publication
   help_text:
-    en: The identification number given to the asset by Public Service and Procurement Canada
-    fr: Le numéro d’identification attribué au produit par Services publics et Approvisionnement Canada
-
-# Field = Digital Object Identifier DOI.
-# {The Digital Object Identifier assigned to the asset. For more information visit: http://cisti-icist.nrc-cnrc.gc.ca/eng/services/cisti/datacite-canada/index.html}
-- preset: canada_digital_object_identifier
+    en: A term that designates how the asset is issued
+    fr: Un terme qui décrit comment la ressource est publié
+  form_snippet: select.html
+  display_snippet: select.html
+  validators: scheming_required scheming_choices
+  choices:
+  - label:
+      en: Monographic
+      fr: Monographique
+    value: monographic
+  - label:
+      en: Single Unit
+      fr: Unité simple
+    value: single_unit
+  - label:
+      en: Multipart monograph
+      fr: Monographie en plusieurs volumes
+    value: multipart_monograph
+  - label:
+      en: Continuing
+      fr: Suite
+    value: continuing
+  - label:
+      en: Serial
+      fr: Série
+    value: serial
+  - label:
+      en: Integrating Resource
+      fr: Ressource intégratrice
+    value: integrating_resource
 
-# Field = Jurisdiction.
-# {The extent or range of judicial, law enforcement or other authority. Example: Level of government that contributed the asset.}
 - preset: canada_jurisdiction
-
-# Field = Licence.
-# Populate the list box with the licence options from the Registry.
-# {The licence applied to the information asset}
 - preset: canada_license_id
-
-# Field = Access Restrictions.
-# Default Value = Unrestricted.
-# {These are the access restrictions of the asset}
 - preset: canada_restrictions
 
-# Field = IMSO Approval.
-# List box options are Yes and No.
-# {Has IMSO approval been obtained for this asset? By selecting yes, you agree to release this asset under the Open Government Licence - Canada}
-# http://open.canada.ca/en/open-government-licence-canada
-- preset: canada_imso_approval
-
-# Field = Ready to Publish.
-# List box options are Yes and No.
-# {Selecting ‘Yes’ will set this asset as ready to publish on the Open Government Portal. Selecting ‘No’ will saved it as a ‘draft’}
+- start_form_page:
+    title: Approval
+  preset: canada_imso_approval
 - preset: canada_ready_to_publish
-
-# Field = Date Released.
-# Available only for an Admin user.
-# Add a Calendar control to select a Date.
-# {The date the asset may be published on the Portal (YYYY-MM-DD)}
 - preset: canada_portal_release_date
 
-- preset: canada_dataset_relationship
-
 
 #
 #   RESOURCE FIELDS

From 0130e24bde0a4ca864f86593b73bff2712834806 Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Sun, 22 Mar 2026 18:35:21 -0400
Subject: [PATCH 18/18] remove dataset stages side bar from resource pages

---
 .../canada/templates/package/resource_edit_base.html  | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/ckanext/canada/templates/package/resource_edit_base.html b/ckanext/canada/templates/package/resource_edit_base.html
index 483b5849a..1749e6444 100644
--- a/ckanext/canada/templates/package/resource_edit_base.html
+++ b/ckanext/canada/templates/package/resource_edit_base.html
@@ -8,17 +8,6 @@
   {% endif %}
 {% endblock %}
 
-{% block secondary_content %}
-  {%- set pages = h.scheming_get_dataset_form_pages(dataset_type) -%}
-  {% snippet "package/snippets/stages_sidebar.html",
-    data={"_form_page": pages | length + 1},
-    dataset_type=dataset_type,
-    s1 = 'complete',
-    s2 = 'active'
-  %}
-  {{ super() }}
-{% endblock %}
-
 {% block content_action %}
   {%- link_for _('All resources'), named_route=pkg.type ~ '.resources', id=pkg.name, class_='btn btn-default', icon='arrow-left' -%}
   {% if res %}