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

24.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_pingurl.inc	Fri Jun 13 14:30:10 2008 UTC

24.2 Comparison summary

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

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

24.4 Active regular expressions

No regular expressions were active.

24.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 (jData. gui().isEd itMode()) {
				19		JahiaC ontainerLi st pingURL s = entry. getContain erList( "t rackBackPi ngURLs" );
				20		Contai nerListBea n pingURLs Bean = new Container ListBean(p ingURLs,jP arams);
				21		pageCo ntext.setA ttribute(" pingURLsLi st", pingU RLsBean);
				22
				23		jData. gui().html ().drawBeg inActionMe nu(pingURL sBean ,
				24		nu ll, null, true, "", "jahiatemp lates.Corp orate_port al_templat es_v2", nu ll, out);
				25		%>
				26		<conte nt:addCont ainerURL n ame="pingU RLsList" i d="addPing UrlContain erURL" dis play="fals e"/>
				27
				28		<h4><c ontent:res ourceBundl e resource Bundle="ja hiatemplat es.Corpora te_portal_ templates_ v2"
				29		re sourceName ="blog.sen tPingUrl"/ >
				30		<log ic:present name="add PingUrlCon tainerURL" >
				31		<a href="< bean:write name='add PingUrlCon tainerURL' />"><img
				32		src="< content:co ntextURL/> /img/actio ns/add.gif " width="1 1" height= "11"
				33		alt="+ " border=" 0"/></a>
				34		</lo gic:presen t>
				35		</h4>
				36		<%
				37		if (pi ngURLs != null) {
				38		En umeration pingURLEnu m = pingUR Ls.getCont ainers();
				39		wh ile (pingU RLEnum.has MoreElemen ts()) {
				40		JahiaCon tainer pin gURL = (Ja hiaContain er)pingURL Enum.nextE lement();
				41		String p ingURLValu e = pingUR L.getField Value("pin gURL","");
				42		Containe rBean ping URLBean = new Contai nerBean(pi ngURL,jPar ams);
				43		%>
				44		<%=pingU RLValue%>
				45		<%jData. gui().html ().drawBeg inActionMe nu(pingURL Bean,
				46		null , null, fa lse, "", " jahiatempl ates.Corpo rate_porta l_template s_v2", nul l, out);%>
				47		<br/>
				48		<%
				49		}
				50		}
				51		jData. gui().html ().drawEnd ActionMenu (pingURLsB ean ,
				52		nu ll, null, true, "", "jahiatemp lates.Corp orate_port al_templat es_v2", nu ll, out);
				53		}
				54		%>