fix: navigation

docs/changelog/7.x.x.txt

@@ -13,6 +13,7 @@
  - fix: Dataform adding fields without fieldname (Wouter van Oijen / ProcoliX)
  - fix: Fatal in Affiliate.pm
  - Fixed several problems to make WebGUI 7 Windows compatible again.
+ - fix: navigation (Wouter van Oijen / Procolix)
 
 
 7.0.2

docs/upgrades/templates-7.0.3/dtree.tmpl

@@ -0,0 +1,37 @@
+#PBtmpl0000000000000130
+<tmpl_if displayTitle>
+	<h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+	<p><tmpl_var description></p>
+</tmpl_if>
+
+<tmpl_if session.var.adminOn>
+	<tmpl_var controls>
+</tmpl_if>
+
+<div class="dtree">
+<script type="text/javascript">
+<!--
+	// Path to dtree directory
+	_dtree_url = "^Extras(Navigation/dtree/);";
+
+	d = new dTree('d','^/;');
+	<tmpl_loop page_loop>
+	d.add(
+		'<tmpl_var page.assetId escape=JS>',
+		<tmpl_if __first__>-99<tmpl_else>'<tmpl_var page.parentId escape=JS>'</tmpl_if>,
+		'<tmpl_var page.menuTitle escape=JS>',
+		'<tmpl_var page.url escape=JS>',
+		'<tmpl_var page.synopsis escape=JS>'
+		<tmpl_if page.newWindow>,'_blank'</tmpl_if>
+	);
+	</tmpl_loop>
+	document.write(d);
+//-->
+</script>
+</div>
+~~~
+<link href="^Extras(Navigation/dtree/dtree.css);" type="text/css" rel="stylesheet" />
+<script src="^Extras(Navigation/dtree/dtree.js);" type="text/javascript"></script>

www/extras/Navigation/dtree/dtree.js

@@ -58,7 +58,7 @@ function Node(id, pid, name, url, title, target, icon, iconOpen, open) {
 
 // Tree object
 
-function dTree(objName) {
+function dTree(objName, path) {
 
 	this.config = {
 
@@ -116,6 +116,8 @@ function dTree(objName) {
 
 	this.obj = objName;
 
+	this.path = path;
+
 	this.aNodes = [];
 
 	this.aIndent = [];
@@ -580,6 +582,7 @@ dTree.prototype.clearCookie = function() {
 
 dTree.prototype.setCookie = function(cookieName, cookieValue, expires, path, domain, secure) {
 
+	path = this.path;
 	document.cookie =
 
 		escape(cookieName) + '=' + escape(cookieValue)