From 145bba03dcc92da7bef7316f146be6425fd34e08 Mon Sep 17 00:00:00 2001 From: Oliver Foster Date: Thu, 3 Feb 2022 17:11:18 +0000 Subject: [PATCH 1/3] issue/3281 Added data-order to allow sorting of nav buttons --- js/PageLevelProgressNavigationView.js | 6 ++++++ properties.schema | 7 +++++++ schema/course.schema.json | 8 ++++++++ 3 files changed, 21 insertions(+) diff --git a/js/PageLevelProgressNavigationView.js b/js/PageLevelProgressNavigationView.js index a21db42..54ed071 100644 --- a/js/PageLevelProgressNavigationView.js +++ b/js/PageLevelProgressNavigationView.js @@ -13,6 +13,12 @@ export default class PageLevelProgressNavigationView extends Backbone.View { return 'btn-icon nav__btn nav__pagelevelprogress-btn pagelevelprogress__nav-btn'; } + attributes() { + return { + 'data-order': (Adapt.course.get('_globals')?._extensions?._pageLevelProgress?._navOrder || 90) + } + } + events() { return { click: 'onProgressClicked' diff --git a/properties.schema b/properties.schema index 4c2c09b..2e11eb1 100644 --- a/properties.schema +++ b/properties.schema @@ -43,6 +43,13 @@ "inputType": "Text", "validators": [], "translatable": true + }, + "_navOrder": { + "type": "number", + "required": true, + "default": 50, + "inputType": "Text", + "validators": [] } }, "properties": { diff --git a/schema/course.schema.json b/schema/course.schema.json index 2f8430d..3ff2cd7 100644 --- a/schema/course.schema.json +++ b/schema/course.schema.json @@ -55,6 +55,14 @@ "_adapt": { "translatable": true } + }, + "_navOrder": { + "type": "number", + "title": "Navigation bar order", + "required": true, + "default": 50, + "inputType": "Text", + "validators": [] } } } From d319983b62793c831fad3e15cd90ca3f76f2c34a Mon Sep 17 00:00:00 2001 From: Oliver Foster Date: Thu, 3 Feb 2022 17:19:58 +0000 Subject: [PATCH 2/3] issue/3281 Set _navOrder to 0 to preserve current state --- properties.schema | 2 +- schema/course.schema.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/properties.schema b/properties.schema index 2e11eb1..55567d2 100644 --- a/properties.schema +++ b/properties.schema @@ -47,7 +47,7 @@ "_navOrder": { "type": "number", "required": true, - "default": 50, + "default": 0, "inputType": "Text", "validators": [] } diff --git a/schema/course.schema.json b/schema/course.schema.json index 3ff2cd7..d7b1989 100644 --- a/schema/course.schema.json +++ b/schema/course.schema.json @@ -60,7 +60,7 @@ "type": "number", "title": "Navigation bar order", "required": true, - "default": 50, + "default": 0, "inputType": "Text", "validators": [] } From 6ae6aa899b7e6630b8c7e78494adb1cc62ddc116 Mon Sep 17 00:00:00 2001 From: Oliver Foster Date: Thu, 3 Feb 2022 18:17:21 +0000 Subject: [PATCH 3/3] issue/3281 Set code default to 0 --- js/PageLevelProgressNavigationView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/PageLevelProgressNavigationView.js b/js/PageLevelProgressNavigationView.js index 54ed071..fdb36c3 100644 --- a/js/PageLevelProgressNavigationView.js +++ b/js/PageLevelProgressNavigationView.js @@ -15,7 +15,7 @@ export default class PageLevelProgressNavigationView extends Backbone.View { attributes() { return { - 'data-order': (Adapt.course.get('_globals')?._extensions?._pageLevelProgress?._navOrder || 90) + 'data-order': (Adapt.course.get('_globals')?._extensions?._pageLevelProgress?._navOrder || 0) } }