10. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Jun 13 14:30:54 2008 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 Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

10.1 Files compared

#	Location	File	Last Modified
1			Fri Jun 13 14:30:54 2008 UTC
2	C:\devel_jahia\corp_V2TemplatesSP4\src\jsp\blogs	addcomment_form.inc	Fri Jun 13 14:30:10 2008 UTC

10.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	1	58
Removed	0	0

10.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	Not shown in the comparison detail

10.4 Active regular expressions

No regular expressions were active.

10.5 Comparison detail

				1		<%--
				2		Copyright 2002-2006 Jahia Ltd
				3
				4		Licensed u nder the J AHIA COMMO N DEVELOPM ENT AND DI STRIBUTION LICENSE ( JCDDL),
				5		Version 1. 0 (the "Li cense"), o r (at your option) a ny later v ersion; yo u may
				6		not use th is file ex cept in co mpliance w ith the Li cense. You should ha ve
				7		received a copy of t he License along wit h this pro gram; if n ot, you ma y obtain
				8		a copy of the Licens e at
				9
				10		http://ww w.jahia.or g/license/
				11
				12		Unless req uired by a pplicable law or agr eed to in writing, s oftware
				13		distribute d under th e License is distrib uted on an "AS IS" B ASIS,
				14		WITHOUT WA RRANTIES O R CONDITIO NS OF ANY KIND, eith er express or implie d.
				15		See the Li cense for the specif ic languag e governin g permissi ons and
				16		limitation s under th e License.
				17		--%><h4><c ontent:res ourceBundl e resource Bundle="ja hiatemplat es.Corpora te_portal_ templates_ v2"
				18		resour ceName="bl og.postYou rOwn"/></h 4>
				19		<content:f ormContent MapperHand ler listNa me="commen tsBean" su bmitMarker ="addComme nt"
				20		immedi atePublica tion="true "/>
				21		<form id=" postcommen t" action= "<%=bypass Url%>?entr yId=<%=ent ryId%>" na me="submit ToContaine rList" met hod="post" >
				22		<table width="10 0%">
				23		<tr>
				24		<t d>
				25		<content :resourceB undle reso urceBundle ="jahiatem plates.Cor porate_por tal_templa tes_v2"
				26		reso urceName=" blog.title "/>
				27		</ td>
				28		<t d><input t ype="text" name="com mentTitle" style="wi dth:80%;" value="Re: <%=title% >"></td>
				29		</tr>
				30		<tr>
				31		<t d>
				32		<content :resourceB undle reso urceBundle ="jahiatem plates.Cor porate_por tal_templa tes_v2"
				33		reso urceName=" blog.autho r"/>
				34		</ td>
				35		<t d><input t ype="text" name="com mentAuthor " style="w idth:80%;" value="<% =jParams.g etUser().g etUsername ()%>"></td >
				36		</tr>
				37		<tr>
				38		<t d>
				39		<content :resourceB undle reso urceBundle ="jahiatem plates.Cor porate_por tal_templa tes_v2"
				40		reso urceName=" blog.body" />
				41		</ td>
				42		<t d><textare a name="co mmentBody" cols="40" rows="50" style="wi dth:80%;he ight:100px ;"></texta rea></td>
				43		</tr>
				44		<tr>
				45		<t d> </ td>
				46		<t d>
				47		<a href= "javascrip t:document .submitToC ontainerLi st.submit( )"
				48		styl e="border: 1px solid #515C6A;pa dding:2px 5px 2px 5p x;">
				49		<con tent:resou rceBundle resourceBu ndle="jahi atemplates .Corporate _portal_te mplates_v2 "
				50		resourceNa me="blog.a ddComment" /></a>
				51		</ td>
				52		</tr>
				53		</tabl e>
				54		<input type="hid den" name= "addCommen t" value=" Submit"/>
				55		<input type="hid den" name= "commentDa te" value= "<%=System .currentTi meMillis() %>"/>
				56		</form>
				57
				58		<br/>