1. Araxis Merge File Comparison Report

Produced by Araxis Merge on Thu Oct 18 14:41:31 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.

1.1 Files compared

#FileLocationLast Modified
1webdavsearch.jspC:\jahia\template_diff\500\corporate_portal_templates_v2\advsearchWed Sep 20 13:21:32 2006 UTC
2webdavsearch.jspC:\jahia\jahia5.0.3_r18924\tomcat\webapps\jahia\jsp\jahia\templates\site1\corporate_portal_templates_v2\advsearchThu Oct 18 14:17:22 2007 UTC

1.2 Comparison summary

DescriptionBetween
Files 1 and 2
BlocksLines
Unchanged2316
Changed12
Inserted00
Removed00

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

1.4 Active regular expressions

No regular expressions were active.

1.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 language="java" contentType="text/html;charset=UTF-8" %> 17 --%><%@ page language="java" contentType="text/html;charset=UTF-8" %>
18 <%@ page import="org.jahia.engines.timebasedpublishing.CalendarHandler" %> 18 <%@ page import="org.jahia.engines.timebasedpublishing.CalendarHandler" %>
19 <%@ page import="java.util.*" %> 19 <%@ page import="java.util.*" %>
20 <%@ page import="org.jahia.bin.*" %> 20 <%@ page import="org.jahia.bin.*" %>
21 <%@ page import="org.jahia.data.search.*" %> 21 <%@ page import="org.jahia.data.search.*" %>
22 <%@ page import="org.jahia.data.*" %> 22 <%@ page import="org.jahia.data.*" %>
23 <%@ page import="org.jahia.params.*" %> 23 <%@ page import="org.jahia.params.*" %>
24 <%@ page import="org.jahia.engines.search.*" %> 24 <%@ page import="org.jahia.engines.search.*" %>
25 <%@ page import="org.jahia.services.search.*" %> 25 <%@ page import="org.jahia.services.search.*" %>
26 <%@ page import="org.jahia.services.search.savedsearch.*" %> 26 <%@ page import="org.jahia.services.search.savedsearch.*" %>
27 <%@ page import="org.jahia.services.search.lucene.*" %> 27 <%@ page import="org.jahia.services.search.lucene.*" %>
28 <%@ page import="org.jahia.services.webdav.*" %> 28 <%@ page import="org.jahia.services.webdav.*" %>
29 <%@ page import="org.compassframework.core.*" %> 29 <%@ page import="org.compass .core.*" %>
30 <%@ page import="org.jahia.ajax.webdav.DAVAbstractAction"%> 30 <%@ page import="org.jahia.ajax.webdav.DAVAbstractAction"%>
31 <%@ page import="org.jahia.engines.timebasedpublishing.CalendarHandler" %> 31 <%@ page import="org.jahia.engines.timebasedpublishing.CalendarHandler" %>
32 <%@ page import="org.apache.slide.search.basic.*" %> 32 <%@ page import="org.apache.slide.search.basic.*" %>
33 <%@ taglib uri="contentLib" prefix="content" %> 33 <%@ taglib uri="contentLib" prefix="content" %>
34  34 
35 <%@ include file="webdavsearchpropertydefinition.inc"%> 35 <%@ include file="webdavsearchpropertydefinition.inc"%>
36  36 
37 <script language="javascript"> 37 <script language="javascript">
38 <!-- 38 <!--
39 function popUp(strURL,strType,strHeight,strWidth) { 39 function popUp(strURL,strType,strHeight,strWidth) {
40     var strOptions=""; 40     var strOptions="";
41     if (strType=="console") strOptions="resizable,height="+strHeight+",width="+strWidth; 41     if (strType=="console") strOptions="resizable,height="+strHeight+",width="+strWidth;
42     if (strType=="fixed") strOptions="status,height="+strHeight+",width="+strWidth; 42     if (strType=="fixed") strOptions="status,height="+strHeight+",width="+strWidth;
43     if (strType=="elastic") strOptions="toolbar,menubar,scrollbars,resizable,location,height="+strHeight+",width="+strWidth; 43     if (strType=="elastic") strOptions="toolbar,menubar,scrollbars,resizable,location,height="+strHeight+",width="+strWidth;
44     window.open(strURL, 'newWin', strOptions); 44     window.open(strURL, 'newWin', strOptions);
45 } 45 }
46  46 
47 function resetLocation(location){ 47 function resetLocation(location){
48     var el = document.getElementById(location); 48     var el = document.getElementById(location);
49     if ( el ){ 49     if ( el ){
50         el.value=""; 50         el.value="";
51     } 51     }
52 } 52 }
53  53 
54 function swithMoreSearchOptions(elId,elPanelId,imgId){ 54 function swithMoreSearchOptions(elId,elPanelId,imgId){
55     var el = document.getElementById(elId); 55     var el = document.getElementById(elId);
56     var elPanel = document.getElementById(elPanelId); 56     var elPanel = document.getElementById(elPanelId);
57     if ( el ){ 57     if ( el ){
58         if ( el.value=="1" ){ 58         if ( el.value=="1" ){
59             el.value = "0"; 59             el.value = "0";
60             if ( elPanel ){ 60             if ( elPanel ){
61                 elPanel.style.display = "none"; 61                 elPanel.style.display = "none";
62             } 62             }
63             switchImage(imgId,'<%=Jahia.getContextPath() + "/jsp/jahia/engines/images/icons/triangle_green_collapse.gif"%>'); 63             switchImage(imgId,'<%=Jahia.getContextPath() + "/jsp/jahia/engines/images/icons/triangle_green_collapse.gif"%>');
64         } else { 64         } else {
65             el.value = "1"; 65             el.value = "1";
66             if ( elPanel ){ 66             if ( elPanel ){
67                 elPanel.style.display = "block"; 67                 elPanel.style.display = "block";
68             } 68             }
69             switchImage(imgId,'<%=Jahia.getContextPath() + "/jsp/jahia/engines/images/icons/triangle_green_expand.gif"%>'); 69             switchImage(imgId,'<%=Jahia.getContextPath() + "/jsp/jahia/engines/images/icons/triangle_green_expand.gif"%>');
70         } 70         }
71     } 71     }
72 } 72 }
73  73 
74 function switchImage(imgName, imgSrc) 74 function switchImage(imgName, imgSrc)
75 { 75 {
76   var img = document.getElementById(imgName); 76   var img = document.getElementById(imgName);
77   if ( img ){ 77   if ( img ){
78     img.src = imgSrc; 78     img.src = imgSrc;
79   } 79   }
80 } 80 }
81  81 
82  82 
83 function submitCriteriaDelete(criteriaOrder){ 83 function submitCriteriaDelete(criteriaOrder){
84     var el = document.getElementById('criteriaItem'); 84     var el = document.getElementById('criteriaItem');
85     if ( el ){ 85     if ( el ){
86         el.value = criteriaOrder; 86         el.value = criteriaOrder;
87     } 87     }
88     submitSearchForm('<%=Search_Engine.UPDATE_CUSTOM_CRITERIAS_SCREEN%>', 88     submitSearchForm('<%=Search_Engine.UPDATE_CUSTOM_CRITERIAS_SCREEN%>',
89                         '<%=WebdavCriteriasHandler.DELETE_OPERATION%>'); 89                         '<%=WebdavCriteriasHandler.DELETE_OPERATION%>');
90 } 90 }
91  91 
92 --> 92 -->
93 </script> 93 </script>
94  94 
95 <% 95 <%
96  96 
97         HashMap engineMap   = (HashMap) request.getAttribute( "org.jahia.engines.EngineHashMap" ); 97         HashMap engineMap   = (HashMap) request.getAttribute( "org.jahia.engines.EngineHashMap" );
98   JahiaData jData = (JahiaData) request.getAttribute( "org.jahia.data.JahiaData" ); 98   JahiaData jData = (JahiaData) request.getAttribute( "org.jahia.data.JahiaData" );
99   ParamBean jParams = jData.params(); 99   ParamBean jParams = jData.params();
100  100 
101         SearchViewHandler searchViewHandler = (SearchViewHandler)engineMap.get(Search_Engine.SEARCH_HANDLER); 101         SearchViewHandler searchViewHandler = (SearchViewHandler)engineMap.get(Search_Engine.SEARCH_HANDLER);
102   AdvSearchViewHandler advSearchViewHandler = (AdvSearchViewHandler)searchViewHandler; 102   AdvSearchViewHandler advSearchViewHandler = (AdvSearchViewHandler)searchViewHandler;
103  103 
104   WebdavSearchDelegate webdavSearchDelegate = advSearchViewHandler.getWebdavSearchDelegate(); 104   WebdavSearchDelegate webdavSearchDelegate = advSearchViewHandler.getWebdavSearchDelegate();
105  105 
106         String contentType = webdavSearchDelegate.getContentType(); 106         String contentType = webdavSearchDelegate.getContentType();
107  107 
108         List webdavLocations = webdavSearchDelegate.getWebdavLocations(); 108         List webdavLocations = webdavSearchDelegate.getWebdavLocations();
109  109 
110   // DASL 110   // DASL
111   String documentAuthor = webdavSearchDelegate.getAuthor(); 111   String documentAuthor = webdavSearchDelegate.getAuthor();
112   if ( documentAuthor == null ){ 112   if ( documentAuthor == null ){
113     documentAuthor = ""; 113     documentAuthor = "";
114   } 114   }
115   String documentTitle = webdavSearchDelegate.getTitle(); 115   String documentTitle = webdavSearchDelegate.getTitle();
116   if ( documentTitle == null ){ 116   if ( documentTitle == null ){
117     documentTitle = ""; 117     documentTitle = "";
118   } 118   }
119   String documentSubject = webdavSearchDelegate.getSubject(); 119   String documentSubject = webdavSearchDelegate.getSubject();
120   if ( documentSubject == null ){ 120   if ( documentSubject == null ){
121     documentSubject = ""; 121     documentSubject = "";
122   } 122   }
123  123 
124   String webdavDialogUrl = Jahia.getContextPath() + "/jsp/jahia/engines/webdav/webdavrepository.jsp?display=" + DAVAbstractAction.DIRECTORIES_ONLY; 124   String webdavDialogUrl = Jahia.getContextPath() + "/jsp/jahia/engines/webdav/webdavrepository.jsp?display=" + DAVAbstractAction.DIRECTORIES_ONLY;
125  125 
126  126 
127 %> 127 %>
128         <TR bgColor=#ffffff> 128         <TR bgColor=#ffffff>
129             <TD> 129             <TD>
130                 <TABLE cellSpacing=0 cellPadding=2 width="100%"> 130                 <TABLE cellSpacing=0 cellPadding=2 width="100%">
131                 <TBODY> 131                 <TBODY>
132                 <TR> 132                 <TR>
133                     <TD width="15%"><FONT size=-1><B><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.location" defaultValue="Location" /></B></FONT></TD> 133                     <TD width="15%"><FONT size=-1><B><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.location" defaultValue="Location" /></B></FONT></TD>
134                     <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.resultsFrom" defaultValue="return results from" /></FONT></TD> 134                     <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.resultsFrom" defaultValue="return results from" /></FONT></TD>
135                     <TD> 135                     <TD>
136                         <% 136                         <%
137                             String location = null; 137                             String location = null;
138                             Iterator locationsIterator = webdavLocations.iterator(); 138                             Iterator locationsIterator = webdavLocations.iterator();
139                             if ( locationsIterator.hasNext() ){ 139                             if ( locationsIterator.hasNext() ){
140                                 while ( locationsIterator.hasNext() ){ 140                                 while ( locationsIterator.hasNext() ){
141                                     location = (String)locationsIterator.next(); 141                                     location = (String)locationsIterator.next();
142                             %> 142                             %>
143                             <INPUT id="webdavLocation" size="35" value="<%=location%>" name="webdavLocation" ><a href="<%=webdavDialogUrl%>" onclick="popUp(this.href,'console',600,800);return false;" target="newWin">&nbsp;<content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.browse" defaultValue="browse" /></a>&nbsp;<a href="javascript:resetLocation('webdavLocation');"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.reset" defaultValue="reset" /></a>&nbsp;<a href="javascript:resetLocation('webdavLocation');"></a><br> 143                             <INPUT id="webdavLocation" size="35" value="<%=location%>" name="webdavLocation" ><a href="<%=webdavDialogUrl%>" onclick="popUp(this.href,'console',600,800);return false;" target="newWin">&nbsp;<content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.browse" defaultValue="browse" /></a>&nbsp;<a href="javascript:resetLocation('webdavLocation');"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.reset" defaultValue="reset" /></a>&nbsp;<a href="javascript:resetLocation('webdavLocation');"></a><br>
144                             <% } 144                             <% }
145                             } else { 145                             } else {
146                                 %> 146                                 %>
147                             <INPUT id="webdavLocation" size="35" value="" name="webdavLocation" ><a href="<%=webdavDialogUrl%>" onclick="popUp(this.href,'console',600,800);return false;" target="newWin">&nbsp;<content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.browse" defaultValue="browse" /></a>&nbsp;<a href="javascript:resetLocation('webdavLocation');"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.reset" defaultValue="reset" /></a><br> 147                             <INPUT id="webdavLocation" size="35" value="" name="webdavLocation" ><a href="<%=webdavDialogUrl%>" onclick="popUp(this.href,'console',600,800);return false;" target="newWin">&nbsp;<content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.browse" defaultValue="browse" /></a>&nbsp;<a href="javascript:resetLocation('webdavLocation');"><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.reset" defaultValue="reset" /></a><br>
148                             <% } %> 148                             <% } %>
149                     </TD> 149                     </TD>
150                 </TR> 150                 </TR>
151                 </TBODY> 151                 </TBODY>
152                 </TABLE> 152                 </TABLE>
153             </TD> 153             </TD>
154         </TR> 154         </TR>
155         <TR bgColor="#ffffff"> 155         <TR bgColor="#ffffff">
156             <TD height="10px">&nbsp;</TD> 156             <TD height="10px">&nbsp;</TD>
157         </TR> 157         </TR>
158         <TR bgColor=#ffffff> 158         <TR bgColor=#ffffff>
159             <TD> 159             <TD>
160                 <TABLE cellSpacing=0 cellPadding=2 width="100%"> 160                 <TABLE cellSpacing=0 cellPadding=2 width="100%">
161                 <TBODY> 161                 <TBODY>
162                 <TR> 162                 <TR>
163                     <TD width="15%"><FONT size=-1><B><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.fileFormat" defaultValue="File Format" /></a></B></FONT></TD> 163                     <TD width="15%"><FONT size=-1><B><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.fileFormat" defaultValue="File Format" /></a></B></FONT></TD>
164                     <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.resultsOfTheFileFormat" defaultValue="return results of the file format" /></a></FONT></TD> 164                     <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.resultsOfTheFileFormat" defaultValue="return results of the file format" /></a></FONT></TD>
165                     <TD><FONT size=-1> 165                     <TD><FONT size=-1>
166                         <SELECT name="contentType"> 166                         <SELECT name="contentType">
167                         <OPTION value="any" <% if ("any".equals(contentType)){%>selected<%}%>><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.fileFormat.anyFormat" defaultValue="any format" /> 167                         <OPTION value="any" <% if ("any".equals(contentType)){%>selected<%}%>><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.fileFormat.anyFormat" defaultValue="any format" />
168                         <OPTION value="pdf" <% if ("pdf".equals(contentType)){%>selected<%}%>>Adobe Acrobat PDF (.pdf) 168                         <OPTION value="pdf" <% if ("pdf".equals(contentType)){%>selected<%}%>>Adobe Acrobat PDF (.pdf)
169                         <OPTION value="doc" <% if ("doc".equals(contentType)){%>selected<%}%>>Microsoft Word (.doc) 169                         <OPTION value="doc" <% if ("doc".equals(contentType)){%>selected<%}%>>Microsoft Word (.doc)
170                         <OPTION value="xls" <% if ("xls".equals(contentType)){%>selected<%}%>>Microsoft Excel (.xls) 170                         <OPTION value="xls" <% if ("xls".equals(contentType)){%>selected<%}%>>Microsoft Excel (.xls)
171                         <OPTION value="ppt" <% if ("ppt".equals(contentType)){%>selected<%}%>>Microsoft Powerpoint (.ppt) 171                         <OPTION value="ppt" <% if ("ppt".equals(contentType)){%>selected<%}%>>Microsoft Powerpoint (.ppt)
172                         </OPTION></SELECT></FONT> 172                         </OPTION></SELECT></FONT>
173                     </TD> 173                     </TD>
174                 </TR> 174                 </TR>
175                 </TBODY> 175                 </TBODY>
176                 </TABLE> 176                 </TABLE>
177             </TD> 177             </TD>
178         </TR> 178         </TR>
179         <TR bgColor="#ffffff"> 179         <TR bgColor="#ffffff">
180             <TD height="10px">&nbsp;</TD> 180             <TD height="10px">&nbsp;</TD>
181         </TR> 181         </TR>
182         <TR bgColor=#ffffff> 182         <TR bgColor=#ffffff>
183             <TD> 183             <TD>
184                 <TABLE cellSpacing=0 cellPadding=2 width="100%"> 184                 <TABLE cellSpacing=0 cellPadding=2 width="100%">
185                 <TBODY> 185                 <TBODY>
186                 <TR> 186                 <TR>
187                     <TD width="15%" nowrap> 187                     <TD width="15%" nowrap>
188                         <FONT size=-1><B><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.moreSearchOptions" defaultValue="More search options" /></B></FONT>&nbsp;<a href="javascript:swithMoreSearchOptions('expandMoreOptions','moreOptionsPanel','imgMoreOptions');" ><% if ( webdavSearchDelegate.getExpandMoreOptions() ){%><content:displayIcon id="imgMoreOptions" src="triangle_green_expand"/><% } else { %><content:displayIcon id="imgMoreOptions" src="triangle_green_collapse"/><% } %></a></B></FONT> 188                         <FONT size=-1><B><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.moreSearchOptions" defaultValue="More search options" /></B></FONT>&nbsp;<a href="javascript:swithMoreSearchOptions('expandMoreOptions','moreOptionsPanel','imgMoreOptions');" ><% if ( webdavSearchDelegate.getExpandMoreOptions() ){%><content:displayIcon id="imgMoreOptions" src="triangle_green_expand"/><% } else { %><content:displayIcon id="imgMoreOptions" src="triangle_green_collapse"/><% } %></a></B></FONT>
189                         <input id="expandMoreOptions" type="hidden" name="expandMoreOptions" value="<% if ( webdavSearchDelegate.getExpandMoreOptions() ){%>1<% } else { %>0<%}%>"> 189                         <input id="expandMoreOptions" type="hidden" name="expandMoreOptions" value="<% if ( webdavSearchDelegate.getExpandMoreOptions() ){%>1<% } else { %>0<%}%>">
190                         <br/><br/> 190                         <br/><br/>
191                     </TD> 191                     </TD>
192                     <TD noWrap width="30%">&nbsp;</TD> 192                     <TD noWrap width="30%">&nbsp;</TD>
193                     <TD>&nbsp;</TD> 193                     <TD>&nbsp;</TD>
194                 </TR> 194                 </TR>
195                 </TBODY> 195                 </TBODY>
196                 </TABLE> 196                 </TABLE>
197             </TD> 197             </TD>
198         </TR> 198         </TR>
199         <TR bgColor=#ffffff> 199         <TR bgColor=#ffffff>
200             <TD> 200             <TD>
201                 <TABLE cellSpacing=0 cellPadding=2 width="100%"> 201                 <TABLE cellSpacing=0 cellPadding=2 width="100%">
202                 <TBODY> 202                 <TBODY>
203                 <TR> 203                 <TR>
204                     <TD align="left" colspan="3"> 204                     <TD align="left" colspan="3">
205                         <div id="moreOptionsPanel" style="display: <% if ( webdavSearchDelegate.getExpandMoreOptions() ){%>block<% } else { %>none<%}%>;" > 205                         <div id="moreOptionsPanel" style="display: <% if ( webdavSearchDelegate.getExpandMoreOptions() ){%>block<% } else { %>none<%}%>;" >
206                             <TABLE cellSpacing=0 cellPadding=2 width="100%"> 206                             <TABLE cellSpacing=0 cellPadding=2 width="100%">
207                             <TR> 207                             <TR>
208                                 <TD width="15%">&nbsp;</TD> 208                                 <TD width="15%">&nbsp;</TD>
209                                 <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.author" defaultValue="Author" /></FONT></TD> 209                                 <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.author" defaultValue="Author" /></FONT></TD>
210                                 <TD><FONT size=-1> 210                                 <TD><FONT size=-1>
211                                     <INPUT class="input" size="35" value="<%=documentAuthor%>" name="documentAuthor" > 211                                     <INPUT class="input" size="35" value="<%=documentAuthor%>" name="documentAuthor" >
212                                     </FONT> 212                                     </FONT>
213                                 </TD> 213                                 </TD>
214                             </TR> 214                             </TR>
215                             <TR> 215                             <TR>
216                                 <TD width="15%">&nbsp;</TD> 216                                 <TD width="15%">&nbsp;</TD>
217                                 <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.title" defaultValue="Title" /></FONT></TD> 217                                 <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.title" defaultValue="Title" /></FONT></TD>
218                                 <TD><FONT size=-1> 218                                 <TD><FONT size=-1>
219                                     <INPUT class="input" size="35" value="<%=documentTitle%>" name="documentTitle" > 219                                     <INPUT class="input" size="35" value="<%=documentTitle%>" name="documentTitle" >
220                                     </FONT> 220                                     </FONT>
221                                 </TD> 221                                 </TD>
222                             </TR> 222                             </TR>
223                             <TR> 223                             <TR>
224                                 <TD width="15%">&nbsp;</TD> 224                                 <TD width="15%">&nbsp;</TD>
225                                 <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.subject" defaultValue="Subject" /></FONT></TD> 225                                 <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.subject" defaultValue="Subject" /></FONT></TD>
226                                 <TD><FONT size=-1> 226                                 <TD><FONT size=-1>
227                                     <INPUT class="input" size="35" value="<%=documentSubject%>" name="documentSubject" > 227                                     <INPUT class="input" size="35" value="<%=documentSubject%>" name="documentSubject" >
228                                     </FONT> 228                                     </FONT>
229                                 </TD> 229                                 </TD>
230                             </TR> 230                             </TR>
231                             <TR bgColor="#ffffff"> 231                             <TR bgColor="#ffffff">
232                                 <TD height="10px" colspan="2">&nbsp;</TD> 232                                 <TD height="10px" colspan="2">&nbsp;</TD>
233                             </TR> 233                             </TR>
234                             <TR> 234                             <TR>
235                                 <TD width="15%">&nbsp;</TD> 235                                 <TD width="15%">&nbsp;</TD>
236                                 <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.creationDate" defaultValue="Creation Date" /></FONT></TD> 236                                 <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.creationDate" defaultValue="Creation Date" /></FONT></TD>
237                                 <TD align="left"><FONT size=-1> 237                                 <TD align="left"><FONT size=-1>
238                                     <div><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.after" defaultValue="after" />&nbsp;:&nbsp;<br/> 238                                     <div><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.after" defaultValue="after" />&nbsp;:&nbsp;<br/>
239                                     <% 239                                     <%
240                                         String includeFile = Jahia.getContextPath() + "/jsp/jahia/engines/calendar/calendar.jsp"; 240                                         String includeFile = Jahia.getContextPath() + "/jsp/jahia/engines/calendar/calendar.jsp";
241                                         CalendarHandler calHandler = webdavSearchDelegate.getCreatedFromCal(); 241                                         CalendarHandler calHandler = webdavSearchDelegate.getCreatedFromCal();
242                                         request.setAttribute("calendarHandler", calHandler); 242                                         request.setAttribute("calendarHandler", calHandler);
243                                     %> 243                                     %>
244                                     <jsp:include page="calendar.jsp" flush="true"/><br/> 244                                     <jsp:include page="calendar.jsp" flush="true"/><br/>
245                                     <content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.before" defaultValue="before" />&nbsp;:&nbsp;<br/> 245                                     <content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.before" defaultValue="before" />&nbsp;:&nbsp;<br/>
246                                     <% 246                                     <%
247                                         calHandler = webdavSearchDelegate.getCreatedToCal(); 247                                         calHandler = webdavSearchDelegate.getCreatedToCal();
248                                         request.setAttribute("calendarHandler", calHandler); 248                                         request.setAttribute("calendarHandler", calHandler);
249                                     %> 249                                     %>
250                                     <jsp:include page="calendar.jsp" flush="true"/> 250                                     <jsp:include page="calendar.jsp" flush="true"/>
251                                     </div> 251                                     </div>
252                                     </FONT> 252                                     </FONT>
253                                 </TD> 253                                 </TD>
254                             </TR> 254                             </TR>
255                             <TR bgColor="#ffffff"> 255                             <TR bgColor="#ffffff">
256                                 <TD height="10px" colspan="2">&nbsp;</TD> 256                                 <TD height="10px" colspan="2">&nbsp;</TD>
257                             </TR> 257                             </TR>
258                             <TR> 258                             <TR>
259                                 <TD width="15%">&nbsp;</TD> 259                                 <TD width="15%">&nbsp;</TD>
260                                 <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.lastModificationDate" defaultValue="Last Modification Date" /></FONT></TD> 260                                 <TD noWrap width="30%"><FONT size=-1><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.lastModificationDate" defaultValue="Last Modification Date" /></FONT></TD>
261                                 <TD align="left"><FONT size=-1> 261                                 <TD align="left"><FONT size=-1>
262                                     <div><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.after" defaultValue="after" />&nbsp;:&nbsp;<br/> 262                                     <div><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.after" defaultValue="after" />&nbsp;:&nbsp;<br/>
263                                     <% 263                                     <%
264                                         calHandler = webdavSearchDelegate.getModifiedFromCal(); 264                                         calHandler = webdavSearchDelegate.getModifiedFromCal();
265                                         request.setAttribute("calendarHandler", calHandler); 265                                         request.setAttribute("calendarHandler", calHandler);
266                                     %> 266                                     %>
267                                     <jsp:include page="calendar.jsp" flush="true"/><br/> 267                                     <jsp:include page="calendar.jsp" flush="true"/><br/>
268                                     <content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.before" defaultValue="before" />&nbsp;:&nbsp;<br/> 268                                     <content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.before" defaultValue="before" />&nbsp;:&nbsp;<br/>
269                                     <% 269                                     <%
270                                         calHandler = webdavSearchDelegate.getModifiedToCal(); 270                                         calHandler = webdavSearchDelegate.getModifiedToCal();
271                                         request.setAttribute("calendarHandler", calHandler); 271                                         request.setAttribute("calendarHandler", calHandler);
272                                     %> 272                                     %>
273                                     <jsp:include page="calendar.jsp" flush="true"/> 273                                     <jsp:include page="calendar.jsp" flush="true"/>
274                                     </div> 274                                     </div>
275                                     </FONT> 275                                     </FONT>
276                                 </TD> 276                                 </TD>
277                             </TR> 277                             </TR>
278                             </TABLE> 278                             </TABLE>
279                         </div> 279                         </div>
280                     </TD> 280                     </TD>
281                 </TR> 281                 </TR>
282                 </TBODY> 282                 </TBODY>
283                 </TABLE> 283                 </TABLE>
284             </TD> 284             </TD>
285         </TR> 285         </TR>
286         <TR bgColor=#ffffff> 286         <TR bgColor=#ffffff>
287             <TD> 287             <TD>
288                 <TABLE cellSpacing=0 cellPadding=2 width="100%"> 288                 <TABLE cellSpacing=0 cellPadding=2 width="100%">
289                 <TBODY> 289                 <TBODY>
290                 <TR> 290                 <TR>
291                     <TD width="15%" nowrap> 291                     <TD width="15%" nowrap>
292                         <FONT size=-1><B><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.customSearchOptions" defaultValue="Custom search options" /></B></FONT>&nbsp;<a href="javascript:swithMoreSearchOptions('expandCustomOptions','customOptionsPanel','imgCustomOptions');" ><% if ( webdavSearchDelegate.getExpandCustomOptions() ){%><content:displayIcon id="imgCustomOptions" src="triangle_green_expand"/><% } else { %><content:displayIcon id="imgCustomOptions" src="triangle_green_collapse"/><% } %></a> 292                         <FONT size=-1><B><content:resourceBundle resourceBundle="jahiatemplates.Corporate_portal_templates_v2" resourceName="search.customSearchOptions" defaultValue="Custom search options" /></B></FONT>&nbsp;<a href="javascript:swithMoreSearchOptions('expandCustomOptions','customOptionsPanel','imgCustomOptions');" ><% if ( webdavSearchDelegate.getExpandCustomOptions() ){%><content:displayIcon id="imgCustomOptions" src="triangle_green_expand"/><% } else { %><content:displayIcon id="imgCustomOptions" src="triangle_green_collapse"/><% } %></a>
293                         <input id="expandCustomOptions" type="hidden" name="expandCustomOptions" value="<% if ( webdavSearchDelegate.getExpandCustomOptions() ){%>1<% } else { %>0<%}%>"> 293                         <input id="expandCustomOptions" type="hidden" name="expandCustomOptions" value="<% if ( webdavSearchDelegate.getExpandCustomOptions() ){%>1<% } else { %>0<%}%>">
294                         <br/><br/> 294                         <br/><br/>
295                     </TD> 295                     </TD>
296                     <TD noWrap width="30%">&nbsp;</TD> 296                     <TD noWrap width="30%">&nbsp;</TD>
297                     <TD>&nbsp;</TD> 297                     <TD>&nbsp;</TD>
298                 </TR> 298                 </TR>
299                 </TBODY> 299                 </TBODY>
300                 </TABLE> 300                 </TABLE>
301             </TD> 301             </TD>
302         </TR> 302         </TR>
303         <TR bgColor=#ffffff> 303         <TR bgColor=#ffffff>
304             <TD> 304             <TD>
305                 <TABLE cellSpacing=0 cellPadding=2 width="100%"> 305                 <TABLE cellSpacing=0 cellPadding=2 width="100%">
306                 <TBODY> 306                 <TBODY>
307                 <TR> 307                 <TR>
308                     <TD align="left" colspan="3"> 308                     <TD align="left" colspan="3">
309                         <div id="customOptionsPanel" style="display: <% if ( webdavSearchDelegate.getExpandCustomOptions() ){%>block<% } else { %>none<%}%>;" > 309                         <div id="customOptionsPanel" style="display: <% if ( webdavSearchDelegate.getExpandCustomOptions() ){%>block<% } else { %>none<%}%>;" >
310                             <%@ include file="webdavsearchcustomoptions.inc"%> 310                             <%@ include file="webdavsearchcustomoptions.inc"%>
311                         </div> 311                         </div>
312                     </TD> 312                     </TD>
313                 </TR> 313                 </TR>
314                 </TBODY> 314                 </TBODY>
315                 </TABLE> 315                 </TABLE>
316             </TD> 316             </TD>
317         </TR> 317         </TR>

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