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.
| # | File | Location | Last Modified |
|---|---|---|---|
| 1 | pagetitle.jsp | C:\jahia\template_diff\V2_JAHIA_5_0_0\src\jsp\common | Fri Oct 19 14:18:35 2007 UTC |
| 2 | pagetitle.jsp | C:\jahia\template_diff\V2_JAHIA_5_0_3\src\jsp\common | Fri Oct 19 14:16:50 2007 UTC |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Blocks | Lines | |
| Unchanged | 2 | 34 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| 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 |
No regular expressions were active.
| 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 | --%> | 17 | --%> | |||
| 18 | <!--%@ include file="../common/declarations.inc"%--> | 18 | <!--%@ include file="../common/declarations.inc"%--> | |||
| 19 | <!--%@ include file="../common/common_vars.inc"%--> | 19 | <!--%@ include file="../common/common_vars.inc"%--> | |||
| 20 | <%@ taglib uri="contentLib" prefix="content" %> | 20 | <%@ taglib uri="contentLib" prefix="content" %> | |||
| 21 | <%@ taglib uri="jahiaHtmlLib" prefix="jahiaHtml" %> | 21 | <%@ taglib uri="jahiaHtmlLib" prefix="jahiaHtml" %> | |||
| 22 | <%@ taglib uri="/WEB-INF/etc/struts/struts-bean" prefix="bean" %> | 22 | <%@ taglib uri="/WEB-INF/etc/struts/struts-bean" prefix="bean" %> | |||
| 23 | <%@ taglib uri="/WEB-INF/etc/struts/struts-html" prefix="html" %> | 23 | <%@ taglib uri="/WEB-INF/etc/struts/struts-html" prefix="html" %> | |||
| 24 | <%@ taglib uri="/WEB-INF/etc/struts/struts-logic" prefix="logic" %> | 24 | <%@ taglib uri="/WEB-INF/etc/struts/struts-logic" prefix="logic" %> | |||
| 25 | <logic:notEqual name="currentPage" property="homePage" value="true"> | 25 | <logic:notEqual name="currentPage" property="homePage" value="true"> | |||
| 26 | <h1> | 26 | <h1> | |||
| 27 | <bean:write name="currentPage" property=" t itle" filter="false"/> | 27 | <bean:write name="currentPage" property="highLightDiffTitle" filter="false"/> | |||
| 28 | <content:pagePropertiesURL id="pagePropertiesURL" display="false" /> | 28 | <content:pagePropertiesURL id="pagePropertiesURL" display="false" /> | |||
| 29 | <logic:present name="pagePropertiesURL"> | 29 | <logic:present name="pagePropertiesURL"> | |||
| 30 | <a href="<bean:write name='pagePropertiesURL'/>" title="Update page title"> | 30 | <a href="<bean:write name='pagePropertiesURL'/>" title="Update page title"> | |||
| 31 | <img src="<content:contextURL/>/img/actions/update.gif" alt="Update" border="0"/> | 31 | <img src="<content:contextURL/>/img/actions/update.gif" alt="Update" border="0"/> | |||
| 32 | </a> | 32 | </a> | |||
| 33 | </logic:present> | 33 | </logic:present> | |||
| 34 | </h1> | 34 | </h1> | |||
| 35 | </logic:notEqual> | 35 | </logic:notEqual> |
Araxis Merge (but not this generated report) is Copyright © 1993-2003 Araxis Ltd (www.araxis.com). All rights reserved.