Author: ssthkjer
Date: 2006-11-13 10:12:51 +0100 (Mon, 13 Nov 2006)
New Revision: 3932
Modified:
trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
Log:
enrichments is now controlled in /enrichments/enrichment-handler.vm
Modified: trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
===================================================================
--- trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
2006-11-10 10:20:12 UTC (rev 3931)
+++ trunk/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
2006-11-13 09:12:51 UTC (rev 3932)
@@ -240,54 +240,9 @@
<decorator:getProperty property="page.spellcheck"/>
<decorator:getProperty property="page.main_ads"/>
+
+ <search:velocity template="/enrichments/enrichment-handler"/>
- <c:choose>
- <c:when test="${no_hits >0 || enrichmentSize >0}">
-
- <!-- Enrichments on top: <c:out
value="${tab.enrichmentOnTop}"/>
- Enrichments in total: <c:out
value="${tab.enrichmentLimit}"/>
- <c:forEach var="ee" items="${enrichments}">
- <c:out value="${ee.name}"/>: <c:out
value="${ee.analysisResult}"/>
- </c:forEach> -->
-
- <%-- Show tab's leading enrichments --%>
- <c:forEach var="ee" items="${enrichments}"
varStatus="i">
- <c:if test="${i.index < tab.enrichmentOnTop &&
ee.analysisResult > tab.enrichmentOnTopScore}">
- <c:set var="pageName"
value="page.${ee.name}"/>
- <search:velocity
template="enrichments/${ee.name}" command="${ee.name}"/>
- <c:out
value="${siteMeshPage.properties[pageName]}" escapeXml="false"/>
- </c:if>
- </c:forEach>
-
- <c:choose>
- <c:when test="${tab.id == 'local-internet' ||
tab.id == 'pss'}">
- <%-- Shows the 3 first hits if more than 1
enrichment --%>
- <decorator:getProperty
property="page.fast-results-norwegian_part1"/>
-
-
- <%-- Show tab's proceeding enrichments --%>
- <c:forEach var="ee" items="${enrichments}"
varStatus="i">
- <c:if test="${(i.index >=
tab.enrichmentOnTop || ee.analysisResult <= tab.enrichmentOnTopScore) &&
i.index < tab.enrichmentLimit}">
- <c:set var="pageName"
value="page.${ee.name}"/>
- <search:velocity
template="enrichments/${ee.name}" command="${ee.name}"/>
- <c:out
value="${siteMeshPage.properties[pageName]}" escapeXml="false"/>
- </c:if>
- </c:forEach>
-
- <%-- Shows the 7 next hits after the
second/third enrichments --%>
- <decorator:getProperty
property="page.fast-results-norwegian_part2"/>
-
- </c:when>
- <c:when test="${tab.id == 'global-internet'}">
- <decorator:getProperty
property="page.global-results"/>
- </c:when>
- </c:choose>
- </c:when>
- <c:otherwise>
- <decorator:getProperty property="page.noHits" />
- </c:otherwise>
- </c:choose>
-
<% } %> <%-- Sok smart --%>
<% } else if (currentC.equals("m") || currentC.equals("l")) {%>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
