Changes for page Rangee Index

Summary

• Objects (1 modified, 0 added, 0 removed)
  • XWiki.WikiMacroClass[0]

Details

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -1,101 +1,56 @@
1	1	{{velocity}}
2		-##{{tree links="true" edges="false"}}
	2	+{{tree links="true" edges="false"}}
3	3	#set($depth = $wikimacro.parameters.depth)
4		-#if ($xcontext.locale == 'de')
5		- #set($locale = '')
6		-#else
	4	+#set($locale = '')
	5	+#if ($xcontext.locale != 'de')
7	7	#set($locale = $xcontext.locale)
8	8	#end
	8	+
	9	+## Macro für rekursive Baumstruktur
	10	+#macro(renderTreeNode $docFullName $currentDepth)
	11	+ #set($doc = $xwiki.getDocument($docFullName))
	12	+ #set($translatedDoc = $doc.getTranslatedDocument())
	13	+
	14	+ ## Nur rendern wenn Sprache passt (leerer locale matched alles für Standardsprache)
	15	+ #set($docLang = $translatedDoc.getLanguage())
	16	+ #if ($locale == '' || $locale == $docLang || ($locale == '' && $docLang == 'de'))
	17	+ #set($cssClass = '')
	18	+
	19	+ ## Kinder-Dokumente abfragen - OHNE currentlanguage Filter
	20	+ #set($childQuery = $services.query.xwql('where doc.parent = :parentDoc and doc.hidden = 0 order by doc.title asc'))
	21	+ #set($children = $childQuery.bindValue('parentDoc', $docFullName).execute())
	22	+
	23	+ ## CSS-Klasse nur wenn Kinder existieren UND Tiefe noch nicht erreicht
	24	+ #if ($children && $children.size() > 0 && $currentDepth < $depth)
	25	+ #set($cssClass = 'jstree-open')
	26	+ #end
	27	+
	28	+ <li class="$cssClass">
	29	+ [[$translatedDoc.getDisplayTitle()>>$translatedDoc.fullName]]
	30	+
	31	+ ## Rekursiv rendern wenn Kinder vorhanden sind
	32	+ #if ($children && $children.size() > 0 && $currentDepth < $depth)
	33	+ #set($nextDepth = $currentDepth + 1)
	34	+ <ul>
	35	+ #foreach($childDocName in $children)
	36	+ #renderTreeNode($childDocName $nextDepth)
	37	+ #end
	38	+ </ul>
	39	+ #end
	40	+ </li>
	41	+ #end
	42	+#end
	43	+
9	9	{{html wiki=true}}
10	10	<ul>
11		- #set($results = false)
12		- #set ($query = $services.query.xwql('where doc.parent = :doc and doc.hidden = 0 order by doc.title asc'))
13		- #set($results = $query.bindValue('doc', $doc.fullName).addFilter('currentlanguage').execute())
14		- $results
15		- #set($children =$doc.getChildren())
16		- $sorter.sort($children, ["name:asc", "ordinal:desc"]))
17		- #foreach($docname in $results)
18		- #set($rdoc = $xwiki.getDocument($docname).getTranslatedDocument())
19		- #if ($locale == $rdoc.getLanguage())
20		- <li class="
21		- #if ($depth > 0)
22		- jstree-open
23		- #end
24		- ">
25		- [[$rdoc.getDisplayTitle()>>$rdoc.fullName]]
26		- </li>
27		- #end
28		- #set($results2 = false)
29		- #set($query2 = $services.query.xwql('where doc.parent=:doc and doc.hidden = 0 order by doc.title asc'))
30		- #set($results2 = $query2.bindValue('doc', $docname).addFilter('currentlanguage').execute())
31		- <ul>
32		- #foreach($rdoc in $results2)
33		- #set($rdoc2 = $xwiki.getDocument($rdoc).getTranslatedDocument())
34		- #if ($locale == $rdoc2.getLanguage())
35		- <li class="
36		- #if ($depth > 1)
37		- jstree-open
38		- #end
39		- ">
40		- [[$rdoc2.getDisplayTitle()>>$rdoc2.fullName]]
41		- </li>
42		- #end
43		- #set($results3 = false)
44		- #set($query3 = $services.query.xwql('where doc.parent=:doc and doc.hidden = 0 order by doc.title asc'))
45		- #set($results3 = $query3.bindValue('doc', $rdoc).addFilter('currentlanguage').execute())
46		- <ul>
47		- #foreach($rdoc2 in $results3)
48		- #set($rdoc3 = $xwiki.getDocument($rdoc2).getTranslatedDocument())
49		- #if ($locale == $rdoc3.getLanguage())
50		- <li class="
51		- #if ($depth > 2)
52		- jstree-open
53		- #end
54		- ">
55		- [[$rdoc3.getDisplayTitle()>>$rdoc3.fullName]]
56		- </li>
57		- #end
58		- #set($results4 = false)
59		- #set($query4 = $services.query.xwql('where doc.parent=:doc and doc.hidden = 0 order by doc.title asc'))
60		- #set($results4 = $query4.bindValue('doc', $rdoc2).addFilter('currentlanguage').execute())
61		- <ul>
62		- #foreach($rdoc3 in $results4)
63		- #set($rdoc4 = $xwiki.getDocument($rdoc3).getTranslatedDocument())
64		- #if ($locale == $rdoc4.getLanguage())
65		- <li class="
66		- #if ($depth > 3)
67		- jstree-open
68		- #end
69		- ">
70		- [[$rdoc4.getDisplayTitle()>>$rdoc4.fullName]]
71		- </li>
72		- #end
73		- #set($results5 = false)
74		- #set($query5 = $services.query.xwql('where doc.parent=:doc and doc.hidden = 0 order by doc.title asc'))
75		- #set($results5 = $query3.bindValue('doc', $rdoc3).addFilter('currentlanguage').execute())
76		- <ul>
77		- #foreach($rdoc4 in $results5)
78		- #set($rdoc5 = $xwiki.getDocument($rdoc4).getTranslatedDocument())
79		- #if ($locale == $rdoc5.getLanguage())
80		- <li class="
81		- #if ($depth > 4)
82		- jstree-open
83		- #end
84		- ">
85		- [[$rdoc5.getDisplayTitle()>>$rdoc5.fullName]]
86		- </li>
87		- #end
88		- #end
89		- </ul>
90		- #end
91		- </ul>
92		- #end
93		- </ul>
94		- #end
95		- </ul>
96		- #end
	46	+ ## Root-Dokumente laden - OHNE currentlanguage Filter
	47	+ #set($rootQuery = $services.query.xwql('where doc.parent = :doc and doc.hidden = 0 order by doc.title asc'))
	48	+ #set($rootDocs = $rootQuery.bindValue('doc', $doc.fullName).execute())
	49	+
	50	+ #foreach($docName in $rootDocs)
	51	+ #renderTreeNode($docName 1)
	52	+ #end
97	97	</ul>
98		-
99	99	{{/html}}
100		-##{{/tree}}
	55	+{{/tree}}
101	101	{{/velocity}}