pvollenweider 2005/03/02 11:00:47 CET
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp/include files.inc header.inc
search_result_pager.inc
src/view/jsp searchresult.jsp web_css.jsp
Log:
Rollback for branch 4-1
Revision Changes Path
1.4.4.1 +3 -77 corporate_portal_templates/src/view/jsp/include/files.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/files.inc.diff?r1=1.4&r2=1.4.4.1&f=h
1.9.4.1 +7 -13
corporate_portal_templates/src/view/jsp/include/header.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/header.inc.diff?r1=1.9&r2=1.9.4.1&f=h
1.2.4.1 +1 -5
corporate_portal_templates/src/view/jsp/include/search_result_pager.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/search_result_pager.inc.diff?r1=1.2&r2=1.2.4.1&f=h
1.19.4.1 +12 -399 corporate_portal_templates/src/view/jsp/searchresult.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/searchresult.jsp.diff?r1=1.19&r2=1.19.4.1&f=h
1.28.4.1 +0 -55 corporate_portal_templates/src/view/jsp/web_css.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/web_css.jsp.diff?r1=1.28&r2=1.28.4.1&f=h
Index: files.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/files.inc,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- files.inc 15 Feb 2005 16:01:32 -0000 1.4
+++ files.inc 2 Mar 2005 10:00:46 -0000 1.4.4.1
@@ -1,80 +1,3 @@
-<%!
-public void getSubTree( JahiaData jData,
- int startPageId,
- int currentPageId,
- String theURL,
- Vector imageArray,
- PageContext pageContext,
- org.apache.log4j.Logger logger
- )
-throws JahiaException {
- try {
- JahiaContainerList linkContainerList =
jData.containers().getAbsoluteContainerList( "linkContainer", currentPageId );
-
- // generates image string before page the link
- String openSpan = "";
- String closeSpan = "";
- for (int i=0; i < imageArray.size(); i++) {
- String skel = ((Boolean) imageArray.elementAt(i)).booleanValue()
? "i" : "pix";
- openSpan += "<span class='" + skel + "'>";
- closeSpan += "</span>";
- }
- try {
- JspWriter out = pageContext.getOut();
- ContainerListBean linkContainerListBean = new
ContainerListBean(linkContainerList,jData.params());
- // parses all subpages
- if (linkContainerList != null) {
- Enumeration linkContainerEnum =
linkContainerList.getContainers();
- ParamBean jParams = jData.params();
- while (linkContainerEnum.hasMoreElements()) {
- JahiaContainer linkContainer = (JahiaContainer)
linkContainerEnum.nextElement();
- ContainerBean linkContainerBean = new
ContainerBean(linkContainer,jParams);
- JahiaPage link = (JahiaPage)
linkContainer.getFieldObject( "link" );
- if (link != null) {
- String lastImage =
linkContainerEnum.hasMoreElements() ? "t" : "l";
- out.print(openSpan + "<span class='" + lastImage +
"'>");
- String className = link.getID() ==
jData.page().getID() ? "folderon" : "folderoff";
- out.print("<a class='" + className + "' href='" +
link.getUrl(jParams) + "'>" + link.getTitle() + "</a>");
- out.println("</span>" + closeSpan);
-
- // displays sub pages info
- if (jData.gui().isPageInPath(link.getID())) {
- Vector childImageArray = (Vector)
imageArray.clone();
- childImageArray.addElement(new
Boolean(linkContainerEnum.hasMoreElements()));
- getSubTree(jData , startPageId, link.getID(),
theURL, childImageArray,pageContext,logger);
- }
- }
- }
- }
- } catch (IOException ioe) {
- logger.debug("IO exception while trying to print tree menu ",
ioe);
- }
- } catch (JahiaPageNotFoundException jpnfe) {
- logger.debug("Could not found page [" + jpnfe.getPageID() + "]
while trying to print tree menu.");
- }
-}
-%>
-<div class="tree">
-<%
-java.util.Properties props = new java.util.Properties();
-int startPageId = -1;
-try {
- props.load(new
java.io.FileInputStream(org.jahia.bin.Jahia.getSettings().getPathResolver().
- resolvePath(
-
"/WEB-INF/etc/slide/listener.properties")));
- try {
- startPageId = Integer.parseInt(props.getProperty("parent.page.id"));
- } catch (NumberFormatException nfe) {
- logger.debug("Could not parse property [parent.page.id]: " +
nfe.toString());
- }
-} catch (IOException ioe) {
- logger.debug("Could not load file listener.properties " +
ioe.toString());
-}
-if (startPageId != -1) {
- getSubTree(jData ,startPageId , startPageId, theURL, new
Vector(),pageContext,logger);
-}
-%>
-</div>
<%
jData.containers().declareField( "file",
ResourceBundleMarker.drawMarker(resBundleID, "file","File"), FieldTypes.FILE,
"" );
jData.containers().declareField(
"description",ResourceBundleMarker.drawMarker(resBundleID,
"description","Description"), FieldTypes.SMALLTEXT,"");
@@ -154,6 +77,9 @@
break;
}
}
+ if ("#".equals(downloadUrl)) {
+ displayLine = false;
+ }
}
if (jData.gui().isEditMode() || displayLine ) {
%>
Index: header.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/header.inc,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -u -r1.9 -r1.9.4.1
--- header.inc 28 Feb 2005 17:58:51 -0000 1.9
+++ header.inc 2 Mar 2005 10:00:46 -0000 1.9.4.1
@@ -119,17 +119,13 @@
if (i.width > 500) i.width=500;
}
-function checkMaxPageItems(theForm){
+function checkMaxPageItems(){
if ( document.searchpager && document.searchpager.maxPageItems
&& document.searchpager.maxPageItems.selectedIndex != -1 ){
- theForm.maxPageItems.value =
document.searchpager.maxPageItems.options[document.searchpager.maxPageItems.selectedIndex].value;
+ document.searchForm.maxPageItems.value =
document.searchpager.maxPageItems.options[document.searchpager.maxPageItems.selectedIndex].value;
}
}
-function setFreeSearchInput(theForm){
- theForm.freeSearch.value=theForm.search.value;
-}
-
-->
</script>
<%@ include file="splash.inc"%>
@@ -174,13 +170,11 @@
</tr>
<tr><td><img src="<jahia:contextURL/>/images/pix.gif" alt=""
width="1" height="5"/></td></tr>
<tr>
- <td align="right" valign="top">
- <form name="searchForm" method="post"
action="<%=jData.gui().html().drawSearchLauncher()%>"
onSubmit="checkMaxPageItems(document.searchForm)" >
- <input type="text" name="search"
value='<%=JahiaTools.getStrParameter(request,"search","")%>' /> <a
href="javascript:checkMaxPageItems(document.searchForm);setFreeSearchInput(document.searchForm);document.searchForm.submit()"><img
src="<jahia:contextURL/>/images/search.gif" alt="<jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="search"/>" width="15" height="15" border="0" align="middle"/></a>
- <input type="hidden" name="maxPageItems" value="10"
/><br>> <a
href="javascript:checkMaxPageItems(document.searchForm);setFreeSearchInput(document.searchForm);document.searchForm.searchView.value='advSearch';document.searchForm.submit()">Advanced
search</a>
- <input type="hidden"
name="<%=PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME%>"
value="false" />
- <input type="hidden" name="searchView"
value="simple" />
- <input type="hidden" name="freeSearch" value='' />
+ <td align="right">
+ <form name="searchForm" method="post"
action="<%=jData.gui().html().drawSearchLauncher()%>"
onSubmit="checkMaxPageItems()" >
+ <input type="text" name="search"
onfocus="this.value=''" value="" /> <a
href="javascript:checkMaxPageItems();document.searchForm.submit()"><img
src="<jahia:contextURL/>/images/search.gif" alt="<jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="search"/>" width="15" height="15" border="0" align="middle"/></a>
+ <input type="hidden" name="maxPageItems" value="10"
/>
+ <input type="hidden"
name="<%=JahiaSearchResultHandlerImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME%>"
value="false" />
</form>
</td>
</tr>
Index: search_result_pager.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/search_result_pager.inc,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- search_result_pager.inc 28 Feb 2005 17:58:51 -0000 1.2
+++ search_result_pager.inc 2 Mar 2005 10:00:46 -0000 1.2.4.1
@@ -7,9 +7,6 @@
</pg:page>
</td>
<pg:page export="pageUrl">
-<td align="left" valign="top" nowrap>
-
-<% if ( !"advSearch".equals(searchView) ){ %>
<script language="javascript1.1" type="text/javascript">
<!--
function submitSearchPagerForm() {
@@ -17,6 +14,7 @@
}
-->
</script>
+<td align="left" valign="top" nowrap>
<form name="searchpager" action='<%=pageUrl + "&screen=naviguate_result"%>'
method="POST">
<select class="input" name="maxPageItems"
onChange="submitSearchPagerForm()" >
<option class="input" value="5" <%if
(maxPageItems==5){%>selected<%}%>>5
@@ -26,8 +24,6 @@
<option class="input" value="100" <%if
(maxPageItems==100){%>selected<%}%>>100
</select>
</form>
-<% } %>
-
</td>
</pg:page>
<td align="left" valign="top" nowrap>
Index: searchresult.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/searchresult.jsp,v
retrieving revision 1.19
retrieving revision 1.19.4.1
diff -u -r1.19 -r1.19.4.1
--- searchresult.jsp 28 Feb 2005 17:58:51 -0000 1.19
+++ searchresult.jsp 2 Mar 2005 10:00:46 -0000 1.19.4.1
@@ -1,179 +1,23 @@
<[EMAIL PROTECTED] file="include/header.inc"%>
<%@ page import="org.jahia.data.search.*" %>
-<%@ page import="org.jahia.engines.search.*" %>
-<%@ page import="org.jahia.services.search.*" %>
-<%@ page import="org.jahia.services.search.lucene.*" %>
-<%!
-public Date getUpdateDateRange(String range){
- Calendar cal = Calendar.getInstance();
- cal.setTimeZone(TimeZone.getTimeZone("UTC"));
- cal.setTime(new Date());
- if ("today".equals(range)){
- cal.set( Calendar.HOUR_OF_DAY, 0 );
- cal.set( Calendar.MINUTE, 0);
- cal.set( Calendar.SECOND, -1);
- } else if ("lastWeek".equals(range)) {
- cal.set( Calendar.WEEK_OF_MONTH, -1);
- } else if ("3m".equals(range)) {
- cal.set( Calendar.MONTH, -3);
- } else if ("6m".equals(range)) {
- cal.set( Calendar.MONTH, -6);
- } else if ("year".equals(range)) {
- cal.set( Calendar.YEAR, -1);
- }
- return cal.getTime();
-}
-%>
<%
HashMap engineMap = (HashMap) request.getAttribute(
"org.jahia.engines.EngineHashMap" );
// Search engine related data
JahiaSearchResult searchResults = (JahiaSearchResult) engineMap.get(
"searchResults" );
+ int totalHits = searchResults.getHitCount();
String searchString = (String) engineMap.get ("searchString");
searchString = removeTags(searchString);
- String searchView = (String)request.getParameter("searchView");
-
- StringBuffer advOptions = new StringBuffer();
- String updateDate = "";
- String occurence = "";
- String contentType = "";
- String occurenceField = "";
- String[] searchDomains = new String[]{};
-
- if ( searchView == null ){
- searchView = "simple";
- } else {
- // adv search form submit
-
- // max update date range
- updateDate =
JahiaTools.getStrParameter(request,"updateDate","anytime");
- if ( !"anytime".equals(updateDate) ){
- Calendar cal = Calendar.getInstance();
- cal.setTimeZone(TimeZone.getTimeZone("UTC"));
- cal.setTime(new Date());
-
- Date maxUpdateDate = getUpdateDateRange(updateDate);
- advOptions.append("(");
- advOptions.append("lastmodifdate:[");
-
advOptions.append(NumberPadding.pad(maxUpdateDate.getTime()));
- advOptions.append(" TO ");
-
advOptions.append(NumberPadding.pad(cal.getTime().getTime()));
- advOptions.append("])");
- }
-
- // occurence
- occurence =
JahiaTools.getStrParameter(request,"occurence","anywhere");
- if ( "fileproperties".equals(occurence) ){
- occurence = "anywhere";
- }
- if ( !"anywhere".equals(occurence) ){
- boolean closeClause = false;
- if ( "title".equals(occurence) ||
"author".equals(occurence) || "contributor".equals(occurence) ) {
- if ( advOptions.length()>0 ){
- advOptions.append(" AND (");
- } else {
- advOptions.append("(");
- }
- closeClause = true;
- }
- if ( "title".equals(occurence) ){
- advOptions.append("fieldname:");
- advOptions.append("title");
- } else if ( "author".equals(occurence) ){
- advOptions.append("fieldname:");
- advOptions.append("creator");
- } else if ( "file.title".equals(occurence) ){
- occurenceField = "file_property_title";
- } else if ( "file.subject".equals(occurence) ){
- occurenceField = "file_property_subject";
- } else if ( "file.comments".equals(occurence) ){
- occurenceField = "file_property_comments";
- } else if ( "file.keywords".equals(occurence) ){
- occurenceField = "file_property_keywords";
- } else if ( "file.author".equals(occurence) ){
- occurenceField = "file_property_author";
- } else if ( "contributor".equals(occurence) ){
- advOptions.append("fieldname:");
- advOptions.append("lastContributor");
- } else if ( "file.contributor".equals(occurence) ){
- occurenceField = "file_property_lastauthor";
- }
- if ( closeClause ) {
- advOptions.append(")");
- }
- }
-
- // contentType
- contentType =
JahiaTools.getStrParameter(request,"contentType","any");
- if ( !"any".equals(contentType) ){
- if ( advOptions.length()>0 ){
- advOptions.append(" AND (");
- } else {
- advOptions.append("(");
- }
- if ( "pdf".equals(contentType) ){
- advOptions.append("content_type:");
- advOptions.append("application_pdf");
- } else if ( "doc".equals(contentType) ){
- advOptions.append("content_type:");
- advOptions.append("application_msword");
- } else if ( "xls".equals(contentType) ){
- advOptions.append("content_type:");
- advOptions.append("application_vnd.ms-excel");
- } else if ( "ppt".equals(contentType) ){
- advOptions.append("content_type:");
-
advOptions.append("application_vnd.ms-powerpoint");
- }
- advOptions.append(")");
- }
-
- }
-
- SearchViewHandlerImpl searchViewHandler = null;
- searchViewHandler =
(SearchViewHandlerImpl)engineMap.get(Search_Engine.SEARCH_HANDLER);
- if ( searchViewHandler == null ){
- searchViewHandler = new SearchViewHandlerImpl();
- if ( "advSearch".equals(searchView) ){
- searchViewHandler.setName("default");
- } else {
- searchViewHandler.setName("fake");
- }
- searchViewHandler.init(jParams,engineMap);
- } else {
- String newQuery = searchViewHandler.getQuery().trim();
- if ( "".equals(newQuery) ) {
- newQuery = advOptions.toString();
- } else if ( advOptions.length()>0 ){
- newQuery = "(" + newQuery + ") AND (" +
advOptions.toString() + ")";
- }
- if ( !"".equals(occurenceField) && !"".equals(newQuery) ){
- newQuery = occurenceField + ":(" + newQuery + ")";
- }
- searchViewHandler.setQuery(newQuery);
-
- searchResults = searchViewHandler.search(jParams);
- if ( searchResults == null ){
- searchResults = new JahiaSearchResult(new
- PageSearchResultBuilderImpl());
- }
- engineMap.put("searchResults",searchResults);
-
- searchViewHandler.getDomains().toArray(searchDomains);
-
- }
-
- int totalHits = searchResults.getHitCount();
-
- int maxPageItems = 3;
+ int maxPageItems = 10;
String val = (String)request.getParameter("maxPageItems");
if ( val != null ){
maxPageItems = Integer.parseInt(val);
}
- boolean oneHitPerPage =
!("false".equalsIgnoreCase(request.getParameter(PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME)));
+ boolean oneHitPerPage =
!("false".equalsIgnoreCase(request.getParameter(JahiaSearchResultHandlerImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME)));
%>
<%
String searchUrl = jData.gui().html().drawSearchLauncher();
@@ -183,6 +27,7 @@
searchUrl = searchUrl.substring(0,pos);
}
%>
+
<pg:pager
url="<%=searchUrl%>"
items="<%= totalHits %>"
@@ -192,245 +37,13 @@
export="offset,currentPageNumber=pageNumber"
scope="request">
-<% if ( "advSearch".equals(searchView) ){%>
-<script language="javascript1.1" type="text/javascript">
-<!--
-function submitSearchPagerForm() {
- var index = document.advSearchForm.maxPageItems.selectedIndex;
- if ( index != -1 ){
- document.searchpager.maxPageItems.value =
-
document.advSearchForm.maxPageItems.options[index].value;
- }
- document.searchpager.submit();
-}
-// override previous declaration
-function checkMaxPageItems(theForm){
- if ( document.advSearchForm && document.advSearchForm.maxPageItems
- && document.advSearchForm.maxPageItems.selectedIndex != -1 ){
- theForm.maxPageItems.value =
document.advSearchForm.maxPageItems.options[document.advSearchForm.maxPageItems.selectedIndex].value;
- }
-}
-
--->
-</script>
-<pg:page export="pageUrl">
-<form name="searchpager" action='<%=pageUrl + "&screen=naviguate_result"%>'
method="POST">
- <input type="hidden" name="maxPageItems" value="<%=maxPageItems%>">
- <input type="hidden" name="searchHandler"
value="<%=searchViewHandler.getName()%>" />
- <input type="hidden" name="searchView" value="<%=searchView%>" />
- <input type="hidden" name="updateDate" value="<%=updateDate%>" />
- <input type="hidden" name="occurence" value="<%=occurence%>" />
- <input type="hidden" name="contentType" value="<%=contentType%>" />
- <%
- for ( int i=0; i<searchDomains.length; i++ ){
- %>
- <input type="hidden" name="searchDomain"
value="<%=searchDomains[i]%>" />
- <% } %>
-</form>
-</pg:page>
-
-<FORM name="advSearchForm"
action="<%=jData.gui().html().drawSearchLauncher()%>" method=get>
-<input type="hidden" name="search" value="<%=searchString%>" />
-<input type="hidden" name="searchHandler"
value="<%=searchViewHandler.getName()%>" />
-<input type="hidden" name="screen" value="execute" />
-<input type="hidden" name="searchView" value="advSearch" />
-<!--
-<input type="hidden" name="maxPageItems" value="3" />
--->
-<input type="hidden"
name="<%=PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME%>"
value="false" />
-<TABLE cellSpacing=0 cellPadding=3 width="100%" border=0>
- <TBODY>
- <TR bgColor=#cbdced>
- <TD>
- <TABLE cellSpacing=0 cellPadding=0 width="100%" border=0>
- <TBODY>
- <TR bgColor=#cbdced>
- <TD>
- <TABLE cellSpacing=0 cellPadding=2 width="100%">
- <TBODY>
- <TR>
- <TD vAlign=top width="15%"><FONT size=-1><BR><B>Find results
- </B></FONT></TD>
- <TD width="85%">
- <TABLE cellSpacing=0 cellPadding=2 width="100%" border="0">
- <TBODY>
- <TR>
- <TD><FONT size=-1>free search</FONT></TD>
- <TD><INPUT size=25
value="<%=searchViewHandler.getFreeSearch()%>" name="freeSearch" ></TD>
- </TR>
- <TR>
- <TD><FONT size=-1>with <B>all</B> of the
words</FONT></TD>
- <TD><INPUT size=25
value="<%=searchViewHandler.getAllWord()%>"
- name="allWordSearch" >
- </TD>
- <TD vAlign=top rowSpan=4><FONT size=-1>
- <select name="maxPageItems"
onChange="submitSearchPagerForm()" >
- <option class="input"
value="5" <%if (maxPageItems==5){%>selected<%}%>>5
- <option class="input"
value="10" <%if (maxPageItems==10){%>selected<%}%>>10
- <option class="input"
value="20" <%if (maxPageItems==20){%>selected<%}%>>20
- <option class="input"
value="50" <%if (maxPageItems==50){%>selected<%}%>>50
- <option class="input"
value="100" <%if (maxPageItems==100){%>selected<%}%>>100
- </select>
- <INPUT type=hidden value=en
- name=hl><span class="text"> <a
href="javascript:document.advSearchForm.submit()">Adv.
Search</a></span></FONT></TD></TR>
- <TR>
- <TD noWrap><FONT size=-1>with the <B>exact
- phrase</B></FONT></TD>
- <TD><INPUT size=25 name="exactPhraseSearch"
value="<%=searchViewHandler.getExactPhrase()%>"></TD></TR>
- <TR>
- <TD noWrap><FONT size=-1>with <B>at least one</B> of
the
- words</FONT></TD>
- <TD><INPUT size=25 name="oneOfWordSearch"
value="<%=searchViewHandler.getOneOfWord()%>"></TD></TR>
- <TR>
- <TD noWrap><FONT size=-1><B>without</B> the
- words</FONT></TD>
- <TD><INPUT size=25 name="withoutWordSearch"
value="<%=searchViewHandler.getWithoutWord()%>"></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></TD></TR>
- <!--
- <TR bgColor=#ffffff>
- <TD>
- <TABLE cellSpacing=0 cellPadding=2 width="100%">
- <TBODY>
- <TR>
- <TD width="15%"><FONT size=-1><B>Language</B></FONT></TD>
- <TD width="40%"><FONT size=-1>Return pages written
-in</FONT></TD>
- <TD><FONT size=-1><SELECT name=lr><OPTION value=""
- selected>any language<OPTION value=lang_ar>Arabic<OPTION
- value=lang_bg>Bulgarian<OPTION
value=lang_ca>Catalan<OPTION
- value=lang_zh-CN>Chinese (Simplified)<OPTION
- value=lang_zh-TW>Chinese (Traditional)<OPTION
- value=lang_hr>Croatian<OPTION value=lang_cs>Czech<OPTION
- value=lang_da>Danish<OPTION value=lang_nl>Dutch<OPTION
- value=lang_en>English<OPTION
value=lang_et>Estonian<OPTION
- value=lang_fi>Finnish<OPTION value=lang_fr>French<OPTION
- value=lang_de>German<OPTION value=lang_el>Greek<OPTION
- value=lang_iw>Hebrew<OPTION
value=lang_hu>Hungarian<OPTION
- value=lang_is>Icelandic<OPTION
- value=lang_id>Indonesian<OPTION
value=lang_it>Italian<OPTION
- value=lang_ja>Japanese<OPTION
value=lang_ko>Korean<OPTION
- value=lang_lv>Latvian<OPTION
value=lang_lt>Lithuanian<OPTION
- value=lang_no>Norwegian<OPTION
value=lang_pl>Polish<OPTION
- value=lang_pt>Portuguese<OPTION
- value=lang_ro>Romanian<OPTION
value=lang_ru>Russian<OPTION
- value=lang_sr>Serbian<OPTION value=lang_sk>Slovak<OPTION
- value=lang_sl>Slovenian<OPTION
value=lang_es>Spanish<OPTION
- value=lang_sv>Swedish<OPTION
-
value=lang_tr>Turkish</OPTION></SELECT></FONT></TD></TR></TBODY></TABLE></TD></TR>
- -->
- <TR bgColor=#ffffff>
- <TD>
- <TABLE cellSpacing=0 cellPadding=2 width="100%">
- <TBODY>
- <TR>
- <TD width="15%"><FONT size=-1><B>File Format</B></FONT></TD>
- <TD noWrap width="40%"><FONT size=-1>return results of the
file
- format</FONT></TD>
- <TD><FONT size=-1>
- <SELECT name="contentType">
- <OPTION value="any" <% if
("any".equals(contentType)){%>selected<%}%>>any format
- <OPTION value="pdf" <% if
("pdf".equals(contentType)){%>selected<%}%>>Adobe Acrobat PDF (.pdf)
- <OPTION value="doc" <% if
("doc".equals(contentType)){%>selected<%}%>>Microsoft Word (.doc)
- <OPTION value="xls" <% if
("xls".equals(contentType)){%>selected<%}%>>Microsoft Excel (.xls)
- <OPTION value="ppt" <% if
("ppt".equals(contentType)){%>selected<%}%>>Microsoft Powerpoint (.ppt)
-
</OPTION></SELECT></FONT></TD></TR></TBODY></TABLE></TD></TR>
- <TR bgColor=#ffffff>
- <TD>
- <TABLE cellSpacing=0 cellPadding=2 width="100%">
- <TBODY>
- <TR>
- <TD width="15%"><FONT size=-1><B>Date</B></FONT></TD>
- <TD noWrap width="40%"><FONT size=-1>Return documents
updated
- in the </FONT></TD>
- <TD><FONT size=-1>
- <SELECT name="updateDate">
- <OPTION value="anytime" <% if
("anytime".equals(updateDate)){%>selected<%}%>>anytime
- <OPTION value="today" <% if
("today".equals(updateDate)){%>selected<%}%>>today
- <OPTION value="lastWeek" <% if
("lastWeek".equals(updateDate)){%>selected<%}%>>last week
- <OPTION value="3m" <% if
("3m".equals(updateDate)){%>selected<%}%>>past 3 months
- <OPTION value="6m" <% if
("6m".equals(updateDate)){%>selected<%}%>>past 6 months
- <OPTION value="year" <% if
("year".equals(updateDate)){%>selected<%}%>>past year</OPTION>
- </SELECT></FONT></TD></TR></TBODY></TABLE></TD>
- <TR>
- <TD>
- <TABLE cellSpacing=0 cellPadding=2 width="100%" border=0>
- <TBODY>
- <TR bgColor=#ffffff>
- <TD width="15%"><FONT size=-1><B>Occurrences</B></FONT></TD>
- <TD noWrap width="40%"><FONT size=-1>Return results where my
- terms occur</FONT></TD>
- <TD><FONT size=-1>
- <SELECT name="occurence">
- <OPTION value="anywhere" <% if (
"anywhere".equals(occurence) ){%>selected<%}%>>-------------- In Jahia's
content --------------
- <!--<OPTION value="body">in the content-->
- <OPTION value="author" <% if (
"author".equals(occurence) ){%>selected<%}%>> in
the Author's name
- <OPTION value="contributor" <% if (
"contributor".equals(occurence)
){%>selected<%}%>> in the Contributor's name
- <OPTION value="fileproperties" <% if (
"fileproperties".equals(occurence) ){%>selected<%}%>>-------------- In file's
properties --------------
- <OPTION value="file.author" <% if (
"file.author".equals(occurence)
){%>selected<%}%>> in the Author property
- <OPTION value="file.contributor" <% if (
"file.contributor".equals(occurence)
){%>selected<%}%>> in the Contributor property
- <OPTION value="file.title" <% if (
"file.title".equals(occurence)
){%>selected<%}%>> in the Title property
- <OPTION value="file.subjet" <% if (
"file.subject".equals(occurence)
){%>selected<%}%>> in the Subject property
- <OPTION value="file.comments" <% if (
"file.comments".equals(occurence)
){%>selected<%}%>> in the Description property
- <OPTION value="file.keywords" <% if (
"file.keywords".equals(occurence)
){%>selected<%}%>> in the Keywords property
- </SELECT></FONT></TD></TR></TBODY></TABLE></TD>
- <TR bgColor=#ffffff>
- <TD>
- <TABLE cellSpacing=0 cellPadding=2 width="100%">
- <TBODY>
- <TR>
- <TD width="15%"><FONT size=-1><B>Domain</B></FONT></TD>
- <TD noWrap width="40%"><FONT size=-1><!--<SELECT
- name=as_dt><OPTION value=i selected>Only<OPTION
- value=e>Don't</OPTION></SELECT>--> return results from
the site
- or domain</FONT></TD>
- <TD>
- <TABLE cellSpacing=0 cellPadding=0>
- <TBODY>
- <TR>
- <TD><FONT size=-1>
- <SELECT name="searchDomain">
- <OPTION value="anywhere" <%if
(searchViewHandler.getDomains().size()==0||searchViewHandler.getDomains().contains("anywhere")){%>selected<%}%>>Anywhere
- <%
- Map searchHandlers =
ServicesRegistry.getInstance().getJahiaSearchService().getSearchManager().getSearchHandlers();
- Iterator it =
searchHandlers.values().iterator();
- SearchHandler searchHandler = null;
- while ( it.hasNext() ){
- searchHandler =
(SearchHandler)it.next();
- if (
!"default".equals(searchHandler.getName()) ){
- %>
- <OPTION
value="<%=searchHandler.getName()%>" <% if
(searchViewHandler.getDomains().contains(searchHandler.getName())){%>selected<%}%>>site
: <%=searchHandler.getTitle()%>
- <%
- }
- }
- %>
- </SELECT></FONT></TD></TR>
- </TBODY></TABLE></TD></TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
-</TR></TBODY></TABLE></FORM>
-
-<% } %>
-
<%-- keep track of preference --%>
-<pg:param
name="<%=PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME%>" />
+<pg:param
name="<%=JahiaSearchResultHandlerImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME%>" />
<pg:param name="search" value="<%=searchString%>" />
-<pg:param name="searchHandler" value="<%=searchViewHandler.getName()%>" />
-<pg:param name="searchView" value="<%=searchView%>" />
-<pg:param name="updateDate" value="<%=updateDate%>" />
-<pg:param name="occurence" value="<%=occurence%>" />
-<pg:param name="contentType" value="<%=contentType%>" />
-<%
- for ( int i=0; i<searchDomains.length; i++ ){
-%>
-<pg:param name="searchDomain" value="<%=searchDomains[i]%>" />
-<% } %>
+
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
- <td valign="top" width="100%" class="maintable10"><% if (
!"advSearch".equals(searchView) ) {%><h1><span
class="grey"><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="searchResultFor"/></span> "<%=searchString%>"</h1><% } else {
%> <% } %>
+ <td valign="top" width="100%" class="maintable10"><h1><span
class="grey"><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="searchResultFor"/></span> "<%=searchString%>"</h1>
<%
if (totalHits!=0) {
%>
@@ -445,7 +58,7 @@
<pg:item>
<%
JahiaSearchHit thisHit =
(JahiaSearchHit)searchResults.results().get(i);
- if (thisHit.getPage() != null){
+ if (thisHit.page != null){
%>
<tr>
<td colspan="3" align="right">
@@ -456,14 +69,14 @@
<td valign="top" width="7"><img
src="<%=theURL%>/images/triangle.gif" alt="-"/></td>
<td valign="top" width="10"><img
src="<%=theURL%>/images/pix.gif" width="10" height="1" alt=""/></td>
<td valign="top" width="100%">
- <a class="leftlinkon"
href="<%=thisHit.getURL()%>"><b><%=thisHit.getPage().getTitle()%></b></a> -
score : <%=thisHit.getScore()%> <% if (!oneHitPerPage){%>%<%}%><br/>
+ <a class="leftlinkon"
href="<%=thisHit.page.getUrl(jData.params())%>"><b><%=thisHit.page.getTitle()%></b></a>
- score : <%=thisHit.getScore()%> <% if (!oneHitPerPage){%>%<%}%><br/>
<%
- if ( thisHit.getType() !=
JahiaSearchHitInterface.FILE_TYPE ){
+ if ( thisHit.type != FieldTypes.FILE ){
%><span
class="grey"><%=thisHit.getTeaser()%>...</span><%
} else {
- String thisPicto =
getPicto(thisHit.getTeaser());
+ String thisPicto =
getPicto(thisHit.teaser);
%>
- <span class="leftlink"><a
href="<%=thisHit.getURL()%>"><img
+ <span class="leftlink"><a
href="<%=thisHit.fileDownloadUrl%>"><img
src="<%=theURL%>/images/icons/standard/<%=thisPicto%>.gif"
alt="[<%=thisPicto%>]"
width="16" height="16"
border="0"/> <%=thisHit.getTeaser()%>...</a></span>
<% } %>
Index: web_css.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/web_css.jsp,v
retrieving revision 1.28
retrieving revision 1.28.4.1
diff -u -r1.28 -r1.28.4.1
--- web_css.jsp 15 Feb 2005 17:04:16 -0000 1.28
+++ web_css.jsp 2 Mar 2005 10:00:46 -0000 1.28.4.1
@@ -585,58 +585,3 @@
.nfDate { font-size: 9px; font-style: normal; font-weight: bold; color:
<%=color1%> }
.nfSource { font-size: 9px; font-style: normal; color: <%=color1%> }
.nfMedia { font-size: 9px; font-style: italic; color: <%=color1%> }
-div.tree {
- font-family: Tahoma, Arial, Helvetica, sans-serif;
- font-size: 11px;
-}
-div.tree span {
- display: block;
-}
-div.tree span.i {
- width: 16px;
- //height: 16px;
- background: url(images/tree_i.gif) repeat-y 0 0;
- padding-left: 16px;
-}
-div.tree span.t {
- width: 16px;
- //height: 16px;
- background: url(images/tree_t.gif) no-repeat 0 0;
- padding-left: 16px;
-}
-div.tree span.l {
- width: 16px;
- //height: 16px;
- background: url(images/tree_l.gif) no-repeat 0 0;
- padding-left: 16px;
-}
-div.tree span.pix {
- width: 16px;
- //height: 16px;
- padding-left: 16px;
-}
-div.tree a {
- color: #666;
- /*white-space: nowrap;*/
- display: block;
- width: 400px;
- padding-left: 32px;
- text-decoration: none;
- /*sets the height for all browsers to auto*/
- height: auto !important;
- /*sets height (which acts like min-height) to your set size
- for IE, since it doesn't understand !important */
- height: 20px;
- /*set min-height for other browsers that understand !important*/
- min-height: 20px;
-}
-div.tree a:hover {
- text-decoration: underline;
-}
-div.tree a.folderon {
- background: url(images/folder_on.gif) no-repeat;
- font-weight: bold;
-}
-div.tree a.folderoff {
- background: url(images/folder_off.gif) no-repeat;
-}
\ No newline at end of file
