Author: tdraier
Date: Fri Aug 10 10:39:01 2007
New Revision: 756
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D756&repname=
=3Dcorporate_portal_templates_v2
Log:
fixed templates for jcrservice/search api changes
Modified:
trunk/src/jsp/advsearch/categories.jsp
trunk/src/jsp/advsearch/detailed_search_result_list.inc
trunk/src/jsp/advsearch/webdavsearch.jsp
trunk/src/jsp/advsearch/webdavsearchpropertydefinition.inc
trunk/src/jsp/advsearch/websitesearch.inc
trunk/src/jsp/advsearchresult.jsp
trunk/src/jsp/box/savedsearch.inc
trunk/src/jsp/box/searchbox.inc
trunk/src/jsp/common/top.inc
trunk/src/jsp/docinfo.jsp
Modified: trunk/src/jsp/advsearch/categories.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/advsear=
ch/categories.jsp&rev=3D756&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/advsearch/categories.jsp (original)
+++ trunk/src/jsp/advsearch/categories.jsp Fri Aug 10 10:39:01 2007
@@ -30,7 +30,6 @@
<%@ page import=3D"org.jahia.services.webdav.model.*" %>
<%@ page import=3D"org.compass.core.*" %>
<%@ page import=3D"org.jahia.ajax.webdav.DAVAbstractAction"%>
-<%@ page import=3D"org.jahia.engines.timebasedpublishing.CalendarHandler" =
%>
<%@ page import=3D"org.jahia.registries.*" %>
<%@ page import=3D"org.jahia.services.sites.*" %>
<%@ page import=3D"org.apache.slide.search.basic.*" %>
Modified: trunk/src/jsp/advsearch/detailed_search_result_list.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/advsear=
ch/detailed_search_result_list.inc&rev=3D756&repname=3Dcorporate_portal_tem=
plates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/advsearch/detailed_search_result_list.inc (original)
+++ trunk/src/jsp/advsearch/detailed_search_result_list.inc Fri Aug 10 10:3=
9:01 2007
@@ -58,53 +58,17 @@
} %>
<display:column property=3D"ranking" title=3D'<%=3DgetResourceBund=
le("search.rank","Ranking",jData)%>' sortable=3D"true"/>
<%
- List folderPathProps =3D advSearchViewHandler.getWebdavSearchDeleg=
ate().getFolderPathAsPropertyName();
if (dfa !=3D null) {
jff =3D dfa.getJahiaFileField();
}
- if ( !folderPathProps.isEmpty() ){
- %>
- <display:column title=3D'<%=3DgetResourceBundle("search.folder","F=
older",jData)%>' sortable=3D"true" comparator=3D"<%=3D comparator %>">
- <%
- if (dfa !=3D null) {
- List folderPath =3D dfa.getFolderPath(folderPathProps);
- Iterator folderPathIt =3D folderPath.iterator();
- DAVFileAccess folderPathDAV =3D null;
- %>
- <table border=3D"0" cellpadding=3D"0" cellspacing=3D"0">
- <tr>
- <%
- while ( folderPathIt.hasNext() ){
- folderPathDAV =3D (DAVFileAccess)folderPathIt.next();
- %>
- <td nowrap align=3D"left" valign=3D"top" style=3D"margin-r=
ight:0px!important;padding-right:0px!important;">
- <%
- if (jData.gui().isIE5(request) || jData.gui().isIE6(reques=
t)) { %>
- <a folder=3D'<%=3D request.getScheme() + "://" +
- request.getServerName() +
- (request.getServerPort()!=3D80?":" + request.getServerPort=
():"") +
- request.getContextPath() + "/webdav/site/" +
- jParams.getSiteKey() + org.jahia.engines.filemanager.Table=
Entry.javascriptDecode(folderPathDAV.getPath()) %>' style=3D"behavior:url(#=
default#AnchorClick);margin-right:0px!important;padding-right:0px!important=
;" target=3D"_new">
- <% } else { %>
- <a style=3D"margin-right:0px!important;padding-right:0px!i=
mportant;" target=3D"_new" href=3D"<%=3DfolderPathDAV.getFullPath(jParams)%=
>">
- <% } %>
- <%=3DfolderPathDAV.getName()%></a><% if ( folderPathIt.has=
Next() ){ %><td align=3D"left" valign=3D"top" style=3D"margin-right:0px!imp=
ortant;padding-right:0px!important;">/</td><% }%>
- <% } %>
- </tr>
- </table>
- <%
- }
- %>
- </display:column>
- <% } else { %>
- <% if ( dfa !=3D null && jff !=3D null ){ %>
+ if ( dfa !=3D null && jff !=3D null ){ %>
<display:column title=3D''>
<a href=3D'<%=3Djff.getDownloadUrl()%>' folder=3D'<%=3D request.=
getScheme() + "://" +
request.getServerName() + (request.getServerPort()!=3D80?":" + =
request.getServerPort():"") +
org.jahia.engines.filemanager.TableEntry.javascriptDecode(jff.g=
etDownloadUrl().substring(0, jff.getDownloadUrl().lastIndexOf("/"))) %>' st=
yle=3D"behavior:url(#default#AnchorClick);margin-right:0px!important;paddin=
g-right:0px!important;"
target=3D"_blank"><img title=3D"Open in IE folder" alt=3D"IE Fol=
der" border=3D"0" src=3D"<content:serverHttpPath/>/jsp/jahia/javascript/zim=
bra/complexTree/IEFolder.gif" /></a>
</display:column>
- <% }
+ <%
}
%>
<display:column title=3D'<%=3DgetResourceBundle("search.file","Fil=
e",jData)%>' sortable=3D"true" comparator=3D"<%=3D comparator %>">
Modified: trunk/src/jsp/advsearch/webdavsearch.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/advsear=
ch/webdavsearch.jsp&rev=3D756&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/advsearch/webdavsearch.jsp (original)
+++ trunk/src/jsp/advsearch/webdavsearch.jsp Fri Aug 10 10:39:01 2007
@@ -30,7 +30,6 @@
<%@ page import=3D"org.jahia.services.webdav.model.*" %>
<%@ page import=3D"org.compass.core.*" %>
<%@ page import=3D"org.jahia.ajax.webdav.DAVAbstractAction"%>
-<%@ page import=3D"org.jahia.engines.timebasedpublishing.CalendarHandler" =
%>
<%@ page import=3D"org.jahia.registries.*" %>
<%@ page import=3D"org.jahia.gui.*" %>
<%@ page import=3D"org.jahia.services.sites.*" %>
@@ -67,24 +66,18 @@
if ( documentTitle =3D=3D null ){
documentTitle =3D "";
}
- String documentSubject =3D webdavSearchDelegate.getSubject();
- if ( documentSubject =3D=3D null ){
- documentSubject =3D "";
- }
+// String documentSubject =3D webdavSearchDelegate.getSubject();
+// if ( documentSubject =3D=3D null ){
+// documentSubject =3D "";
+// }
+
=
- // for GED demo only
- String archivedStatus =3D webdavSearchDelegate.getArchivedStatus();
- =
String accessPermission =3D webdavSearchDelegate.getAccessPermission(); =
if ( accessPermission =3D=3D null || "".equals(accessPermission) ){
accessPermission =3D "read";
}
String webdavDialogUrl =3D Jahia.getContextPath() + "/jsp/jahia/engines/=
webdav/webdavrepository.jsp?display=3D" + DAVAbstractAction.DIRECTORIES_ONL=
Y;
=
- List folderPathProps =3D JahiaWebdavBaseService.getInstance().getFolderP=
athProps();
-
- List categoryProps =3D JahiaWebdavBaseService.getInstance().getCategoryP=
rops();
-
%>
=
<script language=3D"javascript">
@@ -190,125 +183,7 @@
</TABLE>
</TD>
</TR>
- <% =
- boolean displayQuickAccessLabel =3D true;
- if ( Jahia.getSettings().isShowGEDProperties() && !folderPathPro=
ps.isEmpty() ){
- Iterator folderPathPropIt =3D folderPathProps.i=
terator();
- PropertyDefinition propDef =3D null;
- while ( folderPathPropIt.hasNext() ){
- propDef =3D (PropertyDefinition)folderPathPr=
opIt.next();
- String propDefName =3D propDef.getNamespace(=
)+"@"+propDef.getName();
- String resourceName =3D "org.jahia.engines.f=
ilemanager.Filemanager_Engine." + propDef.getName() + ".label";
- resourceName =3D JahiaResourceBundle.getEngi=
neResource(resourceName, jParams, jParams.getLocale());
- if (resourceName =3D=3D null || resourceName=
.trim().length() =3D=3D 0) {
- resourceName =3D propDef.getName();
- }
- String folderPathValues =3D webdavSearchDelegate.getFolderPa=
thValues(propDef.getName());
- boolean selectedFolderPath =3D webdavSearchDelegate.getFolde=
rPathes().contains(propDefName);
- String folderPathDialogUrl =3D webdavDialogUrl;
- if ( selectedFolderPath ){
- folderPathDialogUrl +=3D"&folderPath=3D" + propDefName;
- }
- %>
- <TR bgColor=3D"#ffffff">
- <TD height=3D"10px"> </TD>
- </TR>
- <TR bgColor=3D#ffffff>
- <TD>
- <TABLE cellSpacing=3D0 cellPadding=3D2 width=3D"100%" >
- <TBODY>
- <TR>
- <TD width=3D"15%"><%if (displayQuickAccessLabel){%><FO=
NT size=3D-1><B><content:resourceBundle resourceBundle=3D"jahiatemplates.Co=
rporate_portal_templates_v2" resourceName=3D"search.quickAccess" defaultVal=
ue=3D"Quick access" /></B></FONT><%} displayQuickAccessLabel =3D false;%>&n=
bsp;</TD>
- <TD noWrap width=3D"30%"><FONT size=3D-1><content:reso=
urceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" =
resourceName=3D"search.quickAccessBy" defaultValue=3D"by" /> <%=3Dreso=
urceName%></FONT></TD>
- <TD><FONT size=3D-1>
- <SELECT name=3D"folderPath_<%=3DpropDef.getName()%=
>" onchange=3D"changeFolderPath('folderPathValues_<%=3DpropDef.getName()%>'=
)">
- <OPTION value=3D"" <%if ( !selectedFolderPath ){=
%>selected<%}%>><content:engineResourceBundle resourceName=3D"jahiatemplate=
s.Corporate_portal_templates_v2" resourceName=3D"org.jahia.engines.no.label=
" defaultValue=3D"No" /></OPTION>
- <OPTION value=3D"<%=3DpropDefName%>" <%if ( sele=
ctedFolderPath ){%>selected<%}%>><content:engineResourceBundle resourceName=
=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"org.jahia=
.engines.yes.label" defaultValue=3D"Yes" /></OPTION>
- </SELECT>
- </FONT><br/>
- <INPUT id=3D"folderPathValues_<%=3DpropDef.getName=
()%>" size=3D"35" value=3D"<%=3DfolderPathValues%>" name=3D"folderPathValue=
s_<%=3DpropDef.getName()%>" ><% if ( selectedFolderPath ){%><a href=3D"<%=
=3DfolderPathDialogUrl%>&htmlElementId=3DfolderPathValues_<%=3DpropDef.getN=
ame()%>" onclick=3D"popUp(this.href,'console',600,800);return false;" targe=
t=3D"newWin"> <content:resourceBundle resourceBundle=3D"jahiatemplates=
.Corporate_portal_templates_v2" resourceName=3D"search.browse" defaultValue=
=3D"browse" /></a> <a href=3D"javascript:resetLocation('folderPathValu=
es_<%=3DpropDef.getName()%>');"><content:resourceBundle resourceBundle=3D"j=
ahiatemplates.Corporate_portal_templates_v2" resourceName=3D"search.reset" =
defaultValue=3D"reset" /></a> <a href=3D"javascript:resetLocation('fol=
derPathValues_<%=3DpropDef.getName()%>');"></a><br><% } %>
- <%
- String folderPathAlias =3D null;
- if ( !"".equals(folderPathValues.trim()) ){
- int pos =3D folderPathValues.indexOf("/site/");
- String subStr =3D folderPathValues.substring(p=
os+6);
- int pos2 =3D subStr.indexOf("/");
- String siteKey =3D subStr.substring(0,pos2);
- pos =3D folderPathValues.indexOf("/site/" + si=
teKey);
- subStr =3D folderPathValues.substring(pos+6+si=
teKey.length());
- try {
- JahiaSite site =3D ServicesRegistry.getInsta=
nce().getJahiaSitesService().getSiteByKey(siteKey);
- DAVFileAccess davFileAccess =3D new DAVFileA=
ccess(jParams,site,jParams.getUser(),subStr);
- PropertyName propName =3D PropertyName.getPr=
opertyName(propDef.getName(),propDef.getNamespace());
- PropertyName propAliasName =3D PropertyName.=
getPropertyName(propDef.getName() + "-alias",propDef.getNamespace());
- NodeProperty nodeProp =3D davFileAccess.getR=
evisionDescriptor().getProperty(propName);
- if ( nodeProp !=3D null && "Yes".equalsIgnor=
eCase(nodeProp.getValue().toString().trim()) ){
- nodeProp =3D davFileAccess.getRevisionDe=
scriptor().getProperty(propAliasName);
- if ( nodeProp !=3D null && !"".equals(no=
deProp.getValue().toString().trim()) ){
- folderPathAlias =3D nodeProp.getValue(=
).toString().trim();
- }
- }
- } catch ( Throwable t ){
- t.printStackTrace();
- }
- %>
- <INPUT type=3D"checkbox" id=3D"folderPathSubFold=
ers_<%=3DpropDef.getName()%>" value=3D"yes" name=3D"folderPathSubFolders_<%=
=3DpropDef.getName()%>" <% if (webdavSearchDelegate.getFolderPathSubFolders=
().contains(propDef.getName()) ){%>checked<%}%> / > <content:resourceB=
undle resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" resou=
rceName=3D"search.extendSelectionToSubFolders" defaultValue=3D"extend selec=
tion to sub folders" /><br/>
- <%
- } =
- if ( folderPathAlias !=3D null ){
- %>
- <INPUT type=3D"checkbox" id=3D"folderPathAlias_<%=
=3DpropDef.getName()%>" value=3D"yes" name=3D"folderPathAlias_<%=3DpropDef.=
getName()%>" <% if (webdavSearchDelegate.getFolderPathAlias().contains(prop=
Def.getName()) ){%>checked<%}%> / > <content:resourceBundle resourceBu=
ndle=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"searc=
h.extendSelectionToFolderPathAlias" defaultValue=3D"extend selection to all=
folders of same alias" /> : <%=3DfolderPathAlias%>
- <% =
- }
- %>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- <% } =
- } %>
=
- <% =
- boolean displayCategoryLabel =3D true;
- if ( !WebdavSearchDelegate.SELECT_CATEGORY_OPERATION.equals(webd=
avSearchDelegate.getOperation()) && !categoryProps.isEmpty() ){
- Iterator categoryPropsIt =3D categoryProps.iterator();
- PropertyDefinition propDef =3D null;
- while ( categoryPropsIt.hasNext() ){
- propDef =3D (PropertyDefinition)categoryPropsIt.next();
- String propDefName =3D propDef.getNamespace()+"@"+propDef.ge=
tName();
- String resourceName =3D "org.jahia.engines.filemanager.Filem=
anager_Engine." + propDef.getName() + ".label";
- resourceName =3D JahiaResourceBundle.getEngineResource(resou=
rceName, jParams, jParams.getLocale());
- if (resourceName =3D=3D null || resourceName.trim().length()=
=3D=3D 0) {
- resourceName =3D propDef.getName();
- }
- String categoriesValues =3D webdavSearchDelegate.getCategori=
esValues(propDef.getName());
- String categoriesEngineUrl =3D "";
- %>
- <TR bgColor=3D"#ffffff">
- <TD height=3D"10px"> </TD>
- </TR>
- <TR bgColor=3D#ffffff>
- <TD>
- <TABLE cellSpacing=3D0 cellPadding=3D2 width=3D"100%" >
- <TBODY>
- <TR>
- <TD width=3D"15%"><%if (displayCategoryLabel){%><FONT =
size=3D-1><B><content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo=
rate_portal_templates_v2" resourceName=3D"search.categories" defaultValue=
=3D"Categories" /></B></FONT><%} displayCategoryLabel =3D false;%> </T=
D>
- <TD noWrap width=3D"30%"><FONT size=3D-1><content:reso=
urceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" =
resourceName=3D"search.quickAccessBy" defaultValue=3D"by" /> <%=3Dreso=
urceName%></FONT></TD>
- <TD><INPUT id=3D"categories_<%=3DpropDef.getName()%>" =
size=3D"35" value=3D"<%=3DcategoriesValues%>" name=3D"categories_<%=3DpropD=
ef.getName()%>" ><a href=3D"javascript:selectCategory('<%=3DpropDefName%>')=
"> <content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_=
portal_templates_v2" resourceName=3D"search.browse" defaultValue=3D"browse"=
/></a> <a href=3D"javascript:resetLocation('categories_<%=3DpropDef.g=
etName()%>');"><content:resourceBundle resourceBundle=3D"jahiatemplates.Cor=
porate_portal_templates_v2" resourceName=3D"search.reset" defaultValue=3D"r=
eset" /></a> <a href=3D"javascript:resetLocation('categories_<%=3Dprop=
Def.getName()%>');"></a><br>
- <INPUT type=3D"checkbox" id=3D"subCategoriesEnable=
d_<%=3DpropDef.getName()%>" value=3D"yes" name=3D"subCategoriesEnabled_<%=
=3DpropDef.getName()%>" <% if (webdavSearchDelegate.getSubCategoriesEnabled=
().contains(propDef.getName()) ){%>checked<%}%> / > <content:resourceB=
undle resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" resou=
rceName=3D"search.extendSelectionToSubCategories" defaultValue=3D"extend se=
lection to sub categories" /><br/>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- <% } =
- } else if ( WebdavSearchDelegate.SELECT_CATEGORY_OPERATION.equal=
s(webdavSearchDelegate.getOperation()) ){
- %>
- <jsp:include page=3D"categories.jsp" flush=3D"true"/><br/>
- <% } %>
<TR bgColor=3D"#ffffff">
<TD height=3D"10px"> </TD>
</TR>
@@ -321,32 +196,9 @@
<TD noWrap width=3D"30%"><FONT size=3D-1><content:reso=
urceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" =
resourceName=3D"search.objectOfTheResourceType" defaultValue=3D"return obje=
ct of type" /></a></FONT></TD>
<TD><FONT size=3D-1>
<SELECT name=3D"resourceType">
- <OPTION value=3D"<%=3DString.valueOf(WebdavSearchD=
elegate.FILE_RESOURCE_TYPE)%>" <% if (WebdavSearchDelegate.FILE_RESOURCE_TY=
PE=3D=3DwebdavSearchDelegate.getResourceType()){%>selected<%}%>><content:re=
sourceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2=
" resourceName=3D"search.resourceType.file" defaultValue=3D"file" />
- <OPTION value=3D"<%=3DString.valueOf(WebdavSearchD=
elegate.COLLECTION_RESOURCE_TYPE)%>" <% if (WebdavSearchDelegate.COLLECTION=
_RESOURCE_TYPE=3D=3DwebdavSearchDelegate.getResourceType()){%>selected<%}%>=
><content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_=
templates_v2" resourceName=3D"search.resourceType.folder" defaultValue=3D"f=
older" />
- <OPTION value=3D"<%=3DString.valueOf(WebdavSearchD=
elegate.ALL_RESOURCE_TYPE)%>" <% if (WebdavSearchDelegate.ALL_RESOURCE_TYPE=
=3D=3DwebdavSearchDelegate.getResourceType()){%>selected<%}%>><content:reso=
urceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" =
resourceName=3D"search.resourceType.all" defaultValue=3D"tous" />
- </OPTION></SELECT></FONT>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- <% if ( Jahia.getSettings().isShowGEDProperties() ){ %>
- <TR bgColor=3D"#ffffff">
- <TD height=3D"10px"> </TD>
- </TR>
- <TR bgColor=3D#ffffff>
- <TD>
- <TABLE cellSpacing=3D0 cellPadding=3D2 width=3D"100%">
- <TBODY>
- <TR>
- <TD width=3D"15%"><FONT size=3D-1><B><content:resource=
Bundle resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" reso=
urceName=3D"search.archivedStatus" defaultValue=3D"Archived status" /></a><=
/B></FONT></TD>
- <TD noWrap width=3D"30%"><FONT size=3D-1><content:reso=
urceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" =
resourceName=3D"search.resultsOfTheArchivedStatus" defaultValue=3D"return r=
esults with the status" /></a></FONT></TD>
- <TD><FONT size=3D-1>
- <SELECT name=3D"archivedStatus">
- <OPTION value=3D"all" <% if ("all".equals(archived=
Status)){%>selected<%}%>><content:engineResourceBundle resourceName=3D"org.=
jahia.engines.filemanager.Filemanager_Engine.statusAll.label" defaultValue=
=3D"all" />
- <OPTION value=3D"open" <% if ("open".equals(archiv=
edStatus)){%>selected<%}%>><content:engineResourceBundle resourceName=3D"or=
g.jahia.engines.filemanager.Filemanager_Engine.statusOpen.label" defaultVal=
ue=3D"open" />
- <OPTION value=3D"filed" <% if ("filed".equals(arch=
ivedStatus)){%>selected<%}%>><content:engineResourceBundle resourceName=3D"=
org.jahia.engines.filemanager.Filemanager_Engine.statusFiled.label" default=
Value=3D"filed" />
+ <OPTION value=3D"<%=3DString.valueOf(org.jahia.eng=
ines.search.WebdavSearchDelegate.FILE_RESOURCE_TYPE)%>" <% if (org.jahia.en=
gines.search.WebdavSearchDelegate.FILE_RESOURCE_TYPE=3D=3DwebdavSearchDeleg=
ate.getResourceType()){%>selected<%}%>><content:resourceBundle resourceBund=
le=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"search.=
resourceType.file" defaultValue=3D"file" />
+ <OPTION value=3D"<%=3DString.valueOf(org.jahia.eng=
ines.search.WebdavSearchDelegate.COLLECTION_RESOURCE_TYPE)%>" <% if (org.ja=
hia.engines.search.WebdavSearchDelegate.COLLECTION_RESOURCE_TYPE=3D=3Dwebda=
vSearchDelegate.getResourceType()){%>selected<%}%>><content:resourceBundle =
resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" resourceNam=
e=3D"search.resourceType.folder" defaultValue=3D"folder" />
+ <OPTION value=3D"<%=3DString.valueOf(org.jahia.eng=
ines.search.WebdavSearchDelegate.ALL_RESOURCE_TYPE)%>" <% if (org.jahia.eng=
ines.search.WebdavSearchDelegate.ALL_RESOURCE_TYPE=3D=3DwebdavSearchDelegat=
e.getResourceType()){%>selected<%}%>><content:resourceBundle resourceBundle=
=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"search.re=
sourceType.all" defaultValue=3D"tous" />
</OPTION></SELECT></FONT>
</TD>
</TR>
@@ -354,13 +206,8 @@
</TABLE>
</TD>
</TR>
- <% } %>
- <% if ( Jahia.getSettings().isShowGEDProperties() ){ %>
- <TR bgColor=3D"#ffffff">
- <TD height=3D"10px"> </TD>
- </TR>
<TR bgColor=3D#ffffff>
- <TD>
+ <TD>
<TABLE cellSpacing=3D0 cellPadding=3D2 width=3D"100%">
<TBODY>
<TR>
@@ -378,7 +225,6 @@
</TABLE>
</TD>
</TR>
- <% } %>
<TR bgColor=3D"#ffffff">
<TD height=3D"10px"> </TD>
</TR>
@@ -447,14 +293,14 @@
</FONT>
</TD>
</TR>
- <TR>
- <TD width=3D"15%"> </TD>
- <TD noWrap width=3D"30%"><FONT size=3D-1><=
content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_te=
mplates_v2" resourceName=3D"search.subject" defaultValue=3D"Subject" /></FO=
NT></TD>
- <TD><FONT size=3D-1>
- <INPUT class=3D"input" size=3D"35" val=
ue=3D"<%=3DdocumentSubject%>" name=3D"documentSubject" >
- </FONT>
- </TD>
- </TR>
+ <%--<TR>--%>
+ <%--<TD width=3D"15%"> </TD>--%>
+ <%--<TD noWrap width=3D"30%"><FONT size=3D=
-1><content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_porta=
l_templates_v2" resourceName=3D"search.subject" defaultValue=3D"Subject" />=
</FONT></TD>--%>
+ <%--<TD><FONT size=3D-1>--%>
+ <%--<INPUT class=3D"input" size=3D"35"=
value=3D"<%=3DdocumentSubject%>" name=3D"documentSubject" >--%>
+ <%--</FONT>--%>
+ <%--</TD>--%>
+ <%--</TR>--%>
<TR bgColor=3D"#ffffff">
<TD height=3D"10px" colspan=3D"2"> </=
TD>
</TR>
Modified: trunk/src/jsp/advsearch/webdavsearchpropertydefinition.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/advsear=
ch/webdavsearchpropertydefinition.inc&rev=3D756&repname=3Dcorporate_portal_=
templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/advsearch/webdavsearchpropertydefinition.inc (original)
+++ trunk/src/jsp/advsearch/webdavsearchpropertydefinition.inc Fri Aug 10 1=
0:39:01 2007
@@ -22,12 +22,4 @@
criteriaDefs.add(new CriteriaDefinition("FILEPROP:Keywords","Keywords"=
,"search.keywords",false));
criteriaDefs.add(new CriteriaDefinition("FILEPROP:LastAuthor","Last Au=
thor","search.lastAuthor",false));
criteriaDefs.add(new CriteriaDefinition("FILEPROP:LastModifDate","Last=
Modification Date","search.lastModificationDate",true));
-
- if ( Jahia.getSettings().isShowGEDProperties() ){
- criteriaDefs.add(new CriteriaDefinition("FILEPROP:SysDocProto_NoDoss=
ier","Document number","search.documentNumber",false));
- criteriaDefs.add(new CriteriaDefinition("FILEPROP:SysDocProto_CleTyp=
eProcessus","Process type","search.processType",false));
- criteriaDefs.add(new CriteriaDefinition("FILEPROP:SysDocProto_CleGro=
upeDiffusion","Diffusion group","search.diffusionGroup",false));
- criteriaDefs.add(new CriteriaDefinition("FILEPROP:SysDocProto_CleGro=
upeConfidentialite","Confidential group","search.confidentialGroup",false));
- } =
-
%>
Modified: trunk/src/jsp/advsearch/websitesearch.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/advsear=
ch/websitesearch.inc&rev=3D756&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/advsearch/websitesearch.inc (original)
+++ trunk/src/jsp/advsearch/websitesearch.inc Fri Aug 10 10:39:01 2007
@@ -123,7 +123,7 @@
SearchHandler searchHandler =3D null;
while ( it.hasNext() ){
searchHandler =3D (SearchHandler)it.ne=
xt();
- if ( searchHandler.getName().equals(Ja=
hiaWebdavBaseService.WEBDAV_SEARCH) ){
+ if ( searchHandler.getName().equals(Ja=
hiaSearchBaseService.WEBDAV_SEARCH) ){
continue;
}
if ( !"default".equals(searchHandler.g=
etName()) ){
Modified: trunk/src/jsp/advsearchresult.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/advsear=
chresult.jsp&rev=3D756&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/advsearchresult.jsp (original)
+++ trunk/src/jsp/advsearchresult.jsp Fri Aug 10 10:39:01 2007
@@ -32,6 +32,7 @@
<%@ page import=3D"org.jahia.engines.timebasedpublishing.CalendarHandler" =
%>
<%@ page import=3D"org.jahia.services.search.slide.*" %>
<%@ page import=3D"org.jahia.services.acl.JahiaBaseACL" %>
+<%@ page import=3D"org.jahia.bin.Jahia" %>
=
<jesi:fragment cache=3D"no">
<%
@@ -118,7 +119,7 @@
searchString =3D advSearchViewHandler.getFreeSearch();
=
=
- if ( JahiaWebdavBaseService.getInstance().getEnableSlideSearch() )=
{ %>
+ if ( Jahia.getSettings().isJcrSearchEnabled() ){ %>
<div id=3D"menubar">
<ul id=3D"floatright_tabs">
<li class=3D"tabs_li">
Modified: trunk/src/jsp/box/savedsearch.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/box/sav=
edsearch.inc&rev=3D756&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/box/savedsearch.inc (original)
+++ trunk/src/jsp/box/savedsearch.inc Fri Aug 10 10:39:01 2007
@@ -338,15 +338,15 @@
}
if ( thisHit.getType()=3D=3DJahiaSearchHitInte=
rface.WEBDAVFILE_TYPE){
SearchHit searchHit =3D thisHit.getParsedO=
bject().getSearchHit();
- if ( searchHit instanceof SlideSearchHit ){
- SlideSearchResult slideSearchResult =
=3D (SlideSearchResult)searchHit.getSearchResult();
- highlighter =3D slideSearchResult.high=
lighter(searchHit, jahiaSavedSearch.getQuery(), org.apache.slide.index.luce=
ne.Index.CONTENT_FIELD_NAME);
- //highlighter =3D slideSearchResult.hi=
ghlighter(searchHit, searchString, org.apache.slide.index.lucene.Index.CONT=
ENT_FIELD_NAME);
- if ( highlighter !=3D null ){
- highlighter.setMaxNumFragments(2);
- highlightedText =3D highlighter.fr=
agmentsWithSeparator(org.apache.slide.index.lucene.Index.CONTENT_FIELD_NAME=
);
- }
- }
+// if ( searchHit instanceof SlideSearchHit=
){
+// SlideSearchResult slideSearchResult =
=3D (SlideSearchResult)searchHit.getSearchResult();
+// highlighter =3D slideSearchResult.hi=
ghlighter(searchHit, jahiaSavedSearch.getQuery(), org.apache.slide.index.lu=
cene.Index.CONTENT_FIELD_NAME);
+// //highlighter =3D slideSearchResult.=
highlighter(searchHit, searchString, org.apache.slide.index.lucene.Index.CO=
NTENT_FIELD_NAME);
+// if ( highlighter !=3D null ){
+// highlighter.setMaxNumFragments(2=
);
+// highlightedText =3D highlighter.=
fragmentsWithSeparator(org.apache.slide.index.lucene.Index.CONTENT_FIELD_NA=
ME);
+// }
+// }
DAVFileAccess davObject =3D (DAVFileAccess=
)thisHit.getObject();
String thisPicto =3D getPicto(davObject.ge=
tName());
%>
Modified: trunk/src/jsp/box/searchbox.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/box/sea=
rchbox.inc&rev=3D756&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/box/searchbox.inc (original)
+++ trunk/src/jsp/box/searchbox.inc Fri Aug 10 10:39:01 2007
@@ -143,14 +143,6 @@
<table>
<tr>
<td>
- <content:resourceBundle resourceBundle=3D"jahiatemplates.C=
orporate_portal_templates_v2" resourceName=3D"search.archivedStatus" defaul=
tValue=3D"Archived status" /><br/>
- <select name=3D"archivedStatus" class=3D"input">
- <option value=3D"all" <% if ("all".equals(webdavSearchDele=
gate.getArchivedStatus())){%>selected<%}%>><content:engineResourceBundle re=
sourceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.statusAll.la=
bel" defaultValue=3D"all" />
- <option value=3D"open" <% if ("open".equals(webdavSearchDe=
legate.getArchivedStatus())){%>selected<%}%>><content:engineResourceBundle =
resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.statusOpen=
.label" defaultValue=3D"open" />
- <option value=3D"filed" <% if ("filed".equals(webdavSearch=
Delegate.getArchivedStatus())){%>selected<%}%>><content:engineResourceBundl=
e resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engine.statusFi=
led.label" defaultValue=3D"filed" />
- </select>
- </td>
- <td>
<content:engineResourceBundle resourceName=3D"org.jahia.en=
gines.filemanager.Filemanager_Engine.accessPermission.label" defaultValue=
=3D"Access permission" /><br/>
<select name=3D"accessPermission" class=3D"input">
<option value=3D"read" <% if ("read".equals(accessPermissi=
on)){%>selected<%}%>><content:engineResourceBundle resourceName=3D"org.jahi=
a.engines.filemanager.Filemanager_Engine.readPermission.label" defaultValue=
=3D"Read access" />
@@ -161,35 +153,6 @@
</tr>
</table>
</td> =
- <tr>
- <tr>
- <td>
- <% =
- boolean displayCategoryLabel =3D true;
- List categoryProps =3D JahiaWebdavBaseService.getInstance().=
getCategoryProps();
- if ( !categoryProps.isEmpty() ){
- Iterator categoryPropsIt =3D categoryProps.iterator();
- PropertyDefinition propDef =3D null;
- while ( categoryPropsIt.hasNext() ){
- propDef =3D (PropertyDefinition)categoryPropsIt.next();
- if ( "department".equals(propDef.getName()) ){
- continue;
- }
- String propDefName =3D propDef.getNamespace()+"@"+propDe=
f.getName();
- String resourceName =3D "org.jahia.engines.filemanager.F=
ilemanager_Engine." + propDef.getName() + ".label";
- resourceName =3D JahiaResourceBundle.getEngineResource(r=
esourceName, jParams, jParams.getLocale());
- if (resourceName =3D=3D null || resourceName.trim().leng=
th() =3D=3D 0) {
- resourceName =3D propDef.getName();
- }
- String categoriesValues =3D webdavSearchDelegate.getCate=
goriesValues(propDef.getName());
- String categoriesEngineUrl =3D "";
- %>
- <content:resourceBundle resourceBundle=3D"jahiatemplates=
.Corporate_portal_templates_v2" resourceName=3D"search.quickAccessBy" defau=
ltValue=3D"by" /> <%=3DresourceName%><br/>
- <input class=3D"input" id=3D"categories_<%=3DpropDef.get=
Name()%>" size=3D"35" value=3D"<%=3DcategoriesValues%>" name=3D"categories_=
<%=3DpropDef.getName()%>" ><a href=3D"javascript:selectCategory('<%=3DpropD=
efName%>','<%=3DcontextId%>')"> <content:resourceBundle resourceBundle=
=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"search.br=
owse" defaultValue=3D"browse" /></a> <a href=3D"javascript:resetLocati=
on('form_<%=3DcontextId%>','categories_<%=3DpropDef.getName()%>');"><conten=
t:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_template=
s_v2" resourceName=3D"search.reset" defaultValue=3D"reset" /></a> <a h=
ref=3D"javascript:resetLocation('form_<%=3DcontextId%>','categories_<%=3Dpr=
opDef.getName()%>');"></a><br>
- <input type=3D"checkbox" id=3D"subCategoriesEnabled_<%=
=3DpropDef.getName()%>" value=3D"yes" name=3D"subCategoriesEnabled_<%=3Dpro=
pDef.getName()%>" <% if (webdavSearchDelegate.getSubCategoriesEnabled().con=
tains(propDef.getName()) ){%>checked<%}%> / > <content:resourceBundle =
resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" resourceNam=
e=3D"search.extendSelectionToSubCategories" defaultValue=3D"extend selectio=
n to sub categories" /><br/>
- <% }
- } %>
- </td>
</tr>
</table> =
</form>
Modified: trunk/src/jsp/common/top.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
top.inc&rev=3D756&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/top.inc (original)
+++ trunk/src/jsp/common/top.inc Fri Aug 10 10:39:01 2007
@@ -91,7 +91,7 @@
<%
boolean introducingTheVeryFatZimbra=3Dfalse;
if(request.getSession().getAttribute(userSettings.TBP_VISU_ENABLED)!=
=3Dnull){
- introducingTheVeryFatZimbra=3D((String)request.getSession().getAttribu=
te(userSettings.TBP_VISU_ENABLED)).trim().equalsIgnoreCase("true");
+ introducingTheVeryFatZimbra=3D((Boolean)request.getSession().getAttrib=
ute(userSettings.TBP_VISU_ENABLED)).booleanValue();
}
if(isEditMode && introducingTheVeryFatZimbra) {
%>
Modified: trunk/src/jsp/docinfo.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/docinfo=
.jsp&rev=3D756&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/docinfo.jsp (original)
+++ trunk/src/jsp/docinfo.jsp Fri Aug 10 10:39:01 2007
@@ -237,67 +237,7 @@
=
String contentType =3D file.getType (); //=
(String) file.getProperty("DAV:","getcontenttype");
if (contentType !=3D null) {
- if (!davFile.getPath().equals("#")) {
-
- try {
- InputStream ins =3D davFile.do=
wnloadFile();
- String charSet =3D null; // by=
default open as ascii
- CharsetDetection charsetDet =
=3D new CharsetDetection();
- charsetDet.charsetDetection(in=
s);
- charSet =3D charsetDet.getChar=
set();
- long lastModifiedDate =3D Syst=
em.currentTimeMillis();
- try {
- lastModifiedDate =3D davFi=
le.getJahiaFileField()
- .getLastModifDate();
- } catch ( Throwable t ){
- logger.debug("Error while =
retrieving last modified date", t);
- }
- extDoc =3D ServicesRegistry.ge=
tInstance().getFileExtractionService()
- .getExtractedDocument(cont=
entType,site.getSiteKey() + "_" + davFile.getPath(),lastModifiedDate,
- true,davFile.downl=
oadFile());
- if ( extDoc !=3D null ){
- Map props =3D extDoc.getPr=
operties();
- Iterator keys =3D props.ke=
ySet().iterator();
- String key =3D null;
- String[] vals =3D null;
- while ( keys.hasNext() ){
- key =3D (String)keys.n=
ext();
- if (! "Thumbnail".equa=
ls(key)) {
- vals =3D extDoc.ge=
tPropertiesAsStrings(key);
- if (vals.length>0)=
{
- if (! (vals.le=
ngth=3D=3D1 && "".equals(vals[0]))){
- %>
- <tr>
- <td><%=
=3Dkey%>:</td>
- <td>
- <%
- fo=
r ( int i=3D0; i<vals.length ; i++ ){
- =
String value =3D vals[i];
- =
if ("CreationDate".equals(key) ||
- =
"LastModifDate".equals(key) ||
- =
"LastPrinted".equals(key) ||
- =
"EditTime".equals(key)) {
- =
try {
- =
value =3D sdf.format(new Date(Long.parseLong(value)));
- =
} catch (NumberFormatException nfe) {
- =
//logger.debug("Could not parse creationDate for field [" + dfaI=
d + "]");
- =
}
- =
}
- =
%><%=3Dvalue%><br/><%
- }
- %>
- </td>
- </tr>
- <%
- }
- }
- }
- }
- }
- } catch ( Throwable t ){
- logger.debug(t);
- }
- }
+%> extracted properties were here <%
}
}
%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
