Author: knguyen
Date: Thu Aug 16 14:48:48 2007
New Revision: 758
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D758&repname=
=3Dcorporate_portal_templates_v2
Log:
- fixes related to Slide saved search.
- deactivate container cache for saved search box.
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/detailed_search_result_l=
ist.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/webdavsearch.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/box.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/savedsearch.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/detailed_search_re=
sult_list.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/advsearch/detailed_search_result_list.inc&rev=3D758&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
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/detailed_search_result_l=
ist.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/detailed_search_result_l=
ist.inc Thu Aug 16 14:48:48 2007
@@ -48,37 +48,6 @@
<div class=3D"searchResultListing">
<display:table name=3D"searchResultList" class=3D"searchResultListing"=
pagesize=3D"<%=3DmaxPageItems%>" requestURI=3D'<%=3DsearchUrl + "?screen=
=3Dnaviguate_result"%>' excludedParams=3D"*" decorator=3D"org.jahia.service=
s.search.slide.decorator.SearchResultListItemWrapper" id=3D"listItem">
<display:column property=3D"ranking" title=3D'<%=3DgetResourceBund=
le("search.rank","Ranking",jData)%>' sortable=3D"true"/>
- <% =
- PropertyName folderPathProp =3D advSearchViewHandler.getWebdavSear=
chDelegate().getFolderPathAsPropertyName();
- if ( folderPathProp !=3D null ){
- %> =
- <display:column title=3D'<%=3DgetResourceBundle("search.file.folde=
r","Folder",jData)%>' sortable=3D"true" comparator=3D"<%=3D comparator %>">
- <%
- DAVFileAccess dfa =3D null;
- if (pageContext.getAttribute("listItem") !=3D null) {
- %>
- <bean:define id=3D"davFile" name=3D"listItem" property=3D"davF=
ile"/>
- <%
- dfa =3D (DAVFileAccess) pageContext.getAttribute("davFile");
- List folderPath =3D dfa.getFolderPath(folderPathProp);
- 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;"><!--a style=3D"margin-righ=
t:0px!important;padding-right:0px!important;" href=3D"<%=3DfolderPathDAV.ge=
tFullPath(jParams)%>"--><%=3DfolderPathDAV.getName()%><!--/a--><% if ( fold=
erPathIt.hasNext() ){ %><td align=3D"left" valign=3D"top" style=3D"margin-r=
ight:0px!important;padding-right:0px!important;">/</td><% }%><%
- }%> =
- </tr>
- </table> =
- <% =
- }
- %>
- </display:column>
- <% } %>
<display:column title=3D'<%=3DgetResourceBundle("search.file","Fil=
e",jData)%>' sortable=3D"true" comparator=3D"<%=3D comparator %>">
<%
org.jahia.services.search.slide.SearchResultListItem searchlistI=
tem =3D =
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/webdavsearch.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/advsearch/webdavsearch.jsp&rev=3D758&repname=3Dcorporate_po=
rtal_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
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/webdavsearch.jsp (origin=
al)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/webdavsearch.jsp Thu Aug=
16 14:48:48 2007
@@ -92,14 +92,6 @@
'<%=3DWebdavCriteriasHandler.DELETE_OPERATION%>');
}
=
-function changeFolderPath(folderPathValuesId){
- var el =3D document.getElementById(folderPathValuesId);
- if ( el ){
- el.value =3D "";
- }
- submitSearchForm('<%=3DSearch_Engine.UPDATE_SEARCH_OPTIONS_SCREEN%>');
-}
-
-->
=
</script>
@@ -133,15 +125,7 @@
documentSubject =3D "";
}
=
- String folderPath =3D webdavSearchDelegate.getFolderPath();
- =
String webdavDialogUrl =3D Jahia.getContextPath() + "/jsp/jahia/engines/=
webdav/webdavrepository.jsp?display=3D" + DAVAbstractAction.DIRECTORIES_ONL=
Y;
- String folderPathDialogUrl =3D webdavDialogUrl + "&folderPath=3D" + fold=
erPath;
-
- String folderPathValues =3D
webdavSearchDelegate.getFolderPathValuesAsStr=
ing(",");
- =
- List folderPathProps =3D JahiaWebdavBaseService.getInstance().getFolderP=
athProps();
-
%>
<TR bgColor=3D#ffffff>
<TD>
@@ -170,45 +154,6 @@
</TABLE>
</TD>
</TR>
- <% =
- if ( !folderPathProps.isEmpty() ){
- %> =
- <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.quickAcces" defaultValue=3D"Quick access" /></a></B></FO=
NT></TD>
- <TD noWrap width=3D"30%"><FONT size=3D-1><content:reso=
urceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" =
resourceName=3D"search.listenFilesClassifiedBy" defaultValue=3D"listen file=
s classified by" /></a></FONT></TD>
- <TD><FONT size=3D-1>
- <SELECT name=3D"folderPath" onchange=3D"changeFold=
erPath('folderPathValues')">
- <OPTION value=3D"" <% if ("".equals(folderPath))=
{%>selected<%}%>><content:resourceBundle resourceBundle=3D"jahiatemplates.C=
orporate_portal_templates_v2" resourceName=3D"search.folderPath" defaultVal=
ue=3D"" />
- <% =
- Iterator folderPathPropIt =3D folderPathProps.=
iterator();
- 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();
- }
- %>
- <OPTION value=3D"<%=3DpropDefName%>" <% if (pr=
opDefName.equals(folderPath)){%>selected<%}%>><%=3DresourceName%></OPTION>
- <% } %>
- </SELECT></FONT><br/>
- <INPUT id=3D"folderPathValues" size=3D"35" value=
=3D"<%=3DfolderPathValues%>" name=3D"folderPathValues" ><a href=3D"<%=3Dfol=
derPathDialogUrl%>&htmlElementId=3DfolderPathValues" onclick=3D"popUp(this.=
href,'console',600,800);return false;" target=3D"newWin"> <content:res=
ourceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2"=
resourceName=3D"search.browse" defaultValue=3D"browse" /></a> <a href=
=3D"javascript:resetLocation('folderPathValues');"><content:resourceBundle =
resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" resourceNam=
e=3D"search.reset" defaultValue=3D"reset" /></a> <a href=3D"javascript=
:resetLocation('webdavLocation');"></a><br>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- <% } %>
<TR bgColor=3D"#ffffff">
<TD height=3D"10px"> </TD>
</TR>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/box.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/box.jsp&rev=3D758&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
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/box.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/box.jsp Thu Aug 16 14:48:48 20=
07
@@ -18,11 +18,10 @@
<%@ include file=3D"../common/common_vars.inc"%>
=
<%@ include file=3D"declarations.inc"%>
-
<content:containerList name=3D'<%=3D"boxContainer" + id%>' id=3D"boxContai=
nerList">
<jahiaHtml:actionMenu name=3D"boxContainerList" namePostFix=3D".boxCon=
tainers"
resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2"><b=
r/>
- <content:container id=3D"boxContainer">
+ <content:container id=3D"boxContainer" cacheKey=3D'<%=3D"boxContai=
ner" + id%>'>
<content:textField name=3D'boxType' valueId=3D"boxTypeValue" d=
isplay=3D'false' defaultValue=3D'texts'/>
=
<bean:define id=3D"files" value=3D'<%=3DResourceBundleMarke=
r.getValue(ResourceBundleMarker.drawMarker(resBundleID,"files",""),jParams.=
getLocale())%>'/>
@@ -52,7 +51,6 @@
String layout =3D (String) pageContext.findAttribute("layoutVa=
lue");
ContainerBean boxContainerBean =3D (ContainerBean) pageContext=
.findAttribute("boxContainer");
JahiaContainer boxContainer =3D boxContainerBean.getJahiaConta=
iner();
-
%>
<div class=3D'<%=3DgetCss(layout,resBundleID)%>'>
<div class=3D"deco">
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/savedsearch.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/savedsearch.inc&rev=3D758&repname=3Dcorporate_portal_te=
mplates_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
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/savedsearch.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/savedsearch.inc Thu Aug 16 14:=
48:48 2007
@@ -16,7 +16,12 @@
limitations under the License.
--%><bean:parameter id=3D"displayDetails" name=3D"displayDetails" value=3D=
"false"/>
<content:containerList name=3D'<%=3D"savedSearch" + id%>' id=3D"savedSearc=
h" parentContainerName=3D"boxContainer">
+<<<<<<< .mine
+ <content:container-cache cacheKey=3D'<%=3D"boxContainer" + id%>'/>
+ <content:container id=3D"savedSearchContainer" cache=3D"false">
+=3D=3D=3D=3D=3D=3D=3D
<content:container id=3D"savedSearchContainer" cache=3D"off">
+>>>>>>> .r757
<jahiaHtml:actionMenu name=3D"savedSearchContainer" namePostFix=3D=
".savedSearch"
resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2"
useFieldSet=3D"true">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
