31. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Oct 19 14:26:01 2007 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.

31.1 Files compared

#	File	Location	Last Modified
1	transmenu.inc	C:\jahia\template_diff\V2_JAHIA_5_0_2\src\jsp\javascript	Fri Oct 19 14:17:32 2007 UTC
2	transmenu.inc	C:\jahia\template_diff\V2_JAHIA_5_0_3\src\jsp\javascript	Fri Oct 19 14:16:51 2007 UTC

31.2 Comparison summary

Description	Between Files 1 and 2
Description	Blocks	Lines
Unchanged	2	81
Changed	1	10
Inserted	0	0
Removed	0	0

31.3 Comparison options

Whitespace	All differences in whitespace within lines are ignored
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Hidden in comparison detail

31.4 Active regular expressions

No regular expressions were active.

31.5 Comparison detail

1	<%--	1	<%--
2	Copyright 2002-2006 Jahia Ltd	2	Copyright 2002-2006 Jahia Ltd
3		3
4	Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDDL),	4	Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDDL),
5	Version 1.0 (the "License"), or (at your option) any later version; you may	5	Version 1.0 (the "License"), or (at your option) any later version; you may
6	not use this file except in compliance with the License. You should have	6	not use this file except in compliance with the License. You should have
7	received a copy of the License along with this program; if not, you may obtain	7	received a copy of the License along with this program; if not, you may obtain
8	a copy of the License at	8	a copy of the License at
9		9
10	http://www.jahia.org/license/	10	http://www.jahia.org/license/
11		11
12	Unless required by applicable law or agreed to in writing, software	12	Unless required by applicable law or agreed to in writing, software
13	distributed under the License is distributed on an "AS IS" BASIS,	13	distributed under the License is distributed on an "AS IS" BASIS,
14	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	14	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15	See the License for the specific language governing permissions and	15	See the License for the specific language governing permissions and
16	limitations under the License.	16	limitations under the License.
17	--%><script language="javascript" type="text/javascript"><!--//--><![CDATA[//><!--	17	--%><script language="javascript" type="text/javascript"><!--//--><![CDATA[//><!--
18	// set up drop downs anywhere in the body of the page. I think the bottom of the page is better..	18	// set up drop downs anywhere in the body of the page. I think the bottom of the page is better..
19	// but you can experiment with effect on loadtime.	19	// but you can experiment with effect on loadtime.
20	if (TransMenu.isSupported()) {	20	if (TransMenu.isSupported()) {
21	//==================================================================================================	21	//==================================================================================================
22	// create a set of dropdowns	22	// create a set of dropdowns
23	//==================================================================================================	23	//==================================================================================================
24	// the first param should always be down, as it is here	24	// the first param should always be down, as it is here
25	//	25	//
26	// The second and third param are the top and left offset positions of the menus from their actuators	26	// The second and third param are the top and left offset positions of the menus from their actuators
27	// respectively. To make a menu appear a little to the left and bottom of an actuator, you could use	27	// respectively. To make a menu appear a little to the left and bottom of an actuator, you could use
28	// something like -5, 5	28	// something like -5, 5
29	//	29	//
30	// The last parameter can be .topLeft, .bottomLeft, .topRight, or .bottomRight to inidicate the corner	30	// The last parameter can be .topLeft, .bottomLeft, .topRight, or .bottomRight to inidicate the corner
31	// of the actuator from which to measure the offset positions above. Here we are saying we want the	31	// of the actuator from which to measure the offset positions above. Here we are saying we want the
32	// menu to appear directly below the bottom left corner of the actuator	32	// menu to appear directly below the bottom left corner of the actuator
33	//==================================================================================================	33	//==================================================================================================
34	var ms = new TransMenuSet(TransMenu.direction.down, 1, 0, TransMenu.reference.bottomLeft);	34	var ms = new TransMenuSet(TransMenu.direction.down, 1, 0, TransMenu.reference.bottomLeft);
35		35
36	//==================================================================================================	36	//==================================================================================================
37	// create a dropdown menu	37	// create a dropdown menu
38	//==================================================================================================	38	//==================================================================================================
39	// the first parameter should be the HTML element which will act actuator for the menu	39	// the first parameter should be the HTML element which will act actuator for the menu
40	//==================================================================================================	40	//==================================================================================================
41	<%	41	<%
42		42
43	if(!jData.gui().isEditMode()) {	43	if(!jData.gui().isEditMode()) {
44	topNavigationContainers = topNavigationContainerVector.elements();	44	topNavigationContainers = topNavigationContainerVector.elements();
45	while (topNavigationContainers.hasMoreElements()) {	45	while (topNavigationContainers.hasMoreElements()) {
46	JahiaContainer topNavigationContainer =	46	JahiaContainer topNavigationContainer = (JahiaContainer) topNavigationContainers.nextElement();
47	(JahiaContainer) topNavigationContainers.nextElement( );	47	JahiaPage navigationLink = (JahiaPage ) topNavigationContainer .ge tFieldObject("navigationLink");
48	JahiaPage navigationLink =	48	if (navigationLink != null
49	(JahiaPage) topNavigationContainer.getFieldObject("navigationLink");	49	&& navigationLink.getChilds(user)!=null
50	if (navigationLink != nul l ) {	50	&& navigationLink.getChilds(user).hasMoreElements()) {
51	%>	51	%>
52	var topmenu_<%=topNavigationContainer.getID()%> = ms.addMenu(document.getElementById("topmenu_<%=topNavigationContainer.getID()%>"));	52	var topmenu_<%=topNavigationContainer.getID()%> = ms.addMenu(document.getElementById("topmenu_<%=topNavigationContainer.getID()%>"));
53	<%	53	<%
54	JahiaContainerList level2ContainerList = jData.containers().getAbsoluteContainerList( "navigationContainerList", navigationLink.getID() );	54	JahiaContainerList level2ContainerList = jData.containers().getAbsoluteContainerList( "navigationContainerList", navigationLink.getID() );
55	if (level2ContainerList != null) {	55	if (level2ContainerList != null) {
56	Enumeration level2Containers = level2ContainerList.getContainers();	56	Enumeration level2Containers = level2ContainerList.getContainers();
57	while (level2Containers.hasMoreElements()) {	57	while (level2Containers.hasMoreElements()) {
58	JahiaContainer level2Container =	58	JahiaContainer level2Container =
59	(JahiaContainer) level2Containers.nextElement();	59	(JahiaContainer) level2Containers.nextElement();
60	JahiaPage navigationLink2 =	60	JahiaPage navigationLink2 =
61	(JahiaPage) level2Container.getFieldObject("navigationLink");	61	(JahiaPage) level2Container.getFieldObject("navigationLink");
62	if (navigationLink2 != null) {	62	if (navigationLink2 != null) {
63	%>topmenu_<%=topNavigationContainer.getID()%>.addItem("<%=navigationLink2.getHighLightDiffTitle(jParams)%>", "<%=navigationLink2.getURL(jParams)%>");<%	63	%>topmenu_<%=topNavigationContainer.getID()%>.addItem("<%=navigationLink2.getHighLightDiffTitle(jParams)%>", "<%=navigationLink2.getURL(jParams)%>");<%
64	}	64	}
65	}	65	}
66	}	66	}
67	}	67	}
68	}	68	}
69		69
70	%>	70	%>
71		71
72		72
73		73
74	//==================================================================================================	74	//==================================================================================================
75	// write drop downs into page	75	// write drop downs into page
76	//==================================================================================================	76	//==================================================================================================
77	// this method writes all the HTML for the menus into the page with document.write(). It must be	77	// this method writes all the HTML for the menus into the page with document.write(). It must be
78	// called within the body of the HTML page.	78	// called within the body of the HTML page.
79	//==================================================================================================	79	//==================================================================================================
80	TransMenu.renderAll();	80	TransMenu.renderAll();
81	<%	81	<%
82	}	82	}
83	%>	83	%>
84	}	84	}
85		85
86	//--><!]]></script>	86	//--><!]]></script>