25. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Jun 13 14:30:55 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.

25.1 Files compared

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

25.2 Comparison summary

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

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

25.4 Active regular expressions

No regular expressions were active.

25.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		--%><%
				18		if (trackb acks != nu ll) {
				19		Contai nerListBea n trackbac ksBean = n ew Contain erListBean (trackback s,jParams) ;
				20		jData. gui().html ().drawBeg inActionMe nu(trackba cksBean,
				21		nu ll, null, true, "", "jahiatemp lates.Corp orate_port al_templat es_v2", nu ll, out);
				22		if (tr ackbacksCo unt>0 \|\| j Data.gui() .isEditMod e()) {
				23		%>
				24		<h 4 id="trac kbacks">
				25		<%=track backsCount %> <c ontent:res ourceBundl e resource Bundle="ja hiatemplat es.Corpora te_portal_ templates_ v2"
				26		resource Name="blog .trackback s"/>
				27		</ h4>
				28		<d l>
				29		<%
				30		En umeration trackbacks Enum = tra ckbacks.ge tContainer s();
				31		in t counter = 0;
				32		wh ile (track backsEnum. hasMoreEle ments()) {
				33		JahiaCon tainer tra ckback = ( JahiaConta iner) trac kbacksEnum .nextEleme nt();
				34		Containe rBean trac kbackBean = new Cont ainerBean( trackback, jParams);
				35		counter+ +;
				36		String a lt = count er % 2 == 1 ? "alt" : "alt2";
				37		String t rackBackTi tle = trac kback.getF ieldValue( "trackBack Title","") ;
				38		String t rackBackEx cerpt = tr ackback.ge tFieldValu e("trackBa ckExcerpt" ,"");
				39		String t rackBackUr l = trackb ack.getFie ldValue("t rackBackUr l","#");
				40		String t rackBackBl og_name = trackback. getFieldVa lue("track BackBlog_n ame","#");
				41		%>
				42		<dt id=" trackback< %=counter% >" class=" <%=alt%>">
				43		<a h ref="#trac kback<%=co unter%>" c lass="post no" title= "Link to t rackback < %=counter% >"><%=coun ter%>.</a>
				44		<a h ref="<%=tr ackBackUrl %>" target ="_blank" style="fon t-size:11p x"><%="".e quals(trac kBackBlog_ name)?trac kBackUrl:t rackBackBl og_name%>< /a>
				45		</dt>
				46		<dd clas s="<%=alt% >">
				47		<%
				48		if ( ! "".equal s(trackBac kTitle)) {
				49		%><h3><%=t rackBackTi tle%></h3> <%
				50		}
				51		if ( ! "".equal s(trackBac kExcerpt)) {
				52		%><%=track BackExcerp t%><br/><%
				53		}
				54		%>
				55		<a h ref="<%=tr ackBackUrl %>" target ="_blank" style="fon t-size:11p x"><%="".e quals(trac kBackBlog_ name)?trac kBackUrl:t rackBackBl og_name%>< /a>
				56		<%
				57		jDat a.gui().ht ml().drawB eginAction Menu(track backBean ,
				58		null, null , false, " ", "jahiat emplates.C orporate_p ortal_temp lates_v2", null, out );
				59		%>
				60		</dd>
				61		<%
				62		} // while
				63		%>
				64		</ dl>
				65		<%
				66		}
				67		jData. gui().html ().drawEnd ActionMenu (trackback sBean ,
				68		nu ll, null, true, "", "jahiatemp lates.Corp orate_port al_templat es_v2", nu ll, out);
				69		}
				70		%>