11. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Oct 19 14:25:20 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.

11.1 Files compared

#	File	Location	Last Modified
1	files.inc	C:\jahia\template_diff\V2_JAHIA_5_0_0\src\jsp\box	Fri Oct 19 14:18:35 2007 UTC
2	files.inc	C:\jahia\template_diff\V2_JAHIA_5_0_3\src\jsp\box	Fri Oct 19 14:16:50 2007 UTC

11.2 Comparison summary

Description	Between Files 1 and 2
Description	Blocks	Lines
Unchanged	4	72
Changed	2	11
Inserted	0	0
Removed	1	4

11.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

11.4 Active regular expressions

No regular expressions were active.

11.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	--%><bean:parameter id="displayDetails" name="displayDetails" value="false"/>	17	--%><bean:parameter id="displayDetails" name="displayDetails" value="false"/>
18	<content:containerList name='<%="files" + id%>' id="files" parentContainerName="boxContainer">	18	<content:containerList name='<%="files" + id%>' id="files" parentContainerName="boxContainer">
19	<%	19	<table class="files" border="0" cellspacing="0" cellpadding="0" width="100%">
20	int i = 0;
21	%>
22	<content:container id="fileContainer">	20	<content:container id="fileContainer">
23	<%	21	<%
24	ContainerBean fileContainerBean = (ContainerBean) pageContext.findAttribute("fileContainer");	22	ContainerBean fileContainerBean = (ContainerBean) pageContext.findAttribute("fileContainer");
25	JahiaContainer currentContainer = fileContainerBean.getJahiaContainer();	23	JahiaContainer currentContainer = fileContainerBean.getJahiaContainer();
26	JahiaFileField file = (JahiaFileField) currentContainer.getFieldObject("file");	24	JahiaFileField file = (JahiaFileField) currentContainer.getFieldObject("file");
27	String fileName = "null";	25	String fileName = "null";
28	String formatedSize = "";	26	String formatedSize = "";
29	String formatedLastModifDate = "";	27	String formatedLastModifDate = "";
30	String uploadUsername = "";	28	String uploadUsername = "";
31	String downloadUrl = "#";	29	String downloadUrl = "#";
32	String picto = "file";	30	String picto = "file";
33	boolean displayLine = false;	31	boolean displayLine = false;
34		32
35	if (file != null ) {	33	if (file != null ) {
36	displayLine = true;	34	displayLine = true;
37	formatedSize = file.getFormatedSize();	35	formatedSize = file.getFormatedSize();
38	formatedLastModifDate = file.getFormatedLastModifDate();	36	formatedLastModifDate = file.getFormatedLastModifDate();
39	downloadUrl = file.getDownloadUrl();	37	downloadUrl = file.getDownloadUrl();
40	fileName = file.getFileFieldTitle();	38	fileName = file.getFileFieldTitle();
41	if (fileName.equals("")){	39	if (fileName.equals("")){
42	fileName = file.getRealName();	40	fileName = file.getRealName();
43	}	41	}
44	picto = getPicto(file.getRealName());	42	picto = getPicto(file.getRealName());
45	if ("#".equals(downloadUrl)) {	43	if ("#".equals(downloadUrl)) {
46	displayLine = false;	44	displayLine = false;
47	}	45	}
48	}	46	}
49	if (jData.gui().isEditMode() \|\| displayLine ) {	47	if (jData.gui().isEditMode() \|\| displayLine ) {
50	i++;
51	if (i == 1){
52	%><table class="files" border="0" cellspacing="0" cellpadding="0" width="100%"><%
53	}
54	%>	48	%>
55	<tr>	49	<tr>
56	<td><a class="<%=picto%>" href="<%=downloadUrl%>" title="<%=fileName%>"><%=fileName%></a></td>	50	<td><a class="<%=picto%>" href="<%=downloadUrl%>" title="<%=fileName%>"><%=fileName%></a></td>
57	<td><content:textField valueId="fileDesc" name='fileDesc'	51	<td><content:textField valueId="fileDesc" name='fileDesc'
58	diffActive="true" defaultValue=""/></td>	52	diffActive="true" defaultValue=""/></td>
59	<logic:equal name="displayDetails" value="true">	53	<logic:equal name="displayDetails" value="true">
60	<td class="nowrap"><%=formatedSize%></td>	54	<td class="nowrap"><%=formatedSize%></td>
61	<td class="nowrap"><%=formatedLastModifDate%></td>	55	<td class="nowrap"><%=formatedLastModifDate%></td>
62	</logic:equal>	56	</logic:equal>
63		57
64	<td>	58	<td>
65	<jahiaHtml:actionMenu name="fileContainer" namePostFix=".filesContainer"	59	<jahiaHtml:actionMenu name="fileContainer" namePostFix=".filesContainer"
66	resourceBundle="jahiatemplates.Corporate_portal_templates_v2" useFieldSet="false">	60	resourceBundle="jahiatemplates.Corporate_portal_templates_v2" useFieldSet="false">
67	</jahiaHtml:actionMenu>	61	</jahiaHtml:actionMenu>
68	</td>	62	</td>
69	</tr>	63	</tr>
70	<%	64	<%
71	}	65	}
72	%>	66	%>
73	</content:container>	67	</content:container>
74	<%	68
75	if (i > 0){	69	</table>
76	%></table><%
77	}
78	%>
79	<jahiaHtml:actionMenu name="files" namePostFix=".filesContainers" resourceBundle="jahiatemplates.Corporate_portal_templates_v2"	70	<jahiaHtml:actionMenu name="files" namePostFix=".filesContainers" resourceBundle="jahiatemplates.Corporate_portal_templates_v2"
80	useFieldSet="false" actionIcon='<%=contextURL + "/img/actions/upload.gif"%>' labelKey="add.filesContainers">	71	useFieldSet="false" actionIcon='<%=contextURL + "/img/actions/upload.gif"%>' labelKey="add.filesContainers">
81	</jahiaHtml:actionMenu>	72	</jahiaHtml:actionMenu>
82	</content:containerList>	73	</content:containerList>
83		74
84		75