Site: make title of Glossary page editable

thexerteproject · Jun 15, 2023 · 0eafccb · 0eafccb
1 parent 718631b
commit 0eafccb
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git 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 = $('<page name="Glossary" subtitle=""></page>');
+				var $glossaryTitle = $(data).find('learningObject').attr('glossaryTitle') != undefined ? $(data).find('learningObject').attr('glossaryTitle') : 'Glossary';
+				var $glossaryPage = $('<page name="' + $glossaryTitle + '" subtitle=""></page>');
 				for (var i=0; i<charList.length; i++) {
 					var cDataSection = data.createCDATASection(glossaryTxt[i]);
 					var $section = $('<section name="' + charList[i] + '"><text></text></section>');

diff --git 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 @@
 			<glossaryHover label="Show Definition on Hover" type="Checkbox" defaultValue="true" optional="true"/>
 			<glossaryPage type="ComboBox" data="none,first,last" options="None,First Page,Last Page" optional="true" label="Glossary Page" defaultValue="none" width="175"/>
 			<glossaryMenu type="ComboBox" data="both,menu,headings,neither" options="Menu and Headings,Menu Only,Headings Only,No Menu or Headings" optional="true" label="Glossary Page Navigation" defaultValue="both" width="175"/>
+			<glossaryTitle type="TextInput" label="Glossary Title" defaultValue="Glossary" optional="true" tooltip="The name of the page or menu if either is enabled"/>
 		</glossaryGroup>
 
 		<headerGroup type="group" label="Header" optional="true">

diff --git 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<tempUrlParams.length; i++) {
+		var split = tempUrlParams[i].split("=");
+		if (split.length == 2) {
+			x_urlParams[split[0]] = split[1];
+		} else {
+			hash = tempUrlParams[i];
+		}
+	}
+
     x_pages = xmlData.children();
 	var pageToHide = [],
 		currActPage = 0;
@@ -508,19 +521,6 @@ 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<tempUrlParams.length; i++) {
-		var split = tempUrlParams[i].split("=");
-		if (split.length == 2) {
-			x_urlParams[split[0]] = split[1];
-		} else {
-			hash = tempUrlParams[i];
-		}
-    }
-
 	// there are several URL params that can determine the 1st page viewed - check if they are valid pages before setting start page
 	var customStartPage = false;
 

diff --git a/src/site/wizards/en-GB/basic.xwd b/src/site/wizards/en-GB/basic.xwd
@@ -18,6 +18,7 @@
 			<glossaryHover label="Show Definition on Hover" type="Checkbox" defaultValue="true" optional="true"/>
 			<glossaryPage type="ComboBox" data="none,first,last" options="None,First Page,Last Page" optional="true" label="Glossary Page" defaultValue="none" width="175"/>
 			<glossaryMenu type="ComboBox" data="both,menu,headings,neither" options="Menu and Headings,Menu Only,Headings Only,No Menu or Headings" optional="true" label="Glossary Page Navigation" defaultValue="both" width="175"/>
+			<glossaryTitle type="TextInput" label="Glossary Title" defaultValue="Glossary" optional="true" tooltip="The name of the page or menu if either is enabled" />
 		</glossaryGroup>
 
 		<headerGroup type="group" label="Header" optional="true">

diff --git a/src/site/wizards/en-GB/template.xwd b/src/site/wizards/en-GB/template.xwd
@@ -19,6 +19,7 @@
 			<glossaryHover label="Show Definition on Hover" type="Checkbox" defaultValue="true" optional="true"/>
 			<glossaryPage type="ComboBox" data="none,first,last" options="None,First Page,Last Page" optional="true" label="Glossary Page" defaultValue="none" width="175"/>
 			<glossaryMenu type="ComboBox" data="both,menu,headings,neither" options="Menu and Headings,Menu Only,Headings Only,No Menu or Headings" optional="true" label="Glossary Page Navigation" defaultValue="both" width="175"/>
+			<glossaryTitle type="TextInput" label="Glossary Title" defaultValue="Glossary" optional="true" tooltip="The name of the page or menu if either is enabled"/>
 		</glossaryGroup>
 
 		<headerGroup type="group" label="Header" optional="true">