diff --git a/modules/site/parent_templates/site/common/js/application.js b/modules/site/parent_templates/site/common/js/application.js index 5453d318f..38719a1e3 100644 --- a/modules/site/parent_templates/site/common/js/application.js +++ b/modules/site/parent_templates/site/common/js/application.js @@ -483,7 +483,8 @@ function setup() { } } - var $glossaryPage = $(''); + var $glossaryTitle = $(data).find('learningObject').attr('glossaryTitle') != undefined ? $(data).find('learningObject').attr('glossaryTitle') : 'Glossary'; + var $glossaryPage = $(''); for (var i=0; i'); diff --git a/modules/site/parent_templates/site/wizards/en-GB/data.xwd b/modules/site/parent_templates/site/wizards/en-GB/data.xwd index 346303250..f99a41f9a 100644 --- a/modules/site/parent_templates/site/wizards/en-GB/data.xwd +++ b/modules/site/parent_templates/site/wizards/en-GB/data.xwd @@ -19,6 +19,7 @@ + diff --git a/modules/xerte/parent_templates/Nottingham/common_html5/js/xenith.js b/modules/xerte/parent_templates/Nottingham/common_html5/js/xenith.js index ab5f79181..f833cdf71 100644 --- a/modules/xerte/parent_templates/Nottingham/common_html5/js/xenith.js +++ b/modules/xerte/parent_templates/Nottingham/common_html5/js/xenith.js @@ -260,6 +260,19 @@ x_projectDataLoaded = function(xmlData) { } } + // sort any parameters in url - these will override those in xml + var tempUrlParams = window.location.href.slice(window.location.href.indexOf('?') + 1).split(/[#&]/), + hash; + + for (var i=0; i + diff --git a/src/site/wizards/en-GB/template.xwd b/src/site/wizards/en-GB/template.xwd index 346303250..f99a41f9a 100644 --- a/src/site/wizards/en-GB/template.xwd +++ b/src/site/wizards/en-GB/template.xwd @@ -19,6 +19,7 @@ +