From bd0b9c5fcd7debc47e0c68f25c8c90fbac177460 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Thu, 7 Jun 2007 11:44:20 +0000
Subject: [PATCH] OpenSearch results shown in the web-client now have an icon
 to pop-up the AJAX document preview panel for the item.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5878 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repository/keywordsearch.get.atom.ftl         |  3 ++-
 source/web/css/opensearch.css                     |  3 +--
 source/web/scripts/ajax/opensearch.js             | 15 ++++++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/keywordsearch.get.atom.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/keywordsearch.get.atom.ftl
index a3d9c9e5bd..927afc6d27 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/keywordsearch.get.atom.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/keywordsearch.get.atom.ftl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:relevance="http://a9.com/-/opensearch/extensions/relevance/1.0/">
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:relevance="http://a9.com/-/opensearch/extensions/relevance/1.0/" xmlns:alf="http://www.alfresco.org/opensearch/1.0/">
   <generator version="${server.version}">Alfresco (${server.edition})</generator>
   <title>Alfresco Keyword Search: ${search.searchTerms}</title> 
   <updated>${xmldate(date)}</updated>
@@ -29,6 +29,7 @@
     <link rel="alternate" href="${absurl(url.context)}${row.url}"/>
     <icon>${absurl(url.context)}${row.icon16}</icon>       <#comment>TODO: What's the standard for entry icons?</#comment>
     <id>urn:uuid:${row.id}</id>
+    <alf:noderef>${row.nodeRef}</alf:noderef>
     <updated>${xmldate(row.properties.modified)}</updated>
     <summary>${row.properties.description!""}</summary>
     <author> 
diff --git a/source/web/css/opensearch.css b/source/web/css/opensearch.css
index 28f34b3021..1f8cd72adc 100644
--- a/source/web/css/opensearch.css
+++ b/source/web/css/opensearch.css
@@ -64,8 +64,7 @@
 
 .osResultIcon
 {
-   padding-right: 6px;
-   padding-top: 6px;
+   padding: 4px 4px 0px 4px;
 }
 
 .osResultTitle
diff --git a/source/web/scripts/ajax/opensearch.js b/source/web/scripts/ajax/opensearch.js
index 3836aeecc0..5d277d8bb8 100644
--- a/source/web/scripts/ajax/opensearch.js
+++ b/source/web/scripts/ajax/opensearch.js
@@ -467,7 +467,7 @@ Alfresco.OpenSearchClient.prototype =
             {
                if (link != null)
                {
-                  sb[sb.length] = "<a target='_new' href='";
+                  sb[sb.length] = "<a target='new' href='";
                   sb[sb.length] = link;
                   sb[sb.length] = "'>";
                }
@@ -476,13 +476,22 @@ Alfresco.OpenSearchClient.prototype =
                {
                   sb[sb.length] = "</a>";
                }
+               var noderef = Alfresco.Dom.getElementTextByTagNameNS(elResult, "http://www.alfresco.org/opensearch/1.0/", "alf", "noderef");
+               if (noderef != null)
+               {
+                  sb[sb.length] = "<span onclick=\"AlfNodeInfoMgr.toggle('" + noderef + "',this);\">";
+                  sb[sb.length] = "<img src='" + getContextPath() + "/images/icons/popup.gif' class='popupImage' width='16' height='16' />";
+                  sb[sb.length] = "</span>";
+               }
             }
-            sb[sb.length] = "</div><div class='osResultSummary'>";
+            sb[sb.length] = "</div>";
             if (summary != null)
             {
+               sb[sb.length] = "<div class='osResultSummary'>";
                sb[sb.length] = summary;
+               sb[sb.length] = "</div>";
             }
-            sb[sb.length] = "</div></td></tr>";
+            sb[sb.length] = "</td></tr>";
          }
          
          // close the table