svn commit: r497188 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr: resources/themes/common/html/solrbar.vt.xml src/documentation/resources/structurer/url/pelt.fv

[th...@apache.org]

Author: thorsten
Date: Wed Jan 17 13:44:50 2007
New Revision: 497188

URL: http://svn.apache.org/viewvc?view=rev&rev=497188
Log:
The headsup note was wrong. It was my prior test expression as well. This now provide all functionality grouped in one template (better name, then tiles?). <jx:import uri=cocoon://prepare.tiles.solrbar/> will load all solr contracts.

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solrbar.vt.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/resources/structurer/url/pelt.fv

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solrbar.vt.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solrbar.vt.xml?view=diff&rev=497188&r1=497187&r2=497188
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solrbar.vt.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/themes/common/html/solrbar.vt.xml Wed Jan 17 13:44:50 2007
@@ -28,14 +28,11 @@
           </forrest:property>
         </forrest:contract>
       </forrest:hook>
-      <!-- HEADSUP 
-        The jx:set var="userAgent" must be defined in the main structurer
-        and cannot go into a tiles. -->
-      <!--<jx:set var="userAgent" value="${cocoon.request.getHeader('User-Agent')}"/>-->
+      <jx:set var="userAgent" value="${cocoon.request.getHeader('User-Agent')}"/>
       <!-- If the userAgent is the cocoon crawler then we do not want to 
       output the actionbar. The cocoon crawler does not provide the request
-      header "User-Agent".-->
-      <jx:if test="${!userAgent.equals('')&amp;null!=userAgent}">
+      header "User-Agent" meaning null.-->
+      <jx:if test="${null!=userAgent}">
         <forrest:hook class="solrActionbar">
         <!-- GUI to manage your project in solr. -->
           <forrest:contract name="solr-actionbar">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/resources/structurer/url/pelt.fv
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/resources/structurer/url/pelt.fv?view=diff&rev=497188&r1=497187&r2=497188
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/resources/structurer/url/pelt.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/src/documentation/resources/structurer/url/pelt.fv Wed Jan 17 13:44:50 2007
@@ -31,7 +31,6 @@
   </forrest:view>
   <!-- HTML View of the request (e.g. index.html)-->
   <forrest:view type="html" hooksXpath="/html/body">
-    <jx:set var="userAgent" value="${cocoon.request.getHeader('User-Agent')}"/>
     <jx:import uri="cocoon://prepare.tiles.solrbar"/>
     <jx:import uri="cocoon://prepare.tiles.pelt-html"/>
   </forrest:view>