Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
bd70607
OPEN-4034: form pages for dataset type
wardi Jun 13, 2025
d5d74ff
changes
wardi Jun 13, 2025
48252f9
allow scheming pages functionality to pass through
wardi Jul 18, 2025
642e00b
one more is_resource_supported_by_xloader check
wardi Jul 18, 2025
7b9b271
allow scheming create redirect to page 2
wardi Aug 19, 2025
eb2719e
improve display for the navigation for form stages
RabiaSajjad Dec 5, 2025
0dfca8a
move resources snippet out of secondary block
RabiaSajjad Dec 5, 2025
aeb28d6
Merge branch 'OPEN-4034-form-pages' into feature/temp/form-pages
JVickery-TBS Feb 2, 2026
ae5d5fd
Merge branch 'form-pages-ui' into feature/temp/form-pages
JVickery-TBS Feb 2, 2026
702a131
feat(dev): form pages;
JVickery-TBS Feb 2, 2026
cd375fb
Merge branch 'form-pages-ui' into OPEN-4034-form-pages
JVickery-TBS Feb 2, 2026
99d0145
Merge branch 'feature/temp/form-pages' into OPEN-4034-form-pages
JVickery-TBS Feb 2, 2026
14fc4c3
Merge branch 'master' into OPEN-4034-form-pages
JVickery-TBS Feb 3, 2026
b963885
Merge branch 'master' into OPEN-4034-form-pages
JVickery-TBS Feb 3, 2026
9496f99
feat(dev): scheming pages;
JVickery-TBS Feb 3, 2026
5962eff
Merge branch 'master' into OPEN-4034-form-pages
JVickery-TBS Feb 3, 2026
3daf59f
feat(dev): scheming pages;
JVickery-TBS Feb 3, 2026
df566e0
Merge branch 'master' into OPEN-4034-form-pages
JVickery-TBS Feb 4, 2026
aa0d170
Merge branch 'master' into OPEN-4034-form-pages
JVickery-TBS Feb 4, 2026
380922c
Merge branch 'master' into OPEN-4034-form-pages
JVickery-TBS Feb 4, 2026
746d5a2
feat(templates) manage dropdown;
JVickery-TBS Feb 5, 2026
4ce1e11
fix(syntax): typing;
JVickery-TBS Feb 5, 2026
54b6bd6
rough sidebar stages
wardi Feb 21, 2026
478f157
feat(templates): sidebar stages cont;
JVickery-TBS Mar 5, 2026
e091957
fix(templates): pd forms;
JVickery-TBS Mar 11, 2026
c905ec5
info schema with pages
wardi Mar 15, 2026
c5c2f03
Merge branch 'OPEN-4035-info-pages' into OPEN-4034-form-pages
JVickery-TBS Mar 18, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/1582.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
split dataset type into separate pages using scheming form pages and dataset completeness feature
159 changes: 126 additions & 33 deletions ckanext/canada/assets/internal/canada_internal.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ ol.breadcrumb {
text-decoration: none;
}

.border-0 {
border: 0 !important;
}

#wb-info a {
text-decoration: none;
}
Expand Down Expand Up @@ -504,39 +508,7 @@ label:lang(fr):after {
.control-required {
color: #e00;
}
.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;
}
Expand Down Expand Up @@ -700,6 +672,127 @@ body ul.xloader-log li.item.failure > i::after{
## END ##
#############################*/

/*####################
## 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%;
}

.canada-package-edit-toolbar{
margin: 0 !important;
padding: 0 !important;
}

#canada-package-form-stages{
background-color: #EDEDED;
margin-bottom: 30px;
margin-top: 0;
}

#canada-package-form-stages[data-form-style="new"]{
margin-top: -30px;
}

#canada-package-form-stages .module-heading{
padding-left: 15px !important;
}

#canada-package-form-stages ul.nav li.nav-item{
display: flex !important;
flex-direction: row;
flex-wrap: nowrap;
position: relative;
padding: 0 !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 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 ul.nav li.nav-item.active .canada-package-form-stages--label{
background: #38414d;
color: #fefefe !important;
font-weight: 600;
}

#canada-package-form-stages ul.nav li.nav-item abbr{
height: auto;
display: block;
position: absolute;
right: 12px;
top: 50%;
transform: translate(0, -50%);
pointer-events: hover;
cursor: help;
}

#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 ul.nav button{
padding: 0 !important;
}
/*####################
## END ##
## Package Stages ##
## END ##
######################*/

/*####################################
## Recombinant Base CSS Overrides ##
Expand Down Expand Up @@ -868,4 +961,4 @@ input#field-resource-url{
## TODO: DEPRECATED: ##
## REMOVE AFTER FULL PD DATATABLES QA ##
## END ##
########################################*/
########################################*/
16 changes: 15 additions & 1 deletion ckanext/canada/assets/public/canada_public.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -2074,4 +2088,4 @@ body select[data-field-select2="True"]{
font-weight: 600 !important;
font-size: 32px !important;
color: #38414d !important;
}
}
12 changes: 12 additions & 0 deletions ckanext/canada/plugin/dataset_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
from ckanext.canada.helpers import RELEASE_DATE_FACET_STEP
from ckanext.canada.view import (
CanadaDatasetEditView,
CanadaDatasetEditPageView,
CanadaDatasetCreateView,
CanadaDatasetCreatePageView,
CanadaResourceEditView,
CanadaResourceCreateView,
canada_search,
Expand Down Expand Up @@ -116,6 +118,16 @@ def prepare_dataset_blueprint(self, package_type: str,
methods=['GET'],
strict_slashes=False
)
blueprint.add_url_rule(
'/new/<id>/<page>',
'scheming_new_page',
CanadaDatasetCreatePageView.as_view('new_page'),
)
blueprint.add_url_rule(
'/edit/<id>/<page>',
'scheming_edit_page',
CanadaDatasetEditPageView.as_view('edit_page'),
)
# redirect PD endpoints accessed from /dataset/<pd pkg id>
blueprint.before_request(cast(BeforeRequestCallable,
self._redirect_pd_dataset_endpoints))
Expand Down
Loading
Loading