Author: knguyen
Date: Tue May 15 12:53:07 2007
New Revision: 660
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D660&repname=
=3Dcorporate_portal_templates_v2
Log:
SIACG-3 : complete fix
Modified:
branches/JAHIA-ACG-BRANCH/src/jsp/advsearch/webdavsearch.jsp
branches/JAHIA-ACG-BRANCH/src/jsp/box/searchbox.inc
Modified: branches/JAHIA-ACG-BRANCH/src/jsp/advsearch/webdavsearch.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/src/jsp/advsearch/webdavsearch.jsp&rev=3D660&repname=3Dcorporate_porta=
l_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-ACG-BRANCH/src/jsp/advsearch/webdavsearch.jsp (original)
+++ branches/JAHIA-ACG-BRANCH/src/jsp/advsearch/webdavsearch.jsp Tue May 15=
12:53:07 2007
@@ -159,8 +159,15 @@
<%
String selectCategoriesURL =3D CategoriesSelect_Engine.getInstance().ren=
derLink (jData.params(), "");
%>
-function selectCategory(categoryName){
+function selectCategory(categoryName,jsInputName){
+
var url =3D '<%=3DselectCategoriesURL%>?contextId=3DsearchEngine_' + c=
ategoryName;
+ if (selectCategory.arguments.length > 1) {
+ url +=3D '&jsInputName=3D' + jsInputName;
+ if ( document.getElementById(jsInputName).value =3D=3D '' ){
+ url +=3D '&reset=3Dtrue';
+ }
+ }
OpenJahiaScrollableWindow(url, 'selectCategories_<%=3DHTMLToolBox.clea=
nSessionID(jData.params().getSessionID())%>', 750, 600);
//document.advSearchForm.selectedCategoryProp.value=3DcategoryName;
}
@@ -302,7 +309,7 @@
<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()%>','true');"><content:resourceBundle resourceBundle=3D"jahiatempla=
tes.Corporate_portal_templates_v2" resourceName=3D"search.reset" defaultVal=
ue=3D"reset" /></a> <a href=3D"javascript:resetLocation('categories_<%=
=3DpropDef.getName()%>','true');"></a><br> =
+ <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%>',=
'categories_<%=3DpropDef.getName()%>')"> <content:resourceBundle resou=
rceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"=
search.browse" defaultValue=3D"browse" /></a> <a href=3D"javascript:re=
setLocation('categories_<%=3DpropDef.getName()%>');"><content:resourceBundl=
e resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" resourceN=
ame=3D"search.reset" defaultValue=3D"reset" /></a> <a href=3D"javascri=
pt:resetLocation('categories_<%=3DpropDef.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>
Modified: branches/JAHIA-ACG-BRANCH/src/jsp/box/searchbox.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/src/jsp/box/searchbox.inc&rev=3D660&repname=3Dcorporate_portal_templat=
es_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-ACG-BRANCH/src/jsp/box/searchbox.inc (original)
+++ branches/JAHIA-ACG-BRANCH/src/jsp/box/searchbox.inc Tue May 15 12:53:07=
2007
@@ -20,8 +20,14 @@
<%
String selectCategoriesURL =3D CategoriesSelect_Engine.getInstance().ren=
derLink (jData.params(), "");
%>
-function selectCategory(categoryName,contextId){
+function selectCategory(categoryName,contextId,jsInputName){
var url =3D '<%=3DselectCategoriesURL%>?contextId=3D' + contextId + '_=
' + categoryName;
+ if (selectCategory.arguments.length > 2) {
+ url +=3D '&jsInputName=3D' + jsInputName;
+ if ( document.getElementById(jsInputName).value =3D=3D '' ){
+ url +=3D '&reset=3Dtrue';
+ }
+ }
OpenJahiaScrollableWindow(url, 'selectCategories_<%=3DHTMLToolBox.clea=
nSessionID(jData.params().getSessionID())%>', 750, 600);
}
-->
@@ -185,7 +191,7 @@
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 class=3D"input" id=3D"categories_<%=3DcontextId%>=
_<%=3DpropDef.getName()%>" size=3D"35" value=3D"<%=3DcategoriesValues%>" na=
me=3D"categories_<%=3DpropDef.getName()%>" ><a href=3D"javascript:selectCat=
egory('<%=3DpropDefName%>','<%=3DcontextId%>','categories_<%=3DcontextId%>_=
<%=3DpropDef.getName()%>')"> <content:resourceBundle resourceBundle=3D=
"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"search.brows=
e" defaultValue=3D"browse" /></a> <a href=3D"javascript:resetLocation(=
'form_<%=3DcontextId%>','categories_<%=3DcontextId%>_<%=3DpropDef.getName()=
%>');"><content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_p=
ortal_templates_v2" resourceName=3D"search.reset" defaultValue=3D"reset" />=
</a> <a href=3D"javascript:resetLocation('form_<%=3DcontextId%>','cate=
gories_<%=3DcontextId%>_<%=3DpropDef.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/>
<% }
} %>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
