22. Araxis Merge File Comparison Report

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

22.1 Files compared

#FileLocationLast Modified
1top.incC:\jahia\template_diff\V2_JAHIA_5_0_2\src\jsp\commonFri Oct 19 14:17:32 2007 UTC
2top.incC:\jahia\template_diff\V2_JAHIA_5_0_3\src\jsp\commonFri Oct 19 14:16:50 2007 UTC

22.2 Comparison summary

DescriptionBetween
Files 1 and 2
BlocksLines
Unchanged8403
Changed48
Inserted26
Removed11

22.3 Comparison options

WhitespaceAll differences in whitespace within lines are ignored
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersHidden in comparison detail

22.4 Active regular expressions

No regular expressions were active.

22.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 --%><%@ page import="org.jahia.registries.ServicesRegistry" %> 17 --%><%@ page import="org.jahia.registries.ServicesRegistry" %>
18 <%@ page import="org.jahia.services.acl.JahiaACLManagerService" %> 18 <%@ page import="org.jahia.services.acl.JahiaACLManagerService" %>
19 <%@ page import="org.jahia.services.acl.JahiaBaseACL" %> 19 <%@ page import="org.jahia.services.acl.JahiaBaseACL" %>
20 <%@ page import="org.jahia.resourcebundle.*" %> 20 <%@ page import="org.jahia.resourcebundle.*" %>
21 <%@ page import="java.util.*" %> 21 <%@ page import="java.util.*" %>
22 <%@ page import="org.jahia.utils.*" %> 22 <%@ page import="org.jahia.utils.*" %>
23 <%@ page import="org.jahia.services.sites.*" %> 23 <%@ page import="org.jahia.services.sites.*" %>
24 <%@ taglib uri="JahiaLib" prefix="jahia" %> 24 <%@ taglib uri="JahiaLib" prefix="jahia" %>
25 <%@ page import="org.jahia.settings.SettingsBean"%> 25 <%@ page import="org.jahia.settings.SettingsBean"%>
26 <%@ page import="org.jahia.services.esi.EsiSOAPInvalidatorService"%> 26 <%@ page import="org.jahia.services.esi.EsiSOAPInvalidatorService"%>
27  27 
28 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 28 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
29     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 29     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
30 <html xmlns="http://www.w3.org/1999/xhtml" lang="<%=languageCode%>"> 30 <html xmlns="http://www.w3.org/1999/xhtml" lang="<%=languageCode%>">
31 <head> 31 <head>
32 <%@ include file="/jsp/jahia/javascript/serverconfig_js.inc"%> 32 <%@ include file="/jsp/jahia/javascript/serverconfig_js.inc"%>
33 <script language="javascript"> 33 <script language="javascript">
34 var chatOnline = "<%=chatstatus%>";//default state of the chat 34 var chatOnline = "<%=chatstatus%>";//default state of the chat
35 var currentUserKey = "<%=user.getUserKey()%>";//our userkey 35 var currentUserKey = "<%=user.getUserKey()%>";//our userkey
36 </script> 36 </script>
37 <jesi:fragment aclGroup="true"> 37 <jesi:fragment aclGroup="true">
38 <% 38 <%
39  39 
40 if (contentPage.getPageTemplate(entryLoadRequest).getSourcePath().indexOf("webdav") != -1 ) { 40 if (contentPage.getPageTemplate(entryLoadRequest).getSourcePath().indexOf("webdav") != -1 ) {
41     %> 41     %>
42     <%@ page import="org.jahia.taglibs.ajax.ComplexTreeInclude" %> 42     <%@ page import="org.jahia.taglibs.ajax.ComplexTreeInclude" %>
43     <%@ taglib uri="ajaxLib" prefix="ajax" %> 43     <%@ taglib uri="ajaxLib" prefix="ajax" %>
44     <ajax:zimbraInclude/> 44     <ajax:zimbraInclude/>
45     <% 45     <%
46 } 46 }
47 if ("sitemap".equals(jParams.getEngine())) { 47 if ("sitemap".equals(jParams.getEngine())) {
48     %><meta name="robots" content="noindex,nofollow"/><% 48     %><meta name="robots" content="noindex,nofollow"/><%
49 } 49 }
50 if (request.getServletPath().endsWith("ldap.jsp")) { 50 if (request.getServletPath().endsWith("ldap.jsp")) {
51 %> 51 %>
52 <link rel="stylesheet" href="<content:contextURL/>/css/ldap.css" type="text/css" /> 52 <link rel="stylesheet" href="<content:contextURL/>/css/ldap.css" type="text/css" />
53 <% 53 <%
54 } 54 }
55 if (request.getServletPath().endsWith("quizz.jsp") || request.getServletPath().endsWith("survey.jsp")) { 55 if (request.getServletPath().endsWith("quizz.jsp") || request.getServletPath().endsWith("survey.jsp")) {
56 %> 56 %>
57 <link rel="stylesheet" href="<content:contextURL/>/css/button.css" type="text/css" /> 57 <link rel="stylesheet" href="<content:contextURL/>/css/button.css" type="text/css" />
58 <script language="javascript" src="<content:contextURL/>/javascript/yav.js" type="text/javascript"></script> 58 <script language="javascript" src="<content:contextURL/>/javascript/yav.js" type="text/javascript"></script>
59 <script language="javascript" type="text/javascript"><!-- 59 <script language="javascript" type="text/javascript"> 
60 <%@ include file="../javascript/yav-config_js.inc"%> 60 <%@ include file="../javascript/yav-config_js.inc"%>
61 //-->  
62 </script> 61 </script>
63 <% 62 <%
64 } 63 }
65  64 
66 if (request.getServletPath().endsWith("blog.jsp")){ 65 if (request.getServletPath().endsWith("blog.jsp")){
67 %> 66 %>
68 <link rel="alternate" type="application/rss+xml" title="Jahia Blog" href="<%=bypassUrl%>/template/blog_rss_2_0.rss" /> 67 <link rel="alternate" type="application/rss+xml" title="Jahia Blog" href="<%=bypassUrl%>/template/blog_rss_2_0.rss" />
69 <% 68 <%
70 } 69 }
71 %> 70 %>
72 <content:JSTools/> 71 <content:JSTools/>
73 <title><bean:write name="currentPage" property="title" filter="false"/></title> 72 <title><bean:write name="currentPage" property="title" filter="false"/></title>
74 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 73 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
75 <% 74 <%
76     String metadatakeywords = jParams.getContentPage().getMetadataValue("keywords", jParams, "").trim(); 75     String metadatakeywords = jParams.getContentPage().getMetadataValue("keywords", jParams, "").trim();
77     String metadatadescription = jParams.getContentPage().getMetadataValue("description", jParams, "").trim(); 76     String metadatadescription = jParams.getContentPage().getMetadataValue("description", jParams, "").trim();
78     String metadataauthor = jParams.getContentPage().getMetadataValue("creator", jParams, "").trim(); 77     String metadataauthor = jParams.getContentPage().getMetadataValue("creator", jParams, "").trim();
79     String metadatalastPublished = jParams.getContentPage().getMetadataValue("lastPublishingDate", jParams, "").trim(); 78     String metadatalastPublished = jParams.getContentPage().getMetadataValue("lastPublishingDate", jParams, "").trim();
80 %> 79 %>
81 <% if(!"".equals(metadatakeywords)) { %> 80 <% if(!"".equals(metadatakeywords)) { %>
82 <meta name="keywords" lang="<%=jParams.getLocale().getLanguage()%>" content="<%=metadatakeywords%>"/> 81 <meta name="keywords" lang="<%=jParams.getLocale().getLanguage()%>" content="<%=metadatakeywords%>"/>
83 <%}%> 82 <%}%>
84 <% if(!"".equals(metadatadescription)) { %> 83 <% if(!"".equals(metadatadescription)) { %>
85 <meta name="description" lang="<%=jParams.getLocale().getLanguage()%>" content="<%=metadatadescription%>"/> 84 <meta name="description" lang="<%=jParams.getLocale().getLanguage()%>" content="<%=metadatadescription%>"/>
86 <%}%> 85 <%}%>
87 <% if(!"".equals(metadataauthor)) { %> 86 <% if(!"".equals(metadataauthor)) { %>
88 <meta name="author" lang="<%=jParams.getLocale().getLanguage()%>" content="<%=metadataauthor%>"/> 87 <meta name="author" lang="<%=jParams.getLocale().getLanguage()%>" content="<%=metadataauthor%>"/>
89 <%}%> 88 <%}%>
90 <!--TEMPLATE CSS--> 89 <!--TEMPLATE CSS-->
91 <!-- removed and fusionned template's css: screen.css, jforum.css, portlet.css, advsearch_css.jsp --> 90 <!-- removed and fusionned template's css: screen.css, jforum.css, portlet.css, advsearch_css.jsp -->
92 <link rel="stylesheet" href="<content:contextURL/>/css/template_css.jsp" type="text/css"></link> 91 <link rel="stylesheet" href="<content:contextURL/>/css/template_css.jsp" type="text/css"></link>
93 <!--used in print mode only--> 92 <!--used in print mode only-->
94 <link rel="stylesheet" href="<content:contextURL/>/css/print.css" type="text/css" media="print"></link> 93 <link rel="stylesheet" href="<content:contextURL/>/css/print.css" type="text/css" media="print"></link>
95 <!--END TEMPLATE CSS--> 94 <!--END TEMPLATE CSS-->
96 <script language="javascript" src="<content:serverHttpPath/>/jsp/jahia/javascript/SearchTools.js" type="text/javascript"></script> 95 <script language="javascript" src="<content:serverHttpPath/>/jsp/jahia/javascript/SearchTools.js" type="text/javascript"></script>
97 <% 96 <%
98     boolean introducingTheVeryFatZimbra = false; 97     boolean  n e edZimbra = false;
99     if(request.getSession().getAttribute(userSettings.TBP_VISU_ENABLED)!=null){ 98     if (request.getSession().getAttribute(userSettings.TBP_VISU_ENABLED)!= null){
100     introducingTheVeryFatZimbra =((String)request.getSession().getAttribute(userSettings.TBP_VISU_ENABLED)).t rim().equalsIgnoreCase("true"); 99      n e edZimbra = Boolean.parseBoolean(request.getSession().getAttribute(userSettings.TBP_VISU_ENABLED) .toStri ng());
101 } 100 }
102     if (isEditMode && introducingTheVeryFatZimbra) { 101     if (isEditMode &&  n e edZimbra) {
103 %> 102 %>
104  <% if (request.getServletPath().endsWith("advsearchresult.jsp")) { %> 103  <% if (request.getServletPath().endsWith("advsearchresult.jsp")) { %>
105                 <meta name="robots" content="noindex,nofollow"> 104                 <meta name="robots" content="noindex,nofollow">
106  <% } %> 105  <% } %>
107 <ajax:zimbraInclude/> 106 <ajax:zimbraInclude/>
108 <% 107 <%
109     } 108     }
110 %> 109 %>
111 <logic:equal name="currentRequest" property="editMode" value="true"> 110 <logic:equal name="currentRequest" property="editMode" value="true">
112 <link rel="stylesheet" href="<content:contextURL/>/css/edit.css" type="text/css" ></link> 111 <link rel="stylesheet" href="<content:contextURL/>/css/edit.css" type="text/css" ></link>
113 <script language="javascript" src="<content:contextURL/>/javascript/actions.js" type="text/javascript"></script> 112 <script language="javascript" src="<content:contextURL/>/javascript/actions.js" type="text/javascript"></script>
114 <script language="javascript" src="<content:serverHttpPath/>/jsp/jahia/javascript/zimbra/timebasedpublishing/TimeBasedPublishingStatus.js" type="text/javascript"></script> 113 <script language="javascript" src="<content:serverHttpPath/>/jsp/jahia/javascript/zimbra/timebasedpublishing/TimeBasedPublishingStatus.js" type="text/javascript"></script>
115 </logic:equal> 114 </logic:equal>
116  115 
117 <!-- CORE DEFAULT CSS STYLE--> 116 <!-- CORE DEFAULT CSS STYLE-->
118 <!-- replace tab.css, topmenu.css, menu.css,zimbra.css--> 117 <!-- replace tab.css, topmenu.css, menu.css,zimbra.css-->
119 <link rel="stylesheet" href="<content:serverHttpPath/>/jsp/jahia/css/core_css.jsp" type="text/css"></link> 118 <link rel="stylesheet" href="<content:serverHttpPath/>/jsp/jahia/css/core_css.jsp" type="text/css"></link>
120 <style type="text/css"> 119 <style type="text/css">
121 <!-- 120 <!--
122 table.files tr { 121 table.files tr {
123     behavior: url("<%=contextURL%>/css/trhover.htc"); 122     behavior: url("<%=contextURL%>/css/trhover.htc");
124 } 123 }
125 #navigation ul li { 124 #navigation ul li {
126     behavior: url('<%=contextURL%>/css/lihover1.htc'); 125     behavior: url('<%=contextURL%>/css/lihover1.htc');
127 } 126 }
128 #navigation ul ul li { 127 #navigation ul ul li {
129     behavior: url('<%=contextURL%>/css/lihover2.htc'); 128     behavior: url('<%=contextURL%>/css/lihover2.htc');
130 } 129 }
131 #navigation ul ul ul li { 130 #navigation ul ul ul li {
132     behavior: url('<%=contextURL%>/css/lihover3.htc'); 131     behavior: url('<%=contextURL%>/css/lihover3.htc');
133 } 132 }
134 #navigation ul ul ul ul li { 133 #navigation ul ul ul ul li {
135     behavior: url('<%=contextURL%>/css/lihover4.htc'); 134     behavior: url('<%=contextURL%>/css/lihover4.htc');
136 } 135 }
137 #navigation ul ul ul ul ul li { 136 #navigation ul ul ul ul ul li {
138     behavior: url('<%=contextURL%>/css/lihover5.htc'); 137     behavior: url('<%=contextURL%>/css/lihover5.htc');
139 } 138 }
140 --> 139 -->
141 </style> 140 </style>
142 <% 141 <%
143 if (request.getServletPath().endsWith("sitemap.jsp")) { 142 if (request.getServletPath().endsWith("sitemap.jsp")) {
144     if (! isEditMode) { 143     if (! isEditMode) {
145         %> 144         %>
146         <link rel="stylesheet" href="<content:contextURL/>/css/sitemap.css" type="text/css" /> 145         <link rel="stylesheet" href="<content:contextURL/>/css/sitemap.css" type="text/css" />
147         <% 146         <%
148     } 147     }
149     %> 148     %>
150     <ajax:zimbraInclude/> 149     <ajax:zimbraInclude/>
151     <% 150     <%
152 } 151 }
153 %> 152 %>
154 <% 153 <%
155 if (request.getServletPath().endsWith("advsearchresult.jsp")) { 154 if (request.getServletPath().endsWith("advsearchresult.jsp")) {
156     %> 155     %>
157     <ajax:zimbraInclude/> 156     <ajax:zimbraInclude/>
158     <% 157     <%
159 } 158 }
160 %> 159 %>
161 <% 160 <%
162   final boolean debug = request.getQueryString() != null && request.getQueryString().indexOf("debug=") > -1; 161   final boolean debug = request.getQueryString() != null && request.getQueryString().indexOf("debug=") > -1;
163 %> 162 %>
164  163 
165 <script language="javascript" src="<content:contextURL/>/javascript/cptv2.js" 164 <script language="javascript" src="<content:contextURL/>/javascript/cptv2.js"
166     type="text/javascript"></script> 165     type="text/javascript"></script>
167  166 
168 <!-- versioning--> 167 <!-- versioning-->
169 <script type="text/javascript" src="<content:serverHttpPath/>/jsp/jahia/javascript/zimbra/versioning/ContainerVersionCompare.js"></script> 168 <script type="text/javascript" src="<content:serverHttpPath/>/jsp/jahia/javascript/zimbra/versioning/ContainerVersionCompare.js"></script>
170  169 
171 <%@ include file="../javascript/transmenu_init.inc"%> 170 <%@ include file="../javascript/transmenu_init.inc"%>
172 <script language="javascript" type="text/javascript"> 171 <script language="javascript" type="text/javascript">
173 <!-- 172 <!--
174   function submitSimpleSearchForm(){ 173   function submitSimpleSearchForm(){
175     document.searchForm.<%=Search_Engine.SEARCH_REFINE_ATTRIBUTE%>.value='reset'; 174     document.searchForm.<%=Search_Engine.SEARCH_REFINE_ATTRIBUTE%>.value='reset';
176     return; 175     return;
177   } 176   }
178  177 
179   function hideUserShell(){ 178   function hideUserShell(){
180     try { 179     try {
181       Dwt.setVisibility(document.getElementById("userShell"),false); 180       Dwt.setVisibility(document.getElementById("userShell"),false);
182     } catch (ex){ 181     } catch (ex){
183       return; 182       return;
184     } 183     }
185   } 184   }
186   function showUserShell(){ 185   function showUserShell(){
187     try { 186     try {
188       Dwt.setVisibility(document.getElementById("userShell"),true); 187       Dwt.setVisibility(document.getElementById("userShell"),true);
189     } catch (ex){ 188     } catch (ex){
190       return; 189       return;
191     } 190     }
192   } 191   }
193  192 
194   function esiGeneratePageInvalidationUrl(){ 193   function esiGeneratePageInvalidationUrl(){
195      var theUrl = window.location.href; 194      var theUrl = window.location.href;
196  195 
197      var invEsiMarker = "esi=invalidateNow"; 196      var invEsiMarker = "esi=invalidateNow";
198  197 
199      var posInv = theUrl.indexOf(invEsiMarker); 198      var posInv = theUrl.indexOf(invEsiMarker);
200      //add invalidation marker 199      //add invalidation marker
201      if (posInv == -1) { 200      if (posInv == -1) {
202          var posParam = theUrl.indexOf("?"); 201          var posParam = theUrl.indexOf("?");
203          if (posParam == -1) { 202          if (posParam == -1) {
204             theUrl += "?"+invEsiMarker; 203             theUrl += "?"+invEsiMarker;
205          } else { 204          } else {
206             theUrl += "&"+invEsiMarker; 205             theUrl += "&"+invEsiMarker;
207          } 206          }
208          document.write("Invalidating cache for this page..."); 207          document.write("Invalidating cache for this page...");
209          document.close(); 208          document.close();
210     } 209     }
211     else { 210     else {
212          document.write("The current URL["+theUrl+"] already contains ["+invEsiMarker+"] when it shouldn't"); 211          document.write("The current URL["+theUrl+"] already contains ["+invEsiMarker+"] when it shouldn't");
213          document.close(); 212          document.close();
214     } 213     }
215    window.location.href = theUrl; 214    window.location.href = theUrl;
216    } 215    }
217  216 
218     function esiForwardToOrginalUrl(){ 217     function esiForwardToOrginalUrl(){
219          var theUrl = window.location.href; 218          var theUrl = window.location.href;
220  219 
221          var invEsiMarker = new String("esi=invalidateNow"); 220          var invEsiMarker = new String("esi=invalidateNow");
222          var posInv = theUrl.indexOf(invEsiMarker); 221          var posInv = theUrl.indexOf(invEsiMarker);
223  222 
224          //remove invalidation marker 223          //remove invalidation marker
225         if (posInv != -1) { 224         if (posInv != -1) {
226             document.write(theUrl); 225             document.write(theUrl);
227             theUrl = theUrl.replace(/\?esi=invalidateNow/gi,""); 226             theUrl = theUrl.replace(/\?esi=invalidateNow/gi,"");
228             theUrl = theUrl.replace(/&esi=invalidateNow/gi,""); 227             theUrl = theUrl.replace(/&esi=invalidateNow/gi,"");
229             theUrl = theUrl.replace(/esi=invalidateNow/gi,""); 228             theUrl = theUrl.replace(/esi=invalidateNow/gi,"");
230             window.location.href = theUrl; 229             window.location.href = theUrl;
231         } 230         }
232     } 231     }
233  232 
234     function readCookie(name) 233     function readCookie(name)
235     { 234     {
236         var nameEQ = name + "="; 235         var nameEQ = name + "=";
237         var ca = document.cookie.split(';'); 236         var ca = document.cookie.split(';');
238         for(var i=0;i < ca.length;i++) 237         for(var i=0;i < ca.length;i++)
239         { 238         {
240             var c = ca[i]; 239             var c = ca[i];
241             while (c.charAt(0)==' ') c = c.substring(1,c.length); 240             while (c.charAt(0)==' ') c = c.substring(1,c.length);
242             if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length); 241             if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
243         } 242         }
244         //alert('A cookie was not set. '+name+'. Please ensure that your browser accepts cookies.'); 243         //alert('A cookie was not set. '+name+'. Please ensure that your browser accepts cookies.');
245         return "Username"; 244         return "Username";
246     } 245     }
247 //--> 246 //-->
248 </script> 247 </script>
249 <link rel="stylesheet" href="<content:serverHttpPath/>/jsp/jahia/javascript/zimbra/searchHighlighting/SearchHighlighting.css" type="text/css" /> 248 <link rel="stylesheet" href="<content:serverHttpPath/>/jsp/jahia/javascript/zimbra/searchHighlighting/SearchHighlighting.css" type="text/css" />
250 </head> 249 </head>
251 <body onload="initZimbraShell('MainShell',true,null,'userShell',true,<%if(debug){%>true<%}else{%>false<%}%>,'#dddddd');showUserShell();init();<%if (jData.gui().isEditMode()) {%>getClipBoardIcon();callStatus();<% } %>"> 250 <body onload="initZimbraShell('MainShell',true,null,'userShell',true,<%if(debug){%>true<%}else{%>false<%}%>,'#dddddd');showUserShell();init();<%if (jData.gui().isEditMode()) {%>getClipBoardIcon();callStatus();<% } %>">
252 <div id="userShell"> 251 <div id="userShell">
253 <script language="javascript" type="text/javascript"> 252 <script language="javascript" type="text/javascript">
254 <!-- 253 <!--
255   hideUserShell(); 254   hideUserShell();
256 //--> 255 //-->
257 </script> 256 </script>
258 <div id="pagetitle"><h1><bean:write name="currentPage" property="title" filter="false"/></h1></div> 257 <div id="pagetitle"><h1><bean:write name="currentPage" property="title" filter="false"/></h1></div>
259 <% 258 <%
260         //ServicesRegistry servicesRegistry = ServicesRegistry.getInstance(); 259         //ServicesRegistry servicesRegistry = ServicesRegistry.getInstance();
261     JahiaACLManagerService aclService = ServicesRegistry.getInstance().getJahiaACLManagerService(); 260     JahiaACLManagerService aclService = ServicesRegistry.getInstance().getJahiaACLManagerService();
262  261 
263  262 
264     // metadatas container 263     // metadatas container
265     jData.containers().declareField( "metadataDescription", ResourceBundleMarker.drawMarker(resBundleID, "description","Description"), FieldTypes.SMALLTEXT, (String) pageContext.findAttribute("defaultMetaDescription") ); 264     jData.containers().declareField( "metadataDescription", ResourceBundleMarker.drawMarker(resBundleID, "description","Description"), FieldTypes.SMALLTEXT, (String) pageContext.findAttribute("defaultMetaDescription") );
266     jData.containers().declareField( "metadataKeywords", ResourceBundleMarker.drawMarker(resBundleID, "keywords","Keywords"), FieldTypes.SMALLTEXT, (String) pageContext.findAttribute("defaultMetaKeyword") ); 265     jData.containers().declareField( "metadataKeywords", ResourceBundleMarker.drawMarker(resBundleID, "keywords","Keywords"), FieldTypes.SMALLTEXT, (String) pageContext.findAttribute("defaultMetaKeyword") );
267     Vector metadataFields = new Vector(); 266     Vector metadataFields = new Vector();
268     metadataFields.add( "metadataDescription" ); 267     metadataFields.add( "metadataDescription" );
269     metadataFields.add( "metadataKeywords" ); 268     metadataFields.add( "metadataKeywords" );
270     jData.containers().declareContainer( "metadataContainer", ResourceBundleMarker.drawMarker(resBundleID, "metadataContainer","Metadata Container"), metadataFields ); 269     jData.containers().declareContainer( "metadataContainer", ResourceBundleMarker.drawMarker(resBundleID, "metadataContainer","Metadata Container"), metadataFields );
271  270 
272     JahiaContainerList metadataContainerList = jData.containers().getContainerList( "metadataContainer" ); 271     JahiaContainerList metadataContainerList = jData.containers().getContainerList( "metadataContainer" );
273     Enumeration metadataEnum = metadataContainerList.getContainers(); 272     Enumeration metadataEnum = metadataContainerList.getContainers();
274     String metadataDescription = ""; 273     String metadataDescription = "";
275     String metadataKeywords = ""; 274     String metadataKeywords = "";
276     String updateMetadataURL = jData.gui().html().drawAddContainerLauncher( metadataContainerList ); 275     String updateMetadataURL = jData.gui().html().drawAddContainerLauncher( metadataContainerList );
277     //ContainerListBean metadataContainerListBean = new ContainerListBean(metadataContainerList,jParams); 276     //ContainerListBean metadataContainerListBean = new ContainerListBean(metadataContainerList,jParams);
278     ContainerBean metadataContainerBean = null; 277     ContainerBean metadataContainerBean = null;
279  278 
280     while (metadataEnum.hasMoreElements()) { 279     while (metadataEnum.hasMoreElements()) {
281         JahiaContainer metadataContainer = (JahiaContainer)metadataEnum.nextElement(); 280         JahiaContainer metadataContainer = (JahiaContainer)metadataEnum.nextElement();
282         metadataContainerBean = new ContainerBean(metadataContainer,jParams); 281         metadataContainerBean = new ContainerBean(metadataContainer,jParams);
283         metadataDescription = metadataContainer.getFieldValue("metadataDescription", ""); 282         metadataDescription = metadataContainer.getFieldValue("metadataDescription", "");
284         metadataKeywords  = metadataContainer.getFieldValue("metadataKeywords", ""); 283         metadataKeywords  = metadataContainer.getFieldValue("metadataKeywords", "");
285     } 284     }
286 %> 285 %>
287     <%@ include file="site_settings.inc"%> 286     <%@ include file="site_settings.inc"%>
288     <% if (isLogged) { %> 287     <% if (isLogged) { %>
289     <div id="topmodules"> 288     <div id="topmodules">
290     <%@ include file="/jsp/jahia/topbar/topmenu.inc"%> 289     <%@ include file="/jsp/jahia/topbar/topmenu.inc"%>
291     </div> 290     </div>
292     <% } %> 291     <% } %>
293 </jesi:fragment> 292 </jesi:fragment>
294  293 
295 <jesi:codeblock execute="template" onerror="ignore"> 294 <jesi:codeblock execute="template" onerror="ignore">
296  295 
297     <% 296     <%
298     //Display special info when ESI is enabled 297     //Display special info when ESI is enabled
299     if (jData.getProcessingContext().settings().isEsiCacheActivated()) {  %> 298     if (jData.getProcessingContext().settings().isEsiCacheActivated()) {  %>
300              <esi:remove><script language="JavaScript"> document.title=document.title+' (non-ESI parsed/cached)';</script> </esi:remove> 299              <esi:remove><script language="JavaScript"> document.title=document.title+' (non-ESI parsed/cached)';</script> </esi:remove>
301         <% 300         <%
302         String esiInvParam = request.getParameter("esi"); 301         String esiInvParam = request.getParameter("esi");
303         String isFragmentRequested = request.getParameter("__esi_fragment"); 302         String isFragmentRequested = request.getParameter("__esi_fragment");
304         if (esiInvParam!=null && esiInvParam.equalsIgnoreCase("invalidateNow") 303         if (esiInvParam!=null && esiInvParam.equalsIgnoreCase("invalidateNow")
305             && isFragmentRequested==null) { 304             && isFragmentRequested==null) {
306                 //invalidate page and all its fragments 305                 //invalidate page and all its fragments
307                 ServicesRegistry.getInstance().getEsiSOAPInvalidatorService().SOAPInvalidatePageAndAllFrags(jData.params(), jData.params().getPageID() ); 306                 ServicesRegistry.getInstance().getEsiSOAPInvalidatorService().SOAPInvalidatePageAndAllFrags(jData.params(), jData.params().getPageID() );
308         %><script> 307         %><script>
309         <!-- 308         <!--
310             esiForwardToOrginalUrl(); 309             esiForwardToOrginalUrl();
311         //--> 310         //-->
312         </script> 311         </script>
313                 <% } %> 312                 <% } %>
314 <% } %> 313 <% } %>
315 </jesi:codeblock> 314 </jesi:codeblock>
316  315 
317 <jesi:fragment aclGroup="true" alwaysInvalidate="true"> 316 <jesi:fragment aclGroup="true" alwaysInvalidate="true">
318 <div id="wrapper"><% if(jData.gui().isIE7(request)){%><br/><%}%> 317 <div id="wrapper"><% if(jData.gui().isIE7(request)){%><br/><%}%>
319 <div id="toplinks"><%@ include file="/jsp/jahia/topbar/operationbuttons.inc"%></div> 318 <div id="toplinks"><%@ include file="/jsp/jahia/topbar/operationbuttons.inc"%></div>
320 </jesi:fragment> 319 </jesi:fragment>
321  320 
322 <jesi:fragment aclGroup="true"> 321 <jesi:fragment aclGroup="true">
323     <div id="header"> 322     <div id="header">
324         <div id="logo"> 323         <div id="logo">
325             <logic:present name="logo"> 324             <logic:present name="logo">
326                 <bean:define id="isImage" name="logo" property="image"/> 325                 <bean:define id="isImage" name="logo" property="image"/>
327                 <c:choose> 326                 <c:choose>
328                     <c:when test="${isImage}"> 327                     <c:when test="${isImage}">
329                         <a href='<%=jParams.composeSiteUrl()%>'><img src="<bean:write name='logo' property='downloadUrl'/>" border="0"  alt="<bean:write name='logo' property='title'/>"/></a> 328                         <a href='<%=jParams.composeSiteUrl()%>'><img src="<bean:write name='logo' property='downloadUrl'/>" border="0"  alt="<bean:write name='logo' property='title'/>"/></a>
330                     </c:when> 329                     </c:when>
331                     <c:otherwise> 330                     <c:otherwise>
332                         <a href='<%=jParams.composeSiteUrl()%>'><img src="<content:contextURL/>/img/logo.gif" alt="Logo" border="0"/></a> 331                         <a href='<%=jParams.composeSiteUrl()%>'><img src="<content:contextURL/>/img/logo.gif" alt="Logo" border="0"/></a>
333                     </c:otherwise> 332                     </c:otherwise>
334                 </c:choose> 333                 </c:choose>
335             </logic:present> 334             </logic:present>
336             <logic:notPresent name="logo"> 335             <logic:notPresent name="logo">
337                 <a href='<%=jParams.composeSiteUrl()%>'><img src="<content:contextURL/>/img/logo.gif" alt="Logo" border="0"/></a> 336                 <a href='<%=jParams.composeSiteUrl()%>'><img src="<content:contextURL/>/img/logo.gif" alt="Logo" border="0"/></a>
338             </logic:notPresent> 337             </logic:notPresent>
339             <content:absoluteContainerList id="siteSettingsList" name="siteSettings" pageLevel="1"> 338             <content:absoluteContainerList id="siteSettingsList" name="siteSettings" pageLevel="1">
340             <content:container id="siteSettings"> 339             <content:container id="siteSettings">
341                 <content:textField valueId="footerText" name="footerText" diffActive="true" display="false" defaultValue=""/> 340                 <content:textField valueId="footerText" name="footerText" diffActive="true" display="false" defaultValue=""/>
342                 <jahiaHtml:actionMenu name="siteSettings" namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates_v2" useFieldSet="false" labelKey="logoSettings"> 341                 <jahiaHtml:actionMenu name="siteSettings" namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates_v2" useFieldSet="false" labelKey="logoSettings">
343                 </jahiaHtml:actionMenu> 342                 </jahiaHtml:actionMenu>
344             </content:container> 343             </content:container>
345             <logic:equal name="siteSettingsList" property="fullSize" value="0"> 344             <logic:equal name="siteSettingsList" property="fullSize" value="0">
346                 <jahiaHtml:actionMenu name="siteSettingsList" namePostFix="SiteSettings" resourceBundle="jahiatemplates.Corporate_portal_templates_v2" useFieldSet="false" labelKey="logoSettings"> 345                 <jahiaHtml:actionMenu name="siteSettingsList" namePostFix="SiteSettings" resourceBundle="jahiatemplates.Corporate_portal_templates_v2" useFieldSet="false" labelKey="logoSettings">
347                 </jahiaHtml:actionMenu> 346                 </jahiaHtml:actionMenu>
348             </logic:equal> 347             </logic:equal>
349             </content:absoluteContainerList> 348             </content:absoluteContainerList>
350         </div> 349         </div>
351         <div id="quicklinkright"> 350         <div id="quicklinkright">
352             <%@ include file="quicklinks.inc" %> 351             <%@ include file="quicklinks.inc" %>
353         </div> 352         </div>
354         <div id="topmenu"> 353         <div id="topmenu">
355             <%@ include file="topmenu.inc" %> 354             <%@ include file="topmenu.inc" %>
356         </div> 355         </div>
357     </div> 356     </div>
358 <div id="pagebody"> 357 <div id="pagebody">
359     <% 358     <%
360     if (! isFullScreen) { 359     if (! isFullScreen) {
361         %> 360         %>
362         <div id="navigation"> 361         <div id="navigation">
363             <div class="navdeco"> 362             <div class="navdeco">
364                 <logic:notEqual name="currentPage" property="homePage" value="true"> 363                 <logic:notEqual name="currentPage" property="homePage" value="true">
365                     <jsp:include page="nav/menu.jsp" flush="true"/> 364                     <jsp:include page="nav/menu.jsp" flush="true"/>
366                 </logic:notEqual> 365                 </logic:notEqual>
  366                 <div id="navblock" style="width:100%;background:#e7e4d3;">&nbsp;<br/>&nbsp;
  367                 <% if (isEditMode){%></div><% } %>
367                 <jsp:include page="box/box.jsp" flush="true"> 368                 <jsp:include page="box/box.jsp" flush="true">
368                     <jsp:param name="id" value="navcol"/> 369                     <jsp:param name="id" value="navcol"/>
369                                 <jsp:param name="displayDetails" value="false"/> 370                                 <jsp:param name="displayDetails" value="false"/>
370                 </jsp:include> 371                 </jsp:include>
  372                <% if (!isEditMode){%>
  373                 </div>
  374                 <% }
  375                     if (isEditMode){%><div id="navblock" style="width:100%;background:#e7e4d3;">&nbsp;<br/>&nbsp;</div><% } %>
371  376 
372                 <logic:notEqual name="currentPage" property="template.name" value=" Document Listing"> 377                 <logic:notEqual name="currentPage" property="template.name" value=" Document Listing">
373                     <% 378                     <%
374                     // source & type should be here... 379                     // source & type should be here...
375                     %> 380                     %>
376                 </logic:notEqual> 381                 </logic:notEqual>
377  382 
378                 <form name="searchForm" method="post" action="<%=jData.gui().html().drawSearchLauncher()%>" onSubmit="checkMaxPageItems(document.searchForm)" > 383                 <form name="searchForm" method="post" action="<%=jData.gui().html().drawSearchLauncher()%>" onSubmit="checkMaxPageItems(document.searchForm)" >
379                     <input type="text" name="search" size="10" 384                     <input type="text" name="search" size="10"
380                         value='<%=JahiaTools.getStrParameter(request,"search","")%>' /> 385                         value='<%=JahiaTools.getStrParameter(request,"search","")%>' />
381                     <input type="hidden" name="maxPageItems" value="10" /> 386                     <input type="hidden" name="maxPageItems" value="10" />
382                     <input type="hidden" name="<%=PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME%>" value="true" /> 387                     <input type="hidden" name="<%=PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME%>" value="true" />
383                     <input type="hidden" name="searchView" value="simple" /> 388                     <input type="hidden" name="searchView" value="simple" />
384                     <input type="hidden" name="screen" value="execute" /> 389                     <input type="hidden" name="screen" value="execute" />
385                         <input type="hidden" name="freeSearch" value='' /> 390                         <input type="hidden" name="freeSearch" value='' />
386                           <input type="hidden" name="<%=Search_Engine.SEARCH_REFINE_ATTRIBUTE%>" value="" /> 391                           <input type="hidden" name="<%=Search_Engine.SEARCH_REFINE_ATTRIBUTE%>" value="" />
387                     <input type="hidden" name="searchHandler" value="search" /> 392                     <input type="hidden" name="searchHandler" value="search" />
388                     <input type="submit" name="go" value="<content:resourceBundle 393                     <input type="submit" name="go" value="<content:resourceBundle
389                                 resourceBundle="jahiatemplates.Corporate_portal_templates_v2" 394                                 resourceBundle="jahiatemplates.Corporate_portal_templates_v2"
390                                 resourceName="button.search"/>" onclick="submitSimpleSearchForm();"/> 395                                 resourceName="button.search"/>" onclick="submitSimpleSearchForm();"/>
391                     <% if (advSearchLicenseEnabled){ %> 396                     <% if (advSearchLicenseEnabled){ %>
392                 <a href="javascript:checkMaxPageItems(document.searchForm);setFreeSearchInput(document.searchForm);document.searchForm.searchView.value='advSearch';document.searchForm.searchHandler.value='advSearch';document.searchForm.submit()"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.advancedSearch" defaultValue="Advanced search" /></a> 397                 <a href="javascript:checkMaxPageItems(document.searchForm);setFreeSearchInput(document.searchForm);document.searchForm.searchView.value='advSearch';document.searchForm.searchHandler.value='advSearch';document.searchForm.submit()"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.advancedSearch" defaultValue="Advanced search" /></a>
393                     <% } %> 398                     <% } %>
394                 </form> 399                 </form>
395             </div> 400             </div>
396         </div> 401         </div>
397         <logic:notEqual name="currentPage" property="homePage" value="true"> 402         <logic:notEqual name="currentPage" property="homePage" value="true">
398             <div class="path"> 403             <div class="path">
399                 <content:currentPagePath maxchar="40" separator=" / "/> 404                 <content:currentPagePath maxchar="40" separator=" / "/>
400             </div> 405             </div>
401         </logic:notEqual> 406         </logic:notEqual>
402         <% 407         <%
403     } 408     }
404     %> 409     %>
405     <div id="content" <%if (isFullScreen) {%> style="width: 984px;"<%}%> > 410     <div id="content" <%if (isFullScreen) {%> style="width: 984px;"<%}%> >
406         <jsp:include page="splash/splash.jsp" flush="true"/> 411         <jsp:include page="splash/splash.jsp" flush="true"/>
407         <%if (isFullScreen) {%> </div><%}%> 412         <%if (isFullScreen) {%> </div><%}%>
408 </jesi:fragment> 413 </jesi:fragment>

Araxis Merge (but not this generated report) is Copyright © 1993-2003 Araxis Ltd (www.araxis.com). All rights reserved.